merge revision(s) 20537:

	* win32/win32.c (waitpid): fix bug of checking child slot.
	* win32/win32.c (FindChildSlotByHandle): new.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 1 deletions

diff --git a/win32/win32.c b/win32/win32.c
index 44de047716..abe3949600 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -514,6 +514,18 @@ FindChildSlot(rb_pid_t pid)
     return NULL;
 }
 
+static struct ChildRecord *
+FindChildSlotByHandle(HANDLE h)
+{
+
+    FOREACH_CHILD(child) {
+	if (child->hProcess == h) {
+	    return child;
+	}
+    } END_FOREACH_CHILD;
+    return NULL;
+}
+
 static void
 CloseChildHandle(struct ChildRecord *child)
 {
@@ -2964,7 +2976,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
 	    return -1;
 	}
 
-	return poll_child_status(ChildRecord + ret, stat_loc);
+	return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc);
     }
     else {
 	struct ChildRecord* child = FindChildSlot(pid);