comctl32/tests/misc: remove win9x hacks
Austin English
austinenglish at gmail.com
Tue Jul 26 16:06:06 CDT 2011
https://testbot.winehq.org/JobDetails.pl?Key=12851
--
-Austin
-------------- next part --------------
diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index 5aff06f..8cc8a9e 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -83,7 +83,7 @@ static void test_GetPtrAW(void)
if (0)
{
- /* Crashes on W98, NT4, W2K, XP, W2K3
+ /* Crashes on NT4, W2K, XP, W2K3
* Our implementation also crashes and we should probably leave
* it like that.
*/
@@ -93,13 +93,13 @@ static void test_GetPtrAW(void)
count = pStr_GetPtrA(source, NULL, 0);
ok (count == sourcelen ||
- broken(count == sourcelen - 1), /* win9x */
+ broken(count == sourcelen - 1), /* NT4 */
"Expected count to be %d, it was %d\n", sourcelen, count);
strcpy(dest, desttest);
count = pStr_GetPtrA(source, dest, 0);
ok (count == sourcelen ||
- broken(count == 0), /* win9x */
+ broken(count == 0), /* NT4 */
"Expected count to be %d, it was %d\n", sourcelen, count);
ok (!lstrcmp(dest, desttest) ||
broken(!lstrcmp(dest, "")), /* Win7 */
@@ -107,12 +107,12 @@ static void test_GetPtrAW(void)
count = pStr_GetPtrA(source, NULL, destsize);
ok (count == sourcelen ||
- broken(count == sourcelen - 1), /* win9x */
+ broken(count == sourcelen - 1), /* NT4 */
"Expected count to be %d, it was %d\n", sourcelen, count);
count = pStr_GetPtrA(source, dest, destsize);
ok (count == sourcelen ||
- broken(count == sourcelen - 1), /* win9x */
+ broken(count == sourcelen - 1), /* NT4 */
"Expected count to be %d, it was %d\n", sourcelen, count);
ok (!lstrcmp(source, dest), "Expected source and destination to be the same\n");
@@ -124,7 +124,7 @@ static void test_GetPtrAW(void)
destsize = 15;
count = pStr_GetPtrA(source, dest, destsize);
ok (count == 15 ||
- broken(count == 14), /* win9x */
+ broken(count == 14), /* NT4 */
"Expected count to be 15, it was %d\n", count);
ok (!memcmp(source, dest, 14), "Expected first part of source and destination to be the same\n");
ok (dest[14] == '\0', "Expected destination to be cut-off and 0 terminated\n");
@@ -154,9 +154,7 @@ static void test_Alloc(void)
/* get the allocated size */
size = pGetSize(p);
- ok(size == 1 ||
- broken(size == min), /* win9x */
- "Expected 1, got %d\n", size);
+ ok(size == 1, "Expected 1, got %d\n", size);
/* reallocate the block */
p = pReAlloc(p, 2);
@@ -164,9 +162,7 @@ static void test_Alloc(void)
/* get the new size */
size = pGetSize(p);
- ok(size == 2 ||
- broken(size == min), /* win9x */
- "Expected 2, got %d\n", size);
+ ok(size == 2, "Expected 2, got %d\n", size);
/* free the block */
res = pFree(p);
@@ -174,9 +170,7 @@ static void test_Alloc(void)
/* free a NULL ptr */
res = pFree(NULL);
- ok(res == TRUE ||
- broken(res == FALSE), /* win9x */
- "Expected TRUE, got %d\n", res);
+ ok(res == TRUE, "Expected TRUE, got %d\n", res);
/* reallocate a NULL ptr */
p = pReAlloc(NULL, 2);
More information about the wine-patches
mailing list