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

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -67 +67 @@
 ODINDEBUGCHANNEL(KERNEL32-WPROCESS)
 
+
+//environ.cpp
+char *CreateNewEnvironment(char *lpEnvironment);
 
 /*******************************************************************************
@@ -1906 +1909 @@
  STARTUPINFOA startinfo;
  TEB *pThreadDB = (TEB*)GetThreadTEB();
- char *cmdline = NULL, *newenv = NULL;
+ char *cmdline = NULL, *newenv = NULL, *oldlibpath = NULL;
  BOOL  rc;
 
@@ -1939 +1942 @@
 
         memcpy(&startinfo, lpStartupInfo, sizeof(startinfo));
+        if(lpStartupInfo->hStdInput) {
         retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdInput, &startinfo.hStdInput);
+        }
+        if(lpStartupInfo->hStdOutput) {
         retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdOutput, &startinfo.hStdOutput);
+        }
+        if(lpStartupInfo->hStdError) {
         retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdError, &startinfo.hStdError);
+        }
 
         if(retcode) {
@@ -2019 +2028 @@
                  break;
              }
-
+             else
+             {//maybe it's a short name
+                 if(GetLongPathNameA(buffer, szAppName, sizeof(szAppName)))
+                 {
+                     if(fTerminate) exename++;
+                     break;
+                 }
+             }
              if(fTerminate) {
                   *exename = ' ';
@@ -2039 +2055 @@
     }
 
+    if(lpEnvironment) {
+        newenv = CreateNewEnvironment((char *)lpEnvironment);
+        if(newenv == NULL) {
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+            rc = FALSE;
+            goto finished;
+        }
+        lpEnvironment = newenv;
+    }
+
     DWORD Characteristics, SubSystem, fNEExe, fPEExe;
 
@@ -2050 +2076 @@
     if(!fPEExe || (fPEExe && fWin32k))
     {
+
+    trylaunchagain:
       if(O32_CreateProcess(szAppName, lpCommandLine, lpProcessAttributes,
                          lpThreadAttributes, bInheritHandles, dwCreationFlags,
@@ -2078 +2106 @@
         goto finished;
       }
-
+        else
+        if(!oldlibpath)
+        {//might have failed because it wants to load dlls in its current directory
+            // Add the application directory to the ENDLIBPATH, so dlls can be found there
+            // Only necessary for OS/2 applications
+            oldlibpath = (char *)calloc(4096, 1);
+            if(oldlibpath)
+            {
+                OSLibQueryBeginLibpath(oldlibpath, 4096);
+
+                char *tmp = strrchr(szAppName, '\\');
+                if(tmp) *tmp = 0;
+
+                OSLibSetBeginLibpath(szAppName);
+                if(tmp) *tmp = '\\';
+
+                goto trylaunchagain;
+            }
+
+        }
       // verify why O32_CreateProcess actually failed.
       // If GetLastError() == 191 (ERROR_INVALID_EXE_SIGNATURE)
@@ -2102 +2149 @@
     if(fPEExe)
     {
-      char *lpszPE;
-      char *lpszExecutable;
+      LPCSTR    lpszExecutable;
       int  iNewCommandLineLength;
 
@@ -2110 +2156 @@
 
       if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI)
-        lpszExecutable = (LPSTR)szPECmdLoader;
+        lpszExecutable = szPECmdLoader;
       else
-        lpszExecutable = (LPSTR)szPEGUILoader;
-
-      lpszPE = lpszExecutable;
+        lpszExecutable = szPEGUILoader;
 
       // 2002-04-24 PH
       // set the ODIN32.DEBUG_CHILD environment variable to start new PE processes
       // under a new instance of the (IPMD) debugger.
+      const char *pszDebugChildArg = "";
 #ifdef DEBUG
-      CHAR debug_szPE[ 512 ];
-      PSZ debug_pszOS2Debugger  = getenv("ODIN32.DEBUG_CHILD");
-      if (NULL != debug_pszOS2Debugger)
+      char          szDebugChild[512];
+      const char   *pszChildDebugger = getenv("ODIN32.DEBUG_CHILD");
+      if (pszChildDebugger)
       {
-        // build new start command
-        strcpy(debug_szPE, debug_pszOS2Debugger);
-        strcat(debug_szPE, " ");
-        strcat(debug_szPE, lpszExecutable);
-
-        // we require more space in the new command line
-        iNewCommandLineLength += strlen( debug_szPE );
-
-        // only launch the specified executable (ICSDEBUG.EXE)
-        lpszPE = debug_szPE;
-        lpszExecutable = debug_pszOS2Debugger;
+        /*
+         * Change the executable to the debugger (icsdebug.exe) and
+         * move the previous executable onto the commandline.
+         */
+        szDebugChild[0] = ' ';
+        strcpy(&szDebugChild[1], lpszExecutable);
+        iNewCommandLineLength += strlen(&szDebugChild[0]);
+
+        pszDebugChildArg = &szDebugChild[0];
+        lpszExecutable = pszChildDebugger;
       }
 #endif
@@ -2144 +2188 @@
 
             newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + iNewCommandLineLength + 64);
-            sprintf(newcmdline, " /OPT:[CURDIR=%s] %s %s", lpCurrentDirectory, szAppName, lpCommandLine);
+            sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s %s", pszDebugChildArg, lpCurrentDirectory, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -2152 +2196 @@
 
             newcmdline = (char *)malloc(iNewCommandLineLength + 16);
-            sprintf(newcmdline, " %s %s", szAppName, lpCommandLine);
+            sprintf(newcmdline, "%s %s %s", pszDebugChildArg, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -2192 +2236 @@
                                lpProcessInfo);
     }
+    if(!lpEnvironment) {
+        // Restore old ENDLIBPATH variable
+        // TODO:
+    }
+
     if(rc == TRUE)
     {
@@ -2222 +2271 @@
 finished:
 
+    if(oldlibpath) {
+        OSLibSetBeginLibpath(oldlibpath);
+        free(oldlibpath);
+    }
     if(cmdline) free(cmdline);
     if(newenv)  free(newenv);