Andrew Nguyen : kernel32: Only check the buffer pointer in FormatMessageA if buffer allocation is requested .
Alexandre Julliard
julliard at winehq.org
Mon Apr 19 11:51:19 CDT 2010
Module: wine
Branch: master
Commit: ce61b254d03d3aa4cfb3e803855d22670bb6d8d7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce61b254d03d3aa4cfb3e803855d22670bb6d8d7
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Sun Apr 18 09:09:06 2010 -0500
kernel32: Only check the buffer pointer in FormatMessageA if buffer allocation is requested.
---
dlls/kernel32/format_msg.c | 2 +-
dlls/kernel32/tests/format_msg.c | 83 +++++++++++++++++++++++++++++++++++++-
2 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c
index fbd133b..8c37434 100644
--- a/dlls/kernel32/format_msg.c
+++ b/dlls/kernel32/format_msg.c
@@ -434,7 +434,7 @@ DWORD WINAPI FormatMessageA(
&&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
|| (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0;
- if (!lpBuffer)
+ if ((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) && !lpBuffer)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return 0;
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index f48c0f8..21b6377 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -734,6 +734,32 @@ static void test_message_null_buffer(void)
{
DWORD ret, error;
+ /* Without FORMAT_MESSAGE_ALLOCATE_BUFFER, only the specified buffer size is checked. */
+ SetLastError(0xdeadbeef);
+ 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);
+
+ 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);
+
+ if (0) /* crashes on Windows */
+ {
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL);
+ error = GetLastError();
+ ok(!ret, "FormatMessageA returned %u\n", ret);
+ trace("last error %u\n", error);
+ }
+
SetLastError(0xdeadbeef);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
@@ -743,7 +769,28 @@ static void test_message_null_buffer(void)
"last error %u\n", error);
SetLastError(0xdeadbeef);
- ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL);
+ 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);
+
+ 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);
+}
+
+static void test_message_null_buffer_wide(void)
+{
+ DWORD ret, error;
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL);
error = GetLastError();
if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED)
{
@@ -751,6 +798,39 @@ static void test_message_null_buffer(void)
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(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 1, NULL);
+ error = GetLastError();
+ ok(!ret, "FormatMessageW returned %u\n", ret);
+ ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL);
+ error = GetLastError();
+ ok(!ret, "FormatMessageW returned %u\n", ret);
+ ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL);
+ error = GetLastError();
+ ok(!ret, "FormatMessageW returned %u\n", ret);
+ ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 1, NULL);
+ error = GetLastError();
+ ok(!ret, "FormatMessageW returned %u\n", ret);
+ ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
+
+ SetLastError(0xdeadbeef);
+ ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 256, NULL);
+ error = GetLastError();
ok(!ret, "FormatMessageW returned %u\n", ret);
ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error);
}
@@ -822,5 +902,6 @@ START_TEST(format_msg)
test_message_insufficient_buffer();
test_message_insufficient_buffer_wide();
test_message_null_buffer();
+ test_message_null_buffer_wide();
test_message_from_hmodule();
}
More information about the wine-cvs
mailing list