Fix signed/unsigned comparison warnings.
diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c
index 6f76536..9365650 100644
--- a/dlls/d3d8/cubetexture.c
+++ b/dlls/d3d8/cubetexture.c
@@ -59,8 +59,7 @@
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 @@
};
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);
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 746b2cd..99278c5 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -604,7 +604,7 @@
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 @@
D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture8** ppVolumeTexture) {
IDirect3DVolumeTexture8Impl *object;
- int i;
+ unsigned int i;
UINT tmpW;
UINT tmpH;
UINT tmpD;
@@ -759,7 +759,7 @@
IDirect3DCubeTexture8Impl *object;
ICOM_THIS(IDirect3DDevice8Impl,iface);
- int i,j;
+ unsigned int i,j;
UINT tmpW;
/* Allocate the storage for it */
@@ -1046,7 +1046,7 @@
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 @@
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 @@
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_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 @@
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 @@
IDirect3DBaseTexture8 *oldTxt;
BOOL reapplyStates = TRUE;
- DWORD oldTextureDimensions = -1;
+ INT oldTextureDimensions = -1;
DWORD reapplyFlags = 0;
ICOM_THIS(IDirect3DDevice8Impl,iface);
diff --git a/dlls/d3d8/drawprim.c b/dlls/d3d8/drawprim.c
index b619806..c968f88 100644
--- a/dlls/d3d8/drawprim.c
+++ b/dlls/d3d8/drawprim.c
@@ -521,7 +521,7 @@
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 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 @@
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 @@
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 @@
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 */
diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c
index 75fce7e..3da6200 100644
--- a/dlls/d3d8/stateblock.c
+++ b/dlls/d3d8/stateblock.c
@@ -62,7 +62,7 @@
float f;
DWORD d;
} tmpfloat;
- int i;
+ unsigned int i;
int j;
LPDIRECT3DDEVICE8 iface = (LPDIRECT3DDEVICE8) This;
@@ -585,7 +585,7 @@
IDirect3DDeviceImpl_DeleteStateBlock(This, tmpBlock);
} else {
- int i, j;
+ unsigned int i, j;
PLIGHTINFOEL *src;
/* Recorded => Only update 'changed' values */
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index f14008f..7cac447 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -59,7 +59,7 @@
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 @@
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);
diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c
index 851695a..576740c 100644
--- a/dlls/d3d8/volumetexture.c
+++ b/dlls/d3d8/volumetexture.c
@@ -113,7 +113,7 @@
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);
diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index e194b18..acfb6d4 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -61,8 +61,7 @@
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) {
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 4eab92e..8ecf2c3 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -61,7 +61,7 @@
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) {
diff --git a/dlls/ddraw/convert.c b/dlls/ddraw/convert.c
index 3a1393c..06b6a59 100644
--- a/dlls/ddraw/convert.c
+++ b/dlls/ddraw/convert.c
@@ -70,7 +70,7 @@
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_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 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++)
diff --git a/dlls/ddraw/d3dcommon.c b/dlls/ddraw/d3dcommon.c
index 9fe7540..0ba65c7 100644
--- a/dlls/ddraw/d3dcommon.c
+++ b/dlls/ddraw/d3dcommon.c
@@ -262,7 +262,7 @@
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 @@
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);
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index f903c52..13fdc45 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -162,7 +162,7 @@
void InitDefaultStateBlock(STATEBLOCK* lpStateBlock, int version)
{
- int i, j;
+ unsigned int i, j;
TRACE("(%p,%d)\n", lpStateBlock, version);
memset(lpStateBlock, 0, sizeof(STATEBLOCK));
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 755e288..a455de0 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -1122,7 +1122,7 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
}
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 @@
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);
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index f60c025..29e36fe 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -318,7 +318,7 @@
/* 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 @@
}
} 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;
diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c
index 677b93f..1fad63e 100644
--- a/dlls/ddraw/d3dvertexbuffer.c
+++ b/dlls/ddraw/d3dvertexbuffer.c
@@ -287,7 +287,7 @@
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 @@
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 =
diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c
index 534ba64..c534440 100644
--- a/dlls/ddraw/ddraw/hal.c
+++ b/dlls/ddraw/ddraw/hal.c
@@ -223,7 +223,7 @@
DWORD dwRefreshRate, DWORD dwFlags)
{
int best = -1;
- int i;
+ unsigned int i;
if (!dd_gbl.dwNumModes) return 0;
@@ -525,7 +525,7 @@
HAL_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes,
LPDWORD pCodes)
{
- int i;
+ unsigned int i;
ICOM_THIS(IDirectDrawImpl,iface);
if (*pNumCodes)
*pNumCodes=dd_gbl.dwNumFourCC;
diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index 1b316a9..736f615 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -802,7 +802,7 @@
#undef CMP
- int i;
+ unsigned int i;
if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags)
return FALSE;
diff --git a/dlls/ddraw/dpalette/main.c b/dlls/ddraw/dpalette/main.c
index 5399044..5758f94 100644
--- a/dlls/ddraw/dpalette/main.c
+++ b/dlls/ddraw/dpalette/main.c
@@ -121,7 +121,7 @@
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 @@
if (This->global.dwFlags & DDPCAPS_8BITENTRIES)
{
- int i;
+ unsigned int i;
const BYTE* entry = (const BYTE*)palent;
for (i=dwStart; i < dwCount+dwStart; i++)
diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c
index ff113af..8db4bb5 100644
--- a/dlls/ddraw/dsurface/dib.c
+++ b/dlls/ddraw/dsurface/dib.c
@@ -1257,7 +1257,7 @@
LPPALETTEENTRY palent)
{
RGBQUAD col[256];
- int n;
+ unsigned int n;
HDC dc;
TRACE("updating primary palette\n");
diff --git a/dlls/ddraw/dsurface/main.c b/dlls/ddraw/dsurface/main.c
index f4d26f5..a5c174c 100644
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -554,7 +554,7 @@
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];
diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c
index af5affe..9c90a75 100644
--- a/dlls/ddraw/mesa.c
+++ b/dlls/ddraw/mesa.c
@@ -990,8 +990,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
} 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 @@
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 @@
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 @@
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 @@
} 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 @@
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)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index aee23c3..2763aa7 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -43,7 +43,7 @@
*/
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_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 @@
/* 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 @@
}
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 @@
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;
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index aa1343d..19cc910 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -57,7 +57,7 @@
{ \
/* 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)); \
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index c98bb3d..fdc9350 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -206,7 +206,7 @@
static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
if (TRACE_ON(dinput)) {
- int i;
+ unsigned int i;
static const struct {
DWORD mask;
const char *name;
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index d5263d6..71c3caa 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -381,7 +381,7 @@
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 @@
{
ICOM_THIS(JoystickImpl,iface);
DIDEVICEOBJECTINSTANCEA didoiA;
- int i;
+ unsigned int i;
TRACE("(%p,%p,%ld,0x%08lx(%s))\n",
iface, pdidoi, dwObj, dwHow,
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index b7c9e5b..da0b5f6 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -723,7 +723,8 @@
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);
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 586fa8b..8bee109 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -898,7 +898,7 @@
&CLSID_DirectSoundWave
};
- int i;
+ unsigned int i;
WCHAR wszCurrent[MAX_PATH];
TRACE(": (%p)\n", This);
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 6430c70..ec418af 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -118,7 +118,7 @@
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;
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index d969566..67ab7a8 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -106,7 +106,7 @@
}
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);
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 2b5bb5b..7ae840d 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -828,7 +828,7 @@
}
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 @@
if (ipDSC->buffer) {
if (This->nrofnotifies) {
- unsigned c;
+ int c;
ipDSC->nrofpwaves = This->nrofnotifies;
TRACE("nrofnotifies=%d\n", This->nrofnotifies);
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index a119a7a..6461149 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -95,7 +95,7 @@
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 @@
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 @@
ref = InterlockedDecrement(&This->ref);
if (ref == 0) {
HRESULT hres;
- UINT i;
+ INT i;
timeKillEvent(This->timerID);
timeEndPeriod(DS_TIME_RES);
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 5306581..d682ec4 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -509,7 +509,8 @@
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);
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 650ee30..b6834cb 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -372,7 +372,7 @@
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 @@
} 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 @@
} 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 @@
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 @@
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 @@
} 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 @@
} 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 @@
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 @@
} 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 @@
} 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++) {
diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c
index dee64b8..7a2e569 100644
--- a/dlls/gdi/enhmetafile.c
+++ b/dlls/gdi/enhmetafile.c
@@ -189,7 +189,7 @@
*/
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);
diff --git a/dlls/gdi/enhmfdrv/graphics.c b/dlls/gdi/enhmfdrv/graphics.c
index dab2d48..0f272fe 100644
--- a/dlls/gdi/enhmfdrv/graphics.c
+++ b/dlls/gdi/enhmfdrv/graphics.c
@@ -473,7 +473,8 @@
DWORD iType)
{
EMRPOLYPOLYLINE *emr;
- DWORD cptl = 0, poly, size, point;
+ DWORD cptl = 0, poly, size;
+ INT point;
RECTL bounds;
const POINT *pts;
BOOL ret;
diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index ec2e4bb..a0a37d9 100644
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -1867,7 +1867,7 @@
LPABC abc )
{
DC *dc = DC_GetDCPtr(hdc);
- int i;
+ unsigned int i;
BOOL ret = FALSE;
if(dc->gdiFont)
@@ -2022,7 +2022,7 @@
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;
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index 02b0366..065e0b3 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -1409,9 +1409,9 @@
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 @@
{
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 @@
case GGO_GRAY8_BITMAP:
case WINE_GGO_GRAY16_BITMAP:
{
- int mult, row, col;
+ unsigned int mult, row, col;
BYTE *start, *ptr;
width = lpgm->gmBlackBoxX;
diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c
index ecda608..13cd93c 100644
--- a/dlls/gdi/gdiobj.c
+++ b/dlls/gdi/gdiobj.c
@@ -454,7 +454,7 @@
*/
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 @@
INT WINAPI EnumObjects( HDC hdc, INT nObjType,
GOBJENUMPROC lpEnumFunc, LPARAM lParam )
{
- INT i, retval = 0;
+ UINT i;
+ INT retval = 0;
LOGPEN pen;
LOGBRUSH brush;
diff --git a/dlls/gdi/mfdrv/graphics.c b/dlls/gdi/mfdrv/graphics.c
index 933d8ff..acc855d 100644
--- a/dlls/gdi/mfdrv/graphics.c
+++ b/dlls/gdi/mfdrv/graphics.c
@@ -201,7 +201,7 @@
BOOL ret;
DWORD len;
METARECORD *mr;
- int i,j;
+ unsigned int i,j;
LPPOINT16 pt16;
INT16 totalpoint16 = 0;
INT16 * pointcounts;
diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c
index f5c0db1..33f1b2f 100644
--- a/dlls/gdi/mfdrv/objects.c
+++ b/dlls/gdi/mfdrv/objects.c
@@ -40,7 +40,7 @@
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;
diff --git a/dlls/gdi/mfdrv/text.c b/dlls/gdi/mfdrv/text.c
index 738079c..e893c96 100644
--- a/dlls/gdi/mfdrv/text.c
+++ b/dlls/gdi/mfdrv/text.c
@@ -79,7 +79,7 @@
RECT16 rect16;
LPINT16 lpdx16 = NULL;
BOOL ret;
- int i, j;
+ unsigned int i, j;
LPSTR ascii;
DWORD len;
CHARSETINFO csi;
diff --git a/dlls/gdi/painting.c b/dlls/gdi/painting.c
index 7d5289e..7222ba1 100644
--- a/dlls/gdi/painting.c
+++ b/dlls/gdi/painting.c
@@ -818,7 +818,7 @@
DC *dc;
BOOL result;
POINT lastmove;
- int i;
+ unsigned int i;
dc = DC_GetDCUpdate( hdc );
if(!dc) return FALSE;
@@ -1137,7 +1137,7 @@
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);
diff --git a/dlls/gdi/path.c b/dlls/gdi/path.c
index 4c469d1..77cabbae 100644
--- a/dlls/gdi/path.c
+++ b/dlls/gdi/path.c
@@ -870,7 +870,7 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT i;
+ UINT i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -901,7 +901,7 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT i;
+ UINT i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -920,7 +920,7 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT i;
+ UINT i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -939,7 +939,7 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT i;
+ UINT i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -972,7 +972,7 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT i;
+ UINT i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -994,7 +994,8 @@
{
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 @@
{
GdiPath *pPath = &dc->path;
POINT pt;
- INT poly, point, i;
+ UINT poly, point, i;
/* Check that path is open */
if(pPath->state!=PATH_Open)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 30067fd..e7448a5 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -81,7 +81,7 @@
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 @@
}
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;
}
diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c
index e6bb8b6..aeaebdf 100644
--- a/dlls/iphlpapi/ifenum.c
+++ b/dlls/iphlpapi/ifenum.c
@@ -576,7 +576,7 @@
if ((ioctl(fd, SIOCGIFHWADDR, &ifr)))
ret = ERROR_INVALID_DATA;
else {
- int addrLen;
+ unsigned int addrLen;
switch (ifr.ifr_hwaddr.sa_family)
{
diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c
index 84ded51..ca90474 100644
--- a/dlls/msacm/filter.c
+++ b/dlls/msacm/filter.c
@@ -192,7 +192,7 @@
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 @@
DWORD fdwEnum)
{
PWINE_ACMDRIVERID padid;
- int i;
+ unsigned int i;
TRACE("(%p, %p, %p, %ld, %ld)\n",
had, paftd, fnCallback, dwInstance, fdwEnum);
diff --git a/dlls/msacm/format.c b/dlls/msacm/format.c
index b64f8b0..fa20995 100644
--- a/dlls/msacm/format.c
+++ b/dlls/msacm/format.c
@@ -72,7 +72,7 @@
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 @@
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 @@
DWORD fdwEnum)
{
PWINE_ACMDRIVERID padid;
- int i;
+ unsigned int i;
BOOL bPcmDone = FALSE;
TRACE("(%p, %p, %p, %ld, %ld)\n",
diff --git a/dlls/msacm/internal.c b/dlls/msacm/internal.c
index 9cb8002..0a06473 100644
--- a/dlls/msacm/internal.c
+++ b/dlls/msacm/internal.c
@@ -88,7 +88,7 @@
static BOOL MSACM_FillCache(PWINE_ACMDRIVERID padid)
{
HACMDRIVER had = 0;
- int ntag;
+ unsigned int ntag;
ACMDRIVERDETAILSW add;
ACMFORMATTAGDETAILSW aftd;
diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c
index 643d94b..90a01e0 100644
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -108,7 +108,7 @@
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);
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index 5a4f311..a01311b 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -121,7 +121,7 @@
*/
static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx)
{
- int i;
+ unsigned int i;
TRACE("(%p)\n", wfx);
for (i = 0; i < NUM_PCM_FORMATS; i++) {
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c
index 03cc5ee..cf6a5757 100644
--- a/dlls/msdmo/dmoreg.c
+++ b/dlls/msdmo/dmoreg.c
@@ -461,7 +461,7 @@
if (!pCLSID || !Names || !pcItemsFetched)
return E_POINTER;
- while (count < (INT)cItemsToFetch)
+ while (count < cItemsToFetch)
{
This->index++;
@@ -485,7 +485,7 @@
if (This->pInTypes)
{
- INT i, j;
+ UINT i, j;
DWORD cInTypes;
DMO_PARTIAL_MEDIATYPE* pInTypes;
@@ -521,7 +521,7 @@
if (This->pOutTypes)
{
- INT i, j;
+ UINT i, j;
DWORD cOutTypes;
DMO_PARTIAL_MEDIATYPE* pOutTypes;
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 9a7ff00..064a700 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -192,7 +192,7 @@
*/
static MSVCRT_FILE* msvcrt_alloc_fp(void)
{
- int i;
+ unsigned int i;
for (i = 3; i < sizeof(MSVCRT_fstreams) / sizeof(MSVCRT_fstreams[0]); i++)
{
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index 0d918ed..0dc97b1 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -995,7 +995,7 @@
BYTE* pMem = NULL;
BOOL bReleaseIC = FALSE;
BYTE* pHdr = NULL;
- LONG cbHdr = 0;
+ ULONG cbHdr = 0;
BOOL bSucceeded = FALSE;
BOOL bInDecompress = FALSE;
DWORD biSizeImage;
diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
index e953ab0..a2ba879 100644
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -448,7 +448,7 @@
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 @@
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 @@
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;
