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

Timestamp:

Oct 18, 2000, 7:09:34 PM (25 years ago)

Author:

sandervl

Message:

LoadLibraryExA + memory map close fix, added new registry keys for installation, don't log guard page violation

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.104 2000-10-16 11:05:15 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.105 2000-10-18 17:09:34 sandervl Exp $ */
 
 /*
@@ -792 +792 @@
      *  Endif
      */
-    //only call Open32 if dwFlags == 0 and (LX binary or win32k process)
-    if(dwFlags == 0 && (!fPeLoader || fPE != ERROR_SUCCESS))
+    //only call Open32 if LX binary or win32k process
+    if(!fPeLoader || fPE != ERROR_SUCCESS)
     {
         hDll = O32_LoadLibrary(szModname);
@@ -806 +806 @@
                         ((Win32LxDll *)pModule)->setDllHandleOS2(hDll);
                         if(fPeLoader)
-            {
+                        {
                             if(pModule->AddRef() == -1) {//-1 -> load failed (attachProcess)
-                    dprintf(("Dll %s refused to be loaded; aborting", szModname));
-                    delete pModule;
-                    return 0;
-                }
+                                dprintf(("Dll %s refused to be loaded; aborting", szModname));
+                                delete pModule;
+                                return 0;
+                            }
                         }
                 }
@@ -924 +924 @@
                 SetLastError(ERROR_DLL_INIT_FAILED);
                 delete peldrDll;
-        return NULL;
+                return NULL;
             }
         }
@@ -933 +933 @@
             SetLastError(ERROR_INVALID_EXE_SIGNATURE);
             delete peldrDll;
-        return NULL;
+            return NULL;
         }
     }
@@ -941 +941 @@
                  lpszLibFile, hFile, dwFlags, szModname, fPE));
         SetLastError(fPE);
-    return NULL;
+        return NULL;
     }