Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=31771
This commit is contained in:
The Wine Synchronizer 2008-01-14 12:29:35 +00:00
parent a348280fcc
commit dde4bc9089
5 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/cabinet/cabinet.h
View file

@ -403,11 +403,11 @@ typedef struct {
#define FDI_INT_MAGIC 0xfdfdfd05 #define FDI_INT_MAGIC 0xfdfdfd05
#define REALLY_IS_FCI(hfci) ( \ #define REALLY_IS_FCI(hfci) ( \
(((void *) hfci) != NULL) && \ ((hfci) != NULL) && \
(PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) ) (PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) )
#define REALLY_IS_FDI(hfdi) ( \ #define REALLY_IS_FDI(hfdi) ( \
(((void *) hfdi) != NULL) && \ ((hfdi) != NULL) && \
(PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) ) (PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) )
/* /*

4
reactos/dll/win32/cabinet/cabinet.rbuild
View file

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="cabinet" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> <group>
<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0">
<importlibrary definition="cabinet.spec.def" /> <importlibrary definition="cabinet.spec.def" />
<include base="cabinet">.</include> <include base="cabinet">.</include>
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
@ -16,3 +17,4 @@
<file>cabinet.rc</file> <file>cabinet.rc</file>
<file>cabinet.spec</file> <file>cabinet.spec</file>
</module> </module>
</group>

4
reactos/dll/win32/cabinet/cabinet_main.c
View file

@ -229,7 +229,11 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf
file_in_list(pDestination->FileList, pfdin->psz1, &node); file_in_list(pDestination->FileList, pfdin->psz1, &node);
if (node && !node->DoExtract) if (node && !node->DoExtract)
{
HeapFree(GetProcessHeap(), 0, szFullPath);
HeapFree(GetProcessHeap(), 0, szDirectory);
return 0; return 0;
}
/* create the destination directory if it doesn't exist */ /* create the destination directory if it doesn't exist */
if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES)

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

