14 Jan
2008
14 Jan
'08
12:29 p.m.
Author: winesync
Date: Mon Jan 14 15:29:35 2008
New Revision: 31771
URL: http://svn.reactos.org/svn/reactos?rev=31771&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/cabinet/cabinet.h
trunk/reactos/dll/win32/cabinet/cabinet.rbuild
trunk/reactos/dll/win32/cabinet/cabinet_main.c
trunk/reactos/dll/win32/cabinet/fci.c
trunk/reactos/dll/win32/cabinet/fdi.c
Modified: trunk/reactos/dll/win32/cabinet/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.h (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.h Mon Jan 14 15:29:35 2008
@@ -403,11 +403,11 @@
#define FDI_INT_MAGIC 0xfdfdfd05
#define REALLY_IS_FCI(hfci) ( \
- (((void *) hfci) != NULL) && \
+ ((hfci) != NULL) && \
(PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) )
#define REALLY_IS_FDI(hfdi) ( \
- (((void *) hfdi) != NULL) && \
+ ((hfdi) != NULL) && \
(PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) )
/*
Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.rbuild (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild Mon Jan 14 15:29:35 2008
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!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" />
<include base="cabinet">.</include>
<include base="ReactOS">include/reactos/wine</include>
@@ -16,3 +17,4 @@
<file>cabinet.rc</file>
<file>cabinet.spec</file>
</module>
+</group>
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 (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Mon Jan 14 15:29:35 2008
@@ -229,7 +229,11 @@
file_in_list(pDestination->FileList, pfdin->psz1, &node);
if (node && !node->DoExtract)
+ {
+ HeapFree(GetProcessHeap(), 0, szFullPath);
+ HeapFree(GetProcessHeap(), 0, szDirectory);
return 0;
+ }
/* create the destination directory if it doesn't exist */
if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES)
Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c Mon Jan 14 15:29:35 2008
@@ -188,7 +188,7 @@
return NULL;
}
- if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) {
+ if (!((hfci = (*pfnalloc)(sizeof(FCI_Int))))) {
perf->erfOper = FCIERR_ALLOC_FAIL;
perf->erfType = ERROR_NOT_ENOUGH_MEMORY;
perf->fError = TRUE;
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 (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c Mon Jan 14 15:29:35 2008
@@ -377,7 +377,7 @@
return NULL;
}
- if (!((rv = ((HFDI) (*pfnalloc)(sizeof(FDI_Int)))))) {
+ if (!((rv = (*pfnalloc)(sizeof(FDI_Int))))) {
perf->erfOper = FDIERROR_ALLOC_FAIL;
perf->erfType = ERROR_NOT_ENOUGH_MEMORY;
perf->fError = TRUE;
@@ -461,7 +461,7 @@
}
/* 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;
}
@@ -1138,7 +1138,7 @@
for(;;)
{
ZIPNEEDBITS((cab_ULONG)bl)
- if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16)
+ if((e = (t = tl + (b & ml))->e) > 16)
do
{
if (e == 99)
@@ -1146,7 +1146,7 @@
ZIPDUMPBITS(t->b)
e -= 16;
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)
if (e == 16) /* then it's a literal */
CAB(outbuf)[w++] = (cab_UBYTE)t->v.n;
@@ -1158,22 +1158,22 @@
/* get length of block to copy */
ZIPNEEDBITS(e)
- n = t->v.n + ((cab_ULONG)b & Zipmask[e]);
+ n = t->v.n + (b & Zipmask[e]);
ZIPDUMPBITS(e);
/* decode distance of block to copy */
ZIPNEEDBITS((cab_ULONG)bd)
- if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16)
+ if ((e = (t = td + (b & md))->e) > 16)
do {
if (e == 99)
return 1;
ZIPDUMPBITS(t->b)
e -= 16;
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)
ZIPNEEDBITS(e)
- d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]);
+ d = w - t->v.n - (b & Zipmask[e]);
ZIPDUMPBITS(e)
do
{
@@ -1217,10 +1217,10 @@
/* get the length and its complement */
ZIPNEEDBITS(16)
- n = ((cab_ULONG)b & 0xffff);
+ n = (b & 0xffff);
ZIPDUMPBITS(16)
ZIPNEEDBITS(16)
- if (n != (cab_ULONG)((~b) & 0xffff))
+ if (n != ((~b) & 0xffff))
return 1; /* error in compressed data */
ZIPDUMPBITS(16)
@@ -1312,13 +1312,13 @@
/* read in table lengths */
ZIPNEEDBITS(5)
- nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */
+ nl = 257 + (b & 0x1f); /* number of literal/length codes */
ZIPDUMPBITS(5)
ZIPNEEDBITS(5)
- nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */
+ nd = 1 + (b & 0x1f); /* number of distance codes */
ZIPDUMPBITS(5)
ZIPNEEDBITS(4)
- nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */
+ nb = 4 + (b & 0xf); /* number of bit length codes */
ZIPDUMPBITS(4)
if(nl > 288 || nd > 32)
return 1; /* bad lengths */
@@ -1327,7 +1327,7 @@
for(j = 0; j < nb; j++)
{
ZIPNEEDBITS(3)
- ll[Zipborder[j]] = (cab_ULONG)b & 7;
+ ll[Zipborder[j]] = b & 7;
ZIPDUMPBITS(3)
}
for(; j < 19; j++)
@@ -1349,7 +1349,7 @@
while((cab_ULONG)i < n)
{
ZIPNEEDBITS((cab_ULONG)bl)
- j = (td = tl + ((cab_ULONG)b & m))->b;
+ j = (td = tl + (b & m))->b;
ZIPDUMPBITS(j)
j = td->v.n;
if (j < 16) /* length of code in bits (0..15) */
@@ -1357,7 +1357,7 @@
else if (j == 16) /* repeat last length 3 to 6 times */
{
ZIPNEEDBITS(2)
- j = 3 + ((cab_ULONG)b & 3);
+ j = 3 + (b & 3);
ZIPDUMPBITS(2)
if((cab_ULONG)i + j > n)
return 1;
@@ -1367,7 +1367,7 @@
else if (j == 17) /* 3 to 10 zero length codes */
{
ZIPNEEDBITS(3)
- j = 3 + ((cab_ULONG)b & 7);
+ j = 3 + (b & 7);
ZIPDUMPBITS(3)
if ((cab_ULONG)i + j > n)
return 1;
@@ -1378,7 +1378,7 @@
else /* j == 18: 11 to 138 zero length codes */
{
ZIPNEEDBITS(7)
- j = 11 + ((cab_ULONG)b & 0x7f);
+ j = 11 + (b & 0x7f);
ZIPDUMPBITS(7)
if ((cab_ULONG)i + j > n)
return 1;
@@ -1436,7 +1436,7 @@
/* read in block type */
ZIPNEEDBITS(2)
- t = (cab_ULONG)b & 3;
+ t = b & 3;
ZIPDUMPBITS(2)
/* restore the global bit buffer */