Changeset 21604 for trunk/src

Timestamp:

Mar 24, 2011, 11:14:27 PM (14 years ago)

Author:

dmik

Message:

kernel32: Report ERROR_MOD_NOT_FOUND from LoadLibrary() when it fails to load a DLL due to missing import modules, to mimic Win32 behavior.

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (1 diff)

trunk/src/kernel32/oslibdos.cpp

@@ -3178 +3178 @@
   rc = DosLoadModule(name, CCHMAXPATH, szOemModName, &hModule);
   if(rc) {
-      SetLastError(error2WinError(rc,ERROR_FILE_NOT_FOUND));
+      dprintf(("DosLoadModule([%s]) failed with %d and [%s]",
+               szModName, rc, name));
+      if (rc == ERROR_FILE_NOT_FOUND &&
+          stricmp(szOemModName, name) != 0) {
+          // the DLL could not be loaded due to some missing import module;
+          // Win32 seems to report this with ERROR_MOD_NOT_FOUND, mimic this
+          // behavior
+          SetLastError(ERROR_MOD_NOT_FOUND);
+      } else {
+          SetLastError(error2WinError(rc,ERROR_FILE_NOT_FOUND));
+      }
       return 0;
   }