kernel32/tests/format_msg: remove win9x hacks
Austin English
austinenglish at gmail.com
Tue Jul 26 20:52:07 CDT 2011
https://testbot.winehq.org/JobDetails.pl?Key=12902
--
-Austin
-------------- next part --------------
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index ea2ed43..8c256c5 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -476,9 +476,7 @@ static void test_message_from_string(void)
memcpy(out, init_buf, sizeof(init_buf));
r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0,
0, out, sizeof(out)/sizeof(CHAR), NULL);
- ok(!memcmp(out, init_buf, sizeof(init_buf)) ||
- broken(!strcmp("", out)), /* Win9x */
- "Expected the buffer to be untouched\n");
+ ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n");
ok(r==0, "succeeded: r=%d\n", r);
ok(GetLastError()==0xdeadbeef,
"last error %u\n", GetLastError());
@@ -510,29 +508,17 @@ static void test_message_from_string(void)
memcpy(out, init_buf, sizeof(init_buf));
r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%1", 0,
0, out, sizeof(out)/sizeof(CHAR), NULL);
- ok(!memcmp(out, init_buf, sizeof(init_buf)) ||
- broken(!strcmp("%1", out)), /* Win9x */
- "Expected the buffer to be untouched\n");
- ok(r==0 ||
- broken(r==2), /* Win9x */
- "succeeded: r=%d\n", r);
- ok(GetLastError()==ERROR_INVALID_PARAMETER ||
- broken(GetLastError()==0xdeadbeef), /* Win9x */
- "last error %u\n", GetLastError());
+ ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n");
+ ok(r==0, "succeeded: r=%d\n", r);
+ ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError());
SetLastError(0xdeadbeef);
memcpy(out, init_buf, sizeof(init_buf));
r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, "%1", 0,
0, out, sizeof(out)/sizeof(CHAR), NULL);
- ok(!memcmp(out, init_buf, sizeof(init_buf)) ||
- broken(!strcmp("%1", out)), /* Win9x */
- "Expected the buffer to be untouched\n");
- ok(r==0 ||
- broken(r==2), /* Win9x */
- "succeeded: r=%d\n", r);
- ok(GetLastError()==ERROR_INVALID_PARAMETER ||
- broken(GetLastError()==0xdeadbeef), /* Win9x */
- "last error %u\n", GetLastError());
+ ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n");
+ ok(r==0, "succeeded: r=%d\n", r);
+ ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError());
/* using the format feature */
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0,
@@ -766,12 +752,8 @@ static void test_message_from_string(void)
/* line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0,
0, out, sizeof(out)/sizeof(CHAR));
- ok(!strcmp("hi ", out) ||
- broken(!strcmp("hi\r\n", out)), /* Win9x */
- "failed out=[%s]\n",out);
- ok(r==3 ||
- broken(r==4), /* Win9x */
- "failed: r=%d\n",r);
+ ok(!strcmp("hi ", out), "failed out=[%s]\n",out);
+ ok(r==3, "failed: r=%d\n",r);
/* carriage return line feed */
r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0,
@@ -821,9 +803,7 @@ static void test_message_ignore_inserts(void)
ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%0test", 0, 0, out,
sizeof(out)/sizeof(CHAR), NULL);
ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret);
- ok(!memcmp(out, init_buf, sizeof(init_buf)) ||
- broken(!strcmp("", out)), /* Win9x */
- "Expected the output buffer to be untouched\n");
+ ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n");
ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError());
/* Insert sequences are ignored. */
@@ -835,12 +815,8 @@ static void test_message_ignore_inserts(void)
/* Only the "%n", "%r", and "%t" escape sequences are processed. */
ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%%% %.%!", 0, 0, out,
sizeof(out)/sizeof(CHAR), NULL);
- ok(ret == 8 ||
- broken(ret == 7) /* Win9x */,
- "Expected FormatMessageA to return 8, got %d\n", ret);
- ok(!strcmp("%%% %.%!", out) ||
- broken(!strcmp("%%% %.!", out)) /* Win9x */,
- "Expected output string \"%%%%%% %%.%%!\", got %s\n", out);
+ ok(ret == 8, "Expected FormatMessageA to return 8, got %d\n", ret);
+ ok(!strcmp("%%% %.%!", out), "Expected output string \"%%%%%% %%.%%!\", got %s\n", out);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%n%r%t", 0, 0, out,
sizeof(out)/sizeof(CHAR), NULL);
@@ -872,12 +848,8 @@ static void test_message_ignore_inserts(void)
ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0, 0, out,
sizeof(out)/sizeof(CHAR), NULL);
- ok(!strcmp("hi ", out) ||
- broken(!strcmp("hi\r\n", out)), /* Win9x */
- "Expected output string \"hi \", got %s\n", out);
- ok(ret == 3 ||
- broken(ret == 4), /* Win9x */
- "Expected FormatMessageA to return 3, got %d\n", ret);
+ ok(!strcmp("hi ", out), "Expected output string \"hi \", got %s\n", out);
+ ok(ret == 3, "Expected FormatMessageA to return 3, got %d\n", ret);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0, 0, out,
@@ -1105,17 +1077,13 @@ static void test_message_null_buffer(void)
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
ok(!ret, "FormatMessageA returned %u\n", ret);
- ok(error == ERROR_INSUFFICIENT_BUFFER ||
- error == ERROR_INVALID_PARAMETER, /* win9x */
- "last error %u\n", error);
+ ok(error == ERROR_INSUFFICIENT_BUFFER, "last error %u\n", error);
SetLastError(0xdeadbeef);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 1, NULL);
error = GetLastError();
ok(!ret, "FormatMessageA returned %u\n", ret);
- ok(error == ERROR_INSUFFICIENT_BUFFER ||
- error == ERROR_INVALID_PARAMETER, /* win9x */
- "last error %u\n", error);
+ ok(error == ERROR_INSUFFICIENT_BUFFER, "last error %u\n", error);
if (0) /* crashes on Windows */
{
@@ -1127,25 +1095,19 @@ static void test_message_null_buffer(void)
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
ok(!ret, "FormatMessageA returned %u\n", ret);
- ok(error == ERROR_NOT_ENOUGH_MEMORY ||
- error == ERROR_INVALID_PARAMETER, /* win9x */
- "last error %u\n", error);
+ ok(error == ERROR_NOT_ENOUGH_MEMORY, "last error %u\n", error);
SetLastError(0xdeadbeef);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 1, NULL);
error = GetLastError();
ok(!ret, "FormatMessageA returned %u\n", ret);
- ok(error == ERROR_NOT_ENOUGH_MEMORY ||
- error == ERROR_INVALID_PARAMETER, /* win9x */
- "last error %u\n", error);
+ ok(error == ERROR_NOT_ENOUGH_MEMORY, "last error %u\n", error);
SetLastError(0xdeadbeef);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 256, NULL);
error = GetLastError();
ok(!ret, "FormatMessageA returned %u\n", ret);
- ok(error == ERROR_NOT_ENOUGH_MEMORY ||
- error == ERROR_INVALID_PARAMETER, /* win9x */
- "last error %u\n", error);
+ ok(error == ERROR_NOT_ENOUGH_MEMORY, "last error %u\n", error);
}
static void test_message_null_buffer_wide(void)
@@ -1391,16 +1353,12 @@ static void test_message_from_hmodule(void)
/* Test a message string with an insertion without passing any variadic arguments. */
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */,
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
- ok(ret == 0 ||
- broken(ret != 0), /* Win9x */
- "FormatMessageA returned non-zero\n");
+ ok(ret == 0, "FormatMessageA returned non-zero\n");
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE |
FORMAT_MESSAGE_ARGUMENT_ARRAY, h, 193 /* ERROR_BAD_EXE_FORMAT */,
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
- ok(ret == 0 ||
- broken(ret != 0), /* Win9x */
- "FormatMessageA returned non-zero\n");
+ ok(ret == 0, "FormatMessageA returned non-zero\n");
/*Test nonexistent messageID with varying language ID's Note: FormatMessageW behaves the same*/
SetLastError(0xdeadbeef);
@@ -1469,9 +1427,7 @@ static void test_message_invalid_flags(void)
ptr = (char *)0xdeadbeef;
ret = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER, "test", 0, 0, (char *)&ptr, 0, NULL);
ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret);
- ok(ptr == NULL ||
- broken(ptr == (char *)0xdeadbeef), /* Win9x */
- "Expected output pointer to be initialized to NULL, got %p\n", ptr);
+ ok(ptr == NULL, "Expected output pointer to be initialized to NULL, got %p\n", ptr);
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
GetLastError());
More information about the wine-patches
mailing list