Marko Nikolic : comctl32/tests: Removed sign comparison warning in status tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6ed2208e726f69bce1d0a8dfa9df1e33a010882e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6ed2208e726f69bce1d0a8dfa9...

Author: Marko Nikolic 
Date:   Wed Jun  1 15:50:26 2011 +0200

comctl32/tests: Removed sign comparison warning in status tests.

---

dlls/comctl32/tests/status.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c
index 8509674..0eaae59 100644
--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -40,8 +40,8 @@ static WNDPROC g_status_wndproc;
 static RECT g_rcCreated;
 static HWND g_hMainWnd;
 static int g_wmsize_count = 0;
-static DWORD g_ysize;
-static DWORD g_dpisize;
+static INT g_ysize;
+static INT g_dpisize;
 static int g_wmdrawitm_ctr;
 static WNDPROC g_wndproc_saved;

@@ -120,7 +120,7 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMET
     static const int sizes[] = { 6,  7,  8,  9, 10, 11, 12, 13, 15, 16,
                                 20, 22, 28, 36, 48, 72};
     DWORD i;
-    DWORD y;
+    INT y;
     LPSTR facename = (CHAR *)enumlf->elfFullName;

/* on win9x, enumlf->elfFullName is only valid for truetype fonts */
@@ -260,6 +260,7 @@ static void test_status_control(void)
     HICON hIcon;
     char ch;
     char chstr[10] = "Inval id";
+    COLORREF crColor = RGB(0,0,0);

hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0);

@@ -343,14 +344,14 @@ static void test_status_control(void)
     }

/* Set background color */
-    r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0));
-    ok(r == CLR_DEFAULT ||
-       broken(r == 0), /* win95 */
-       "Expected %d, got %d\n", CLR_DEFAULT, r);
-    r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT);
-    ok(r == RGB(255,0,0) ||
-       broken(r == 0), /* win95 */
-       "Expected %d, got %d\n", RGB(255,0,0), r);
+    crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0));
+    ok(crColor == CLR_DEFAULT ||
+       broken(crColor == RGB(0,0,0)), /* win95 */
+       "Expected 0x%.8x, got 0x%.8x\n", CLR_DEFAULT, crColor);
+    crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT);
+    ok(crColor == RGB(255,0,0) ||
+       broken(crColor == RGB(0,0,0)), /* win95 */
+       "Expected 0x%.8x, got 0x%.8x\n", RGB(255,0,0), crColor);

/* Add an icon to the status bar */
     hIcon = LoadIcon(NULL, IDI_QUESTION);