Paul Vriens : kernel32/tests: Fix a few tests on win9x.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c3a58cc7d8377b7b098d9058bf1aca9a7c9a775d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c3a58cc7d8377b7b098d9058bf...

Author: Paul Vriens 
Date:   Mon Sep  8 07:57:30 2008 +0200

kernel32/tests: Fix a few tests on win9x.

---

dlls/kernel32/tests/module.c |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c
index 7b602e7..3bda333 100644
--- a/dlls/kernel32/tests/module.c
+++ b/dlls/kernel32/tests/module.c
@@ -223,7 +223,7 @@ static void testLoadLibraryEx(void)
     HANDLE hfile;

hfile = CreateFileA("testfile.dll", GENERIC_READ | GENERIC_WRITE,
-                        FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
                         NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n");

@@ -231,24 +231,28 @@ static void testLoadLibraryEx(void)
     SetLastError(0xdeadbeef);
     hmodule = LoadLibraryExA(NULL, NULL, 0);
     ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND,
-       "Expected ERROR_MOD_NOT_FOUND, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+       "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+       GetLastError());

/* empty lpFileName */
     SetLastError(0xdeadbeef);
     hmodule = LoadLibraryExA("", NULL, 0);
     ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
-    ok(GetLastError() == ERROR_MOD_NOT_FOUND,
-       "Expected ERROR_MOD_NOT_FOUND, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_MOD_NOT_FOUND ||
+       GetLastError() == ERROR_DLL_NOT_FOUND, /* win9x */
+       "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND, got %d\n",
+       GetLastError());

/* hFile is non-NULL */
     SetLastError(0xdeadbeef);
     hmodule = LoadLibraryExA("testfile.dll", hfile, 0);
     ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
     ok(GetLastError() == ERROR_SHARING_VIOLATION ||
-       GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */
-       "Expected ERROR_SHARING_VIOLATION or ERROR_INVALID_PARAMETER, got %d\n",
-       GetLastError());
+       GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */
+       GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */
+       "Unexpected last error, got %d\n", GetLastError());

/* try to open a file that is locked */
     SetLastError(0xdeadbeef);
@@ -256,8 +260,10 @@ static void testLoadLibraryEx(void)
     ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
     todo_wine
     {
-        ok(GetLastError() == ERROR_SHARING_VIOLATION,
-           "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
+        ok(GetLastError() == ERROR_SHARING_VIOLATION ||
+           GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */
+           "Expected ERROR_SHARING_VIOLATION or ERROR_FILE_NOT_FOUND, got %d\n",
+           GetLastError());
     }

/* lpFileName does not matter */
@@ -277,8 +283,10 @@ static void testLoadLibraryEx(void)
     ok(hmodule == 0, "Expected 0, got %p\n", hmodule);
     todo_wine
     {
-        ok(GetLastError() == ERROR_FILE_INVALID,
-          "Expected ERROR_FILE_INVALID, got %d\n", GetLastError());
+        ok(GetLastError() == ERROR_FILE_INVALID ||
+           GetLastError() == ERROR_BAD_FORMAT, /* win9x */
+           "Expected ERROR_FILE_INVALID or ERROR_BAD_FORMAT, got %d\n",
+           GetLastError());
     }

DeleteFileA("testfile.dll");