Changeset 4662 for zzufTweet

Timestamp:

Sep 23, 2010, 1:57:01 AM (11 years ago)

Author:

Sam Hocevar

Message:

Mark diverted Win32 functions as stdcall, it's the correct calling
convention.

File:

• zzuf/trunk/src/libzzuf/lib-win32.c (modified) (5 diffs)

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -38 +38 @@
 /* Kernel functions that we divert */
 #if defined HAVE_CREATEFILEA
-static HANDLE (*ORIG(CreateFileA))(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
-                                   DWORD, DWORD, HANDLE);
+static HANDLE (__stdcall *ORIG(CreateFileA))(LPCTSTR, DWORD, DWORD,
+                                             LPSECURITY_ATTRIBUTES,
+                                             DWORD, DWORD, HANDLE);
 #endif
 #if defined HAVE_CREATEFILEA
-static HANDLE (*ORIG(CreateFileW))(LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
-                                   DWORD, DWORD, HANDLE);
+static HANDLE (__stdcall *ORIG(CreateFileW))(LPCWSTR, DWORD, DWORD,
+                                             LPSECURITY_ATTRIBUTES,
+                                             DWORD, DWORD, HANDLE);
 #endif
 #if defined HAVE_READFILE
-static BOOL (*ORIG(ReadFile))(HANDLE, LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
+static BOOL (__stdcall *ORIG(ReadFile))(HANDLE, LPVOID, DWORD, LPDWORD,
+                                        LPOVERLAPPED);
 #endif
 #if defined HAVE_CLOSEHANDLE
-static BOOL (*ORIG(CloseHandle))(HANDLE);
+static BOOL (__stdcall *ORIG(CloseHandle))(HANDLE);
 #endif
 
@@ -57 +60 @@
 
 #if defined HAVE_CREATEFILEA
-HANDLE NEW(CreateFileA)(LPCTSTR lpFileName, DWORD dwDesiredAccess,
+HANDLE __stdcall NEW(CreateFileA)(LPCTSTR lpFileName, DWORD dwDesiredAccess,
            DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
            DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
            HANDLE hTemplateFile)
 {
-    fprintf(stderr, "CreateFileA diverted!\n");
+    fprintf(stderr, "CreateFileA(%s)\n", lpFileName);
     return ORIG(CreateFileA)(lpFileName, dwDesiredAccess, dwShareMode,
                              lpSecurityAttributes, dwCreationDisposition,
@@ -70 +73 @@
 
 #if defined HAVE_CREATEFILEW
-HANDLE NEW(CreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess,
+HANDLE __stdcall NEW(CreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess,
            DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
            DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
            HANDLE hTemplateFile)
 {
-    fprintf(stderr, "CreateFileW diverted!\n");
+    fprintf(stderr, "CreateFileW(?)\n");
     return ORIG(CreateFileW)(lpFileName, dwDesiredAccess, dwShareMode,
                              lpSecurityAttributes, dwCreationDisposition,
@@ -87 +90 @@
 
 #if defined HAVE_READFILE
-BOOL NEW(ReadFile)(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
-                   LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped)
+BOOL __stdcall NEW(ReadFile)(HANDLE hFile, LPVOID lpBuffer,
+           DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead,
+           LPOVERLAPPED lpOverlapped)
 {
-    fprintf(stderr, "ReadFile diverted!\n");
+    fprintf(stderr, "ReadFile(%i)\n", nNumberOfBytesToRead);
     return ORIG(ReadFile)(hFile, lpBuffer, nNumberOfBytesToRead,
                           lpNumberOfBytesRead, lpOverlapped);
@@ -101 +105 @@
 
 #if defined HAVE_CLOSEHANDLE
-BOOL NEW(CloseHandle)(HANDLE hObject)
+BOOL __stdcall NEW(CloseHandle)(HANDLE hObject)
 {
-    fprintf(stderr, "CloseHandle diverted!\n");
+    fprintf(stderr, "CloseHandle(%i)\n", hObject);
     return ORIG(CloseHandle)(hObject);
 }