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

Timestamp:

Jan 15, 2004, 11:41:39 AM (22 years ago)

Author:

sandervl

Message:

Updates

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.190 2004-01-11 12:12:34 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.191 2004-01-15 10:41:39 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright 2003 Innotek Systemberatung GmbH (sandervl@innotek.de)
+ *
  *
  * NOTE: Even though Odin32 OS/2 apps don't switch FS selectors,
@@ -50 +52 @@
 
 #include <win\ntddk.h>
+#include <win\psapi.h>
 
 #include <custombuild.h>
@@ -64 +67 @@
 ODINDEBUGCHANNEL(KERNEL32-WPROCESS)
 
+
+//environ.cpp
+char *CreateNewEnvironment(char *lpEnvironment);
 
 /*******************************************************************************
@@ -268 +274 @@
 
     ProcessPDB.unknown10       = (PVOID)&unknownPDBData[0];
-
     //initialize the startup info part of the db entry.
-////    O32_GetStartupInfo(&StartupInfo);
+    O32_GetStartupInfo(&StartupInfo);
     StartupInfo.cb             = sizeof(StartupInfo);
     /* Set some defaults as GetStartupInfo() used to set... */
@@ -282 +287 @@
     if (!StartupInfo.lpTitle)
         StartupInfo.lpTitle    = "Title";
-
     ProcessENVDB.hStdin  = StartupInfo.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
     ProcessENVDB.hStdout = StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -530 +534 @@
     fExitProcess = TRUE;
 
+    // Lower priority of all threads to minimize the chance that they're scheduled
+    // during ExitProcess. Can't kill them as that's possibly dangerous (deadlocks
+    // in WGSS for instance)
+    threadListMutex.enter();
+    teb = threadList;
+    while(teb) {
+        if(teb->o.odin.hThread != hThread) {
+            dprintf(("Active thread id %d, handle %x", LOWORD(teb->o.odin.threadId), teb->o.odin.hThread));
+            SetThreadPriority(teb->o.odin.hThread, THREAD_PRIORITY_LOWEST);
+        }
+        teb = teb->o.odin.next;
+    }
+    threadListMutex.leave();
+
     HMDeviceCommClass::CloseOverlappedIOHandlers();
 
@@ -556 +574 @@
     while(teb) {
         dprintf(("Active thread id %d, handle %x", LOWORD(teb->o.odin.threadId), teb->o.odin.hThread));
-        if(teb->o.odin.hThread != hThread && teb->o.odin.dwSuspend > 0) {
-            //kill any threads that are suspended; dangerous, but so is calling
-            //SuspendThread; we assume the app knew what it was doing
-            TerminateThread(teb->o.odin.hThread, 0);
-            ResumeThread(teb->o.odin.hThread);
+        if(teb->o.odin.hThread != hThread) {
+            if(teb->o.odin.dwSuspend > 0) {
+                //kill any threads that are suspended; dangerous, but so is calling
+                //SuspendThread; we assume the app knew what it was doing
+                TerminateThread(teb->o.odin.hThread, 0);
+                ResumeThread(teb->o.odin.hThread);
+            }
+            else SetThreadPriority(teb->o.odin.hThread, THREAD_PRIORITY_LOWEST);
         }
         teb = teb->o.odin.next;
@@ -1575 +1596 @@
     }
 
-    dprintf(("KERNEL32:  GetCommandLineW: %s\n", pszCmdLineA));
+    dprintf(("KERNEL32:  GetCommandLineW: %ls\n", pszCmdLineW));
     return pszCmdLineW;
 }
@@ -1855 +1876 @@
                               LPCSTR pszNELoader)
 {
+    if(pszPECmdLoader) dprintf(("PE Cmd %s", pszPECmdLoader));
+    if(pszPEGUILoader) dprintf(("PE GUI %s", pszPEGUILoader));
+    if(pszNELoader)    dprintf(("NE %s", pszNELoader));
     if(pszPECmdLoader)   strcpy(szPECmdLoader, pszPECmdLoader);
     if(pszPEGUILoader)   strcpy(szPEGUILoader, pszPEGUILoader);
@@ -1885 +1909 @@
  STARTUPINFOA startinfo;
  TEB *pThreadDB = (TEB*)GetThreadTEB();
- char *cmdline = NULL;
+ char *cmdline = NULL, *newenv = NULL;
  BOOL  rc;
 
@@ -1892 +1916 @@
             lpEnvironment, lpCurrentDirectory, lpStartupInfo));
 
