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

Timestamp:

Oct 10, 2000, 7:14:09 PM (25 years ago)

Author:

sandervl

Message:

pe loader fixes, add system32\drivers dir during installation, add build date + time during kernel32 load

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.102 2000-10-06 15:16:07 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.103 2000-10-10 17:14:09 sandervl Exp $ */
 
 /*
@@ -9 +9 @@
  * NOTE: Even though Odin32 OS/2 apps don't switch FS selectors,
  *       we still allocate a TEB to store misc information.
+ *
+ * TODO: What happens when a dll is first loaded as LOAD_LIBRARY_AS_DATAFILE
+ *       and then for real? (first one not freed of course)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -25 +28 @@
 #include "windllpeldr.h"
 #include "winexepeldr.h"
-#include "winfakepeldr.h"
 #include "windlllx.h"
 #include <vmutex.h>
@@ -443 +445 @@
  BOOL rc;
 
+    SetLastError(ERROR_SUCCESS);
     //SvL: Ignore FreeLibary for executable
     if(WinExe && hinstance == WinExe->getInstanceHandle()) {
@@ -633 +636 @@
  *                      by the module).
  *
- *                  partially implemented yet - imports are resolved it seems.
  *
  *                  LOAD_LIBRARY_AS_DATAFILE
@@ -648 +650 @@
  *                      LoadCursor, LoadIcon, LoadImage, LoadMenu.)
  *
- *                  not implemented yet.
  *
  *                  LOAD_WITH_ALTERED_SEARCH_PATH
@@ -677 +678 @@
                                         /* lpszLibFile contains a path. */
     ULONG           fPE;                /* isPEImage return value. */
+    DWORD           Characteristics;    //file header's Characteristics
 
     /** @sketch
@@ -720 +722 @@
     if (WinExe != NULL && WinExe->matchModName(lpszLibFile))
         return WinExe->getInstanceHandle();
+
     pModule = Win32DllBase::findModule((LPSTR)lpszLibFile);
     if (pModule)
@@ -760 +763 @@
 
     //test if dll is in PE or LX format
-    fPE = Win32ImageBase::isPEImage(szModname);
+    fPE = Win32ImageBase::isPEImage(szModname, &Characteristics);
 
     /** @sketch
@@ -785 +788 @@
             if(pModule)
             {
-
                 if(pModule->isLxDll())
                 {
@@ -829 +831 @@
     if(fPE == ERROR_SUCCESS)
     {
-        Win32PeLdrDll * peldrDll;
-        /* TODO!
-         * We might use the fake loader class to do the LOAD_LIBRARY_AS_DATAFILE and
-         * executable image loading. These are both loaded for accessing resource.
-         * But this requires that they behaves like Dlls...
-        if (dwFlags & LOAD_LIBRARY_AS_DATAFILE || fPE == 2)
-        {
-            peldrDll = new Win32PeLdrRsrcImg(szModname);
-        }
-        else
-        */
+        Win32PeLdrDll *peldrDll;
+
+        //SvL: If executable -> load as data file (only resources)
+        if(!(Characteristics & IMAGE_FILE_DLL))
+        {
+            dwFlags |= (LOAD_LIBRARY_AS_DATAFILE | DONT_RESOLVE_DLL_REFERENCES);
+        }
 
         peldrDll = new Win32PeLdrDll(szModname);
@@ -853 +851 @@
          * Process dwFlags
          */
-        if (dwFlags & (DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE))
-        {
-            peldrDll->disableThreadLibraryCalls();
-            //peldrDll->setDontProcessImports(); not implemented?
+        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();
+        }
+        if (dwFlags & DONT_RESOLVE_DLL_REFERENCES)
+        {
+            dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): DONT_RESOLVE_DLL_REFERENCES",
+                      lpszLibFile, hFile, dwFlags));
+            peldrDll->disableLibraryCalls();
+            peldrDll->disableImportHandling();
         }
         if (dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH)
@@ -863 +870 @@
                       lpszLibFile, hFile, dwFlags));
             //peldrDll->setLoadWithAlteredSearchPath();
-        }
-        if (dwFlags & LOAD_LIBRARY_AS_DATAFILE)
-        {
-            dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): Warning dwFlags LOAD_LIBRARY_AS_DATAFILE is not implemented.",
-                     lpszLibFile, hFile, dwFlags));
-            //peldrDll->setLoadAsDatafile();
         }
 
@@ -918 +919 @@
             SetLastError(ERROR_INVALID_EXE_SIGNATURE);
             delete peldrDll;
-                return NULL;
+            return NULL;
         }
     }