@ -188,7 +188,7 @@ HFCI __cdecl FCICreate(
return NULL; return NULL;
} }
if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) { if (!((hfci = (*pfnalloc)(sizeof(FCI_Int))))) {
perf->erfOper = FCIERR_ALLOC_FAIL; perf->erfOper = FCIERR_ALLOC_FAIL;
perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->erfType = ERROR_NOT_ENOUGH_MEMORY;
perf->fError = TRUE; perf->fError = TRUE;

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

@ -377,7 +377,7 @@ HFDI __cdecl FDICreate(
return NULL; return NULL;
} }
if (!((rv = ((HFDI) (*pfnalloc)(sizeof(FDI_Int)))))) { if (!((rv = (*pfnalloc)(sizeof(FDI_Int))))) {
perf->erfOper = FDIERROR_ALLOC_FAIL; perf->erfOper = FDIERROR_ALLOC_FAIL;
perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->erfType = ERROR_NOT_ENOUGH_MEMORY;
perf->fError = TRUE; perf->fError = TRUE;
@ -461,7 +461,7 @@ static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize)
} }
/* otherwise, set the stream to just after the string and return */ /* otherwise, set the stream to just after the string and return */
PFDI_SEEK(hfdi, hf, base + ((cab_off_t) strlen((char *) buf)) + 1, SEEK_SET); PFDI_SEEK(hfdi, hf, base + strlen((char *)buf) + 1, SEEK_SET);
return (char *) buf; return (char *) buf;
} }
@ -1138,7 +1138,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph
for(;;) for(;;)
{ {
ZIPNEEDBITS((cab_ULONG)bl) ZIPNEEDBITS((cab_ULONG)bl)
if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) if((e = (t = tl + (b & ml))->e) > 16)
do do
{ {
if (e == 99) if (e == 99)
@ -1146,7 +1146,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph
ZIPDUMPBITS(t->b) ZIPDUMPBITS(t->b)
e -= 16; e -= 16;
ZIPNEEDBITS(e) ZIPNEEDBITS(e)
} while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16);
ZIPDUMPBITS(t->b) ZIPDUMPBITS(t->b)
if (e == 16) /* then it's a literal */ if (e == 16) /* then it's a literal */
CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; CAB(outbuf)[w++] = (cab_UBYTE)t->v.n;
@ -1158,22 +1158,22 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph
/* get length of block to copy */ /* get length of block to copy */
ZIPNEEDBITS(e) ZIPNEEDBITS(e)
n = t->v.n + ((cab_ULONG)b & Zipmask[e]); n = t->v.n + (b & Zipmask[e]);
ZIPDUMPBITS(e); ZIPDUMPBITS(e);
/* decode distance of block to copy */ /* decode distance of block to copy */
ZIPNEEDBITS((cab_ULONG)bd) ZIPNEEDBITS((cab_ULONG)bd)
if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) if ((e = (t = td + (b & md))->e) > 16)
do { do {
if (e == 99) if (e == 99)
return 1; return 1;
ZIPDUMPBITS(t->b) ZIPDUMPBITS(t->b)
e -= 16; e -= 16;
ZIPNEEDBITS(e) ZIPNEEDBITS(e)
} while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16);
ZIPDUMPBITS(t->b) ZIPDUMPBITS(t->b)
ZIPNEEDBITS(e) ZIPNEEDBITS(e)
d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); d = w - t->v.n - (b & Zipmask[e]);
ZIPDUMPBITS(e) ZIPDUMPBITS(e)
do do
{ {
@ -1217,10 +1217,10 @@ static cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state)
/* get the length and its complement */ /* get the length and its complement */
ZIPNEEDBITS(16) ZIPNEEDBITS(16)
n = ((cab_ULONG)b & 0xffff); n = (b & 0xffff);
ZIPDUMPBITS(16) ZIPDUMPBITS(16)
ZIPNEEDBITS(16) ZIPNEEDBITS(16)
if (n != (cab_ULONG)((~b) & 0xffff)) if (n != ((~b) & 0xffff))
return 1; /* error in compressed data */ return 1; /* error in compressed data */
ZIPDUMPBITS(16) ZIPDUMPBITS(16)
@ -1312,13 +1312,13 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
/* read in table lengths */ /* read in table lengths */
ZIPNEEDBITS(5) ZIPNEEDBITS(5)
nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */ nl = 257 + (b & 0x1f); /* number of literal/length codes */
ZIPDUMPBITS(5) ZIPDUMPBITS(5)
ZIPNEEDBITS(5) ZIPNEEDBITS(5)
nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */ nd = 1 + (b & 0x1f); /* number of distance codes */
ZIPDUMPBITS(5) ZIPDUMPBITS(5)
ZIPNEEDBITS(4) ZIPNEEDBITS(4)
nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */ nb = 4 + (b & 0xf); /* number of bit length codes */
ZIPDUMPBITS(4) ZIPDUMPBITS(4)
if(nl > 288 || nd > 32) if(nl > 288 || nd > 32)
return 1; /* bad lengths */ return 1; /* bad lengths */
@ -1327,7 +1327,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
for(j = 0; j < nb; j++) for(j = 0; j < nb; j++)
{ {
ZIPNEEDBITS(3) ZIPNEEDBITS(3)
ll[Zipborder[j]] = (cab_ULONG)b & 7; ll[Zipborder[j]] = b & 7;
ZIPDUMPBITS(3) ZIPDUMPBITS(3)
} }
for(; j < 19; j++) for(; j < 19; j++)
@ -1349,7 +1349,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
while((cab_ULONG)i < n) while((cab_ULONG)i < n)
{ {
ZIPNEEDBITS((cab_ULONG)bl) ZIPNEEDBITS((cab_ULONG)bl)
j = (td = tl + ((cab_ULONG)b & m))->b; j = (td = tl + (b & m))->b;
ZIPDUMPBITS(j) ZIPDUMPBITS(j)
j = td->v.n; j = td->v.n;
if (j < 16) /* length of code in bits (0..15) */ if (j < 16) /* length of code in bits (0..15) */
@ -1357,7 +1357,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
else if (j == 16) /* repeat last length 3 to 6 times */ else if (j == 16) /* repeat last length 3 to 6 times */
{ {
ZIPNEEDBITS(2) ZIPNEEDBITS(2)
j = 3 + ((cab_ULONG)b & 3); j = 3 + (b & 3);
ZIPDUMPBITS(2) ZIPDUMPBITS(2)
if((cab_ULONG)i + j > n) if((cab_ULONG)i + j > n)
return 1; return 1;
@ -1367,7 +1367,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
else if (j == 17) /* 3 to 10 zero length codes */ else if (j == 17) /* 3 to 10 zero length codes */
{ {
ZIPNEEDBITS(3) ZIPNEEDBITS(3)
j = 3 + ((cab_ULONG)b & 7); j = 3 + (b & 7);
ZIPDUMPBITS(3) ZIPDUMPBITS(3)
if ((cab_ULONG)i + j > n) if ((cab_ULONG)i + j > n)
return 1; return 1;
@ -1378,7 +1378,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
else /* j == 18: 11 to 138 zero length codes */ else /* j == 18: 11 to 138 zero length codes */
{ {
ZIPNEEDBITS(7) ZIPNEEDBITS(7)
j = 11 + ((cab_ULONG)b & 0x7f); j = 11 + (b & 0x7f);
ZIPDUMPBITS(7) ZIPDUMPBITS(7)
if ((cab_ULONG)i + j > n) if ((cab_ULONG)i + j > n)
return 1; return 1;
@ -1436,7 +1436,7 @@ static cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state
/* read in block type */ /* read in block type */
ZIPNEEDBITS(2) ZIPNEEDBITS(2)
t = (cab_ULONG)b & 3; t = b & 3;
ZIPDUMPBITS(2) ZIPDUMPBITS(2)
/* restore the global bit buffer */ /* restore the global bit buffer */