[cwittich] 38831: sync cabinet with wine 1.1.13

Author: cwittich
Date: Sat Jan 17 12:30:33 2009
New Revision: 38831

URL: http://svn.reactos.org/svn/reactos?rev=38831&view=rev
Log:
sync cabinet with wine 1.1.13

Modified:
    trunk/reactos/dll/win32/cabinet/cabinet_main.c
    trunk/reactos/dll/win32/cabinet/fci.c

Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_m...
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Sat Jan 17 12:30:33 2009
@@ -69,17 +69,17 @@

/* FDI callback functions */

-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 INT_PTR fdi_open(char *pszFile, int oflag, int pmode)
+static INT_PTR CDECL fdi_open(char *pszFile, int oflag, int pmode)
 {
     HANDLE handle;
     DWORD dwAccess = 0;
@@ -120,7 +120,7 @@
     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;
     DWORD dwRead;
@@ -131,7 +131,7 @@
     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;
     DWORD dwWritten;
@@ -142,13 +142,13 @@
     return 0;
 }

-static int fdi_close(INT_PTR hf)
+static int CDECL fdi_close(INT_PTR hf)
 {
     HANDLE handle = (HANDLE) hf;
     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;
     return SetFilePointer(handle, dist, NULL, seektype);
@@ -182,7 +182,7 @@
     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)
     {

Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sat Jan 17 12:30:33 2009
@@ -1949,7 +1949,7 @@
   /* TODO error handling of err */

/* 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 buffer p_fci_internal->data_out AGAIN */
     /* read a block from p_fci_internal->handleCFFILE2 */
@@ -2005,7 +2005,7 @@
   p_fci_internal->cFiles=0;

/* 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 buffer p_fci_internal->data_out AGAIN */
     /* read a block from p_fci_internal->handleCFDATA2 */