Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync to Wine-20040914:

Browse source 
Hans Leidekker <hans@it.vu.nl>
- Fix signed/unsigned comparison warnings.

svn path=/trunk/; revision=10901
This commit is contained in:
Gé van Geldorp 2004-09-19 09:18:36 +00:00
parent 5d5247de81
commit 4319f1c249
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/lib/cabinet/cabextract.c
View file

@ -341,7 +341,7 @@ char *cabinet_read_string(struct cabinet *cab)
{
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 @@ void QTMinitmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) {
* 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) */

2
reactos/lib/cabinet/cabinet_main.c
View file

@ -95,7 +95,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR what)
LPSTR dir;
unsigned char *ptr = (unsigned char*) dest;
int i;
unsigned int i;
TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what));

9
reactos/lib/cabinet/fdi.c
View file

@ -280,7 +280,7 @@ char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize)
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 @@ void QTMfdi_initmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s)
* 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 @@ BOOL __cdecl FDICopy(
{
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';

16
reactos/lib/cabinet/winehq2ros.patch
View file

@ -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);
}
}