kernel32/tests: Don't crash on WinMe.

6d416e69 · Paul Vriens · Alexandre Julliard · 61c69e55 · 6d416e69
Commit 6d416e69 authored Oct 07, 2009 by Paul Vriens Committed by Alexandre Julliard Oct 07, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 14 deletions

module.c dlls/kernel32/tests/module.c +22 -14

No files found.
--- 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);
+    if (is_unicode_enabled)
-    hmodule = LoadLibraryExA(NULL, NULL, 0);
+    {
-    ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
+        SetLastError(0xdeadbeef);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+        hmodule = LoadLibraryExA(NULL, NULL, 0);
-       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+        ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-       "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+        ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
-       GetLastError());
+           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);
+    if (is_unicode_enabled)
-    hmodule = LoadLibraryExA(NULL, hfile, 0);
+    {
-    ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
+        SetLastError(0xdeadbeef);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+        hmodule = LoadLibraryExA(NULL, hfile, 0);
-       GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */
+        ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-       "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+        ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
-       GetLastError());
+           GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */
+           "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+           GetLastError());
+    }
    CloseHandle(hfile);