[ros-diffs] [akhaldi] 59127: [CABINET] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Fri May 31 16:57:42 2013
New Revision: 59127

URL: http://svn.reactos.org/svn/reactos?rev=59127&view=rev
Log:
[CABINET]
* Sync with Wine 1.5.26.

Modified:
    trunk/reactos/dll/win32/cabinet/fci.c
    trunk/reactos/dll/win32/cabinet/fdi.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] Fri May 31 16:57:42 2013
@@ -29,6 +29,8 @@
 - call pfnfcignc on exactly the same position as MS FCIAddFile in every case
 
 */
+
+
 
 #include <config.h>
 

Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] Fri May 31 16:57:42 2013
@@ -2041,7 +2041,7 @@
       /* outlen=0 means this block was the last contiguous part
          of a split block, continued in the next cabinet */
       if (outlen == 0) {
-        int pathlen, filenamelen, i;
+        int pathlen, filenamelen;
         INT_PTR cabhf;
         char fullpath[MAX_PATH], userpath[256];
         FDINOTIFICATION fdin;
@@ -2056,6 +2056,8 @@
 
         /* set up the next decomp_state... */
         if (!(cab->next)) {
+          unsigned int i;
+
           if (!cab->mii.hasnext) return DECR_INPUT;
 
           if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state)))))
@@ -2695,13 +2697,13 @@
 
     /* find the folder for this file if necc. */
     if (filehf) {
-      int i2;
-
       fol = CAB(firstfol);
       if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) {
         /* pick the last folder */
         while (fol->next) fol = fol->next;
       } else {
+        unsigned int i2;
+
         for (i2 = 0; (i2 < file->index); i2++)
           if (fol->next) /* bug resistance, should always be true */
             fol = fol->next;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri May 31 16:57:42 2013
@@ -46,7 +46,7 @@
 reactos/dll/win32/avifil32        # Synced to Wine-1.5.26
 reactos/dll/win32/bcrypt          # Synced to Wine-1.5.19
 reactos/dll/win32/browseui        # Out of sync
-reactos/dll/win32/cabinet         # Synced to Wine-1.5.19
+reactos/dll/win32/cabinet         # Synced to Wine-1.5.26
 reactos/dll/win32/clusapi         # Synced to Wine-1.5.19
 reactos/dll/win32/comcat          # Synced to Wine-1.5.4
 reactos/dll/win32/comctl32        # Synced to Wine 1.5.26