Changeset 3678 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Jun 8, 2000, 8:08:58 PM (25 years ago)

Author:

sandervl

Message:

RegQueryValueW, OpenFile and LoadLibrary fixes

File:

• trunk/src/kernel32/wprocess.cpp (modified) (7 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.81 2000-05-22 19:08:01 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.82 2000-06-08 18:08:58 sandervl Exp $ */
 
 /*
@@ -661 +661 @@
     BOOL            fPath;              /* Flags which is set if the    */
                                         /* lpszLibFile contains a path. */
-    BOOL            fPE;                /* isPEImage return value. */
+    ULONG           fPE;                /* isPEImage return value. */
 
     /** @sketch
@@ -802 +802 @@
      */
     fPE = Win32ImageBase::isPEImage(szModname);
-    if (fPE)
+    if(fPE == ERROR_SUCCESS)
     {
         Win32PeLdrDll * peldrDll;
@@ -887 +887 @@
     else
     {
-        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x) library were found (%s) but it's not loadable!",
-                 lpszLibFile, hFile, dwFlags, szModname));
-        SetLastError(ERROR_INVALID_EXE_SIGNATURE);
+        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x) library wasn't found (%s) or isn't loadable; err %x",
+                 lpszLibFile, hFile, dwFlags, szModname, fPE));
+        SetLastError(fPE);
     }
 
@@ -1370 +1370 @@
         if(winimage == NULL)
         {
-     char modname[CCHMAXPATH];
+        char modname[CCHMAXPATH];
 
         strcpy(modname, lpszModName);
@@ -1376 +1376 @@
         Win32DllBase::renameDll(modname);
 
-        if(Win32ImageBase::isPEImage(modname) == FALSE)
-                {
+        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+        {
          HINSTANCE hInstance;
 
@@ -1431 +1431 @@
         Win32DllBase::renameDll(modname);
 
-        if(Win32ImageBase::isPEImage(modname) == FALSE)
-                {
+        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+        {
          HINSTANCE hInstance;