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

Timestamp:

Oct 16, 2000, 1:05:15 PM (25 years ago)

Author:

sandervl

Message:

LoadLibraryExA fix (for dlls with the same name as the exe)

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.103 2000-10-10 17:14:09 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.104 2000-10-16 11:05:15 sandervl Exp $ */
 
 /*
@@ -679 +679 @@
     ULONG           fPE;                /* isPEImage return value. */
     DWORD           Characteristics;    //file header's Characteristics
+    BOOL            fDllModule;         //file type
 
     /** @sketch
@@ -708 +709 @@
     /** @sketch
      *  First we'll see if the module is allready loaded - either as the EXE or as DLL.
-     *  IF Executable present AND libfile matches the modname of the executable THEN
+     *  IF NOT dll AND Executable present AND libfile matches the modname of the executable THEN
      *      RETURN instance handle of executable.
      *  Endif
@@ -720 +721 @@
      *  Endif
      */
-    if (WinExe != NULL && WinExe->matchModName(lpszLibFile))
+    if(strstr(lpszLibFile, ".DLL")) {
+        fDllModule = TRUE;
+    }
+    else {
+        if(!strstr(lpszLibFile, ".")) {
+            //if there's no extension or trainling dot, we
+            //assume it's a dll (see Win32 SDK docs)
+            fDllModule = TRUE;
+        }
+    }
+
+    //todo: the entire exe name probably needs to be identical (path + extension)
+    //      -> check in NT
+    if (!fDllModule && WinExe != NULL && WinExe->matchModName(lpszLibFile))
         return WinExe->getInstanceHandle();
 
@@ -790 +804 @@
                 if(pModule->isLxDll())
                 {
-                        ((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;
-                                }
-                        }
+                        ((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;
+                }
+                        }
                 }
                 pModule->incDynamicLib();
@@ -851 +865 @@
          * Process dwFlags
          */
-        if (dwFlags & LOAD_LIBRARY_AS_DATAFILE) 
+        if (dwFlags & LOAD_LIBRARY_AS_DATAFILE)
         {
             dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): LOAD_LIBRARY_AS_DATAFILE",
                       lpszLibFile, hFile, dwFlags));
             peldrDll->setLoadAsDataFile();
-            peldrDll->disableLibraryCalls();
+            peldrDll->disableLibraryCalls();
         }
         if (dwFlags & DONT_RESOLVE_DLL_REFERENCES)
@@ -862 +876 @@
             dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): DONT_RESOLVE_DLL_REFERENCES",
                       lpszLibFile, hFile, dwFlags));
-            peldrDll->disableLibraryCalls();
+            peldrDll->disableLibraryCalls();
             peldrDll->disableImportHandling();
         }
@@ -910 +924 @@
                 SetLastError(ERROR_DLL_INIT_FAILED);
                 delete peldrDll;
-                return NULL;
+        return NULL;
             }
         }
@@ -919 +933 @@
             SetLastError(ERROR_INVALID_EXE_SIGNATURE);
             delete peldrDll;
-            return NULL;
+        return NULL;
         }
     }
@@ -927 +941 @@
                  lpszLibFile, hFile, dwFlags, szModname, fPE));
         SetLastError(fPE);
-        return NULL;
+    return NULL;
     }
 
@@ -1111 +1125 @@
             return ERROR_NOT_ENOUGH_MEMORY;
         }
-        strcpy((char *)pszCmdLineA, pszPeExe);
-        
+    strcpy((char *)pszCmdLineA, pszPeExe);
+
         rc = NO_ERROR;
     }
@@ -1473 +1487 @@
         if(!strstr(szModule, ".")) {
             //if there's no extension or trainling dot, we
-                        //assume it's a dll (see Win32 SDK docs)
+            //assume it's a dll (see Win32 SDK docs)
             fDllModule = TRUE;
         }
@@ -1481 +1495 @@
         *dot = 0;
 
-    if(!fDllModule && WinExe && !strcmpi(szModule, WinExe->getModuleName())) {
+    if(!fDllModule && WinExe && WinExe->matchModName(szModule)) {
         hMod = WinExe->getInstanceHandle();
     }
@@ -1591 +1605 @@
     }
     if(szAppName[0] == '"') {
-         exename = &szAppName[1];
+     exename = &szAppName[1];
     }
     else exename = szAppName;
 
-    if(GetFileAttributesA(exename) == -1) { 
-        dprintf(("CreateProcess: can't find executable!"));
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        return FALSE;
-    }    
+    if(GetFileAttributesA(exename) == -1) {
+    dprintf(("CreateProcess: can't find executable!"));
+    SetLastError(ERROR_FILE_NOT_FOUND);
+    return FALSE;
+    }
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
 
