Module: wine Branch: master Commit: 5e941f89c2dfcfb7e4e7f66638c7505dc2b78d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e941f89c2dfcfb7e4e7f66638...
Author: Austin English austinenglish@gmail.com Date: Tue Jul 26 19:11:34 2011 -0700
user32/tests: Remove win9x hacks.
---
dlls/user32/tests/edit.c | 8 ++------ dlls/user32/tests/resource.c | 12 +++++------- dlls/user32/tests/static.c | 4 +--- dlls/user32/tests/text.c | 8 +------- 4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d279f0d..c6c815a 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1318,9 +1318,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 32766; WinNT: 2147483646UL */ - ok( (r == 32766) || (r == 2147483646UL), - "got limit %u (expected 32766 or 2147483646)\n", r); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); DestroyWindow(hwEdit);
/* Test default limit for multi-line control */ @@ -1330,9 +1328,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 65535; WinNT: 4294967295UL */ - ok( (r == 65535) || (r == 4294967295UL), - "got limit %u (expected 65535 or 4294967295)\n", r); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); DestroyWindow(hwEdit); }
diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index c64aff0..5bc2d7a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -180,12 +180,10 @@ static void test_accel1(void) ok( hAccel != NULL, "create accelerator table\n");
r = CopyAcceleratorTable( hAccel, NULL, 0 ); - ok( r == n || broken(r == 2), /* win9x */ - "two entries in table %u/%u\n", r, n); + ok( r == n, "two entries in table %u/%u\n", r, n);
r = CopyAcceleratorTable( hAccel, &ac[0], n ); - ok( r == n || broken(r == 2), /* win9x */ - "still should be two entries in table %u/%u\n", r, n); + ok( r == n, "still should be two entries in table %u/%u\n", r, n);
n=0; ok( ac[n].cmd == 1000, "cmd 0 not preserved got %x\n", ac[n].cmd); @@ -262,11 +260,11 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, NULL, 100 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 0 ); ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 1 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -318,7 +316,7 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, out, 2 ); - ok( res == 2 || broken(res == 1), /* win9x */ "copy 2 failed %d\n", res); + ok( res == 2, "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index d04f725..b761356 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -95,9 +95,7 @@ static void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok( g_nReceivedColorStatic == exp || - broken(g_nReceivedColorStatic == 0), /* win9x */ - "expected %u got %u\n", exp, g_nReceivedColorStatic ); + ok( g_nReceivedColorStatic == exp, "expected %u got %u\n", exp, g_nReceivedColorStatic ); else expect_eq(g_nReceivedColorStatic, exp, int, "%d"); DestroyWindow(hStatic); diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index b45a312..1874b15 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -114,13 +114,7 @@ static void test_DrawTextCalcRect(void) heightcheck = textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !EMPTY(rect) && !MODIFIED(rect), "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); - if (textheight != 0) /* Windows 98 */ - { - win_skip("XP conformity failed, skipping XP tests. Probably win9x\n"); - conform_xp = FALSE; - } - else - ok(textheight==0,"Got textheight from DrawTextExA\n"); + ok(textheight==0,"Got textheight from DrawTextExA\n");
SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, text, 0, &rect, DT_CALCRECT);
-
Alexandre Julliard