Andrew Talbot : d3dx9_36: Avoid signed-unsigned integer comparisons.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1a45569f72336db77e6387898bdaae55fbae6a5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1a45569f72336db77e6387898b...

Author: Andrew Talbot 
Date:   Thu Jan  3 22:46:48 2013 +0000

d3dx9_36: Avoid signed-unsigned integer comparisons.

---

dlls/d3dx9_36/skin.c    |    2 +-
 dlls/d3dx9_36/surface.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
index 1525f0e..c3857d6 100644
--- a/dlls/d3dx9_36/skin.c
+++ b/dlls/d3dx9_36/skin.c
@@ -83,7 +83,7 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface)
     TRACE("%p decreasing refcount to %u\n", This, ref);

if (ref == 0) {
-        int i;
+        DWORD i;
         for (i = 0; i < This->num_bones; i++) {
             HeapFree(GetProcessHeap(), 0, This->bones[i].name);
             HeapFree(GetProcessHeap(), 0, This->bones[i].vertices);
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 999c12e..923f17d 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -49,7 +49,7 @@ static const struct

static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid)
 {
-    int i;
+    unsigned int i;

for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++)
     {
@@ -62,7 +62,7 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid)

static const GUID *d3dformat_to_wic_guid(D3DFORMAT format)
 {
-    int i;
+    unsigned int i;

for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++)
     {
@@ -143,7 +143,7 @@ struct dds_header

static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc)
 {
-    int i;
+    unsigned int i;
     static const DWORD known_fourcc[] = {
         MAKEFOURCC('U','Y','V','Y'),
         MAKEFOURCC('Y','U','Y','2'),
@@ -193,7 +193,7 @@ static const struct {

static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format)
 {
-    int i;
+    unsigned int i;

for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++)
     {
@@ -278,7 +278,7 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi

static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat)
 {
-    int i;
+    unsigned int i;

memset(pixel_format, 0, sizeof(*pixel_format));

@@ -575,7 +575,7 @@ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const vo
 {
     HRESULT hr;
     int face;
-    int mip_level;
+    UINT mip_level;
     UINT size;
     RECT src_rect;
     UINT src_pitch;