[PATCH 2/2] Don't crash on WinMe

[Paul Vriens]

---
 dlls/kernel32/tests/module.c |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c
index 374a18e..4cb30a8 100644
--- a/dlls/kernel32/tests/module.c
+++ b/dlls/kernel32/tests/module.c
@@ -228,13 +228,18 @@ static void testLoadLibraryEx(void)
     ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n");
 
     /* NULL lpFileName */
-    SetLastError(0xdeadbeef);
-    hmodule = LoadLibraryExA(NULL, NULL, 0);
-    ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
-       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
-       "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
-       GetLastError());
+    if (is_unicode_enabled)
+    {
+        SetLastError(0xdeadbeef);
+        hmodule = LoadLibraryExA(NULL, NULL, 0);
+        ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
+        ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+           GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+           "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+           GetLastError());
+    }
+    else
+        win_skip("NULL filename crashes on WinMe\n");
 
     /* empty lpFileName */
     SetLastError(0xdeadbeef);
@@ -281,13 +286,16 @@ static void testLoadLibraryEx(void)
     }
 
     /* lpFileName does not matter */
-    SetLastError(0xdeadbeef);
-    hmodule = LoadLibraryExA(NULL, hfile, 0);
-    ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
-       GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */
-       "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
-       GetLastError());
+    if (is_unicode_enabled)
+    {
+        SetLastError(0xdeadbeef);
+        hmodule = LoadLibraryExA(NULL, hfile, 0);
+        ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
+        ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+           GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */
+           "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+           GetLastError());
+    }
 
     CloseHandle(hfile);
 
-- 
1.6.2.5


--------------010106030802080208010502--