user32/tests/resource: remove win9x hacks
Austin English
austinenglish at gmail.com
Tue Jul 26 21:11:34 CDT 2011
https://testbot.winehq.org/JobDetails.pl?Key=12909
--
-Austin
-------------- next part --------------
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");
More information about the wine-patches
mailing list