Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CABINET] Sync with Wine 3.0. CORE-14225

Browse source
This commit is contained in:
Amine Khaldi 2018-01-19 00:06:11 +01:00
parent f1713a3c60
commit 736e16553a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dll/win32/cabinet/fdi.c
View file

@ -2039,19 +2039,19 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
fullpath[0] = '\0'; fullpath[0] = '\0';
if (pathlen) { if (pathlen) {
strcpy(fullpath, userpath); strcpy(fullpath, userpath);
#ifndef __REACTOS__ #ifdef __REACTOS__
if (fullpath[pathlen - 1] != '\\')
strcat(fullpath, "\\");
#else
if (fullpath[pathlen - 1] == '\\') if (fullpath[pathlen - 1] == '\\')
fullpath[pathlen - 1] = '\0'; fullpath[pathlen - 1] = '\0';
#else
if (fullpath[pathlen - 1] != '\\')
strcat(fullpath, "\\");
#endif #endif
} }
#ifndef __REACTOS__ #ifdef __REACTOS__
if (filenamelen)
#else
if (filenamelen) { if (filenamelen) {
strcat(fullpath, "\\"); strcat(fullpath, "\\");
#else
if (filenamelen)
#endif #endif
strcat(fullpath, cab->mii.nextname); strcat(fullpath, cab->mii.nextname);
#ifdef __REACTOS__ #ifdef __REACTOS__
@ -2498,7 +2498,7 @@ BOOL __cdecl FDICopy(
fdin.psz2 = (CAB(mii).nextinfo) ? CAB(mii).nextinfo : &emptystring; fdin.psz2 = (CAB(mii).nextinfo) ? CAB(mii).nextinfo : &emptystring;
fdin.psz3 = pszCabPath; fdin.psz3 = pszCabPath;
if (((*pfnfdin)(fdintCABINET_INFO, &fdin))) { if (pfnfdin(fdintCABINET_INFO, &fdin) == -1) {
set_error( fdi, FDIERROR_USER_ABORT, 0 ); set_error( fdi, FDIERROR_USER_ABORT, 0 );
goto bail_and_fail; goto bail_and_fail;
} }
@ -2625,7 +2625,7 @@ BOOL __cdecl FDICopy(
fdin.psz2 = (CAB(mii).prevname) ? CAB(mii).prevname : &emptystring; fdin.psz2 = (CAB(mii).prevname) ? CAB(mii).prevname : &emptystring;
fdin.psz3 = (CAB(mii).previnfo) ? CAB(mii).previnfo : &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 ); set_error( fdi, FDIERROR_USER_ABORT, 0 );
goto bail_and_fail; goto bail_and_fail;
} }

2
media/doc/README.WINE
View file

@ -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/avifil32 # Synced to Wine-3.0
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23
reactos/dll/win32/browseui # Out of sync 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/clusapi # Synced to WineStaging-2.9
reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comcat # Synced to WineStaging-2.9
reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comctl32 # Synced to Wine-3.0