Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CABINET]

Browse source 
* Sync with Wine 1.5.26.

svn path=/trunk/; revision=59127
This commit is contained in:
Amine Khaldi 2013-05-31 16:57:42 +00:00
parent 31500a3e7b
commit a811de5d38
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/cabinet/fci.c
View file

@ -30,6 +30,8 @@ There is still some work to be done:
*/ */
#include <config.h> #include <config.h>
#include <assert.h> #include <assert.h>

8
reactos/dll/win32/cabinet/fdi.c
View file

@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
/* outlen=0 means this block was the last contiguous part /* outlen=0 means this block was the last contiguous part
of a split block, continued in the next cabinet */ of a split block, continued in the next cabinet */
if (outlen == 0) { if (outlen == 0) {
int pathlen, filenamelen, i; int pathlen, filenamelen;
INT_PTR cabhf; INT_PTR cabhf;
char fullpath[MAX_PATH], userpath[256]; char fullpath[MAX_PATH], userpath[256];
FDINOTIFICATION fdin; FDINOTIFICATION fdin;
@ -2056,6 +2056,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
/* set up the next decomp_state... */ /* set up the next decomp_state... */
if (!(cab->next)) { if (!(cab->next)) {
unsigned int i;
if (!cab->mii.hasnext) return DECR_INPUT; if (!cab->mii.hasnext) return DECR_INPUT;
if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state)))))
@ -2695,13 +2697,13 @@ BOOL __cdecl FDICopy(
/* find the folder for this file if necc. */ /* find the folder for this file if necc. */
if (filehf) { if (filehf) {
int i2;
fol = CAB(firstfol); fol = CAB(firstfol);
if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) { if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) {
/* pick the last folder */ /* pick the last folder */
while (fol->next) fol = fol->next; while (fol->next) fol = fol->next;
} else { } else {
unsigned int i2;
for (i2 = 0; (i2 < file->index); i2++) for (i2 = 0; (i2 < file->index); i2++)
if (fol->next) /* bug resistance, should always be true */ if (fol->next) /* bug resistance, should always be true */
fol = fol->next; fol = fol->next;

2
reactos/media/doc/README.WINE
View file

@ -46,7 +46,7 @@ reactos/dll/win32/atl100 # Synced to Wine-1.5.19
reactos/dll/win32/avifil32 # Synced to Wine-1.5.26 reactos/dll/win32/avifil32 # Synced to Wine-1.5.26
reactos/dll/win32/bcrypt # Synced to Wine-1.5.19 reactos/dll/win32/bcrypt # Synced to Wine-1.5.19
reactos/dll/win32/browseui # Out of sync 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/clusapi # Synced to Wine-1.5.19
reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comcat # Synced to Wine-1.5.4
reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26