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

Timestamp:

Aug 17, 2000, 8:22:18 PM (25 years ago)

Author:

sandervl

Message:

GetModuleHandle fix + minor changes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.87 2000-08-11 18:42:55 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.88 2000-08-17 18:22:18 sandervl Exp $ */
 
 /*
@@ -756 +756 @@
     }
 
+    //test if dll is in PE or LX format
+    fPE = Win32ImageBase::isPEImage(szModname);
 
     /** @sketch
-     *  IF dwFlags == 0 THEN
+     *  IF dwFlags == 0 && (!fPeLoader || !fPE) THEN
      *      Try load the executable using LoadLibrary
      *      IF successfully loaded THEN
@@ -770 +772 @@
      *  Endif
      */
-    if (dwFlags == 0)
+    //only call Open32 if dwFlags == 0 and (LX binary or win32k process)
+    if(dwFlags == 0 && (!fPeLoader || fPE != ERROR_SUCCESS))
     {
         hDll = O32_LoadLibrary(szModname);
@@ -816 +819 @@
      *  return hDll.
      */
-    fPE = Win32ImageBase::isPEImage(szModname);
     if(fPE == ERROR_SUCCESS)
     {
@@ -1138 +1140 @@
 HANDLE WIN32API GetModuleHandleA(LPCTSTR lpszModule)
 {
- HANDLE    hMod;
+ HANDLE    hMod = 0;
  Win32DllBase *windll;
  char      szModule[CCHMAXPATH];