-    //SvL: Allright. Before we call O32_CreateProcess, we must take care of 
+    //SvL: Allright. Before we call O32_CreateProcess, we must take care of
     //     lpCurrentDirectory ourselves. (Open32 ignores it!)
     if(lpCurrentDirectory) {
-        char *newcmdline;
-
-        newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
-        sprintf(newcmdline, "PE.EXE /OPT:[CURDIR=%s] %s", lpCurrentDirectory, cmdline);
-        free(cmdline);
-        cmdline = newcmdline;
+    char *newcmdline;
+
+    newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
+    sprintf(newcmdline, "PE.EXE /OPT:[CURDIR=%s] %s", lpCurrentDirectory, cmdline);
+    free(cmdline);
+    cmdline = newcmdline;
     }
     else {
-        char *newcmdline;
-
-        newcmdline = (char *)malloc(strlen(cmdline) + 16);
-        sprintf(newcmdline, "PE.EXE %s", cmdline);
-        free(cmdline);
-        cmdline = newcmdline;
+    char *newcmdline;
+
+    newcmdline = (char *)malloc(strlen(cmdline) + 16);
+    sprintf(newcmdline, "PE.EXE %s", cmdline);
+    free(cmdline);
+    cmdline = newcmdline;
     }
     rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline,lpProcessAttributes,
@@ -1624 +1638 @@
                          lpEnvironment, lpCurrentDirectory, lpStartupInfo,
                          lpProcessInfo);
-    if(rc == TRUE) 
+    if(rc == TRUE)
     {
       if (dwCreationFlags & DEBUG_PROCESS && pThreadDB != NULL)
@@ -1701 +1715 @@
     rc = O32_WaitForInputIdle(procinfo.hProcess, 15000);
     if(rc != 0) {
-        dprintf(("WinExec: WaitForInputIdle %x returned %x", procinfo.hProcess, rc));
+        dprintf(("WinExec: WaitForInputIdle %x returned %x", procinfo.hProcess, rc));
     }
     return procinfo.hProcess; //correct?
@@ -1712 +1726 @@
  * Copyright 1995 Alexandre Julliard
  */
-HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) 
+HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
 {
     LOADPARAMS *params = (LOADPARAMS *)paramBlock;
@@ -1747 +1761 @@
         startup.wShowWindow = params->lpCmdShow[1];
     }
-    
+
     if (CreateProcessA( filename, cmdline, NULL, NULL, FALSE, 0,
                         params->lpEnvAddress, NULL, &startup, &info ))
     {
         /* Give 15 seconds to the app to come up */
-        if ( O32_WaitForInputIdle ( info.hProcess, 15000 ) ==  0xFFFFFFFF ) 
+        if ( O32_WaitForInputIdle ( info.hProcess, 15000 ) ==  0xFFFFFFFF )
             dprintf(("ERROR: WaitForInputIdle failed: Error %ld\n", GetLastError() ));
         hInstance = 33;
@@ -1817 +1831 @@
   dprintf(("GetVersionStruct of module %s %x %d", lpszModName, verstruct, bufLength));
   if(verstruct == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
   }
-  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) 
+  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName))
   {
         winimage = (Win32ImageBase *)WinExe;
   }
-  else 
+  else
   {
         winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
@@ -1848 +1862 @@
                    return winimage->getVersionStruct(verstruct, bufLength);
               }
-              dprintf(("GetVersionStruct; just loaded dll %s, but can't find it now!", modname));
+          dprintf(("GetVersionStruct; just loaded dll %s, but can't find it now!", modname));
               return 0;
           }
@@ -1859 +1873 @@
           winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
           if(winimage != NULL) {
-                rc = winimage->getVersionStruct(verstruct, bufLength);
-          }
-          else  dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", lpszModName));
-          FreeLibrary(hDll);
+            rc = winimage->getVersionStruct(verstruct, bufLength);
+      }
+          else  dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", lpszModName));
+      FreeLibrary(hDll);
           return rc;
         }
@@ -1903 +1917 @@
                 return winimage->getVersionSize();
             }
-            dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", modname));
+        dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", modname));
             return 0;
         }
@@ -1914 +1928 @@
         winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
         if(winimage != NULL) {
-                size = winimage->getVersionSize();
-        }
-        else    dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", lpszModName));
-        FreeLibrary(hDll);
+            size = winimage->getVersionSize();
+    }
+        else    dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", lpszModName));
+    FreeLibrary(hDll);
         return size;
       }