Commit e724f6aa authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard

kernel32/tests: Centralize the FormatMessageW skip detection.

parent 5505ae97
...@@ -130,15 +130,6 @@ static void test_message_from_string_wide(void) ...@@ -130,15 +130,6 @@ static void test_message_from_string_wide(void)
WCHAR out[0x100] = {0}; WCHAR out[0x100] = {0};
DWORD r, error; DWORD r, error;
SetLastError(0xdeadbeef);
r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
if (!r && error == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
/* the basics */ /* the basics */
r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0,
0, out, sizeof(out)/sizeof(WCHAR), NULL); 0, out, sizeof(out)/sizeof(WCHAR), NULL);
...@@ -802,14 +793,6 @@ static void test_message_ignore_inserts_wide(void) ...@@ -802,14 +793,6 @@ static void test_message_ignore_inserts_wide(void)
DWORD ret; DWORD ret;
WCHAR out[256]; WCHAR out[256];
SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out,
sizeof(out)/sizeof(WCHAR), NULL); sizeof(out)/sizeof(WCHAR), NULL);
ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret);
...@@ -902,14 +885,6 @@ static void test_message_insufficient_buffer_wide(void) ...@@ -902,14 +885,6 @@ static void test_message_insufficient_buffer_wide(void)
WCHAR out[5]; WCHAR out[5];
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
SetLastError(0xdeadbeef);
memcpy(out, init_buf, sizeof(init_buf)); memcpy(out, init_buf, sizeof(init_buf));
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, 0, NULL); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, 0, NULL);
ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret);
...@@ -1006,15 +981,6 @@ static void test_message_null_buffer_wide(void) ...@@ -1006,15 +981,6 @@ static void test_message_null_buffer_wide(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError(); error = GetLastError();
if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
ok(!ret, "FormatMessageW returned %u\n", ret); ok(!ret, "FormatMessageW returned %u\n", ret);
ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
...@@ -1144,14 +1110,6 @@ static void test_message_allocate_buffer_wide(void) ...@@ -1144,14 +1110,6 @@ static void test_message_allocate_buffer_wide(void)
DWORD ret; DWORD ret;
WCHAR *buf; WCHAR *buf;
SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
/* While MSDN suggests that FormatMessageW allocates a buffer whose size is /* While MSDN suggests that FormatMessageW allocates a buffer whose size is
* the larger of the output string and the requested buffer size, the tests * the larger of the output string and the requested buffer size, the tests
* will not try to determine the actual size of the buffer allocated, as * will not try to determine the actual size of the buffer allocated, as
...@@ -1397,14 +1355,6 @@ static void test_message_invalid_flags_wide(void) ...@@ -1397,14 +1355,6 @@ static void test_message_invalid_flags_wide(void)
WCHAR *ptr; WCHAR *ptr;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
SetLastError(0xdeadbeef);
memcpy(out, init_buf, sizeof(init_buf)); memcpy(out, init_buf, sizeof(init_buf));
ret = FormatMessageW(0, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); ret = FormatMessageW(0, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL);
ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret);
...@@ -1482,17 +1432,28 @@ static void test_message_invalid_flags_wide(void) ...@@ -1482,17 +1432,28 @@ static void test_message_invalid_flags_wide(void)
START_TEST(format_msg) START_TEST(format_msg)
{ {
DWORD ret;
test_message_from_string(); test_message_from_string();
test_message_from_string_wide();
test_message_ignore_inserts(); test_message_ignore_inserts();
test_message_ignore_inserts_wide();
test_message_insufficient_buffer(); test_message_insufficient_buffer();
test_message_insufficient_buffer_wide();
test_message_null_buffer(); test_message_null_buffer();
test_message_null_buffer_wide();
test_message_allocate_buffer(); test_message_allocate_buffer();
test_message_allocate_buffer_wide();
test_message_from_hmodule(); test_message_from_hmodule();
test_message_invalid_flags(); test_message_invalid_flags();
SetLastError(0xdeadbeef);
ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("FormatMessageW is not implemented\n");
return;
}
test_message_from_string_wide();
test_message_ignore_inserts_wide();
test_message_insufficient_buffer_wide();
test_message_null_buffer_wide();
test_message_allocate_buffer_wide();
test_message_invalid_flags_wide(); test_message_invalid_flags_wide();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment