Detlef Riekenberg : kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c26a3a011649b92fb665e412fd70910ef6667765
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c26a3a011649b92fb665e412fd70910ef6667765

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Sun Mar 31 07:52:01 2019 +0200

kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE).

FormatMessageA/W sets last error to ERROR_NO_WORK_DONE when nothing
was done, after Sep 2015, but before or with Win10 v1709.

Signed-off-by: Detlef Riekenberg <wine.dev at web.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/format_msg.c | 20 ++++++++++++--------
 include/winerror.h               |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index 57ee78a..9214e3e 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -155,7 +155,7 @@ static void test_message_from_string_wide(void)
     error = GetLastError();
     ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out));
     ok(r==0, "succeeded: r=%d\n", r);
-    ok(error==0xdeadbeef, "last error %u\n", error);
+    ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error);
 
     /* format placeholder with no specifier */
     SetLastError(0xdeadbeef);
@@ -443,7 +443,7 @@ static void test_message_from_string(void)
     r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL);
     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,
+    ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE),
        "last error %u\n", GetLastError());
 
     /* format placeholder with no specifier */
@@ -745,7 +745,8 @@ static void test_message_ignore_inserts(void)
                          ARRAY_SIZE(out), NULL);
     ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret);
     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());
+    ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE),
+        "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError());
 
     /* Insert sequences are ignored. */
     ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out,
@@ -855,7 +856,8 @@ static void test_message_ignore_inserts_wide(void)
                          ARRAY_SIZE(out), NULL);
     ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret);
     ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out));
-    ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError());
+    ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE),
+      "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError());
 
     /* Insert sequences are ignored. */
     ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out,
@@ -1294,8 +1296,8 @@ static void test_message_allocate_buffer(void)
                          "", 0, 0, (char *)&buf, 0, NULL);
     ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret);
     ok(buf == NULL, "Expected output buffer pointer to be NULL\n");
-    ok(GetLastError() == 0xdeadbeef,
-       "Expected last error to be untouched, got %u\n", GetLastError());
+    ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE),
+       "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError());
 
     buf = (char *)0xdeadbeef;
     ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER,
@@ -1391,8 +1393,8 @@ static void test_message_allocate_buffer_wide(void)
                          empty, 0, 0, (WCHAR *)&buf, 0, NULL);
     ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret);
     ok(buf == NULL, "Expected output buffer pointer to be NULL\n");
-    ok(GetLastError() == 0xdeadbeef,
-       "Expected last error to be untouched, got %u\n", GetLastError());
+    ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE),
+       "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError());
 
     buf = (WCHAR *)0xdeadbeef;
     ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER,
@@ -1522,6 +1524,7 @@ static void test_message_from_hmodule(void)
     error = GetLastError();
     ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret);
     ok(error == ERROR_RESOURCE_LANG_NOT_FOUND ||
+       error == ERROR_RESOURCE_TYPE_NOT_FOUND ||
        error == ERROR_MR_MID_NOT_FOUND ||
        error == ERROR_MUI_FILE_NOT_FOUND ||
        error == ERROR_MUI_FILE_NOT_LOADED,
@@ -1533,6 +1536,7 @@ static void test_message_from_hmodule(void)
     error = GetLastError();
     ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret);
     ok(error == ERROR_RESOURCE_LANG_NOT_FOUND ||
+       error == ERROR_RESOURCE_TYPE_NOT_FOUND ||
        error == ERROR_MR_MID_NOT_FOUND ||
        error == ERROR_MUI_FILE_NOT_FOUND ||
        error == ERROR_MUI_FILE_NOT_LOADED,
diff --git a/include/winerror.h b/include/winerror.h
index d78c91e..79be438 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
 #define ERROR_NO_DATA                                      232
 #define ERROR_PIPE_NOT_CONNECTED                           233
 #define ERROR_MORE_DATA                                    234
+#define ERROR_NO_WORK_DONE                                 235
 #define ERROR_VC_DISCONNECTED                              240
 #define ERROR_INVALID_EA_NAME                              254
 #define ERROR_EA_LIST_INCONSISTENT                         255