Francois Gouget : testbot/TestAgentd: Make the socket blocking again even when timing out waiting for the child process .

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 9f3eec5df2bdc45ef686e41a4ea691a51756c1de
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=9f3eec5df2bdc45ef686e41a4...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Sun Mar 24 23:35:43 2013 +0100

testbot/TestAgentd: Make the socket blocking again even when timing out waiting for the child process.

---

 testbot/src/testagentd/platform_windows.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c
index 10ea55a..92fc9aa 100644
--- a/testbot/src/testagentd/platform_windows.c
+++ b/testbot/src/testagentd/platform_windows.c
@@ -198,7 +198,8 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child
         break;
     case WAIT_TIMEOUT:
         set_status(ST_ERROR, "timed out waiting for the child process");
-        return 0;
+        success = 0;
+        goto cleanup;
     default:
         debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError());
         break;
@@ -207,6 +208,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child
     list_remove(&child->entry);
     free(child);
 
+ cleanup:
     /* We must reset WSAEventSelect before we can make
      * the socket blocking again.
      */