+    if(lpEnvironment) {
+        newenv = CreateNewEnvironment((char *)lpEnvironment);
+        if(newenv == NULL) {
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+            rc = FALSE;
+            goto finished;
+        }
+        lpEnvironment = newenv;
+    }
 #ifdef DEBUG
     if(lpStartupInfo) {
@@ -1924 +1957 @@
         if(retcode) {
             SetLastError(ERROR_INVALID_HANDLE);
-            return FALSE;
+            rc = FALSE;
+            goto finished;
         }
 
@@ -2009 +2043 @@
         dprintf(("CreateProcess: can't find executable!"));
 
-        if(cmdline)
-            free(cmdline);
-
         SetLastError(ERROR_FILE_NOT_FOUND);
-        return FALSE;
+
+        rc = FALSE;
+        goto finished;
     }
 
@@ -2052 +2085 @@
         }
 
-        if(cmdline)
-            free(cmdline);
-        return(TRUE);
+        rc = TRUE;
+        goto finished;
       }
 
@@ -2068 +2100 @@
 
           // the current value of GetLastError() is still valid.
-          if(cmdline)
-              free(cmdline);
-
-          return FALSE;
+          rc = FALSE;
+          goto finished;
       }
     }
@@ -2190 +2220 @@
         pThreadDB->o.odin.pidDebuggee = 0;
     }
-    if(cmdline)
-        free(cmdline);
-
     if(lpProcessInfo)
     {
@@ -2202 +2229 @@
     else
       dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));
+
+finished:
+
+    if(cmdline) free(cmdline);
+    if(newenv)  free(newenv);
     return(rc);
 }
@@ -2365 +2397 @@
 {
  Win32ImageBase *winmod;
- FARPROC   proc;
+ FARPROC   proc = 0;
  ULONG     ulAPIOrdinal;
 
@@ -2378 +2410 @@
                 proc = (FARPROC)winmod->getApi((int)ulAPIOrdinal);
         }
-        else    proc = (FARPROC)winmod->getApi((char *)lpszProc);
+        else 
+        if (lpszProc && *lpszProc) {
+                proc = (FARPROC)winmod->getApi((char *)lpszProc);
+        }
         if(proc == 0) {
 #ifdef DEBUG
@@ -2387 +2422 @@
 #endif
                 SetLastError(ERROR_PROC_NOT_FOUND);
+                return 0;
         }
         if(HIWORD(lpszProc))
@@ -2440 +2476 @@
 #endif
                 SetLastError(ERROR_PROC_NOT_FOUND);
+                return (FARPROC)-1;
         }
         if(HIWORD(lpszProc))
@@ -2507 +2544 @@
 }
 //******************************************************************************
-//******************************************************************************
-
-
+// Forwarder for PSAPI.DLL
+//
+// Returns the handles of all loaded modules
+//
+//******************************************************************************
+BOOL WINAPI PSAPI_EnumProcessModules(HANDLE hProcess, HMODULE *lphModule, 
+                                     DWORD cb, LPDWORD lpcbNeeded)
+{
+  DWORD count;
+  DWORD countMax;
+  HMODULE     hModule;
+
+  dprintf(("KERNEL32: EnumProcessModules %p, %ld, %p", lphModule, cb, lpcbNeeded));
+
+  if ( lphModule == NULL )
+        cb = 0;
+
+  if ( lpcbNeeded != NULL )
+       *lpcbNeeded = 0;
+  
+  count = 0;
+  countMax = cb / sizeof(HMODULE);
+
+  count = Win32DllBase::enumDlls(lphModule, countMax);
+   
+  if ( lpcbNeeded != NULL )
+     *lpcbNeeded = sizeof(HMODULE) * count;
+
+  return TRUE;
+}
+//******************************************************************************
+// Forwarder for PSAPI.DLL
+//
+// Returns some information about the module identified by hModule
+//
+//******************************************************************************
+BOOL WINAPI PSAPI_GetModuleInformation(HANDLE hProcess, HMODULE hModule, 
+                                       LPMODULEINFO lpmodinfo, DWORD cb)
+{
+    BOOL ret = FALSE;
+    Win32DllBase *winmod = NULL;
+
+    dprintf(("KERNEL32: GetModuleInformation hModule=%x", hModule));
+ 
+    if (!lpmodinfo || cb < sizeof(MODULEINFO)) return FALSE;
+
+    winmod = Win32DllBase::findModule((HINSTANCE)hModule);
+    if (!winmod) {
+        dprintf(("GetModuleInformation failed to find module"));
+        return FALSE;
+    }
+
+    lpmodinfo->SizeOfImage = winmod->getImageSize();
+    lpmodinfo->EntryPoint  = winmod->getEntryPoint();
+    lpmodinfo->lpBaseOfDll = (void*)hModule;
+
+    return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
 /**
  * Gets the startup info which was passed to CreateProcess when