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

Timestamp:

Jan 10, 2003, 4:19:54 PM (23 years ago)

Author:

sandervl

Message:

changes for inheritance (check security structure); workaround for PeekNamedPipe with unnamed pipes; support input/output redirection for child processes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.170 2003-01-06 14:43:51 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.171 2003-01-10 15:19:54 sandervl Exp $ */
 
 /*
@@ -1808 +1808 @@
                             LPPROCESS_INFORMATION lpProcessInfo )
 {
+ STARTUPINFOA startinfo;
  TEB *pThreadDB = (TEB*)GetThreadTEB();
  char *cmdline = NULL;
@@ -1818 +1819 @@
 #ifdef DEBUG
     if(lpStartupInfo) {
-    dprintf(("lpStartupInfo->lpReserved %x", lpStartupInfo->lpReserved));
-    dprintf(("lpStartupInfo->lpDesktop %x", lpStartupInfo->lpDesktop));
-    dprintf(("lpStartupInfo->lpTitle %s", lpStartupInfo->lpTitle));
-    dprintf(("lpStartupInfo->dwX %x", lpStartupInfo->dwX));
-    dprintf(("lpStartupInfo->dwY %x", lpStartupInfo->dwY));
-    dprintf(("lpStartupInfo->dwXSize %x", lpStartupInfo->dwXSize));
-    dprintf(("lpStartupInfo->dwYSize %x", lpStartupInfo->dwYSize));
-    dprintf(("lpStartupInfo->dwXCountChars %x", lpStartupInfo->dwXCountChars));
-    dprintf(("lpStartupInfo->dwYCountChars %x", lpStartupInfo->dwYCountChars));
-    dprintf(("lpStartupInfo->dwFillAttribute %x", lpStartupInfo->dwFillAttribute));
-    dprintf(("lpStartupInfo->dwFlags %x", lpStartupInfo->dwFlags));
-    dprintf(("lpStartupInfo->wShowWindow %x", lpStartupInfo->wShowWindow));
-    dprintf(("lpStartupInfo->hStdInput %x", lpStartupInfo->hStdInput));
-    dprintf(("lpStartupInfo->hStdOutput %x", lpStartupInfo->hStdOutput));
-    dprintf(("lpStartupInfo->hStdError %x", lpStartupInfo->hStdError));
+        dprintf(("lpStartupInfo->lpReserved %x", lpStartupInfo->lpReserved));
+        dprintf(("lpStartupInfo->lpDesktop %x", lpStartupInfo->lpDesktop));
+        dprintf(("lpStartupInfo->lpTitle %s", lpStartupInfo->lpTitle));
+        dprintf(("lpStartupInfo->dwX %x", lpStartupInfo->dwX));
+        dprintf(("lpStartupInfo->dwY %x", lpStartupInfo->dwY));
+        dprintf(("lpStartupInfo->dwXSize %x", lpStartupInfo->dwXSize));
+        dprintf(("lpStartupInfo->dwYSize %x", lpStartupInfo->dwYSize));
+        dprintf(("lpStartupInfo->dwXCountChars %x", lpStartupInfo->dwXCountChars));
+        dprintf(("lpStartupInfo->dwYCountChars %x", lpStartupInfo->dwYCountChars));
+        dprintf(("lpStartupInfo->dwFillAttribute %x", lpStartupInfo->dwFillAttribute));
+        dprintf(("lpStartupInfo->dwFlags %x", lpStartupInfo->dwFlags));
+        dprintf(("lpStartupInfo->wShowWindow %x", lpStartupInfo->wShowWindow));
+        dprintf(("lpStartupInfo->hStdInput %x", lpStartupInfo->hStdInput));
+        dprintf(("lpStartupInfo->hStdOutput %x", lpStartupInfo->hStdOutput));
+        dprintf(("lpStartupInfo->hStdError %x", lpStartupInfo->hStdError));
     }
 #endif
+
+    if(bInheritHandles && lpStartupInfo->dwFlags & STARTF_USESTDHANDLES) 
+    {
+        //Translate standard handles if the child needs to inherit them
+        int retcode = 0;
+
+        memcpy(&startinfo, lpStartupInfo, sizeof(startinfo));
+        retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdInput, &startinfo.hStdInput);
+        retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdOutput, &startinfo.hStdOutput);
+        retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdError, &startinfo.hStdError);
+
+        if(retcode) {  
+            SetLastError(ERROR_INVALID_HANDLE);
+            return FALSE;
+        }
+
+        lpStartupInfo = &startinfo;
+    }
 
     // open32 does not support DEBUG_ONLY_THIS_PROCESS