ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marko Nikolic 2011-06-01 15:50:26 +02:00 committed by Alexandre Julliard
parent cf6dae563c
commit 6ed2208e72
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/comctl32/tests/status.c
View File

@ -40,8 +40,8 @@ static WNDPROC g_status_wndproc;
static RECT g_rcCreated; static RECT g_rcCreated;
static HWND g_hMainWnd; static HWND g_hMainWnd;
static int g_wmsize_count = 0; static int g_wmsize_count = 0;
static DWORD g_ysize; static INT g_ysize;
static DWORD g_dpisize; static INT g_dpisize;
static int g_wmdrawitm_ctr; static int g_wmdrawitm_ctr;
static WNDPROC g_wndproc_saved; 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, static const int sizes[] = { 6, 7, 8, 9, 10, 11, 12, 13, 15, 16,
20, 22, 28, 36, 48, 72}; 20, 22, 28, 36, 48, 72};
DWORD i; DWORD i;
DWORD y; INT y;
LPSTR facename = (CHAR *)enumlf->elfFullName; LPSTR facename = (CHAR *)enumlf->elfFullName;
/* on win9x, enumlf->elfFullName is only valid for truetype fonts */ /* on win9x, enumlf->elfFullName is only valid for truetype fonts */
@ -260,6 +260,7 @@ static void test_status_control(void)
HICON hIcon; HICON hIcon;
char ch; char ch;
char chstr[10] = "Inval id"; char chstr[10] = "Inval id";
COLORREF crColor = RGB(0,0,0);
hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0); hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0);
@ -343,14 +344,14 @@ static void test_status_control(void)
} }
/* Set background color */ /* Set background color */
r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0));
ok(r == CLR_DEFAULT || ok(crColor == CLR_DEFAULT ||
broken(r == 0), /* win95 */ broken(crColor == RGB(0,0,0)), /* win95 */
"Expected %d, got %d\n", CLR_DEFAULT, r); "Expected 0x%.8x, got 0x%.8x\n", CLR_DEFAULT, crColor);
r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT);
ok(r == RGB(255,0,0) || ok(crColor == RGB(255,0,0) ||
broken(r == 0), /* win95 */ broken(crColor == RGB(0,0,0)), /* win95 */
"Expected %d, got %d\n", RGB(255,0,0), r); "Expected 0x%.8x, got 0x%.8x\n", RGB(255,0,0), crColor);
/* Add an icon to the status bar */ /* Add an icon to the status bar */
hIcon = LoadIcon(NULL, IDI_QUESTION); hIcon = LoadIcon(NULL, IDI_QUESTION);