[CABINET] Sync with Wine 3.0. CORE-14225
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 18 Jan 2018 23:06:11 +0000 (00:06 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 18 Jan 2018 23:06:11 +0000 (00:06 +0100)
dll/win32/cabinet/fdi.c
media/doc/README.WINE

index 250ff1b..a864bd7 100644 (file)
@@ -2039,19 +2039,19 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
             fullpath[0] = '\0';
             if (pathlen) {
               strcpy(fullpath, userpath);
-#ifndef __REACTOS__
-              if (fullpath[pathlen - 1] != '\\')
-                strcat(fullpath, "\\");
-#else
+#ifdef __REACTOS__
               if (fullpath[pathlen - 1] == '\\')
                 fullpath[pathlen - 1] = '\0';
+#else
+              if (fullpath[pathlen - 1] != '\\')
+                strcat(fullpath, "\\");
 #endif
             }
-#ifndef __REACTOS__
-            if (filenamelen)
-#else
+#ifdef __REACTOS__
             if (filenamelen) {
               strcat(fullpath, "\\");
+#else
+            if (filenamelen)
 #endif
               strcat(fullpath, cab->mii.nextname);
 #ifdef __REACTOS__
@@ -2498,7 +2498,7 @@ BOOL __cdecl FDICopy(
   fdin.psz2 = (CAB(mii).nextinfo) ? CAB(mii).nextinfo : &emptystring;
   fdin.psz3 = pszCabPath;
 
-  if (((*pfnfdin)(fdintCABINET_INFO, &fdin))) {
+  if (pfnfdin(fdintCABINET_INFO, &fdin) == -1) {
     set_error( fdi, FDIERROR_USER_ABORT, 0 );
     goto bail_and_fail;
   }
@@ -2625,7 +2625,7 @@ BOOL __cdecl FDICopy(
       fdin.psz2 = (CAB(mii).prevname) ? CAB(mii).prevname : &emptystring;
       fdin.psz3 = (CAB(mii).previnfo) ? CAB(mii).previnfo : &emptystring;
 
-      if (((*pfnfdin)(fdintPARTIAL_FILE, &fdin))) {
+      if (pfnfdin(fdintPARTIAL_FILE, &fdin) == -1) {
         set_error( fdi, FDIERROR_USER_ABORT, 0 );
         goto bail_and_fail;
       }
index 239c5fd..1d25ea7 100644 (file)
@@ -51,7 +51,7 @@ reactos/dll/win32/atl100              # Synced to Wine-3.0
 reactos/dll/win32/avifil32            # Synced to Wine-3.0
 reactos/dll/win32/bcrypt              # Synced to WineStaging-1.9.23
 reactos/dll/win32/browseui            # Out of sync
-reactos/dll/win32/cabinet             # Synced to WineStaging-2.9
+reactos/dll/win32/cabinet             # Synced to Wine-3.0
 reactos/dll/win32/clusapi             # Synced to WineStaging-2.9
 reactos/dll/win32/comcat              # Synced to WineStaging-2.9
 reactos/dll/win32/comctl32            # Synced to Wine-3.0