(ACE_Process::wait) Allow passing back of exit status of the child process.

1 files changed, 10 insertions, 2 deletions

diff --git a/ace/Process.cpp b/ace/Process.cpp
index 07d4cf2c39c..e7d2527df36 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -144,8 +144,16 @@ ACE_Process::wait (int *status)
 {
 #if defined (ACE_WIN32)
   // Notice that status doesn't get updated.
-  ACE_UNUSED_ARG (status);
-  return ::WaitForSingleObject (process_info_.hProcess, INFINITE);
+  int retv;
+
+  // Don't try to get the process exit status if wait failed so we can
+  // keep the original error code intact.
+  if ((retv = ::WaitForSingleObject (process_info_.hProcess, INFINITE))
+      != WAIT_FAILED)
+    // The error status of GetExitCodeProcess is nontheless not tested.
+    // (Don't know how to return the value.)
+    ::GetExitCodeProcess (process_info_.hProcess, (LPDWORD) status);
+  return retv;
 #else /* ACE_WIN32 */
   return ACE_OS::waitpid (this->child_id_, status, 0);
 #endif /* ACE_WIN32 */