reactos/lib/cabinet
diff -u -r1.3 -r1.4
--- cabextract.c 26 Aug 2004 15:11:50 -0000 1.3
+++ cabextract.c 19 Sep 2004 09:18:35 -0000 1.4
@@ -341,7 +341,7 @@
{
cab_off_t len=256, base = cabinet_getoffset(cab), maxlen = cab->filelen - base;
BOOL ok = FALSE;
- int i;
+ unsigned int i;
cab_UBYTE *buf = NULL;
TRACE("(cab == ^%p)\n", cab);
@@ -1148,7 +1148,8 @@
* QTMinit (internal)
*/
int QTMinit(int window, int level, cab_decomp_state *decomp_state) {
- int wndsize = 1 << window, msz = window * 2, i;
+ unsigned int wndsize = 1 << window;
+ int msz = window * 2, i;
cab_ULONG j;
/* QTM supports window sizes of 2^10 (1Kb) through 2^21 (2Mb) */
reactos/lib/cabinet
diff -u -r1.1 -r1.2
--- cabinet_main.c 14 Jan 2004 01:47:46 -0000 1.1
+++ cabinet_main.c 19 Sep 2004 09:18:36 -0000 1.2
@@ -95,7 +95,7 @@
LPSTR dir;
unsigned char *ptr = (unsigned char*) dest;
- int i;
+ unsigned int i;
TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what));
reactos/lib/cabinet
diff -u -r1.1 -r1.2
--- fdi.c 14 Jan 2004 01:47:46 -0000 1.1
+++ fdi.c 19 Sep 2004 09:18:36 -0000 1.2
@@ -280,7 +280,7 @@
base = FDI_getoffset(hfdi, hf),
maxlen = cabsize - base;
BOOL ok = FALSE;
- int i;
+ unsigned int i;
cab_UBYTE *buf = NULL;
TRACE("(hfdi == ^%p, hf == %d)\n", hfdi, hf);
@@ -650,7 +650,8 @@
* QTMfdi_init (internal)
*/
int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) {
- int wndsize = 1 << window, msz = window * 2, i;
+ unsigned int wndsize = 1 << window;
+ int msz = window * 2, i;
cab_ULONG j;
/* QTM supports window sizes of 2^10 (1Kb) through 2^21 (2Mb) */
@@ -2279,8 +2280,8 @@
{
FDICABINETINFO fdici;
FDINOTIFICATION fdin;
- int cabhf, filehf;
- int i, idx;
+ int cabhf, filehf, idx;
+ unsigned int i;
char fullpath[MAX_PATH];
size_t pathlen, filenamelen;
char emptystring = '\0';
reactos/lib/cabinet
diff -u -r1.1 -r1.2
--- winehq2ros.patch 11 Mar 2004 20:08:15 -0000 1.1
+++ winehq2ros.patch 19 Sep 2004 09:18:36 -0000 1.2
@@ -0,0 +1,16 @@
+Index: cabextract.c
+===================================================================
+RCS file: /home/wine/wine/dlls/cabinet/cabextract.c,v
+retrieving revision 1.14
+diff -u -r1.14 cabextract.c
+--- cabextract.c 2 Sep 2004 23:00:54 -0000 1.14
++++ cabextract.c 19 Sep 2004 09:31:32 -0000
+@@ -2514,7 +2514,7 @@
+ cabname = (char *) (fi->folder->cab[0]->filename);
+ }
+
+- ERR(errmsg, cabname);
++ ERR((char *)errmsg, cabname);
+ }
+ }
+