Fix signed/unsigned comparison warnings.

dlls/d3d8/cubetexture.c

@@ -59,8 +59,7 @@ ULONG WINAPI IDirect3DCubeTexture8Impl_AddRef(LPDIRECT3DCUBETEXTURE8 iface) {
 ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 iface) {
     ICOM_THIS(IDirect3DCubeTexture8Impl,iface);
     ULONG ref = --This->ref;
-    int i;
-    int j;
+    unsigned int i, j;
 
     TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
     if (ref == 0) {
@@ -134,8 +133,7 @@ static const GLenum cube_targets[6] = {
 };
 
 void     WINAPI        IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 iface) {
-    int i;
-    int j;
+    unsigned int i, j;
     ICOM_THIS(IDirect3DCubeTexture8Impl,iface);
     TRACE("(%p) : About to load texture: dirtified(%d)\n", This, This->Dirty);
 

dlls/d3d8/device.c

@@ -604,7 +604,7 @@ void     WINAPI  IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DG
 HRESULT  WINAPI  IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage,
                                                     D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture8** ppTexture) {
     IDirect3DTexture8Impl *object;
-    int i;
+    unsigned int i;
     UINT tmpW;
     UINT tmpH;
 
@@ -667,7 +667,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 ifac
                                                           D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture8** ppVolumeTexture) {
 
     IDirect3DVolumeTexture8Impl *object;
-    int i;
+    unsigned int i;
     UINT tmpW;
     UINT tmpH;
     UINT tmpD;
@@ -759,7 +759,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface,
 
     IDirect3DCubeTexture8Impl *object;
     ICOM_THIS(IDirect3DDevice8Impl,iface);
-    int i,j;
+    unsigned int i,j;
     UINT tmpW;
 
     /* Allocate the storage for it */
@@ -1046,7 +1046,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface,
 	if (NULL != pSourceRectsArray && NULL != pDestPointsArray) {
 
 	  int bytesPerPixel = ((IDirect3DSurface8Impl*) pSourceSurface)->bytesPerPixel;
-	  int i;
+	  unsigned int i;
 
 	  /* Copy rect by rect */
 	  for (i = 0; i < cRects; i++) {
@@ -1205,7 +1205,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_GetFrontBuffer(LPDIRECT3DDEVICE8 iface, ID
     vcheckGLcall("glPixelStorei");
     /* stupid copy */
     {
-      long j;
+      unsigned long j;
       for (j = 0; j < This->PresentParms.BackBufferHeight; ++j) {
 	glReadPixels(0, This->PresentParms.BackBufferHeight - j - 1, This->PresentParms.BackBufferWidth, 1,
 		     GL_BGRA, GL_UNSIGNED_BYTE, ((char*) lockedRect.pBits) + (j * lockedRect.Pitch));
@@ -1361,7 +1361,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count
     GLfloat old_z_clear_value;
     GLint   old_stencil_clear_value;
     GLfloat old_color_clear_value[4];
-    int i;
+    unsigned int i;
     CONST D3DRECT* curRect;
 
     TRACE("(%p) Count (%ld), pRects (%p), Flags (%lx), Z (%f), Stencil (%ld)\n", This,
@@ -1464,7 +1464,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count
 }
 HRESULT  WINAPI  IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) {
     ICOM_THIS(IDirect3DDevice8Impl,iface);
-    int k;
+    unsigned int k;
 
     /* Most of this routine, comments included copied from ddraw tree initially: */
     TRACE("(%p) : State=%d\n", This, d3dts);
@@ -2527,7 +2527,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3
 
     case D3DRS_TEXTUREFACTOR             :
         {
-            int i;
+            unsigned int i;
 
             /* Note the texture color applies to all textures whereas 
                GL_TEXTURE_ENV_COLOR applies to active only */
@@ -3162,7 +3162,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
 
     IDirect3DBaseTexture8 *oldTxt;
     BOOL reapplyStates = TRUE;
-    DWORD oldTextureDimensions = -1;
+    INT oldTextureDimensions = -1;
     DWORD reapplyFlags = 0;
 
     ICOM_THIS(IDirect3DDevice8Impl,iface);

dlls/d3d8/drawprim.c

@@ -521,7 +521,7 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface,                              /* interf
                  BOOL isPtSize, float ptSize,                       /* pointSize    */
                  D3DVECTOR_4 *texcoords, int *numcoords)               /* texture info */
 {
-    int textureNo;
+    unsigned int textureNo;
     float s, t, r, q;
     ICOM_THIS(IDirect3DDevice8Impl,iface);
 
@@ -665,7 +665,7 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface,                              /* interf
 void drawStridedFast(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *sd, 
                      int PrimitiveType, ULONG NumPrimitives,
                      const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) {
-    int          textureNo   = 0;
+    unsigned int textureNo   = 0;
     GLenum       glPrimType  = GL_POINTS;
     int          NumVertexes = NumPrimitives;
     ICOM_THIS(IDirect3DDevice8Impl,iface);
@@ -927,7 +927,7 @@ void drawStridedSlow(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *sd,
                      int PrimitiveType, ULONG NumPrimitives,
                      const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) {
 
-    int                        textureNo    = 0;
+    unsigned int               textureNo    = 0;
     GLenum                     glPrimType   = GL_POINTS;
     int                        NumVertexes  = NumPrimitives;
     const short               *pIdxBufS     = NULL;
@@ -1237,7 +1237,7 @@ void drawStridedSoftwareVS(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *s
                      int PrimitiveType, ULONG NumPrimitives,
                      const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) {
 
-    int                        textureNo    = 0;
+    unsigned int               textureNo    = 0;
     GLenum                     glPrimType   = GL_POINTS;
     int                        NumVertexes  = NumPrimitives;
     const short               *pIdxBufS     = NULL;
@@ -1467,7 +1467,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
     BOOL                          isLightingOn = FALSE;
     Direct3DVertexStridedData     dataLocations;
     ICOM_THIS(IDirect3DDevice8Impl,iface);
-    int                           i;
+    unsigned int                  i;
     int                           useHW = FALSE;
 
     /* Work out what the FVF should look like */

dlls/d3d8/stateblock.c

@@ -62,7 +62,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_InitStartupStateBlock(IDirect3DDevice8Impl* T
         float f;
 	DWORD d;
     } tmpfloat;
-    int i;
+    unsigned int i;
     int j;
     LPDIRECT3DDEVICE8 iface = (LPDIRECT3DDEVICE8) This;
 
@@ -585,7 +585,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl* This,
         IDirect3DDeviceImpl_DeleteStateBlock(This, tmpBlock);
 
     } else {
-        int i, j;
+        unsigned int i, j;
         PLIGHTINFOEL *src;
 
         /* Recorded => Only update 'changed' values */

dlls/d3d8/texture.c

@@ -59,7 +59,7 @@ ULONG WINAPI IDirect3DTexture8Impl_AddRef(LPDIRECT3DTEXTURE8 iface) {
 ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) {
     ICOM_THIS(IDirect3DTexture8Impl,iface);
     ULONG ref = --This->ref;
-    int i;
+    unsigned int i;
 
     TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
     if (ref == 0) {
@@ -109,7 +109,7 @@ DWORD    WINAPI        IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 ifac
     return 0;
 }
 void     WINAPI        IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) {
-    int i;
+    unsigned int i;
     ICOM_THIS(IDirect3DTexture8Impl,iface);
     TRACE("(%p) : About to load texture\n", This);
 

dlls/d3d8/volumetexture.c

@@ -113,7 +113,7 @@ DWORD    WINAPI        IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMET
     return 0;
 }
 void     WINAPI        IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) {
-    int i;
+    unsigned int i;
     ICOM_THIS(IDirect3DVolumeTexture8Impl,iface);
     TRACE("(%p) : About to load texture\n", This);
 

dlls/d3d9/cubetexture.c

@@ -61,8 +61,7 @@ ULONG WINAPI IDirect3DCubeTexture9Impl_AddRef(LPDIRECT3DCUBETEXTURE9 iface) {
 ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 iface) {
     ICOM_THIS(IDirect3DCubeTexture9Impl,iface);
     ULONG ref = --This->ref;
-    int i;
-    int j;
+    unsigned int i, j;
 
     TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
     if (ref == 0) {

dlls/d3d9/texture.c

@@ -61,7 +61,7 @@ ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) {
 ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) {
     ICOM_THIS(IDirect3DTexture9Impl,iface);
     ULONG ref = --This->ref;
-    int i;
+    unsigned int i;
 
     TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
     if (ref == 0) {

dlls/ddraw/convert.c

@@ -70,7 +70,7 @@ static void pixel_convert_16_to_8(void *src, void *dst, DWORD width, DWORD heigh
 static void palette_convert_16_to_8(
 	LPPALETTEENTRY palent, void *screen_palette, DWORD start, DWORD count
 ) {
-    int i;
+    unsigned int i;
     unsigned int *pal = (unsigned int *) screen_palette;
 
     for (i = 0; i < count; i++)
@@ -82,7 +82,7 @@ static void palette_convert_16_to_8(
 static void palette_convert_15_to_8(
 	LPPALETTEENTRY palent, void *screen_palette, DWORD start, DWORD count
 ) {
-    int i;
+    unsigned int i;
     unsigned int *pal = (unsigned int *) screen_palette;
 
     for (i = 0; i < count; i++)
@@ -167,7 +167,7 @@ static void pixel_convert_32_to_8(
 static void palette_convert_24_to_8(
 	LPPALETTEENTRY palent, void *screen_palette, DWORD start, DWORD count
 ) {
-    int i;
+    unsigned int i;
     unsigned int *pal = (unsigned int *) screen_palette;
 
     for (i = 0; i < count; i++)

dlls/ddraw/d3dcommon.c

@@ -262,7 +262,7 @@ void dump_flexible_vertex(DWORD d3dvtVertexType)
 	FE(D3DFVF_DIFFUSE),
 	FE(D3DFVF_SPECULAR)
     };
-    int i;
+    unsigned int i;
     
     if (d3dvtVertexType & D3DFVF_RESERVED0) DPRINTF("D3DFVF_RESERVED0 ");
     switch (d3dvtVertexType & D3DFVF_POSITION_MASK) {
@@ -298,7 +298,7 @@ void
 convert_FVF_to_strided_data(DWORD d3dvtVertexType, LPVOID lpvVertices, D3DDRAWPRIMITIVESTRIDEDDATA *strided, DWORD dwStartVertex)
 {
     int current_offset = 0;
-    int tex_index;
+    unsigned int tex_index;
     int size = get_flexible_vertex_size(d3dvtVertexType);
 
     lpvVertices = ((BYTE *) lpvVertices) + (size * dwStartVertex);

dlls/ddraw/d3ddevice/main.c

@@ -162,7 +162,7 @@ DWORD InitTextureStageStateTab[] = {
 	
 void InitDefaultStateBlock(STATEBLOCK* lpStateBlock, int version)
 {
-    int i, j;  
+    unsigned int i, j;  
     TRACE("(%p,%d)\n", lpStateBlock, version);    
     memset(lpStateBlock, 0, sizeof(STATEBLOCK));
     

dlls/ddraw/d3ddevice/mesa.c

@@ -1122,7 +1122,7 @@ GL_IDirect3DDeviceImpl_1_CreateExecuteBuffer(LPDIRECT3DDEVICE iface,
 static void flush_zbuffer_to_GL(IDirect3DDeviceImpl *d3d_dev, LPCRECT pRect, IDirectDrawSurfaceImpl *surf) {
     static BOOLEAN first = TRUE;
     IDirect3DDeviceGLImpl* gl_d3d_dev = (IDirect3DDeviceGLImpl*) d3d_dev;
-    int row;
+    unsigned int row;
     GLenum type;
     
     if (first == TRUE) {
@@ -1427,7 +1427,7 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
 	
 	/* Some fast paths first before the generic case.... */
 	if ((d3dvtVertexType == D3DFVF_VERTEX) && (num_active_stages <= 1)) {
-	    int index;
+	    unsigned int index;
 	    
 	    for (index = 0; index < dwIndexCount; index++) {
 		int i = (dwIndices == NULL) ? index : dwIndices[index];
@@ -1448,7 +1448,7 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
 				   tex_coord[0], tex_coord[1]);
 	    }
 	} else if ((d3dvtVertexType == D3DFVF_TLVERTEX) && (num_active_stages <= 1)) {
-	    int index;
+	    unsigned int index;
 	    
 	    for (index = 0; index < dwIndexCount; index++) {
 		int i = (dwIndices == NULL) ? index : dwIndices[index];
@@ -1482,7 +1482,7 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
 	    /* This is the 'slow path' but that should support all possible vertex formats out there...
 	       Note that people should write a fast path for all vertex formats out there...
 	       */  
-	    int index;
+	    unsigned int index;
 	    static const D3DVALUE no_index[] = { 0.0, 0.0, 0.0, 0.0 };
 	    
 	    for (index = 0; index < dwIndexCount; index++) {
@@ -1535,7 +1535,7 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
 		}
 		
 		if (TRACE_ON(ddraw_geom)) {
-		    int tex_index;
+		    unsigned int tex_index;
 		    
 		    if ((d3dvtVertexType & D3DFVF_POSITION_MASK) == D3DFVF_XYZ) {
 			D3DVALUE *position =
@@ -2781,12 +2781,12 @@ static HRESULT d3ddevice_clear(IDirect3DDeviceImpl *This,
     IDirect3DDeviceGLImpl *glThis = (IDirect3DDeviceGLImpl *) This;
     GLbitfield bitfield = 0;
     D3DRECT rect;
-    int i;
+    unsigned int i;
     
     TRACE("(%p)->(%08lx,%p,%08lx,%08lx,%f,%08lx)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil);
     if (TRACE_ON(ddraw)) {
 	if (dwCount > 0) {
-	    int i;
+	    unsigned int i;
 	    TRACE(" rectangles : \n");
 	    for (i = 0; i < dwCount; i++) {
 	        TRACE("  - %ld x %ld     %ld x %ld\n", lpRects[i].u1.x1, lpRects[i].u2.y1, lpRects[i].u3.x2, lpRects[i].u4.y2);

dlls/ddraw/d3dexecutebuffer.c

@@ -318,7 +318,7 @@ static void execute(IDirect3DExecuteBufferImpl *This,
 		    
 		    /* Enough for the moment */
 		    if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT) {
-		        int nb;
+		        unsigned int nb;
 			D3DVERTEX  *src = ((LPD3DVERTEX)  ((char *)This->desc.lpData + vs)) + ci->wStart;
 			D3DTLVERTEX *dst = ((LPD3DTLVERTEX) (This->vertex_data)) + ci->wDest;
 			D3DMATRIX *mat2 = lpDevice->world_mat;
@@ -369,7 +369,7 @@ static void execute(IDirect3DExecuteBufferImpl *This,
 			    
 			}
 		    } else if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORM) {
-		        int nb;
+		        unsigned int nb;
 			D3DLVERTEX *src  = ((LPD3DLVERTEX) ((char *)This->desc.lpData + vs)) + ci->wStart;
 			D3DTLVERTEX *dst = ((LPD3DTLVERTEX) (This->vertex_data)) + ci->wDest;
 			D3DMATRIX mat;

dlls/ddraw/d3dvertexbuffer.c

@@ -287,7 +287,7 @@ process_vertices_strided(IDirect3DVertexBufferImpl *This,
     IDirect3DVertexBufferGLImpl *glThis = (IDirect3DVertexBufferGLImpl *) This;
     DWORD size = get_flexible_vertex_size(dwVertexTypeDesc);
     char *dest_ptr;
-    int i;
+    unsigned int i;
 
     This->processed = TRUE;
 
@@ -321,7 +321,7 @@ process_vertices_strided(IDirect3DVertexBufferImpl *This,
     memcpy(&(glThis->proj_mat), device_impl->proj_mat, sizeof(D3DMATRIX));
 
     for (i = 0; i < dwCount; i++) {
-        int tex_index;
+        unsigned int tex_index;
 
 	if ((dwVertexTypeDesc & D3DFVF_POSITION_MASK) == D3DFVF_XYZ) {
 	    D3DVALUE *position =

dlls/ddraw/ddraw/hal.c

@@ -223,7 +223,7 @@ static DWORD choose_mode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP,
 			 DWORD dwRefreshRate, DWORD dwFlags)
 {
     int best = -1;
-    int i;
+    unsigned int i;
 
     if (!dd_gbl.dwNumModes) return 0;
 
@@ -525,7 +525,7 @@ HRESULT WINAPI
 HAL_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes,
 			       LPDWORD pCodes)
 {
-    int i;
+    unsigned int i;
     ICOM_THIS(IDirectDrawImpl,iface);
     if (*pNumCodes)
 	*pNumCodes=dd_gbl.dwNumFourCC;

dlls/ddraw/ddraw/main.c

@@ -802,7 +802,7 @@ BOOL Main_DirectDraw_DDSD_Match(const DDSURFACEDESC2* requested,
 
 #undef CMP
 
-    int i;
+    unsigned int i;
 
     if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags)
 	return FALSE;

dlls/ddraw/dpalette/main.c

@@ -121,7 +121,7 @@ Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags,
 
     if (This->global.dwFlags & DDPCAPS_8BITENTRIES)
     {
-	int i;
+	unsigned int i;
 	LPBYTE entry = (LPBYTE)palent;
 
 	for (i=dwStart; i < dwCount+dwStart; i++)
@@ -145,7 +145,7 @@ Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags,
 
     if (This->global.dwFlags & DDPCAPS_8BITENTRIES)
     {
-	int i;
+	unsigned int i;
 	const BYTE* entry = (const BYTE*)palent;
 
 	for (i=dwStart; i < dwCount+dwStart; i++)

dlls/ddraw/dsurface/dib.c

@@ -1257,7 +1257,7 @@ void DIB_DirectDrawSurface_update_palette(IDirectDrawSurfaceImpl* This,
 					  LPPALETTEENTRY palent)
 {
     RGBQUAD col[256];
-    int n;
+    unsigned int n;
     HDC dc;
 
     TRACE("updating primary palette\n");

dlls/ddraw/dsurface/main.c

@@ -554,7 +554,7 @@ Main_DirectDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface,
 		valid_windows++;
 
 		if (valid_windows < NUMBER_OF_WINDOWS) {
-		    int i;
+		    unsigned int i;
 		    tot_meas = valid_windows * MEASUREMENT_WINDOW;
 		    for (i = 0; i < valid_windows; i++) {
 			total_time += perf_storage[i];

dlls/ddraw/mesa.c

@@ -990,8 +990,8 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
         case CONVERT_PALETTED: {
 	    IDirectDrawPaletteImpl* pal = current_surface->palette;
 	    BYTE table[256][4];
-	    int i;
-	    int x, y;
+	    unsigned int i;
+	    unsigned int x, y;
 	    BYTE *src = (BYTE *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (pal == NULL) {
@@ -1044,7 +1044,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	       Note2: when using color-keying + alpha, are the alpha bits part of the
 	              color-space or not ?
 	    */
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1067,7 +1067,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_CK_5551: {
 	    /* Change the alpha value of the color-keyed pixels to emulate color-keying. */
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1090,7 +1090,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_CK_4444: {
 	    /* Change the alpha value of the color-keyed pixels to emulate color-keying. */
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1113,7 +1113,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_CK_4444_ARGB: {
 	    /* Move the four Alpha bits... */
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1135,7 +1135,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	} break;
 	
         case CONVERT_CK_1555: {
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1158,7 +1158,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_555: {
 	    /* Converting the 0555 format in 5551 packed */
-	    int x, y;
+	    unsigned int x, y;
 	    WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1192,7 +1192,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_CK_RGB24: {
 	    /* This is a pain :-) */
-	    int x, y;
+	    unsigned int x, y;
 	    BYTE *src = (BYTE *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top));
 	    DWORD *dst;
 	    
@@ -1217,7 +1217,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 
         case CONVERT_CK_8888: {
 	    /* Just use the alpha component to handle color-keying... */
-	    int x, y;
+	    unsigned int x, y;
 	    DWORD *src = (DWORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1239,7 +1239,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	} break;
 	
         case CONVERT_CK_8888_ARGB: {
-	    int x, y;
+	    unsigned int x, y;
 	    DWORD *src = (DWORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)
@@ -1262,7 +1262,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
 	
         case CONVERT_RGB32_888: {
 	    /* Just add an alpha component and handle color-keying... */
-	    int x, y;
+	    unsigned int x, y;
 	    DWORD *src = (DWORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
 	    
 	    if (*temp_buffer == NULL)

dlls/dinput/device.c

@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
  */
 void _dump_cooperativelevel_DI(DWORD dwFlags) {
     if (TRACE_ON(dinput)) {
-	int   i;
+	unsigned int   i;
 	static const struct {
 	    DWORD       mask;
 	    const char  *name;
@@ -64,7 +64,7 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) {
 
 void _dump_EnumObjects_flags(DWORD dwFlags) {
     if (TRACE_ON(dinput)) {
-	int   i;
+	unsigned int   i;
 	DWORD type, instance;
 	static const struct {
 	    DWORD       mask;
@@ -134,7 +134,7 @@ void _dump_OBJECTINSTANCEW(DIDEVICEOBJECTINSTANCEW *ddoi) {
 
 /* This function is a helper to convert a GUID into any possible DInput GUID out there */
 const char *_dump_dinput_GUID(const GUID *guid) {
-    int i;
+    unsigned int i;
     static const struct {
 	const GUID *guid;
 	const char *name;
@@ -179,7 +179,7 @@ const char *_dump_dinput_GUID(const GUID *guid) {
 }
 
 void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) {
-    int i;
+    unsigned int i;
 
     TRACE("Dumping DIDATAFORMAT structure:\n");
     TRACE("  - dwSize: %ld\n", df->dwSize);
@@ -284,7 +284,7 @@ void release_DataFormat(DataFormat * format)
 DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) {
     DataFormat *ret;
     DataTransform *dt;
-    int i, j;
+    unsigned int i, j;
     int same = 1;
     int *done;
     int index = 0;

dlls/dinput/device_private.h

@@ -57,7 +57,7 @@ extern void release_DataFormat(DataFormat *df) ;
 {										\
   /* If queue_len > 0, queuing is requested -> TRACE the event queued */	\
   if (This->queue_len > 0) {							\
-    DWORD nq;									\
+    int nq;									\
     TRACE(" queueing %d at offset %d (queue head %d / size %d)\n", 		\
 	  (int) (data), (int) (offset),                           		\
 	  (int) (This->queue_head), (int) (This->queue_len));			\

dlls/dinput/dinput_main.c

@@ -206,7 +206,7 @@ static char *_dump_DIDEVTYPE_value(DWORD dwDevType) {
 
 static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
     if (TRACE_ON(dinput)) {
-	int   i;
+	unsigned int   i;
 	static const struct {
 	    DWORD       mask;
 	    const char  *name;

dlls/dinput/joystick_linux.c

@@ -381,7 +381,7 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
     LPCDIDATAFORMAT df)
 {
     ICOM_THIS(JoystickImpl,iface);
-    int i;
+    unsigned int i;
     LPDIDATAFORMAT new_df = 0;
     LPDIOBJECTDATAFORMAT new_rgodf = 0;
     ObjProps * new_props = 0;
@@ -1051,7 +1051,7 @@ HRESULT WINAPI JoystickAImpl_GetObjectInfo(
 {
     ICOM_THIS(JoystickImpl,iface);
     DIDEVICEOBJECTINSTANCEA didoiA;
-    int i;
+    unsigned int i;
 
     TRACE("(%p,%p,%ld,0x%08lx(%s))\n",
           iface, pdidoi, dwObj, dwHow,

dlls/dinput/mouse.c

@@ -723,7 +723,8 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
 						  DWORD flags
 ) {
     ICOM_THIS(SysMouseImpl,iface);
-    DWORD len, nqtail;
+    DWORD len;
+    int nqtail;
     
     TRACE("(%p)->(dods=%ld,entries=%ld,fl=0x%08lx)\n",This,dodsize,*entries,flags);
     

dlls/dmloader/loader.c

@@ -898,7 +898,7 @@ HRESULT WINAPI DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) {
 		&CLSID_DirectSoundWave
 	};
 	
-	int i;
+	unsigned int i;
 	WCHAR wszCurrent[MAX_PATH];
 
 	TRACE(": (%p)\n", This);

dlls/dmusic/collection.c

@@ -118,7 +118,7 @@ HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument (
 
 HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument (LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen) {
 	ICOM_THIS_MULTI(IDirectMusicCollectionImpl, CollectionVtbl, iface);
-	int r = 0;
+	unsigned int r = 0;
 	DMUS_PRIVATE_INSTRUMENTENTRY *tmpEntry;
 	struct list *listEntry;
 		

dlls/dsound/buffer.c

@@ -106,7 +106,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(
 	}
 
 	if (TRACE_ON(dsound)) {
-	    int	i;
+	    unsigned int	i;
 	    for (i=0;i<howmuch;i++)
 		TRACE("notify at %ld to 0x%08lx\n",
 		    notify[i].dwOffset,(DWORD)notify[i].hEventNotify);

dlls/dsound/capture.c

@@ -828,7 +828,7 @@ static HRESULT WINAPI IDirectSoundCaptureNotifyImpl_SetNotificationPositions(
     }
 
     if (TRACE_ON(dsound)) {
-	int	i;
+	unsigned int i;
 	for (i=0;i<howmuch;i++)
 	    TRACE("notify at %ld to 0x%08lx\n",
 	    notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
@@ -1338,7 +1338,7 @@ IDirectSoundCaptureBufferImpl_Start(
 
         if (ipDSC->buffer) {
             if (This->nrofnotifies) {
-            	unsigned c;
+            	int c;
 
 		ipDSC->nrofpwaves = This->nrofnotifies;
 		TRACE("nrofnotifies=%d\n", This->nrofnotifies);

dlls/dsound/dsound.c

@@ -95,7 +95,7 @@ static void _dump_DSCAPS(DWORD xmask) {
         FE(DSCAPS_SECONDARY16BIT)
 #undef FE
     };
-    int     i;
+    unsigned int     i;
 
     for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
         if ((flags[i].mask & xmask) == flags[i].mask)
@@ -123,7 +123,7 @@ static void _dump_DSBCAPS(DWORD xmask) {
         FE(DSBCAPS_MUTE3DATMAXDISTANCE)
 #undef FE
     };
-    int     i;
+    unsigned int     i;
 
     for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
         if ((flags[i].mask & xmask) == flags[i].mask)
@@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundImpl_Release(
     ref = InterlockedDecrement(&This->ref);
     if (ref == 0) {
         HRESULT hres;
-        UINT i;
+        INT i;
 
         timeKillEvent(This->timerID);
         timeEndPeriod(DS_TIME_RES);

dlls/dsound/mixer.c

@@ -509,7 +509,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO
 
 static void DSOUND_PhaseCancel(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len)
 {
-	INT     i, ilen, field, nBlockAlign, todo;
+	INT     ilen, field, nBlockAlign;
+	UINT    i, todo;
 	BYTE	*buf, *ibuf;
 
 	TRACE("(%p,%ld,%ld)\n",dsb,writepos,len);

dlls/dsound/propset.c

@@ -372,7 +372,7 @@ static HRESULT WINAPI DSPROPERTY_Description1(
     if ( IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultPlayback) ||
 	 IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultVoicePlayback) ) {
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
 	wodn = waveOutGetNumDevs();
@@ -401,7 +401,7 @@ static HRESULT WINAPI DSPROPERTY_Description1(
     } else if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) ||
 	        IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) {
 	ULONG wid;
-	int widn;
+	unsigned int widn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
 	widn = waveInGetNumDevs();
@@ -430,7 +430,7 @@ static HRESULT WINAPI DSPROPERTY_Description1(
     } else {
 	BOOL found = FALSE;
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	/* given specific device so try the render devices first */
 	wodn = waveOutGetNumDevs();
 	for (wod = 0; wod < wodn; wod++) {
@@ -461,7 +461,7 @@ static HRESULT WINAPI DSPROPERTY_Description1(
 
 	if (found == FALSE) {
             ULONG wid;
-            int widn;
+            unsigned int widn;
             /* given specific device so try the capture devices next */
             widn = waveInGetNumDevs();
             for (wid = 0; wid < widn; wid++) {
@@ -538,7 +538,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA(
     if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultPlayback) ||
 	 IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoicePlayback) ) {
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
 	wodn = waveOutGetNumDevs();
@@ -574,7 +574,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA(
     } else if (IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) ||
 	       IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) {
 	ULONG wid;
-	int widn;
+	unsigned int widn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
 	widn = waveInGetNumDevs();
@@ -611,7 +611,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA(
     } else {
 	BOOL found = FALSE;
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	/* given specific device so try the render devices first */
 	wodn = waveOutGetNumDevs();
 	for (wod = 0; wod < wodn; wod++) {
@@ -694,7 +694,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW(
     if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultPlayback) ||
 	 IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoicePlayback) ) {
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
 	wodn = waveOutGetNumDevs();
@@ -730,7 +730,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW(
     } else if (IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) ||
 	       IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) {
 	ULONG wid;
-	int widn;
+	unsigned int widn;
 	TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
 	ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
 	widn = waveInGetNumDevs();
@@ -767,7 +767,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW(
     } else {
 	BOOL found = FALSE;
 	ULONG wod;
-	int wodn;
+	unsigned int wodn;
 	/* given specific device so try the render devices first */
 	wodn = waveOutGetNumDevs();
 	for (wod = 0; wod < wodn; wod++) {

dlls/gdi/enhmetafile.c

@@ -189,7 +189,7 @@ X(EMR_CREATECOLORSPACEW)
  */
 static const char *get_emr_name(DWORD type)
 {
-    int i;
+    unsigned int i;
     for(i = 0; i < sizeof(emr_names) / sizeof(emr_names[0]); i++)
         if(type == emr_names[i].type) return emr_names[i].name;
     TRACE("Unknown record type %ld\n", type);

dlls/gdi/enhmfdrv/graphics.c

@@ -473,7 +473,8 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po
 			DWORD iType)
 {
     EMRPOLYPOLYLINE *emr;
-    DWORD cptl = 0, poly, size, point;
+    DWORD cptl = 0, poly, size;
+    INT point;
     RECTL bounds;
     const POINT *pts;
     BOOL ret;

dlls/gdi/font.c

@@ -1867,7 +1867,7 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar,
                                    LPABC abc )
 {
     DC *dc = DC_GetDCPtr(hdc);
-    int	i;
+    unsigned int i;
     BOOL ret = FALSE;
 
     if(dc->gdiFont)
@@ -2022,7 +2022,7 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs,
 DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs,
                                  LPKERNINGPAIR lpKerningPairs )
 {
-    int i;
+    unsigned int i;
     FIXME("(%p,%ld,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs);
     for (i = 0; i < cPairs; i++)
         lpKerningPairs[i].iKernAmount = 0;

dlls/gdi/freetype.c

@@ -1409,9 +1409,9 @@ static LONG load_VDMX(GdiFont font, LONG height)
     BYTE hdr[6], tmp[2], group[4];
     BYTE devXRatio, devYRatio;
     USHORT numRecs, numRatios;
-    DWORD offset = -1;
+    DWORD result, offset = -1;
     LONG ppem = 0;
-    int i, result;
+    int i;
 
     result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6);
 
@@ -1541,7 +1541,7 @@ static void calc_hash(FONT_DESC *pfd)
 {
     DWORD hash = 0, *ptr, two_chars;
     WORD *pwc;
-    int i;
+    unsigned int i;
 
     for(i = 0, ptr = (DWORD*)&pfd->matrix; i < sizeof(FMAT2)/sizeof(DWORD); i++, ptr++)
         hash ^= *ptr;
@@ -2432,7 +2432,7 @@ DWORD WineEngGetGlyphOutline(GdiFont font, UINT glyph, UINT format,
     case GGO_GRAY8_BITMAP:
     case WINE_GGO_GRAY16_BITMAP:
       {
-	int mult, row, col;
+	unsigned int mult, row, col;
 	BYTE *start, *ptr;
 
         width = lpgm->gmBlackBoxX;

dlls/gdi/gdiobj.c

@@ -454,7 +454,7 @@ static const struct DefaultFontInfo default_fonts[] =
  */
 static const struct DefaultFontInfo* get_default_fonts(UINT charset)
 {
-        int     n;
+        unsigned int n;
 
         for(n=0;n<(sizeof(default_fonts)/sizeof(default_fonts[0]));n++)
         {
@@ -1265,7 +1265,8 @@ RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0)
 INT WINAPI EnumObjects( HDC hdc, INT nObjType,
                             GOBJENUMPROC lpEnumFunc, LPARAM lParam )
 {
-    INT i, retval = 0;
+    UINT i;
+    INT retval = 0;
     LOGPEN pen;
     LOGBRUSH brush;
 

dlls/gdi/mfdrv/graphics.c

@@ -201,7 +201,7 @@ MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygon
     BOOL ret;
     DWORD len;
     METARECORD *mr;
-    int       i,j;
+    unsigned int i,j;
     LPPOINT16 pt16;
     INT16 totalpoint16 = 0;
     INT16 * pointcounts;

dlls/gdi/mfdrv/objects.c

@@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj )
 {
     METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
-    INT16 index;
+    UINT16 index;
 
     for(index = 0; index < physDev->handles_size; index++)
         if(physDev->handles[index] == 0) break; 

dlls/gdi/mfdrv/text.c

@@ -79,7 +79,7 @@ MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
     RECT16	rect16;
     LPINT16	lpdx16 = NULL;
     BOOL	ret;
-    int		i, j;
+    unsigned int i, j;
     LPSTR       ascii;
     DWORD len;
     CHARSETINFO csi;

dlls/gdi/painting.c

@@ -818,7 +818,7 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
     DC *dc;
     BOOL result;
     POINT lastmove;
-    int i;
+    unsigned int i;
 
     dc = DC_GetDCUpdate( hdc );
     if(!dc) return FALSE;
@@ -1137,7 +1137,7 @@ POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut )
 BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert,
                           void * grad_array, ULONG ngrad, ULONG mode )
 {
-  int i;
+  unsigned int i;
 
   TRACE("vert_array:0x%08lx nvert:%ld grad_array:0x%08lx ngrad:%ld\n",
         (long)vert_array, nvert, (long)grad_array, ngrad);

dlls/gdi/path.c

@@ -870,7 +870,7 @@ BOOL PATH_PolyBezierTo(DC *dc, const POINT *pts, DWORD cbPoints)
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         i;
+   UINT        i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -901,7 +901,7 @@ BOOL PATH_PolyBezier(DC *dc, const POINT *pts, DWORD cbPoints)
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         i;
+   UINT        i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -920,7 +920,7 @@ BOOL PATH_Polyline(DC *dc, const POINT *pts, DWORD cbPoints)
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         i;
+   UINT        i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -939,7 +939,7 @@ BOOL PATH_PolylineTo(DC *dc, const POINT *pts, DWORD cbPoints)
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         i;
+   UINT        i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -972,7 +972,7 @@ BOOL PATH_Polygon(DC *dc, const POINT *pts, DWORD cbPoints)
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         i;
+   UINT        i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -994,7 +994,8 @@ BOOL PATH_PolyPolygon( DC *dc, const POINT* pts, const INT* counts,
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt, startpt;
-   INT         poly, point, i;
+   UINT        poly, i;
+   INT         point;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)
@@ -1019,7 +1020,7 @@ BOOL PATH_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts,
 {
    GdiPath     *pPath = &dc->path;
    POINT       pt;
-   INT         poly, point, i;
+   UINT        poly, point, i;
 
    /* Check that path is open */
    if(pPath->state!=PATH_Open)

dlls/imm32/imm.c

@@ -81,7 +81,7 @@ static void ImmInternalSetOpenStatus(BOOL fOpen);
 
 static VOID IMM_PostResult(InputContextData *data)
 {
-    int i;
+    unsigned int i;
     TRACE("Posting result as IME_CHAR\n");
 
     for (i = 0; i < data->dwResultStringSize / sizeof (WCHAR); i++)
@@ -613,11 +613,11 @@ LONG WINAPI ImmGetCompositionStringW(
     }
     else if (dwIndex == GCS_COMPATTR)
     {
-        int len = data->dwCompStringLength;
+        unsigned int len = data->dwCompStringLength;
         
         if (dwBufLen >= len)
         {
-            int i=0;
+            unsigned int i=0;
             for (i = 0;  i < len; i++)
                 ((LPBYTE)lpBuf)[i] = ATTR_INPUT;
         }

dlls/iphlpapi/ifenum.c

@@ -576,7 +576,7 @@ DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr,
     if ((ioctl(fd, SIOCGIFHWADDR, &ifr)))
       ret = ERROR_INVALID_DATA;
     else {
-      int addrLen;
+      unsigned int addrLen;
 
       switch (ifr.ifr_hwaddr.sa_family)
       {

dlls/msacm/filter.c

@@ -192,7 +192,7 @@ static BOOL MSACM_FilterEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
 				   DWORD fdwEnum)
 {
     ACMFILTERTAGDETAILSW	aftd;
-    int				i, j;
+    unsigned int i, j;
 
     for (i = 0; i < padid->cFilterTags; i++) {
 	memset(&aftd, 0, sizeof(aftd));
@@ -425,7 +425,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
 				  DWORD fdwEnum)
 {
     PWINE_ACMDRIVERID		padid;
-    int				i;
+    unsigned int			i;
 
     TRACE("(%p, %p, %p, %ld, %ld)\n",
 	  had, paftd, fnCallback, dwInstance, fdwEnum);

dlls/msacm/format.c

@@ -72,7 +72,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
 
 	    if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) {
 		ACMFORMATDETAILSA	afd;
-		int			i, idx;
+		unsigned int		i, idx;
 		MMRESULT		mmr;
 		char			buffer[ACMFORMATDETAILS_FORMAT_CHARS+16];
 
@@ -441,7 +441,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
 				   DWORD fdwEnum)
 {
     ACMFORMATTAGDETAILSW	aftd;
-    int				i, j;
+    unsigned int			i, j;
 
     for (i = 0; i < padid->cFormatTags; i++) {
 	memset(&aftd, 0, sizeof(aftd));
@@ -771,7 +771,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
 				  DWORD fdwEnum)
 {
     PWINE_ACMDRIVERID		padid;
-    int				i;
+    unsigned int			i;
     BOOL			bPcmDone = FALSE;
 
     TRACE("(%p, %p, %p, %ld, %ld)\n",

dlls/msacm/internal.c

@@ -88,7 +88,7 @@ BOOL MSACM_FindFormatTagInCache(WINE_ACMDRIVERID* padid, DWORD fmtTag, LPDWORD i
 static BOOL MSACM_FillCache(PWINE_ACMDRIVERID padid)
 {
     HACMDRIVER		        had = 0;
-    int			        ntag;
+    unsigned int		        ntag;
     ACMDRIVERDETAILSW	        add;
     ACMFORMATTAGDETAILSW        aftd;
 

dlls/msacm/msacm32_main.c

@@ -108,7 +108,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
     BOOL 		bLocal = TRUE;
     PWINE_ACMDRIVERID	padid;
     DWORD		val = 0;
-    int			i;
+    unsigned int	i;
     MMRESULT		mmr = MMSYSERR_NOERROR;
 
     TRACE("(%p, %d, %p);\n", hao, uMetric, pMetric);

dlls/msacm/pcmconverter.c

@@ -121,7 +121,7 @@ static	struct {
  */
 static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx)
 {
-    int i;
+    unsigned int i;
     TRACE("(%p)\n", wfx);
 
     for (i = 0; i < NUM_PCM_FORMATS; i++) {

dlls/msdmo/dmoreg.c

@@ -461,7 +461,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
     if (!pCLSID || !Names || !pcItemsFetched)
         return E_POINTER;
 
-    while (count < (INT)cItemsToFetch)
+    while (count < cItemsToFetch)
     {
         This->index++;
 
@@ -485,7 +485,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
 
         if (This->pInTypes)
         {
-            INT i, j;
+            UINT i, j;
             DWORD cInTypes;
             DMO_PARTIAL_MEDIATYPE* pInTypes;
 
@@ -521,7 +521,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
 
         if (This->pOutTypes)
         {
-            INT i, j;
+            UINT i, j;
             DWORD cOutTypes;
             DMO_PARTIAL_MEDIATYPE* pOutTypes;
 

dlls/msvcrt/file.c

@@ -192,7 +192,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag)
  */
 static MSVCRT_FILE* msvcrt_alloc_fp(void)
 {
-  int i;
+  unsigned int i;
 
   for (i = 3; i < sizeof(MSVCRT_fstreams) / sizeof(MSVCRT_fstreams[0]); i++)
   {

dlls/msvideo/msvideo_main.c

@@ -995,7 +995,7 @@ HANDLE VFWAPI ICImageDecompress(
 	BYTE*	pMem = NULL;
 	BOOL	bReleaseIC = FALSE;
 	BYTE*	pHdr = NULL;
-	LONG	cbHdr = 0;
+	ULONG	cbHdr = 0;
 	BOOL	bSucceeded = FALSE;
 	BOOL	bInDecompress = FALSE;
 	DWORD	biSizeImage;

dlls/netapi32/nbt.c

@@ -448,7 +448,7 @@ static UCHAR NetBTNameWaitLoop(NetBTAdapter *adapter, SOCKET fd, PNCB ncb,
  DWORD sendTo, BOOL broadcast, DWORD timeout, DWORD maxQueries,
  NBNameCacheEntry **cacheEntry)
 {
-    int queries;
+    unsigned int queries;
     NetBTNameQueryData queryData;
 
     if (!adapter) return NRC_BADDR;
@@ -534,7 +534,7 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ],
      name[NCBNAMSZ - 1] == 0x20))
     {
         UCHAR toLookup[NCBNAMSZ];
-        int i;
+        unsigned int i;
 
         for (i = 0; i < NCBNAMSZ - 1 && name[i] && name[i] != ' '; i++)
             toLookup[i] = name[i];
@@ -915,7 +915,8 @@ static UCHAR NetBTSessionReq(SOCKET fd, const UCHAR *calledName,
  const UCHAR *callingName)
 {
     UCHAR buffer[NBSS_HDRSIZE + MAX_DOMAIN_NAME_LEN * 2], ret;
-    int len = 0, r;
+    int r;
+    unsigned int len = 0;
     DWORD bytesSent, bytesReceived, recvFlags = 0;
     WSABUF wsaBuf;