commit 449d10fd7933a27bf937bb2f2d7bbe7e715f500c
author Eric Pouech <pouech-eric@wanadoo.fr> Tue Aug 19 01:05:17 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 19 01:05:17 2003 +0000
tree eccf2e171a03ec24bb0dd86d95db9d7a6216b9bc
parent 9b8a0595bc2c8f689cc094909f69f7ccc86e5bf5

Fixed regression in process creation (std handle inheritance).

server/process.c

diff --git a/server/process.c b/server/process.c
index 333e11c..cc4721d 100644
--- a/server/process.c
+++ b/server/process.c
@@ -83,7 +83,6 @@
     struct object       obj;          /* object header */
     struct list         entry;        /* entry in list of startup infos */
     int                 inherit_all;  /* inherit all handles from parent */
-    int                 use_handles;  /* use stdio handles */
     int                 create_flags; /* creation flags */
     int                 unix_pid;     /* Unix pid of new process */
     obj_handle_t        hstdin;       /* handle for stdin */
@@ -216,14 +215,25 @@
          * like if hConOut and hConIn are console handles, then they should be on the same
          * physical console
          */
-        inherit_console( parent_thread, process,
-                         (info->inherit_all || info->use_handles) ? info->hstdin : 0 );
+        inherit_console( parent_thread, process, info->inherit_all ? info->hstdin : 0 );
     }
     if (info)
     {
-        reply->hstdin  = info->hstdin;
-        reply->hstdout = info->hstdout;
-        reply->hstderr = info->hstderr;
+        if (!info->inherit_all)
+        {
+            reply->hstdin  = duplicate_handle( parent_thread->process, info->hstdin, process,
+                                               0, TRUE, DUPLICATE_SAME_ACCESS );
+            reply->hstdout = duplicate_handle( parent_thread->process, info->hstdout, process,
+                                               0, TRUE, DUPLICATE_SAME_ACCESS );
+            reply->hstderr = duplicate_handle( parent_thread->process, info->hstderr, process,
+                                               0, TRUE, DUPLICATE_SAME_ACCESS );
+        }
+        else
+        {
+            reply->hstdin  = info->hstdin;
+            reply->hstdout = info->hstdout;
+            reply->hstderr = info->hstderr;
+        }
     }
     else reply->hstdin = reply->hstdout = reply->hstderr = 0;
     /* some handles above may have been invalid; this is not an error */
@@ -870,7 +880,6 @@
     if (!(info = alloc_object( &startup_info_ops ))) return;
     list_add_head( &startup_info_list, &info->entry );
     info->inherit_all  = req->inherit_all;
-    info->use_handles  = req->use_handles;
     info->create_flags = req->create_flags;
     info->unix_pid     = req->unix_pid;
     info->hstdin       = req->hstdin;