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

Timestamp:

Aug 11, 2000, 8:42:55 PM (25 years ago)

Author:

sandervl

Message:

misc fixes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.86 2000-08-11 10:56:20 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.87 2000-08-11 18:42:55 sandervl Exp $ */
 
 /*
@@ -431 +431 @@
  BOOL rc;
 
+    //SvL: Ignore FreeLibary for executable
+    if(WinExe && hinstance == WinExe->getInstanceHandle()) {
+        return TRUE;
+    }
+
     winmod = Win32DllBase::findModule(hinstance);
     if(winmod) {
@@ -698 +703 @@
      *  Endif
      */
+    if(WinExe) {
+      char  szDllName[CCHMAXPATH];
+      char *dot;
+
+        strcpy(szDllName, OSLibStripPath((char *)lpszLibFile));
+        strupr(szDllName);
+        dot = strstr(szDllName, ".");
+        if(dot)
+            *dot = 0;
+
+        if(!strcmp(szDllName, WinExe->getModuleName())) {
+                return WinExe->getInstanceHandle();
+        }
+    }
     pModule = Win32DllBase::findModule((LPSTR)lpszLibFile);
     if (pModule)
@@ -1052 +1071 @@
     if(WinExe) {
         if(WinExe->getCommandLineW())
-        return WinExe->getCommandLineW();
+             return WinExe->getCommandLineW();
     }
     if(asciicmdline == NULL) //not used for converted exes
-      asciicmdline = O32_GetCommandLine();
+        asciicmdline = O32_GetCommandLine();
 
     if(asciicmdline) {