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

Timestamp:

Oct 3, 2000, 7:28:32 PM (25 years ago)

Author:

sandervl

Message:

misc updates + fixes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.98 2000-10-02 13:38:58 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.99 2000-10-03 17:28:32 sandervl Exp $ */
 
 /*
@@ -788 +788 @@
                 if(pModule->isLxDll())
                 {
-                    ((Win32LxDll *)pModule)->setDllHandleOS2(hDll);
-                    if (fPeLoader)
-                        pModule->AddRef();
+                        ((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();
@@ -796 +802 @@
             else
                 return hDll; //happens when LoadLibrary is called in kernel32's initterm (nor harmful)
+
             dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): returns 0x%x. Loaded %s using O32_LoadLibrary.",
                      lpszLibFile, hFile, dwFlags, hDll, szModname));
@@ -902 +909 @@
                 SetLastError(ERROR_DLL_INIT_FAILED);
                 delete peldrDll;
+                return NULL;
             }
         }
@@ -910 +918 @@
             SetLastError(ERROR_INVALID_EXE_SIGNATURE);
             delete peldrDll;
+                return NULL;
         }
     }
@@ -917 +926 @@
                  lpszLibFile, hFile, dwFlags, szModname, fPE));
         SetLastError(fPE);
+        return NULL;
     }
 
@@ -1100 +1110 @@
             return ERROR_NOT_ENOUGH_MEMORY;
         }
-
+        strcpy((char *)pszCmdLineA, pszPeExe);
+        
         rc = NO_ERROR;
     }