Author: akhaldi
Date: Thu Aug 18 09:58:31 2016
New Revision: 72274
URL: http://svn.reactos.org/svn/reactos?rev=72274&view=rev
Log:
[CABINET] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/cabinet/cabinet_main.c
trunk/reactos/dll/win32/cabinet/fdi.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_main.c?rev=72274&r1=72273&r2=72274&view=diff
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Thu Aug 18
09:58:31 2016
@@ -319,7 +319,7 @@
HFDI hfdi;
char *str, *end, *path = NULL, *name = NULL;
- TRACE("(%p, %s)\n", dest, szCabName);
+ TRACE("(%p, %s)\n", dest, debugstr_a(szCabName));
hfdi = FDICreate(mem_alloc,
mem_free,
Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?rev=72274&r1=72273&r2=72274&view=diff
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Thu Aug 18
09:58:31 2016
@@ -2571,7 +2571,7 @@
* where all the cabinet files needed for decryption are simultaneously
* available. But presumably, the API is supposed to support cabinets
which
* are split across multiple CDROMS; we may need to change our
implementation
- * to strictly serialize it's file usage so that it opens only one cabinet
+ * to strictly serialize its file usage so that it opens only one cabinet
* at a time. Some experimentation with Windows is needed to figure out
the
* precise semantics required. The relevant code is here and in
fdi_decomp().
*/
@@ -2602,8 +2602,8 @@
* if we imagine parallelized access to the FDICopy API.
*
* The current implementation punts -- it just returns the previous
cabinet and
- * it's info from the header of this cabinet. This provides the right
answer in
- * 95% of the cases; its worth checking if Microsoft cuts the same
corner before
+ * its info from the header of this cabinet. This provides the right
answer in
+ * 95% of the cases; it's worth checking if Microsoft cuts the same
corner before
* we "fix" it.
*/
ZeroMemory(&fdin, sizeof(FDINOTIFICATION));
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72274&r1=72273&r2=72274&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:58:31 2016
@@ -51,7 +51,7 @@
reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.16
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4
reactos/dll/win32/browseui # Out of sync
-reactos/dll/win32/cabinet # Synced to WineStaging-1.9.11
+reactos/dll/win32/cabinet # Synced to WineStaging-1.9.16
reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11
reactos/dll/win32/comcat # Synced to WineStaging-1.9.11
reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11
