Module: wine Branch: master Commit: f516cab0175a9d7e9ab210d8adf06f02d041224b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f516cab0175a9d7e9ab210d8ad...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jan 13 23:31:50 2009 +0100
include: Change to LONG/ULONG in fdi.h for Win64 compatibility.
---
dlls/cabinet/cabinet_main.c | 2 +- dlls/cabinet/tests/fdi.c | 8 ++++---- dlls/msi/media.c | 2 +- dlls/setupapi/setupcab.c | 2 +- include/fdi.h | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index fde5d9a..45454f4 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -148,7 +148,7 @@ static int CDECL fdi_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; }
-static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index c38fee3..1fa3851 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -81,7 +81,7 @@ static int CDECL fdi_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; }
-static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); @@ -548,7 +548,7 @@ static void test_FDIIsCabinet(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - ok(cabinfo.cbCabinet == 0, "Expected 0, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 0, "Expected 0, got %d\n", cabinfo.cbCabinet); ok(cabinfo.cFiles == 0, "Expected 0, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 0, "Expected 0, got %d\n", cabinfo.cFolders); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); @@ -563,7 +563,7 @@ static void test_FDIIsCabinet(void) ret = FDIIsCabinet(hfdi, fd, &cabinfo); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(cabinfo.cbCabinet == 0, "Expected 0, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 0, "Expected 0, got %d\n", cabinfo.cbCabinet); ok(cabinfo.cFiles == 0, "Expected 0, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 0, "Expected 0, got %d\n", cabinfo.cFolders); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); @@ -584,7 +584,7 @@ static void test_FDIIsCabinet(void) ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); todo_wine { - ok(cabinfo.cbCabinet == 182, "Expected 182, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); }
diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 89d84c4..d7c19c5 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -219,7 +219,7 @@ static int CDECL cabinet_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; }
-static long CDECL cabinet_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL cabinet_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE)hf; /* flags are compatible and so are passed straight through */ diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 765f416..9f7a330 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -250,7 +250,7 @@ static int CDECL sc_cb_close(INT_PTR hf) return -1; }
-static long CDECL sc_cb_lseek(INT_PTR hf, long dist, int seektype) +static LONG CDECL sc_cb_lseek(INT_PTR hf, LONG dist, int seektype) { DWORD ret;
diff --git a/include/fdi.h b/include/fdi.h index 708642a..ef97958 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -32,10 +32,10 @@ extern "C" { * Common FCI/TDI declarations */
-typedef unsigned long CHECKSUM; +typedef ULONG CHECKSUM;
-typedef unsigned long UOFF; -typedef unsigned long COFF; +typedef ULONG UOFF; +typedef ULONG COFF;
/**********************************************************************/
@@ -143,7 +143,7 @@ typedef void *HFDI; /**********************************************************************/
typedef struct { - long cbCabinet; /* Total length of cabinet file */ + LONG cbCabinet; /* Total length of cabinet file */ USHORT cFolders; /* Count of folders in cabinet */ USHORT cFiles; /* Count of files in cabinet */ USHORT setID; /* Cabinet set ID */ @@ -217,14 +217,14 @@ typedef UINT (__cdecl *PFNWRITE)(INT_PTR hf, void *pv, UINT cb); typedef int (__cdecl *PFNCLOSE)(INT_PTR hf); #define FNCLOSE(fn) int __cdecl fn(INT_PTR hf)
-typedef long (__cdecl *PFNSEEK) (INT_PTR hf, long dist, int seektype); -#define FNSEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype) +typedef LONG (__cdecl *PFNSEEK) (INT_PTR hf, LONG dist, int seektype); +#define FNSEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype)
typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid); #define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid)
typedef struct { - long cb; + LONG cb; char *psz1; char *psz2; char *psz3; /* Points to a 256 character buffer */ @@ -261,7 +261,7 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
typedef struct { char ach[2]; /* Set to { '*', '\0' } */ - long cbFile; /* Required spill file size */ + LONG cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE;
#include <poppack.h>