dlls/d3d9/tests/visual.c -- address five compiler warnings

Gerald Pfeifer gerald at pfeifer.com
Sat Dec 29 14:16:29 CST 2007


This gets us rid of another five compiler warnings. :-)

Gerald

ChangeLog:
Fix the type of three loop variables and remove two superflous checks.

Index: dlls/d3d9/tests/visual.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d9/tests/visual.c,v
retrieving revision 1.62
diff -u -3 -p -r1.62 visual.c
--- dlls/d3d9/tests/visual.c	21 Dec 2007 13:30:16 -0000	1.62
+++ dlls/d3d9/tests/visual.c	29 Dec 2007 20:14:36 -0000
@@ -557,7 +557,7 @@ static void test_mova(IDirect3DDevice9 *
     IDirect3DVertexShader9 *mova_shader = NULL;
     IDirect3DVertexShader9 *mov_shader = NULL;
     HRESULT hr;
-    int i, j;
+    UINT i, j;
 
     hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader);
     ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr);
@@ -862,7 +862,8 @@ static void test_cube_wrap(IDirect3DDevi
     IDirect3DSurface9 *surface = NULL;
     D3DLOCKED_RECT locked_rect;
     HRESULT hr;
-    INT x, y, face;
+    UINT x;
+    INT y, face;
 
     hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration);
     ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr);
@@ -4348,12 +4349,12 @@ static void vshader_version_varying_test
        "vs_3_0 returned color 0x%08x, expected 0x00203366\n", color);
     color = getPixelColor(device, 160, 360);
     ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 &&
-       (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 &&
+                                             (color & 0x0000ff00) <= 0x00000000 &&
        (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00210068,
        "vs_1_1 returned color 0x%08x, expected 0x00808080\n", color);
     color = getPixelColor(device, 480, 360);
     ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 &&
-       (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 &&
+                                             (color & 0x0000ff00) <= 0x00000000 &&
        (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00210068,
        "vs_2_0 returned color 0x%08x, expected 0x00000000\n", color);
 



More information about the wine-patches mailing list