Fix signed/unsigned comparison warnings.

dlls/ole32/storage.c

@@ -766,7 +766,8 @@ static int
 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 @@ HRESULT WINAPI IStream16_fnRead(
 		/* 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 @@ HRESULT WINAPI IStream16_fnRead(
 		/* 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");

dlls/ole32/storage32.c

@@ -2677,7 +2677,7 @@ ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This)
   }
   else
   {
-    int i;
+    unsigned int i;
     /*
      * Follow the chain to the last one.
      */
@@ -6667,7 +6667,8 @@ static HRESULT STORAGE_WriteCompObj( LPSTORAGE pstg, CLSID *clsid,
 /* 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;

dlls/ole32/tests/propvariant.c

@@ -127,7 +127,7 @@ static void test_validtypes()
 {
     PROPVARIANT propvar;
     HRESULT hr;
-    int i;
+    unsigned int i;
 
     memset(&propvar, 0, sizeof(propvar));
 

dlls/oleaut32/olepicture.c

@@ -1177,7 +1177,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
     HDC					hdcref;
     struct jpeg_source_mgr		xjsm;
     LPBYTE                              oldbits;
-    int i;
+    unsigned int i;
 
     if(!libjpeg_handle) {
         if(!load_libjpeg()) {
@@ -1353,7 +1353,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
   }
   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++) {

dlls/opengl32/wgl.c

@@ -520,7 +520,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc,
 {
     /* 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 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc,
     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);

dlls/quartz/enumregfilters.c

@@ -41,7 +41,7 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size
 {
     IEnumRegFiltersImpl* pEnumRegFilters;
     REGFILTER* pRegFilters = NULL;
-    int i;
+    unsigned int i;
 
     TRACE("(%p, %ld, %p)\n", pInRegFilters, size, ppEnum);
 
@@ -139,7 +139,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF
 {
     ULONG cFetched; 
     IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface;
-    int i;
+    unsigned int i;
 
     cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex;
 

dlls/quartz/filtermapper.c

@@ -367,7 +367,7 @@ static HRESULT FM2_WriteFilterData(IPropertyBag * pPropBag, const REGFILTER2 * p
 {
     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 @@ static HRESULT FM2_WriteFilterData(IPropertyBag * pPropBag, const REGFILTER2 * p
     {
         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 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters(
     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 */

dlls/quartz/main.c

@@ -162,7 +162,7 @@ static IClassFactoryVtbl DSCF_Vtbl =
  */
 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);

dlls/richedit/reader.c

@@ -894,7 +894,7 @@ char	buf[rtfBufSiz];
 int RTFReadCharSetMap(RTF_Info *info, int csId)
 {
         int	*stdCodeArray;
-        int i;
+        unsigned int i;
 
     TRACE("\n");
 
@@ -2620,7 +2620,7 @@ int RTFHexToChar(int i)
 
 int RTFReadOutputMap(RTF_Info *info, char *outMap[], int reinit)
 {
-    int  i;
+    unsigned int  i;
     int  stdCode;
     char *name, *seq;
 

dlls/rpcrt4/rpc_server.c

@@ -755,7 +755,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
 {
   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);

dlls/rpcrt4/rpcrt4_main.c

@@ -475,7 +475,7 @@ unsigned short WINAPI UuidHash(UUID *uuid, RPC_STATUS *Status)
 {
   BYTE *data = (BYTE*)uuid;
   short c0 = 0, c1 = 0, x, y;
-  int i;
+  unsigned int i;
 
   if (!uuid) data = (BYTE*)(uuid = &uuid_nil);
 

dlls/serialui/confdlg.c

@@ -147,7 +147,8 @@ static PARAM2STR SERIALUI_Flow2Str={ SERIALUI_TABLESIZE(SERIALUI_Flow2StrData),S
  */
 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 DWORD SERIALUI_BaudConvertTable[] =  {
 
 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_MakeBaudDword(LPDWORD lpdwBaudRate)
 
 static BOOL SERIALUI_MakeBaudEnum(LPDWORD lpdwBaudRate)
 {
-    int i;
+    unsigned int i;
 
     for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2)
     {

dlls/setupapi/diskspace.c

@@ -117,7 +117,7 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace,
                         PVOID Reserved1, UINT Reserved2)
 {
     WCHAR driveW[20];
-    int i;
+    unsigned int i;
     LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace;
     BOOL rc = FALSE;
     static const WCHAR bkslsh[]= {'\\',0};

dlls/setupapi/parser.c

@@ -178,7 +178,7 @@ static void *grow_array( void *array, unsigned int *count, size_t elem )
 /* 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 @@ static const WCHAR *get_string_subst( struct inf_file *file, const WCHAR *str, u
     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 @@ BOOL WINAPI SetupOpenAppendInfFileW( PCWSTR name, HINF parent_hinf, UINT *error
 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 );

dlls/setupapi/queue.c

@@ -173,7 +173,7 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const
  */
 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;

dlls/ttydrv/palette.c

@@ -33,14 +33,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 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");

dlls/urlmon/umon.c

@@ -1078,8 +1078,7 @@ HRESULT CoInternetCreateSecurityManager( IServiceProvider *pSP,
 
 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)

dlls/user/comm16.c

@@ -324,8 +324,8 @@ static VOID WINAPI COMM16_WriteComplete(DWORD status, DWORD len, LPOVERLAPPED ov
 
 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) ?

dlls/user/tests/msg.c

@@ -2402,7 +2402,7 @@ static void test_button_messages(void)
 	{ BS_AUTORADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq },
 	{ BS_OWNERDRAW, WmSetFocusButtonSeq, WmKillFocusButtonSeq }
     };
-    int i;
+    unsigned int i;
     HWND hwnd;
 
     subclass_button();

dlls/uxtheme/stylemap.c

@@ -1050,7 +1050,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = {
 
 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;

dlls/uxtheme/system.c

@@ -434,7 +434,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName,
 
     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);

dlls/winedos/dosconf.c

@@ -397,7 +397,7 @@ static void DOSCONF_Parse(char *menuname)
 {
     char confline[256];
     char *p, *trail;
-    int i;
+    unsigned int i;
 
     if (menuname != NULL) /* we need to jump to a certain sub menu */
     {

dlls/winedos/int21.c

@@ -890,7 +890,7 @@ static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name )
  */
 static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access )
 {
-    int i;
+    unsigned int i;
     const WCHAR *p;
     HANDLE handle;
 

dlls/winedos/ioports.c

@@ -166,7 +166,8 @@ static void set_IO_permissions(int val1, int val, char rw)
 
 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};
 

dlls/winedos/vga.c

@@ -692,7 +692,7 @@ void VGA_ShowMouse( BOOL show )
 void VGA_PrepareVideoMemCopy(unsigned Xres, unsigned Yres)
 {
     char *p, *p2;
-    int i;
+    unsigned int i;
 
     /*
      * Allocate space for char + attr.

dlls/winedos/vxd.c

@@ -830,7 +830,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *context )
             {
                 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);

dlls/wineps/clipping.c

@@ -95,7 +95,7 @@ void PSDRV_SetClip( PSDRV_PDEVICE *physDev )
         }
         else
         {
-            INT i;
+            UINT i;
             RECT *pRect = (RECT *)rgndata->Buffer;
 
             PSDRV_WriteArrayDef(physDev, szArrayName, rgndata->rdh.nCount * 4);

dlls/wineps/graphics.c

@@ -381,7 +381,8 @@ BOOL PSDRV_Polyline( PSDRV_PDEVICE *physDev, const POINT* pt, INT count )
 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");

dlls/wineps/ps.c

@@ -701,7 +701,7 @@ BOOL PSDRV_WriteBytes(PSDRV_PDEVICE *physDev, const BYTE *bytes, DWORD number)
 {
     char *buf = HeapAlloc(PSDRV_Heap, 0, number * 3 + 1);
     char *ptr;
-    int i;
+    unsigned int i;
 
     ptr = buf;
 

dlls/wineps/text.c

@@ -142,7 +142,7 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, LPCWSTR
         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 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, LPCWSTR
 
     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 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, LPCWSTR
 	    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);

dlls/wineps/type1afm.c

 /*******************************************************************************
- *  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

dlls/wineps/type42.c

@@ -100,7 +100,7 @@ struct tagTYPE42 {
 
 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);

dlls/winmm/lolvldrv.c

@@ -818,7 +818,7 @@ static  BOOL	MMDRV_ExitPerType(LPWINE_MM_DRIVER lpDrv, UINT type)
  */
 void    MMDRV_Exit(void)
 {
-    int i;
+    unsigned int i;
     TRACE("()\n");
 
     for (i = 0; i < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0]); i++)

dlls/winmm/mmsystem.c

@@ -308,7 +308,7 @@ UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16 hmix,
 {
     MIXERLINECONTROLSA	mlcA;
     DWORD		ret;
-    int			i;
+    unsigned int	i;
     LPMIXERCONTROL16	lpmc16;
 
     TRACE("(%04x, %p, %08lx)\n", hmix, lpmlc16, fdwControls);

dlls/winmm/winmm.c

@@ -426,7 +426,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd,
 	    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 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW,
 {
     MIXERLINECONTROLSA	mlcA;
     DWORD		ret;
-    int			i;
+    unsigned int	i;
 
     TRACE("(%p, %p, %08lx)\n", hmix, lpmlcW, fdwControls);
 

dlls/winsock/socket.c

@@ -514,7 +514,7 @@ static fd_set* fd_set_import( fd_set* fds, const WS_fd_set* wsfds, int access, i
     /* 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 @@ static void fd_set_unimport( WS_fd_set* wsfds, int lfd[] )
 {
     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 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds,
 
         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 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
                       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 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
                         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;
 

dlls/wintab32/context.c

@@ -712,9 +712,9 @@ int WINAPI WTDataGet(HCTX hCtx, UINT wBegin, UINT wEnd,
 {
     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 @@ int WINAPI WTDataPeek(HCTX hCtx, UINT wBegin, UINT wEnd,
 {
     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);

libs/wine/debug.c

@@ -144,7 +144,8 @@ void wine_dbg_add_option( const char *name, unsigned char set, unsigned char cle
 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)

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;

programs/notepad/dialog.c

@@ -360,7 +360,8 @@ VOID DIALOG_FilePrint(VOID)
     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;

programs/regedit/listview.c

@@ -59,7 +59,7 @@ static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCF
 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;

programs/regedit/regproc.c

@@ -522,7 +522,7 @@ HKEY getRegClass(LPSTR lpClass)
 {
     LPSTR classNameEnd;
     LPSTR classNameBeg;
-    int i;
+    unsigned int i;
 
     char  lpClassCopy[KEY_MAX_LEN];
 
@@ -1364,7 +1364,7 @@ BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name)
         }
         HeapFree(GetProcessHeap(), 0, branch_name);
     } else {
-        int i;
+        unsigned int i;
 
         /* export all registry classes */
         file = REGPROC_open_export_file(file_name);

programs/taskmgr/dbgchnl.c

@@ -198,7 +198,8 @@ typedef int (*EnumChannelCB)(HANDLE, void*, char*, void*);
 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;

programs/uninstaller/main.c

@@ -66,7 +66,7 @@ typedef struct {
 
 uninst_entry *entries = NULL;
 
-int numentries = 0;
+unsigned int numentries = 0;
 int list_need_update = 1;
 int oldsel = -1;
 
@@ -88,7 +88,8 @@ void UninstallProgram(void);
 
 void ListUninstallPrograms(void)
 {
-    int i, len;
+    unsigned int i;
+    int len;
     char *descr;
 
     if (! FetchUninstallInformation())
@@ -107,7 +108,7 @@ void ListUninstallPrograms(void)
 
 void RemoveSpecificProgram(char *name)
 {
-    int i;
+    unsigned int i;
 
     if (! FetchUninstallInformation())
         return;
@@ -273,7 +274,7 @@ int FetchUninstallInformation(void)
 
 void UninstallProgram(void)
 {
-    int i;
+    unsigned int i;
     char errormsg[1024];
     BOOL res;
     STARTUPINFO si;
@@ -323,7 +324,8 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
     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;

programs/wcmd/batch.c

@@ -49,7 +49,7 @@ void WCMD_batch (char *file, char *command, int called) {
 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)) && 

programs/wineboot/wineboot.c

@@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot);
 
 static BOOL GetLine( HANDLE hFile, char *buf, size_t buflen )
 {
-    int i=0;
+    unsigned int i=0;
     buf[0]='\0';
 
     do

programs/winecfg/drive.c

@@ -456,7 +456,8 @@ void refreshDriveEditDialog(HWND dialog) {
   char *label;
   char *serial;
   char *device;
-  int i, selection = -1;
+  unsigned int i;
+  int selection = -1;
 
   updatingUI = TRUE;
 

programs/wineconsole/curses.c

@@ -329,7 +329,8 @@ static void	WCCURSES_SetTitle(const struct inner_data* data)
  */
 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;

programs/winedbg/break.c

@@ -49,8 +49,7 @@ void  break_set_xpoints(BOOL set)
 {
     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;
 

programs/winemenubuilder/winemenubuilder.c

@@ -397,7 +397,7 @@ static int ExtractFromICO(const char *szFileName, const char *szXPMFileName)
 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)

programs/winemine/main.c

@@ -260,16 +260,16 @@ void InitBoard( BOARD *p_board )
 
     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 @@ void InitBoard( BOARD *p_board )
         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 TestBoard( HWND hWnd, BOARD *p_board, unsigned x, unsigned y, int msg )
 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;

programs/winhelp/winhelp.c

@@ -93,7 +93,7 @@ HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile)
 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 LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
 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 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
     PAINTSTRUCT         ps;
     HDC                 hDc;
     TEXTMETRIC          tm;
-    int                 i;
+    unsigned int        i;
     RECT                r;
 
     switch (msg)
@@ -1622,7 +1622,7 @@ static void WINHELP_DeleteLines(WINHELP_WINDOW *win)
 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 @@ static void WINHELP_InitFonts(HWND hWnd)
 
     if (!init)
     {
-        INT i;
+        UINT i;
 
         for (i = 0; i < FONTS_LEN; i++)
 	{

server/registry.c

@@ -180,7 +180,8 @@ static void dump_path( const struct key *key, const struct key *base, FILE *f )
 /* 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])
     {

server/trace.c

@@ -117,7 +117,7 @@ static void dump_context( const CONTEXT *context )
 
 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 );