comctl32: Fix the remaining broken tests in win95.

This commit is contained in:
James Hawkins 2008-09-15 04:08:24 -05:00 committed by Alexandre Julliard
parent 3b5c2cba44
commit 72638e0ea4
1 changed files with 9 additions and 1 deletions

View File

@ -166,6 +166,11 @@ static void test_height(void)
g_wmsize_count = 0; g_wmsize_count = 0;
SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE);
if (!g_wmsize_count)
{
skip("Status control not resized in win95, skipping broken tests.");
return;
}
ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n");
GetClientRect(hwndStatus, &rc2); GetClientRect(hwndStatus, &rc2);
@ -361,8 +366,11 @@ static void test_status_control(void)
todo_wine todo_wine
{ {
SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text"); SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text");
lstrcpyA(charArray, "apple");
SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray); SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray);
ok(strcmp(charArray,"Tooltip Text") == 0, "Expected Tooltip Text, got %s\n", charArray); ok(strcmp(charArray,"Tooltip Text") == 0 ||
broken(!strcmp(charArray, "apple")), /* win95 */
"Expected Tooltip Text, got %s\n", charArray);
} }
/* Make simple */ /* Make simple */