Alexandre Julliard : advpack/tests: Add CDECL to the cabinet callback functions.
Alexandre Julliard
julliard at winehq.org
Sun Jan 4 09:08:53 CST 2009
Module: wine
Branch: master
Commit: d7ca3dd2003b538b6bca31f58e34729320bcaad4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ca3dd2003b538b6bca31f58e34729320bcaad4
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Jan 3 20:12:26 2009 +0100
advpack/tests: Add CDECL to the cabinet callback functions.
---
dlls/advpack/tests/files.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c
index 9ddd3bc..611bbc4 100644
--- a/dlls/advpack/tests/files.c
+++ b/dlls/advpack/tests/files.c
@@ -174,33 +174,33 @@ static void test_AddDelBackupEntry(void)
/* the FCI callbacks */
-static void *mem_alloc(ULONG cb)
+static void * CDECL mem_alloc(ULONG cb)
{
return HeapAlloc(GetProcessHeap(), 0, cb);
}
-static void mem_free(void *memory)
+static void CDECL mem_free(void *memory)
{
HeapFree(GetProcessHeap(), 0, memory);
}
-static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv)
+static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv)
{
return TRUE;
}
-static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
+static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv)
{
return 0;
}
-static int file_placed(PCCAB pccab, char *pszFile, long cbFile,
- BOOL fContinuation, void *pv)
+static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile,
+ BOOL fContinuation, void *pv)
{
return 0;
}
-static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv)
+static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv)
{
HANDLE handle;
DWORD dwAccess = 0;
@@ -224,7 +224,7 @@ static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv)
return (INT_PTR)handle;
}
-static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
+static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
{
HANDLE handle = (HANDLE)hf;
DWORD dwRead;
@@ -236,7 +236,7 @@ static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
return dwRead;
}
-static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
+static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
{
HANDLE handle = (HANDLE)hf;
DWORD dwWritten;
@@ -248,7 +248,7 @@ static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv)
return dwWritten;
}
-static int fci_close(INT_PTR hf, int *err, void *pv)
+static int CDECL fci_close(INT_PTR hf, int *err, void *pv)
{
HANDLE handle = (HANDLE)hf;
ok(CloseHandle(handle), "Failed to CloseHandle\n");
@@ -256,7 +256,7 @@ static int fci_close(INT_PTR hf, int *err, void *pv)
return 0;
}
-static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
+static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
{
HANDLE handle = (HANDLE)hf;
DWORD ret;
@@ -267,7 +267,7 @@ static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv)
return ret;
}
-static int fci_delete(char *pszFile, int *err, void *pv)
+static int CDECL fci_delete(char *pszFile, int *err, void *pv)
{
BOOL ret = DeleteFileA(pszFile);
ok(ret, "Failed to DeleteFile %s\n", pszFile);
@@ -275,7 +275,7 @@ static int fci_delete(char *pszFile, int *err, void *pv)
return 0;
}
-static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv)
+static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv)
{
LPSTR tempname;
@@ -294,8 +294,8 @@ static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv)
return FALSE;
}
-static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
- USHORT *pattribs, int *err, void *pv)
+static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
+ USHORT *pattribs, int *err, void *pv)
{
BY_HANDLE_FILE_INFORMATION finfo;
FILETIME filetime;
More information about the wine-cvs
mailing list