Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync cabinet with wine 1.1.13

Browse source 
svn path=/trunk/; revision=38831
This commit is contained in:
Christoph von Wittich 2009-01-17 18:30:33 +00:00
parent 63bca16061
commit c65e1246ff
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/cabinet/cabinet_main.c
View file

@ -69,17 +69,17 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
/* FDI callback functions */ /* FDI callback functions */
static void *mem_alloc(ULONG cb) static void * CDECL mem_alloc(ULONG cb)
{ {
return HeapAlloc(GetProcessHeap(), 0, cb); return HeapAlloc(GetProcessHeap(), 0, cb);
} }
static void mem_free(void *memory) static void CDECL mem_free(void *memory)
{ {
HeapFree(GetProcessHeap(), 0, memory); HeapFree(GetProcessHeap(), 0, memory);
} }
static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) static INT_PTR CDECL fdi_open(char *pszFile, int oflag, int pmode)
{ {
HANDLE handle; HANDLE handle;
DWORD dwAccess = 0; DWORD dwAccess = 0;
@ -120,7 +120,7 @@ static INT_PTR fdi_open(char *pszFile, int oflag, int pmode)
return (INT_PTR) handle; return (INT_PTR) handle;
} }
static UINT fdi_read(INT_PTR hf, void *pv, UINT cb) static UINT CDECL fdi_read(INT_PTR hf, void *pv, UINT cb)
{ {
HANDLE handle = (HANDLE) hf; HANDLE handle = (HANDLE) hf;
DWORD dwRead; DWORD dwRead;
@ -131,7 +131,7 @@ static UINT fdi_read(INT_PTR hf, void *pv, UINT cb)
return 0; return 0;
} }
static UINT fdi_write(INT_PTR hf, void *pv, UINT cb) static UINT CDECL fdi_write(INT_PTR hf, void *pv, UINT cb)
{ {
HANDLE handle = (HANDLE) hf; HANDLE handle = (HANDLE) hf;
DWORD dwWritten; DWORD dwWritten;
@ -142,13 +142,13 @@ static UINT fdi_write(INT_PTR hf, void *pv, UINT cb)
return 0; return 0;
} }
static int fdi_close(INT_PTR hf) static int CDECL fdi_close(INT_PTR hf)
{ {
HANDLE handle = (HANDLE) hf; HANDLE handle = (HANDLE) hf;
return CloseHandle(handle) ? 0 : -1; return CloseHandle(handle) ? 0 : -1;
} }
static long 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; HANDLE handle = (HANDLE) hf;
return SetFilePointer(handle, dist, NULL, seektype); return SetFilePointer(handle, dist, NULL, seektype);
@ -182,7 +182,7 @@ static BOOL file_in_list(struct FILELIST *pNode, LPCSTR szFilename,
return FALSE; return FALSE;
} }
static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
{ {
switch (fdint) switch (fdint)
{ {

4
reactos/dll/win32/cabinet/fci.c
View file

@ -1949,7 +1949,7 @@ static BOOL fci_flush_cabinet(
/* TODO error handling of err */ /* TODO error handling of err */
/* while not all CFFILE structures have been copied to the cabinet do */ /* while not all CFFILE structures have been copied to the cabinet do */
while(!FALSE) { if (p_fci_internal->data_out) while(!FALSE) {
/* REUSE the variable read_result */ /* REUSE the variable read_result */
/* REUSE the buffer p_fci_internal->data_out AGAIN */ /* REUSE the buffer p_fci_internal->data_out AGAIN */
/* read a block from p_fci_internal->handleCFFILE2 */ /* read a block from p_fci_internal->handleCFFILE2 */
@ -2005,7 +2005,7 @@ static BOOL fci_flush_cabinet(
p_fci_internal->cFiles=0; p_fci_internal->cFiles=0;
/* while not all CFDATA structures have been copied to the cabinet do */ /* while not all CFDATA structures have been copied to the cabinet do */
while(!FALSE) { if (p_fci_internal->data_out) while(!FALSE) {
/* REUSE the variable read_result AGAIN */ /* REUSE the variable read_result AGAIN */
/* REUSE the buffer p_fci_internal->data_out AGAIN */ /* REUSE the buffer p_fci_internal->data_out AGAIN */
/* read a block from p_fci_internal->handleCFDATA2 */ /* read a block from p_fci_internal->handleCFDATA2 */