13 Dec
2012
13 Dec
'12
1:25 p.m.
Author: akhaldi
Date: Thu Dec 13 13:25:38 2012
New Revision: 57903
URL: http://svn.reactos.org/svn/reactos?rev=57903&view=rev
Log:
[CABINET]
* Sync with Wine 1.5.19.
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_…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Thu Dec 13 13:25:38 2012
@@ -365,6 +365,7 @@
if ((end = strrchr(str, '\\')))
{
+ path = str;
end++;
name = HeapAlloc( GetProcessHeap(), 0, strlen(end) + 1 );
if (!name)
@@ -374,7 +375,6 @@
}
strcpy( name, end );
*end = 0;
- path = str;
}
else
{
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] Thu Dec 13 13:25:38 2012
@@ -703,14 +703,14 @@
pfdici->cFiles = num_files;
pfdici->setID = setid;
pfdici->iCabinet = cabidx;
- pfdici->fReserve = (flags & cfheadRESERVE_PRESENT) ? TRUE : FALSE;
- pfdici->hasprev = (flags & cfheadPREV_CABINET) ? TRUE : FALSE;
- pfdici->hasnext = (flags & cfheadNEXT_CABINET) ? TRUE : FALSE;
+ pfdici->fReserve = (flags & cfheadRESERVE_PRESENT) != 0;
+ pfdici->hasprev = (flags & cfheadPREV_CABINET) != 0;
+ pfdici->hasnext = (flags & cfheadNEXT_CABINET) != 0;
return TRUE;
}
/***********************************************************************
- * FDIIsCabinet (CABINET.21)
+ * FDIIsCabinet (CABINET.21)
*
* Informs the caller as to whether or not the provided file handle is
* really a cabinet or not, filling out the provided PFDICABINETINFO
@@ -725,7 +725,7 @@
* be filled out with information about the cabinet
* file indicated by hf if, indeed, it is determined
* to be a cabinet.
- *
+ *
* RETURNS
* TRUE if the file is a cabinet. The info pointed to by pfdici will
* be provided.
@@ -736,10 +736,7 @@
* INCLUDES
* fdi.c
*/
-BOOL __cdecl FDIIsCabinet(
- HFDI hfdi,
- INT_PTR hf,
- PFDICABINETINFO pfdici)
+BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
{
BOOL rv;
FDI_Int *fdi = get_fdi_ptr( hfdi );
@@ -749,13 +746,11 @@
if (!fdi) return FALSE;
if (!hf) {
- ERR("(!hf)!\n");
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
if (!pfdici) {
- ERR("(!pfdici)!\n");
SetLastError(ERROR_BAD_ARGUMENTS);
return FALSE;
}
@@ -820,20 +815,20 @@
/* initialize arithmetic coding models */
- QTMfdi_initmodel(&QTM(model7), &QTM(m7sym)[0], 7, 0);
-
- QTMfdi_initmodel(&QTM(model00), &QTM(m00sym)[0], 0x40, 0x00);
- QTMfdi_initmodel(&QTM(model40), &QTM(m40sym)[0], 0x40, 0x40);
- QTMfdi_initmodel(&QTM(model80), &QTM(m80sym)[0], 0x40, 0x80);
- QTMfdi_initmodel(&QTM(modelC0), &QTM(mC0sym)[0], 0x40, 0xC0);
+ QTMfdi_initmodel(&QTM(model7), QTM(m7sym), 7, 0);
+
+ QTMfdi_initmodel(&QTM(model00), QTM(m00sym), 0x40, 0x00);
+ QTMfdi_initmodel(&QTM(model40), QTM(m40sym), 0x40, 0x40);
+ QTMfdi_initmodel(&QTM(model80), QTM(m80sym), 0x40, 0x80);
+ QTMfdi_initmodel(&QTM(modelC0), QTM(mC0sym), 0x40, 0xC0);
/* model 4 depends on table size, ranges from 20 to 24 */
- QTMfdi_initmodel(&QTM(model4), &QTM(m4sym)[0], (msz < 24) ? msz : 24, 0);
+ QTMfdi_initmodel(&QTM(model4), QTM(m4sym), (msz < 24) ? msz : 24, 0);
/* model 5 depends on table size, ranges from 20 to 36 */
- QTMfdi_initmodel(&QTM(model5), &QTM(m5sym)[0], (msz < 36) ? msz : 36, 0);
+ QTMfdi_initmodel(&QTM(model5), QTM(m5sym), (msz < 36) ? msz : 36, 0);
/* model 6pos depends on table size, ranges from 20 to 42 */
- QTMfdi_initmodel(&QTM(model6pos), &QTM(m6psym)[0], msz, 0);
- QTMfdi_initmodel(&QTM(model6len), &QTM(m6lsym)[0], 27, 0);
+ QTMfdi_initmodel(&QTM(model6pos), QTM(m6psym), msz, 0);
+ QTMfdi_initmodel(&QTM(model6len), QTM(m6lsym), 27, 0);
return DECR_OK;
}
@@ -2046,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, idx, i;
+ int pathlen, filenamelen, i;
INT_PTR cabhf;
char fullpath[MAX_PATH], userpath[256];
FDINOTIFICATION fdin;
@@ -2065,24 +2060,22 @@
if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state)))))
return DECR_NOMEMORY;
-
+
ZeroMemory(cab->next, sizeof(fdi_decomp_state));
/* copy pszCabPath to userpath */
ZeroMemory(userpath, 256);
- pathlen = (pszCabPath) ? strlen(pszCabPath) : 0;
+ pathlen = pszCabPath ? strlen(pszCabPath) : 0;
if (pathlen) {
- if (pathlen < 256) {
- for (i = 0; i <= pathlen; i++)
- userpath[i] = pszCabPath[i];
- } /* else we are in a weird place... let's leave it blank and see if the
user fixes it */
- }
+ if (pathlen < 256) /* else we are in a weird place... let's leave it
blank and see if the user fixes it */
+ strcpy(userpath, pszCabPath);
+ }
/* initial fdintNEXT_CABINET notification */
ZeroMemory(&fdin, sizeof(FDINOTIFICATION));
- fdin.psz1 = (cab->mii.nextname) ? cab->mii.nextname : &emptystring;
- fdin.psz2 = (cab->mii.nextinfo) ? cab->mii.nextinfo : &emptystring;
- fdin.psz3 = &userpath[0];
+ fdin.psz1 = cab->mii.nextname ? cab->mii.nextname : &emptystring;
+ fdin.psz2 = cab->mii.nextinfo ? cab->mii.nextinfo : &emptystring;
+ fdin.psz3 = userpath;
fdin.fdie = FDIERROR_NONE;
fdin.pv = pvUser;
@@ -2091,7 +2084,7 @@
do {
pathlen = strlen(userpath);
- filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0;
+ filenamelen = cab->mii.nextname ? strlen(cab->mii.nextname) : 0;
/* slight overestimation here to save CPU cycles in the developer's brain
*/
if ((pathlen + filenamelen + 3) > MAX_PATH) {
@@ -2100,16 +2093,17 @@
}
/* paste the path and filename together */
- idx = 0;
+ fullpath[0] = '\0';
if (pathlen) {
- for (i = 0; i < pathlen; i++) fullpath[idx++] = userpath[i];
- if (fullpath[idx - 1] != '\\') fullpath[idx++] = '\\';
+ strcpy(fullpath, userpath);
+ if (fullpath[pathlen - 1] != '\\')
+ strcat(fullpath, "\\");
}
- if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] =
cab->mii.nextname[i];
- fullpath[idx] = '\0';
-
+ if (filenamelen)
+ strcat(fullpath, cab->mii.nextname);
+
TRACE("full cab path/file name: %s\n", debugstr_a(fullpath));
-
+
/* try to get a handle to the cabfile */
cabhf = CAB(fdi)->open(fullpath, _O_RDONLY|_O_BINARY, _S_IREAD |
_S_IWRITE);
if (cabhf == -1) {
@@ -2118,14 +2112,14 @@
if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT;
continue;
}
-
+
if (cabhf == 0) {
ERR("PFDI_OPEN returned zero for %s.\n", fullpath);
fdin.fdie = FDIERROR_CABINET_NOT_FOUND;
if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT;
continue;
}
-
+
/* check if it's really a cabfile. Note that this doesn't implement
the bug */
if (!FDI_read_entries(CAB(fdi), cabhf, &fdici,
&(cab->next->mii))) {
WARN("FDIIsCabinet failed.\n");
@@ -2479,7 +2473,6 @@
FDICABINETINFO fdici;
FDINOTIFICATION fdin;
INT_PTR cabhf, filehf = 0;
- int idx;
unsigned int i;
char fullpath[MAX_PATH];
size_t pathlen, filenamelen;
@@ -2490,9 +2483,9 @@
fdi_decomp_state *decomp_state;
FDI_Int *fdi = get_fdi_ptr( hfdi );
- TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, "
+ TRACE("(hfdi == ^%p, pszCabinet == %s, pszCabPath == %s, flags == %x, "
"pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n",
- hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser);
+ hfdi, debugstr_a(pszCabinet), debugstr_a(pszCabPath), flags, pfnfdin, pfnfdid,
pvUser);
if (!fdi) return FALSE;
@@ -2503,8 +2496,8 @@
}
ZeroMemory(decomp_state, sizeof(fdi_decomp_state));
- pathlen = (pszCabPath) ? strlen(pszCabPath) : 0;
- filenamelen = (pszCabinet) ? strlen(pszCabinet) : 0;
+ pathlen = pszCabPath ? strlen(pszCabPath) : 0;
+ filenamelen = pszCabinet ? strlen(pszCabinet) : 0;
/* slight overestimation here to save CPU cycles in the developer's brain */
if ((pathlen + filenamelen + 3) > MAX_PATH) {
@@ -2515,12 +2508,11 @@
}
/* paste the path and filename together */
- idx = 0;
- if (pathlen) {
- for (i = 0; i < pathlen; i++) fullpath[idx++] = pszCabPath[i];
- }
- if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = pszCabinet[i];
- fullpath[idx] = '\0';
+ fullpath[0] = '\0';
+ if (pathlen)
+ strcpy(fullpath, pszCabPath);
+ if (filenamelen)
+ strcat(fullpath, pszCabinet);
TRACE("full cab path/file name: %s\n", debugstr_a(fullpath));
@@ -2535,12 +2527,12 @@
/* check if it's really a cabfile. Note that this doesn't implement the bug */
if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) {
- ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper);
+ WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper);
fdi->free(decomp_state);
fdi->close(cabhf);
return FALSE;
}
-
+
/* cabinet notification */
ZeroMemory(&fdin, sizeof(FDINOTIFICATION));
fdin.setID = fdici.setID;
@@ -2815,7 +2807,7 @@
fdin.pv = pvUser;
fdin.psz1 = (char *)file->filename;
fdin.hf = filehf;
- fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that
right? */
+ fdin.cb = (file->attribs & cffile_A_EXEC) != 0; /* FIXME: is that right? */
fdin.date = file->date;
fdin.time = file->time;
fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */
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] Thu Dec 13 13:25:38 2012
@@ -45,7 +45,7 @@
reactos/dll/win32/avifil32 # Synced to Wine-1.3.37
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.4
+reactos/dll/win32/cabinet # Synced to Wine-1.5.19
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.3.37