Changeset 593 for trunk/src/kernel32

Timestamp:

Aug 20, 1999, 12:10:03 AM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.22 1999-08-18 17:18:01 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.23 1999-08-19 22:10:03 sandervl Exp $ */
 
 /*
@@ -215 +215 @@
   }
 
-  //SvL: Use 0 instead of the real instance handle (for resource lookup)
   Win32Exe *winexe;
 
-  winexe = new Win32Exe(0, NameTableId, Win32TableId);
+  winexe = new Win32Exe(hinstance, NameTableId, Win32TableId);
 
   if(winexe) {
@@ -227 +226 @@
 
         winexe->setVersionId(VersionResId);
-        winexe->setOS2InstanceHandle(hinstance);
         winexe->setEntryPoint((ULONG)EntryPoint);
         winexe->setTLSAddress(TlsAddress);
@@ -562 +560 @@
 
   dprintf(("GetModuleFileName %X", hinstModule));
-  if(hinstModule == 0 || hinstModule == -1 || (WinExe && hinstModule == WinExe->getOS2InstanceHandle())) {
-    module = (Win32Image *)WinExe;
+  if(hinstModule == 0 || hinstModule == -1 || (WinExe && hinstModule == WinExe->getInstanceHandle())) {
+        module = (Win32Image *)WinExe;
   }
   else {
-    module = (Win32Image *)Win32Dll::findModule(hinstModule);
+        module = (Win32Image *)Win32Dll::findModule(hinstModule);
   }
 
   if(module) {
-    fpath = module->getFullPath();
+        fpath = module->getFullPath();
   }
   if(fpath) {
-    //SvL: 13-9-98: +1
-    rc = min(strlen(fpath)+1, cchPath);
-    strncpy(lpszPath, fpath, rc);
+        //SvL: 13-9-98: +1
+        rc = min(strlen(fpath)+1, cchPath);
+        strncpy(lpszPath, fpath, rc);
   }
   else  rc = O32_GetModuleFileName(hinstModule, lpszPath, cchPath);
@@ -745 +743 @@
   hinstance = OS2QueryModuleHandle(modname);
   if(hinstance == 0) {
-    dprintf(("GetVersionStruct can't find handle for %s\n", modname));
-    return(FALSE);
-  }
-  if(WinExe && WinExe->getOS2InstanceHandle() == hinstance) {
-    winimage = (Win32Image *)WinExe;
+        dprintf(("GetVersionStruct can't find handle for %s\n", modname));
+        return(FALSE);
+  }
+  if(WinExe && WinExe->getInstanceHandle() == hinstance) {
+        winimage = (Win32Image *)WinExe;
   }
   else {
-    winimage = (Win32Image *)Win32Dll::findModule(hinstance);
-    if(winimage == NULL) {
-        dprintf(("GetVersionStruct can't find Win32Image for %s\n", modname));
-        return(FALSE);
-    }
+        winimage = (Win32Image *)Win32Dll::findModule(hinstance);
+        if(winimage == NULL) {
+                dprintf(("GetVersionStruct can't find Win32Image for %s\n", modname));
+                return(FALSE);
+        }
   }
   if(winimage->getVersionId() == -1) {
@@ -778 +776 @@
   }
 
-  if(WinExe && WinExe->getOS2InstanceHandle() == hinstance) {
-    winimage = (Win32Image *)WinExe;
+  if(WinExe && WinExe->getInstanceHandle() == hinstance) {
+        winimage = (Win32Image *)WinExe;
   }
   else {
-    winimage = (Win32Image *)Win32Dll::findModule(hinstance);
-    if(winimage == NULL) {
-        dprintf(("GetVersionSize can't find Win32Image for %s\n", modname));
-        return(FALSE);
-    }
+        winimage = (Win32Image *)Win32Dll::findModule(hinstance);
+        if(winimage == NULL) {
+                dprintf(("GetVersionSize can't find Win32Image for %s\n", modname));
+                return(FALSE);
+        }
   }
   if(winimage->getVersionId() == -1) {
-    dprintf(("GetVersionSize: %s has no version resource!\n", modname));
-    return(FALSE);
+        dprintf(("GetVersionSize: %s has no version resource!\n", modname));
+        return(FALSE);
   }
   ULONG size = OS2GetResourceSize(hinstance, winimage->getVersionId());