update for HEAD-2003021201

[reactos.git] / include / funcs.h

diff --git a/include/funcs.h b/include/funcs.h
index 1d0902f..3c1798b 100644 (file)
--- a/include/funcs.h
+++ b/include/funcs.h
@@ -37,6 +37,19 @@
 extern "C" {
 #endif /* __cplusplus */
 
+typedef
+DWORD (CALLBACK *PPROGRESS_ROUTINE)(
+       LARGE_INTEGER TotalFileSize,
+       LARGE_INTEGER TotalBytesTransferred,
+       LARGE_INTEGER StreamSize,
+       LARGE_INTEGER StreamBytesTransferred,
+       DWORD StreamNumber,
+       DWORD CallbackReason,
+       HANDLE SourceFile,
+       HANDLE DestinationFile,
+       LPVOID UserData);
+typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE;
+
 /* These functions were a real pain, having to figure out which
    had Unicode/Ascii versions and which did not */
 
@@ -341,8 +354,10 @@ extern "C" {
 #define FindNextFile  FindNextFileW
 #define SearchPath  SearchPathW
 #define CopyFile  CopyFileW
+#define CopyFileEx  CopyFileExW
 #define MoveFile  MoveFileW
 #define MoveFileEx  MoveFileExW
+#define MoveFileWithProgress  MoveFileWithProgressW
 #define CreateNamedPipe  CreateNamedPipeW
 #define GetNamedPipeHandleState  GetNamedPipeHandleStateW
 #define CallNamedPipe  CallNamedPipeW
@@ -745,8 +760,10 @@ extern "C" {
 #define FindNextFile  FindNextFileA
 #define SearchPath  SearchPathA
 #define CopyFile  CopyFileA
+#define CopyFileEx  CopyFileExA
 #define MoveFile  MoveFileA
 #define MoveFileEx  MoveFileExA
+#define MoveFileWithProgress  MoveFileWithProgressA
 #define CreateNamedPipe  CreateNamedPipeA
 #define GetNamedPipeHandleState  GetNamedPipeHandleStateA
 #define CallNamedPipe  CallNamedPipeA
@@ -865,7 +882,6 @@ int STDCALL AbortDoc(HDC);
 WINBOOL STDCALL AbortPath(HDC);
 WINBOOL STDCALL AbortPrinter(HANDLE);
 WINBOOL CALLBACK AbortProc(HDC, int);
-WINBOOL STDCALL AbortSystemShutdown(LPTSTR);
 WINBOOL STDCALL AccessCheck(
                    PSECURITY_DESCRIPTOR  pSecurityDescriptor,
                    HANDLE  ClientToken,
@@ -933,7 +949,11 @@ LockResource(
             );
 
 int
+#ifdef __GNUC__
 STDCALL
+#else
+__stdcall
+#endif
 WinMain(
        HINSTANCE hInstance,
        HINSTANCE hPrevInstance,
@@ -5503,7 +5523,8 @@ WINBOOL
 STDCALL
 DrawEdge(HDC hdc, LPRECT qrc, UINT edge, UINT grfFlags);
 
-WINBOOL STDCALL
+WINBOOL
+STDCALL
 DrawFrameControl(HDC, LPRECT, UINT, UINT);
 
 WINBOOL