James Hawkins : comctl32: Fix the remaining broken tests in win95.
Alexandre Julliard
julliard at winehq.org
Mon Sep 15 06:54:49 CDT 2008
Module: wine
Branch: master
Commit: 72638e0ea4a13983fecf543739186899c936fb8d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=72638e0ea4a13983fecf543739186899c936fb8d
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Mon Sep 15 04:08:24 2008 -0500
comctl32: Fix the remaining broken tests in win95.
---
dlls/comctl32/tests/status.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c
index d7cb25c..0418c8d 100644
--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -166,6 +166,11 @@ static void test_height(void)
g_wmsize_count = 0;
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");
GetClientRect(hwndStatus, &rc2);
@@ -361,8 +366,11 @@ static void test_status_control(void)
todo_wine
{
SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text");
+ lstrcpyA(charArray, "apple");
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 */
More information about the wine-cvs
mailing list