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

Timestamp:

Oct 23, 1999, 2:34:48 PM (26 years ago)

Author:

sandervl

Message:

Changes for logging & getversionsize/struct

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.39 1999-10-22 18:07:24 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.40 1999-10-23 12:34:48 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <winexebase.h>
 #include <windllpeldr.h>
+#include <winfakepeldr.h>
 
 #ifdef __IBMCPP__
@@ -605 +606 @@
          if(lpszCommandLine) {
                 cmdline = (char *)malloc(strlen(lpszImageName)+strlen(lpszCommandLine) + 16);
-                sprintf(cmdline, "%s %s", lpszImageName, lpszCommandLine);
+                sprintf(cmdline, "PE.EXE %s %s", lpszImageName, lpszCommandLine);
                 fAllocStr = TRUE;
          }
-         else   cmdline = (char *)lpszImageName;
+         else {
+                cmdline = (char *)malloc(strlen(lpszImageName) + 16);
+                sprintf(cmdline, "PE.EXE %s", lpszImageName);
+                fAllocStr = TRUE;
+         }
     }
-    else cmdline = (char *)lpszCommandLine;
-
+    else {
+        cmdline = (char *)malloc(strlen(lpszCommandLine) + 16);
+        sprintf(cmdline, "PE.EXE %s", lpszCommandLine);
+        fAllocStr = TRUE;
+    }
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
     rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
     if(fAllocStr)
-    free(cmdline);
+        free(cmdline);
 
     dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));
@@ -674 +682 @@
 {
  Win32ImageBase *winimage;
+ Win32PeLdrRsrcImg *rsrcimg;
 
   dprintf(("GetVersionStruct"));
@@ -681 +690 @@
   else {
         winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
-        if(winimage == NULL) {
-                dprintf(("GetVersionStruct can't find Win32Image for %s\n", modname));
-                return(FALSE);
+        if(winimage == NULL) 
+        {
+                if(Win32ImageBase::isPEImage(modname) == FALSE) 
+                {
+                 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);
+                        }
+                        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;
         }
   }
@@ -693 +730 @@
 {
  Win32ImageBase *winimage;
+ Win32PeLdrRsrcImg *rsrcimg;
 
   dprintf(("GetVersionSize of %s\n", modname));
@@ -701 +739 @@
   else {
         winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
-        if(winimage == NULL) {
-                dprintf(("GetVersionSize can't find Win32Image for %s\n", modname));
-                return(FALSE);
+        if(winimage == NULL) 
+        {
+                if(Win32ImageBase::isPEImage(modname) == FALSE) 
+                {
+                 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->getVersionSize();
+                        }
+                        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(("GetVersionSize can't load %s\n", modname));
+                        delete rsrcimg;
+                        return(FALSE);
+                }
+                rsrcimg->init(0);
+                int size = rsrcimg->getVersionSize();
+                delete rsrcimg;
+                return size;
         }
   }