Fix signed/unsigned comparison warnings.
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index a57ab57..51f30e7 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -766,7 +766,8 @@
STORAGE_get_free_big_blocknr(HANDLE hf) {
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
- int lastbigblocknr,i,curblock,bigblocknr;
+ int lastbigblocknr,i,bigblocknr;
+ unsigned int curblock;
struct storage_header sth;
BOOL ret;
@@ -1073,7 +1074,7 @@
/* use small block reader */
blocknr = STORAGE_get_nth_next_small_blocknr(This->hf,This->stde.pps_sb,This->offset.u.LowPart/SMALLSIZE);
while (cb) {
- int cc;
+ unsigned int cc;
if (!STORAGE_get_small_block(This->hf,blocknr,block)) {
WARN("small block read failed!!!\n");
@@ -1093,7 +1094,7 @@
/* use big block reader */
blocknr = STORAGE_get_nth_next_big_blocknr(This->hf,This->stde.pps_sb,This->offset.u.LowPart/BIGSIZE);
while (cb) {
- int cc;
+ unsigned int cc;
if (!STORAGE_get_big_block(This->hf,blocknr,block)) {
WARN("big block read failed!!!\n");
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 9d01a68..2c9e1b3 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2677,7 +2677,7 @@
}
else
{
- int i;
+ unsigned int i;
/*
* Follow the chain to the last one.
*/
@@ -6667,7 +6667,8 @@
/* enumerate HKEY_CLASSES_ROOT\\CLSID looking for a CLSID whose name matches */
static HRESULT CLSIDFromUserType(LPCWSTR lpszUserType, CLSID *clsid)
{
- LONG r, count, i, len;
+ LONG r, i, len;
+ ULONG count;
WCHAR szKey[0x40];
HKEY hkey, hkeyclsid;
LPWSTR buffer = NULL;
diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c
index 114e4f9..17d5770 100644
--- a/dlls/ole32/tests/propvariant.c
+++ b/dlls/ole32/tests/propvariant.c
@@ -127,7 +127,7 @@
{
PROPVARIANT propvar;
HRESULT hr;
- int i;
+ unsigned int i;
memset(&propvar, 0, sizeof(propvar));
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 3fed873..1f70a5c 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -1177,7 +1177,7 @@
HDC hdcref;
struct jpeg_source_mgr xjsm;
LPBYTE oldbits;
- int i;
+ unsigned int i;
if(!libjpeg_handle) {
if(!load_libjpeg()) {
@@ -1353,7 +1353,7 @@
}
default:
{
- int i;
+ unsigned int i;
FIXME("Unknown magic %04x, %ld read bytes:\n",magic,xread);
hr=E_FAIL;
for (i=0;i<xread+8;i++) {
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 1e0d6a0..5d29437 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -520,7 +520,7 @@
{
/* We are running using client-side rendering fonts... */
GLYPHMETRICS gm;
- int glyph;
+ unsigned int glyph;
int size = 0;
void *bitmap = NULL, *gl_bitmap = NULL;
int org_alignment;
@@ -531,7 +531,7 @@
LEAVE_GL();
for (glyph = first; glyph < first + count; glyph++) {
- int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL);
+ unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL);
int height, width_int;
TRACE("Glyph : %3d / List : %ld\n", glyph, listBase);
diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c
index 73bd380..ee47db5 100644
--- a/dlls/quartz/enumregfilters.c
+++ b/dlls/quartz/enumregfilters.c
@@ -41,7 +41,7 @@
{
IEnumRegFiltersImpl* pEnumRegFilters;
REGFILTER* pRegFilters = NULL;
- int i;
+ unsigned int i;
TRACE("(%p, %ld, %p)\n", pInRegFilters, size, ppEnum);
@@ -139,7 +139,7 @@
{
ULONG cFetched;
IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface;
- int i;
+ unsigned int i;
cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex;
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index cb21927..a72a9d4 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -367,7 +367,7 @@
{
VARIANT var;
int size = sizeof(struct REG_RF);
- int i;
+ unsigned int i;
struct Vector mainStore = {NULL, 0, 0};
struct Vector clsidStore = {NULL, 0, 0};
struct REG_RF rrf;
@@ -395,7 +395,7 @@
{
struct REG_RFP rrfp;
REGFILTERPINS2 rgPin2 = prf2->u.s1.rgPins2[i];
- int j;
+ unsigned int j;
rrfp.signature[0] = '0';
rrfp.signature[1] = 'p';
@@ -999,7 +999,7 @@
if (SUCCEEDED(hr))
{
IMoniker ** ppMoniker;
- int i;
+ unsigned int i;
ULONG nMonikerCount = monikers.current / sizeof(struct MONIKER_MERIT);
/* sort the monikers in descending merit order */
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 91f2705..3da717e 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -162,7 +162,7 @@
*/
DWORD WINAPI QUARTZ_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
- int i;
+ unsigned int i;
IClassFactoryImpl *factory;
TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
diff --git a/dlls/richedit/reader.c b/dlls/richedit/reader.c
index 1e74d88..8425843 100644
--- a/dlls/richedit/reader.c
+++ b/dlls/richedit/reader.c
@@ -894,7 +894,7 @@
int RTFReadCharSetMap(RTF_Info *info, int csId)
{
int *stdCodeArray;
- int i;
+ unsigned int i;
TRACE("\n");
@@ -2620,7 +2620,7 @@
int RTFReadOutputMap(RTF_Info *info, char *outMap[], int reinit)
{
- int i;
+ unsigned int i;
int stdCode;
char *name, *seq;
diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
index affd278..ab1a05f 100644
--- a/dlls/rpcrt4/rpc_server.c
+++ b/dlls/rpcrt4/rpc_server.c
@@ -755,7 +755,7 @@
{
PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec;
RpcServerInterface* sif;
- int i;
+ unsigned int i;
TRACE("(%p,%s,%p,%u,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls,
MaxRpcSize, IfCallbackFn);
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 15cbabc..d223400 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -475,7 +475,7 @@
{
BYTE *data = (BYTE*)uuid;
short c0 = 0, c1 = 0, x, y;
- int i;
+ unsigned int i;
if (!uuid) data = (BYTE*)(uuid = &uuid_nil);
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index d4435ff..fd72b28 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -147,7 +147,8 @@
*/
static void SERIALUI_AddConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, DWORD dwVal)
{
- int i,n;
+ unsigned int i;
+ int n;
HWND hControl = GetDlgItem(hDlg,id);
if(!hControl)
@@ -212,7 +213,7 @@
static BOOL SERIALUI_MakeBaudDword(LPDWORD lpdwBaudRate)
{
- int i;
+ unsigned int i;
for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2)
{
@@ -227,7 +228,7 @@
static BOOL SERIALUI_MakeBaudEnum(LPDWORD lpdwBaudRate)
{
- int i;
+ unsigned int i;
for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2)
{
diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c
index f47137b..72c6928 100644
--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -117,7 +117,7 @@
PVOID Reserved1, UINT Reserved2)
{
WCHAR driveW[20];
- int i;
+ unsigned int i;
LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace;
BOOL rc = FALSE;
static const WCHAR bkslsh[]= {'\\',0};
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 8c760f0..9c13f6d 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -178,7 +178,7 @@
/* find a section by name */
static int find_section( struct inf_file *file, const WCHAR *name )
{
- int i;
+ unsigned int i;
for (i = 0; i < file->nb_sections; i++)
if (!strcmpiW( name, file->sections[i]->name )) return i;
@@ -313,7 +313,8 @@
struct section *strings_section;
struct line *line;
struct field *field;
- int i, dirid;
+ unsigned int i;
+ int dirid;
WCHAR *dirid_str, *end;
const WCHAR *ret = NULL;
@@ -1167,7 +1168,7 @@
void WINAPI SetupCloseInfFile( HINF hinf )
{
struct inf_file *file = hinf;
- int i;
+ unsigned int i;
for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] );
HeapFree( GetProcessHeap(), 0, file->src_root );
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index 38b1115..37c7295 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -173,7 +173,7 @@
*/
static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths )
{
- int src_len = 1, dst_len = 1;
+ unsigned int src_len = 1, dst_len = 1;
WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target;
if (op->src_root) src_len += strlenW(op->src_root) + 1;
diff --git a/dlls/ttydrv/palette.c b/dlls/ttydrv/palette.c
index d0999fc..57d5770 100644
--- a/dlls/ttydrv/palette.c
+++ b/dlls/ttydrv/palette.c
@@ -33,14 +33,14 @@
static PALETTEENTRY *COLOR_sysPal;
-static int palette_size = 256; /* FIXME */
+static unsigned int palette_size = 256; /* FIXME */
/***********************************************************************
* TTYDRV_PALETTE_Initialize
*/
BOOL TTYDRV_PALETTE_Initialize(void)
{
- int i;
+ unsigned int i;
PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS];
TRACE("(void)\n");
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 4439ddf..c3d0ad3 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -1078,8 +1078,7 @@
static BOOL URLMON_IsBinary(LPVOID pBuffer, DWORD cbSize)
{
- int binarycount = 0;
- int i;
+ unsigned int i, binarycount = 0;
unsigned char *buff = pBuffer;
for(i=0; i<cbSize; i++) {
if(buff[i] < 32)
diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c
index c1f743c..35ee2f8 100644
--- a/dlls/user/comm16.c
+++ b/dlls/user/comm16.c
@@ -324,8 +324,8 @@
static void comm_waitread(struct DosDeviceStruct *ptr)
{
- int bleft;
- COMSTAT stat;
+ unsigned int bleft;
+ COMSTAT stat;
/* FIXME: get timeouts working properly so we can read bleft bytes */
bleft = ((ptr->ibuf_tail > ptr->ibuf_head) ?
diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c
index 17b0267..931ab06 100644
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
@@ -2402,7 +2402,7 @@
{ BS_AUTORADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq },
{ BS_OWNERDRAW, WmSetFocusButtonSeq, WmKillFocusButtonSeq }
};
- int i;
+ unsigned int i;
HWND hwnd;
subclass_button();
diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c
index 9b0a405..a113d70 100644
--- a/dlls/uxtheme/stylemap.c
+++ b/dlls/uxtheme/stylemap.c
@@ -1050,7 +1050,7 @@
BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId)
{
- int i;
+ unsigned int i;
const MSSTYLES_CLASS_MAP *map;
*iPartId = 0;
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index ee7511e..1000947 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -434,7 +434,7 @@
PTHEME_FILE pt;
HRESULT hr;
- int i;
+ unsigned int i;
int iDocId;
TRACE("(%s,%s,%p,%d)\n", debugstr_w(pszThemeName), debugstr_w(pszPropertyName),
pszValueBuff, cchMaxValChars);
diff --git a/dlls/winedos/dosconf.c b/dlls/winedos/dosconf.c
index a968baa..47e2d2d 100644
--- a/dlls/winedos/dosconf.c
+++ b/dlls/winedos/dosconf.c
@@ -397,7 +397,7 @@
{
char confline[256];
char *p, *trail;
- int i;
+ unsigned int i;
if (menuname != NULL) /* we need to jump to a certain sub menu */
{
diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c
index e74eb8f..1c7cbc7 100644
--- a/dlls/winedos/int21.c
+++ b/dlls/winedos/int21.c
@@ -890,7 +890,7 @@
*/
static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access )
{
- int i;
+ unsigned int i;
const WCHAR *p;
HANDLE handle;
diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c
index 81cb45e..b71bb79 100644
--- a/dlls/winedos/ioports.c
+++ b/dlls/winedos/ioports.c
@@ -166,7 +166,8 @@
static void do_IO_port_init_read_or_write(const WCHAR *str, char rw)
{
- int val, val1, i;
+ int val, val1;
+ unsigned int i;
WCHAR *end;
static const WCHAR allW[] = {'a','l','l',0};
diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c
index 46d8651..39110574 100644
--- a/dlls/winedos/vga.c
+++ b/dlls/winedos/vga.c
@@ -692,7 +692,7 @@
void VGA_PrepareVideoMemCopy(unsigned Xres, unsigned Yres)
{
char *p, *p2;
- int i;
+ unsigned int i;
/*
* Allocate space for char + attr.
diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c
index 3b807be..b192bda 100644
--- a/dlls/winedos/vxd.c
+++ b/dlls/winedos/vxd.c
@@ -830,7 +830,7 @@
{
LPBYTE page = module->baseAddr + r->VirtualAddress;
WORD *TypeOffset = (WORD *)(r + 1);
- int count = (r->SizeOfBlock - sizeof(*r)) / sizeof(*TypeOffset);
+ unsigned int count = (r->SizeOfBlock - sizeof(*r)) / sizeof(*TypeOffset);
TRACE("MapModule: %d relocations for page %08lx\n",
count, (DWORD)page);
diff --git a/dlls/wineps/clipping.c b/dlls/wineps/clipping.c
index 32f1989..cc061df 100644
--- a/dlls/wineps/clipping.c
+++ b/dlls/wineps/clipping.c
@@ -95,7 +95,7 @@
}
else
{
- INT i;
+ UINT i;
RECT *pRect = (RECT *)rgndata->Buffer;
PSDRV_WriteArrayDef(physDev, szArrayName, rgndata->rdh.nCount * 4);
diff --git a/dlls/wineps/graphics.c b/dlls/wineps/graphics.c
index 121343d..8d52af5 100644
--- a/dlls/wineps/graphics.c
+++ b/dlls/wineps/graphics.c
@@ -381,7 +381,8 @@
BOOL PSDRV_PolyPolygon( PSDRV_PDEVICE *physDev, const POINT* pts, const INT* counts,
UINT polygons )
{
- DWORD polygon, line, total;
+ DWORD polygon, total;
+ INT line;
POINT *dev_pts, *pt;
TRACE("\n");
diff --git a/dlls/wineps/ps.c b/dlls/wineps/ps.c
index 013dbee..759f731 100644
--- a/dlls/wineps/ps.c
+++ b/dlls/wineps/ps.c
@@ -701,7 +701,7 @@
{
char *buf = HeapAlloc(PSDRV_Heap, 0, number * 3 + 1);
char *ptr;
- int i;
+ unsigned int i;
ptr = buf;
diff --git a/dlls/wineps/text.c b/dlls/wineps/text.c
index 5beb343..3dca720 100644
--- a/dlls/wineps/text.c
+++ b/dlls/wineps/text.c
@@ -142,7 +142,7 @@
GetTextExtentPoint32W(physDev->hdc, str, count, &sz);
if((char_extra = GetTextCharacterExtra(physDev->hdc)) != 0) {
- INT i;
+ UINT i;
SIZE tmpsz;
deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT));
@@ -162,7 +162,7 @@
if(deltas) {
SIZE tmpsz;
- INT i;
+ UINT i;
/* Get the width of the last char and add on all the offsets */
if(physDev->font.fontloc == Download)
GetTextExtentPointI(physDev->hdc, glyphs + count - 1, 1, &tmpsz);
@@ -247,7 +247,7 @@
PSDRV_WriteBuiltinGlyphShow(physDev, str, count);
}
else {
- INT i;
+ UINT i;
float dx = 0.0, dy = 0.0;
float cos_theta = cos(physDev->font.escapement * M_PI / 1800.0);
float sin_theta = sin(physDev->font.escapement * M_PI / 1800.0);
diff --git a/dlls/wineps/type1afm.c b/dlls/wineps/type1afm.c
index 119cf17..2188819 100644
--- a/dlls/wineps/type1afm.c
+++ b/dlls/wineps/type1afm.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Adobe Font Metric (AFM) file parsing finctions for Wine PostScript driver.
+ * Adobe Font Metric (AFM) file parsing functions for Wine PostScript driver.
* See http://partners.adobe.com/asn/developer/pdfs/tn/5004.AFM_Spec.pdf.
*
* Copyright 2001 Ian Pilcher
diff --git a/dlls/wineps/type42.c b/dlls/wineps/type42.c
index 458dcb9..2424e29 100644
--- a/dlls/wineps/type42.c
+++ b/dlls/wineps/type42.c
@@ -100,7 +100,7 @@
static BOOL LoadTable(HDC hdc, OTTable *table)
{
- int i;
+ unsigned int i;
if(table->MS_tag == MS_MAKE_TAG('g','d','i','r')) return TRUE;
table->len = GetFontData(hdc, table->MS_tag, 0, NULL, 0);
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index 62a02b6..260448a 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -818,7 +818,7 @@
*/
void MMDRV_Exit(void)
{
- int i;
+ unsigned int i;
TRACE("()\n");
for (i = 0; i < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0]); i++)
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 4d6cf54..18ed860 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -308,7 +308,7 @@
{
MIXERLINECONTROLSA mlcA;
DWORD ret;
- int i;
+ unsigned int i;
LPMIXERCONTROL16 lpmc16;
TRACE("(%04x, %p, %08lx)\n", hmix, lpmlc16, fdwControls);
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 10588c0..b413daa 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -426,7 +426,7 @@
MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)lpmcd->paDetails;
MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA;
int size = max(1, lpmcd->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTA);
- int i;
+ unsigned int i;
if (lpmcd->u.cMultipleItems != 0) {
size *= lpmcd->u.cMultipleItems;
@@ -491,7 +491,7 @@
{
MIXERLINECONTROLSA mlcA;
DWORD ret;
- int i;
+ unsigned int i;
TRACE("(%p, %p, %08lx)\n", hmix, lpmlcW, fdwControls);
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index a623c71..5ebfc39 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -514,7 +514,7 @@
/* translate Winsock fd set into local fd set */
if( wsfds )
{
- int i;
+ unsigned int i;
FD_ZERO(fds);
for( i = 0; i < wsfds->fd_count; i++ )
@@ -580,7 +580,7 @@
{
if ( wsfds )
{
- int i;
+ unsigned int i;
for( i = 0; i < wsfds->fd_count; i++ )
if ( lfd[i] >= 0 ) release_sock_fd( wsfds->fd_array[i], lfd[i] );
@@ -2093,7 +2093,7 @@
if (p_except && ws_exceptfds)
{
- int i, j;
+ unsigned int i, j;
for (i = j = 0; i < ws_exceptfds->fd_count; i++)
{
@@ -2164,7 +2164,8 @@
LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )
{
- int i, n, fd, err = WSAENOTSOCK, flags, ret;
+ unsigned int i;
+ int n, fd, err = WSAENOTSOCK, flags, ret;
struct iovec* iovec;
struct ws2_async *wsa;
@@ -3343,7 +3344,8 @@
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )
{
- int i, n, fd, err = WSAENOTSOCK, flags, ret;
+ unsigned int i;
+ int n, fd, err = WSAENOTSOCK, flags, ret;
struct iovec* iovec;
struct ws2_async *wsa;
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index bbcbe78..ba88516 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -712,9 +712,9 @@
{
LPOPENCONTEXT context;
LPVOID ptr = lpPkts;
- UINT bgn = 0;
- UINT end = 0;
- UINT num = 0;
+ INT bgn = 0;
+ INT end = 0;
+ INT num = 0;
TRACE("(%p, %u, %u, %d, %p, %p)\n",
hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts);
@@ -770,9 +770,9 @@
{
LPOPENCONTEXT context;
LPVOID ptr = lpPkts;
- UINT bgn = 0;
- UINT end = 0;
- UINT num = 0;
+ INT bgn = 0;
+ INT end = 0;
+ INT num = 0;
TRACE("(%p, %u, %u, %d, %p, %p)\n",
hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts);
diff --git a/libs/wine/debug.c b/libs/wine/debug.c
index 2fb76fd..44d2fd6 100644
--- a/libs/wine/debug.c
+++ b/libs/wine/debug.c
@@ -144,7 +144,8 @@
int wine_dbg_parse_options( const char *str )
{
char *opt, *next, *options;
- int i, errors = 0;
+ unsigned int i;
+ int errors = 0;
if (!(options = strdup(str))) return -1;
for (opt = options; opt; opt = next)
diff --git a/programs/avitools/aviinfo.c b/programs/avitools/aviinfo.c
index d4ec09c..7c79f67 100644
--- a/programs/avitools/aviinfo.c
+++ b/programs/avitools/aviinfo.c
@@ -27,7 +27,7 @@
int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
{
- int n;
+ unsigned int n;
HRESULT hres;
PAVIFILE avif;
PAVISTREAM vids,auds;
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 7cbee4f..9659097 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -360,7 +360,8 @@
PRINTDLG printer;
SIZE szMetric;
int cWidthPels, cHeightPels, border;
- int xLeft, yTop, i, pagecount, dopage, copycount;
+ int xLeft, yTop, pagecount, dopage, copycount;
+ unsigned int i;
LOGFONT hdrFont;
HFONT font, old_font=0;
DWORD size;
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index 0a273ac..55dd8b8 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -59,7 +59,7 @@
LPTSTR get_item_text(HWND hwndLV, int item)
{
LPTSTR newStr, curStr;
- int maxLen = 128;
+ unsigned int maxLen = 128;
curStr = HeapAlloc(GetProcessHeap(), 0, maxLen);
if (!curStr) return NULL;
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 1cac38f..b75cb0d 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -522,7 +522,7 @@
{
LPSTR classNameEnd;
LPSTR classNameBeg;
- int i;
+ unsigned int i;
char lpClassCopy[KEY_MAX_LEN];
@@ -1364,7 +1364,7 @@
}
HeapFree(GetProcessHeap(), 0, branch_name);
} else {
- int i;
+ unsigned int i;
/* export all registry classes */
file = REGPROC_open_export_file(file_name);
diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c
index 79ed96c..71544a8 100644
--- a/programs/taskmgr/dbgchnl.c
+++ b/programs/taskmgr/dbgchnl.c
@@ -198,7 +198,8 @@
static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user, unsigned unique)
{
struct dll_option_layout dol;
- int i, j, ret = 1;
+ int i, ret = 1;
+ unsigned int j;
void* buf_addr;
unsigned char buffer[32];
void* addr;
diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c
index 74e6f05..eb4dc47 100644
--- a/programs/uninstaller/main.c
+++ b/programs/uninstaller/main.c
@@ -66,7 +66,7 @@
uninst_entry *entries = NULL;
-int numentries = 0;
+unsigned int numentries = 0;
int list_need_update = 1;
int oldsel = -1;
@@ -88,7 +88,8 @@
void ListUninstallPrograms(void)
{
- int i, len;
+ unsigned int i;
+ int len;
char *descr;
if (! FetchUninstallInformation())
@@ -107,7 +108,7 @@
void RemoveSpecificProgram(char *name)
{
- int i;
+ unsigned int i;
if (! FetchUninstallInformation())
return;
@@ -273,7 +274,7 @@
void UninstallProgram(void)
{
- int i;
+ unsigned int i;
char errormsg[1024];
BOOL res;
STARTUPINFO si;
@@ -323,7 +324,8 @@
HDC hdc;
PAINTSTRUCT ps;
TEXTMETRIC tm;
- int cxChar, cyChar, i, y, bx, maxx, maxy, wx, wy;
+ unsigned int i;
+ int cxChar, cyChar, y, bx, maxx, maxy, wx, wy;
static HWND hwndList = 0, static_text = 0;
DWORD style;
RECT rect;
diff --git a/programs/wcmd/batch.c b/programs/wcmd/batch.c
index 570b5d5..bf6bdee 100644
--- a/programs/wcmd/batch.c
+++ b/programs/wcmd/batch.c
@@ -49,7 +49,7 @@
HANDLE h = INVALID_HANDLE_VALUE;
char string[MAXSTRING];
char extension[][WCMD_BATCH_EXT_SIZE] = {".bat",".cmd"};
-int i;
+unsigned int i;
BATCH_CONTEXT *prev_context;
for(i=0; (i<(sizeof(extension)/WCMD_BATCH_EXT_SIZE)) &&
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 4e523e0..8fcbcfb 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -61,7 +61,7 @@
static BOOL GetLine( HANDLE hFile, char *buf, size_t buflen )
{
- int i=0;
+ unsigned int i=0;
buf[0]='\0';
do
diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c
index a22b151..94db811 100644
--- a/programs/winecfg/drive.c
+++ b/programs/winecfg/drive.c
@@ -456,7 +456,8 @@
char *label;
char *serial;
char *device;
- int i, selection = -1;
+ unsigned int i;
+ int selection = -1;
updatingUI = TRUE;
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 6e94320..6c44cf4 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -329,7 +329,8 @@
*/
static void WCCURSES_Refresh(const struct inner_data* data, int tp, int bm)
{
- int x, y;
+ unsigned int x;
+ int y;
CHAR_INFO* cell;
DWORD attr;
char ch;
diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c
index 707ba5f..388ddb7 100644
--- a/programs/winedbg/break.c
+++ b/programs/winedbg/break.c
@@ -49,8 +49,7 @@
{
static BOOL last; /* = 0 = FALSE */
- int i;
- unsigned ret, size;
+ unsigned int i, ret, size;
void* addr;
struct dbg_breakpoint* bp = dbg_curr_process->bp;
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index ba73146..f4de321 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -397,7 +397,7 @@
static BOOL create_default_icon( const char *filename, const char* comment )
{
FILE *fXPM;
- int i;
+ unsigned int i;
if (!(fXPM = fopen(filename, "w"))) return FALSE;
if (fprintf(fXPM, "/* XPM */\n/* %s */\nstatic char * icon[] = {", comment) <= 0)
diff --git a/programs/winemine/main.c b/programs/winemine/main.c
index 9eece4f..fed4a7f 100644
--- a/programs/winemine/main.c
+++ b/programs/winemine/main.c
@@ -260,16 +260,16 @@
LoadBoard( p_board );
- if( p_board->pos.x < (unsigned) GetSystemMetrics( SM_CXFIXEDFRAME ))
+ if( p_board->pos.x < GetSystemMetrics( SM_CXFIXEDFRAME ))
p_board->pos.x = GetSystemMetrics( SM_CXFIXEDFRAME );
- if( p_board->pos.x > (unsigned) (GetSystemMetrics( SM_CXSCREEN )
+ if( p_board->pos.x > (GetSystemMetrics( SM_CXSCREEN )
- GetSystemMetrics( SM_CXFIXEDFRAME ))) {
p_board->pos.x = GetSystemMetrics( SM_CXSCREEN )
- GetSystemMetrics( SM_CXFIXEDFRAME );
}
- if( p_board->pos.y < (unsigned) (GetSystemMetrics( SM_CYMENU )
+ if( p_board->pos.y < (GetSystemMetrics( SM_CYMENU )
+ GetSystemMetrics( SM_CYCAPTION )
+ GetSystemMetrics( SM_CYFIXEDFRAME ))) {
p_board->pos.y = GetSystemMetrics( SM_CYMENU ) +
@@ -277,7 +277,7 @@
GetSystemMetrics( SM_CYFIXEDFRAME );
}
- if( p_board->pos.y > (unsigned) (GetSystemMetrics( SM_CYSCREEN )
+ if( p_board->pos.y > (GetSystemMetrics( SM_CYSCREEN )
- GetSystemMetrics( SM_CYFIXEDFRAME ))) {
p_board->pos.y = GetSystemMetrics( SM_CYSCREEN )
- GetSystemMetrics( SM_CYFIXEDFRAME );
@@ -840,7 +840,7 @@
void TestMines( BOARD *p_board, POINT pt, int msg )
{
BOOL draw = TRUE;
- unsigned col, row;
+ int col, row;
col = (pt.x - p_board->mines_rect.left) / MINE_WIDTH + 1;
row = (pt.y - p_board->mines_rect.top ) / MINE_HEIGHT + 1;
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index 656c72a..ea23008 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -93,7 +93,7 @@
HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name)
{
static HLPFILE_WINDOWINFO mwi;
- int i;
+ unsigned int i;
if (!name || !name[0])
name = Globals.active_win->lpszName;
@@ -365,7 +365,7 @@
static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin,
HLPFILE_PAGE* page, int nCmdShow)
{
- int i;
+ unsigned int i;
win->hMainWnd = oldwin->hMainWnd;
win->hButtonBoxWnd = oldwin->hButtonBoxWnd;
@@ -1112,7 +1112,7 @@
PAINTSTRUCT ps;
HDC hDc;
TEXTMETRIC tm;
- int i;
+ unsigned int i;
RECT r;
switch (msg)
@@ -1622,7 +1622,7 @@
static void WINHELP_DeleteWindow(WINHELP_WINDOW* win)
{
WINHELP_WINDOW** w;
- int i;
+ unsigned int i;
WINHELP_BUTTON* b;
WINHELP_BUTTON* bp;
@@ -1683,7 +1683,7 @@
if (!init)
{
- INT i;
+ UINT i;
for (i = 0; i < FONTS_LEN; i++)
{
diff --git a/server/registry.c b/server/registry.c
index 7796e59..02bf2c7 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -180,7 +180,8 @@
/* dump a value to a text file */
static void dump_value( const struct key_value *value, FILE *f )
{
- int i, count;
+ unsigned int i;
+ int count;
if (value->name[0])
{
diff --git a/server/trace.c b/server/trace.c
index fecc0bf..ac52fca 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -117,7 +117,7 @@
static void dump_exc_record( const EXCEPTION_RECORD *rec )
{
- int i;
+ unsigned int i;
fprintf( stderr, "{code=%lx,flags=%lx,rec=%p,addr=%p,params={",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionRecord,
rec->ExceptionAddress );