@@ -1812 +1813 @@
 {
  Win32ImageBase *winimage;
- Win32PeLdrRsrcImg *rsrcimg;
-
-  dprintf(("GetVersionStruct of module %s", lpszModName));
+ HINSTANCE hDll;
+
+  dprintf(("GetVersionStruct of module %s %x %d", lpszModName, verstruct, bufLength));
+  if(verstruct == NULL) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+  }
+  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) 
+  {
+        winimage = (Win32ImageBase *)WinExe;
+  }
+  else 
+  {
+        winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
+        if(winimage == NULL)
+        {
+          char modname[CCHMAXPATH];
+
+          strcpy(modname, lpszModName);
+          //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+          Win32DllBase::renameDll(modname);
+
+          if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+          {
+            HINSTANCE hInstance;
+
+              //must be an LX dll, just load it (app will probably load it anyway)
+              hInstance = LoadLibraryA(modname);
+              if(hInstance == 0)
+                  return 0;
+
+              winimage = (Win32ImageBase *)Win32DllBase::findModule(hInstance);
+              if(winimage) {
+                   return winimage->getVersionStruct(verstruct, bufLength);
+              }
+              dprintf(("GetVersionStruct; just loaded dll %s, but can't find it now!", modname));
+              return 0;
+          }
+          BOOL rc = FALSE;
+
+          hDll = LoadLibraryExA(lpszModName, 0, LOAD_LIBRARY_AS_DATAFILE);
+          if(hDll == 0)
+              return 0;
+
+          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);
+          return rc;
+        }
+  }
+  return winimage->getVersionStruct(verstruct, bufLength);
+}
+//******************************************************************************
+//******************************************************************************
+ULONG SYSTEM GetVersionSize(char *lpszModName)
+{
+ Win32ImageBase *winimage;
+ HINSTANCE hDll;
+
+  dprintf(("GetVersionSize of %s\n", lpszModName));
+
   if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) {
         winimage = (Win32ImageBase *)WinExe;
@@ -1822 +1884 @@
         if(winimage == NULL)
         {
-        char modname[CCHMAXPATH];
-
-        strcpy(modname, lpszModName);
-        //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
-        Win32DllBase::renameDll(modname);
-
-        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
-        {
-         HINSTANCE hInstance;
+          char modname[CCHMAXPATH];
+
+          strcpy(modname, lpszModName);
+          //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+          Win32DllBase::renameDll(modname);
+
+          if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+          {
+            HINSTANCE hInstance;
 
             //must be an LX dll, just load it (app will probably load it anyway)
@@ -1836 +1898 @@
             if(hInstance == 0)
                 return 0;
-                winimage = (Win32ImageBase *)Win32DllBase::findModule(hInstance);
-                if(winimage) {
-                return winimage->getVersionStruct(verstruct, bufLength);
-            }
-            return 0;
-        }
-        //SvL: Try to load it
-        rsrcimg = new Win32PeLdrRsrcImg(modname);
-        if(rsrcimg == NULL)
-            return 0;
-
-            rsrcimg->init(0);
-        if(rsrcimg->getError() != NO_ERROR)
-        {
-                dprintf(("GetVersionStruct can't load %s\n", modname));
-            delete rsrcimg;
-                return(FALSE);
-        }
-        BOOL rc = rsrcimg->getVersionStruct(verstruct, bufLength);
-        delete rsrcimg;
-        return rc;
-        }
-  }
-  return winimage->getVersionStruct(verstruct, bufLength);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG SYSTEM GetVersionSize(char *lpszModName)
-{
- Win32ImageBase *winimage;
- Win32PeLdrRsrcImg *rsrcimg;
-
-  dprintf(("GetVersionSize of %s\n", lpszModName));
-
-  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) {
-        winimage = (Win32ImageBase *)WinExe;
-  }
-  else {
-        winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
-        if(winimage == NULL)
-        {
-     char modname[CCHMAXPATH];
-
-        strcpy(modname, lpszModName);
-        //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
-        Win32DllBase::renameDll(modname);
-
-        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
-        {
-         HINSTANCE hInstance;
-
-            //must be an LX dll, just load it (app will probably load it anyway)
-            hInstance = LoadLibraryA(modname);
-            if(hInstance == 0)
-                return 0;
-                winimage = (Win32ImageBase *)Win32DllBase::findModule(hInstance);
-                if(winimage) {
+
+            winimage = (Win32ImageBase *)Win32DllBase::findModule(hInstance);
+            if(winimage) {
                 return winimage->getVersionSize();
             }
+            dprintf(("GetVersionSize; just loaded dll %s, but can't find it now!", modname));
             return 0;
         }
-
-        //SvL: Try to load it
-        rsrcimg = new Win32PeLdrRsrcImg(modname);
-        if(rsrcimg == NULL)
+        int size = 0;
+
+        hDll = LoadLibraryExA(lpszModName, 0, LOAD_LIBRARY_AS_DATAFILE);
+        if(hDll == 0)
             return 0;
 
-            rsrcimg->init(0);
-        if(rsrcimg->getError() != NO_ERROR)
-        {
-                dprintf(("GetVersionSize can't load %s\n", modname));
-            delete rsrcimg;
-                return(FALSE);
-        }
-        int size = rsrcimg->getVersionSize();
-        delete rsrcimg;
+        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);
         return size;
-        }
+      }
   }
   return winimage->getVersionSize();
 }
 //******************************************************************************
-//TODO:What does this do exactly??
 //******************************************************************************
 ODINFUNCTION1(BOOL,DisableThreadLibraryCalls,HMODULE,hModule)