01/01: [CABINET] Sync with Wine 3.0. CORE-14225

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=736e16553a1453cacc2f3…
commit 736e16553a1453cacc2f3a87d7516658d336e74c
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Jan 19 00:06:11 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Jan 19 00:06:11 2018 +0100
    [CABINET] Sync with Wine 3.0. CORE-14225
---
 dll/win32/cabinet/fdi.c | 18 +++++++++---------
 media/doc/README.WINE   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dll/win32/cabinet/fdi.c b/dll/win32/cabinet/fdi.c
index 250ff1b2e3..a864bd7fdb 100644
--- a/dll/win32/cabinet/fdi.c
+++ b/dll/win32/cabinet/fdi.c
@@ -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;
       }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 239c5fd0d8..1d25ea7149 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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