comctl32/tests/listview: remove win9x hacks
Austin English
austinenglish at gmail.com
Tue Jul 26 14:31:07 CDT 2011
https://testbot.winehq.org/JobDetails.pl?Key=12846
--
-Austin
-------------- next part --------------
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 15a0b5d..51008d6 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -1322,8 +1322,7 @@ static void test_columns(void)
/* Check its width */
rc = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
- ok(rc == 10 || broken(rc == 0) /* win9x */,
- "Inserting column with no mask failed to set width to 10 with %d\n", rc);
+ ok(rc == 10, "Inserting column with no mask failed to set width to 10 with %d\n", rc);
DestroyWindow(hwnd);
@@ -3888,7 +3887,7 @@ static void test_notifyformat(void)
r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0);
expect(0, r);
r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0);
- ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r );
+ ok( r == 1, "Expected 1, got %d\n", r );
r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY);
ok(r != 0, "Expected valid format\n");
@@ -3898,7 +3897,7 @@ static void test_notifyformat(void)
r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0);
expect(1, r);
r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0);
- ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r );
+ ok( r == 1, "Expected 1, got %d\n", r );
notifyFormat = NFR_ANSI;
r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_REQUERY);
@@ -3906,14 +3905,14 @@ static void test_notifyformat(void)
r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0);
expect(0, r);
r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0);
- ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r );
+ ok( r == 1, "Expected 1, got %d\n", r );
DestroyWindow(hwnd);
/* try different unicode window combination and defaults */
if (!GetModuleHandleW(NULL))
{
- win_skip("Additional notify format tests are incompatible with Win9x\n");
+ win_skip("GetModuleHandleW is unavailable, skipping tests\n");
return;
}
More information about the wine-patches
mailing list