[ros-diffs] [reactos] 01/01: [CABINET] Sync with Wine Staging 4.18. CORE-16441

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e4180451f32526433151…

commit 0e4180451f3252643315118d552d6d2f569a53c1
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Oct 26 22:50:17 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Oct 26 22:50:17 2019 +0100

    [CABINET] Sync with Wine Staging 4.18. CORE-16441
---
 dll/win32/cabinet/fci.c | 14 +++++++-------
 media/doc/README.WINE   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dll/win32/cabinet/fci.c b/dll/win32/cabinet/fci.c
index 167ca747d03..2f6ded6845a 100644
--- a/dll/win32/cabinet/fci.c
+++ b/dll/win32/cabinet/fci.c
@@ -174,7 +174,7 @@ typedef struct FCI_Int
   cab_UWORD          cFolders;
   cab_UWORD          cFiles;
   cab_ULONG          cDataBlocks;
-  cab_ULONG          cbFileRemainer; /* uncompressed, yet to be written data */
+  cab_ULONG          cbFileRemainder; /* uncompressed, yet to be written data */
                /* of spanned file of a spanning folder of a spanning cabinet */
   struct temp_file   data;
   BOOL               fNewPrevious;
@@ -839,7 +839,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder,
cab_ULONG *
 static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG payload
)
 {
     cab_ULONG sizeOfFiles = 0, sizeOfFilesPrev;
-    cab_ULONG cbFileRemainer = 0;
+    cab_ULONG cbFileRemainder = 0;
     struct file *file, *next;
 
     LIST_FOR_EACH_ENTRY_SAFE( file, next, &fci->files_list, struct file, entry )
@@ -852,10 +852,10 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder
*folder, cab_ULONG
 
         sizeOfFilesPrev = sizeOfFiles;
         /* set complete size of all processed files */
-        if (file->folder == cffileCONTINUED_FROM_PREV &&
fci->cbFileRemainer != 0)
+        if (file->folder == cffileCONTINUED_FROM_PREV &&
fci->cbFileRemainder != 0)
         {
-            sizeOfFiles += fci->cbFileRemainer;
-            fci->cbFileRemainer = 0;
+            sizeOfFiles += fci->cbFileRemainder;
+            fci->cbFileRemainder = 0;
         }
         else sizeOfFiles += file->size;
 
@@ -888,7 +888,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder,
cab_ULONG
                 {
                     /* The size of the uncompressed, data of a spanning file in a */
                     /* spanning data */
-                    cbFileRemainer = sizeOfFiles - payload;
+                    cbFileRemainder = sizeOfFiles - payload;
                 }
                 file->folder = cffileCONTINUED_FROM_PREV;
             }
@@ -899,7 +899,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder,
cab_ULONG
             fci->files_size -= size;
         }
     }
-    fci->cbFileRemainer = cbFileRemainer;
+    fci->cbFileRemainder = cbFileRemainder;
     return TRUE;
 }
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index ae8472fc556..e1d75bff533 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -52,7 +52,7 @@ dll/win32/atl100              # Synced to WineStaging-3.3
 dll/win32/avifil32            # Synced to WineStaging-4.18
 dll/win32/bcrypt              # Synced to WineStaging-1.9.23
 dll/win32/browseui            # Out of sync
-dll/win32/cabinet             # Synced to WineStaging-3.3
+dll/win32/cabinet             # Synced to WineStaging-4.18
 dll/win32/clusapi             # Synced to WineStaging-3.3
 dll/win32/comcat              # Synced to WineStaging-3.3
 dll/win32/comctl32            # Synced to WineStaging-3.3