Austin English : comctl32/tests: Remove win9x hacks.
Alexandre Julliard
julliard at winehq.org
Wed Jul 27 13:25:25 CDT 2011
Module: wine
Branch: master
Commit: fbb0e180511176e1c21b05c4e651e966f693afe3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb0e180511176e1c21b05c4e651e966f693afe3
Author: Austin English <austinenglish at gmail.com>
Date: Tue Jul 26 12:31:07 2011 -0700
comctl32/tests: Remove win9x hacks.
---
dlls/comctl32/tests/listview.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 850c717..765992e 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -1323,8 +1323,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);
@@ -3919,7 +3918,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");
@@ -3929,7 +3928,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);
@@ -3937,17 +3936,10 @@ 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");
- return;
- }
-
hwndparentW = create_parent_window(TRUE);
ok(IsWindow(hwndparentW), "Unicode parent creation failed\n");
if (!IsWindow(hwndparentW)) return;
More information about the wine-cvs
mailing list