rpcrt4: Wait for server threads to finish in RpcMgmtWaitServerListen.

This fixes races when stopping manual listen RPC servers. It should fix races in Office applications as well as our services.exe (visible as CS error on prefix shutdown). Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

rpcrt4: Wait for server threads to finish in RpcMgmtWaitServerListen.
09e98be2 · Jacek Caban · Alexandre Julliard · e98c7a59 · 09e98be2
Commit 09e98be2 authored May 31, 2017 by Jacek Caban Committed by Alexandre Julliard May 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 1 deletion

rpc_server.c dlls/rpcrt4/rpc_server.c +24 -1

No files found.
--- a/dlls/rpcrt4/rpc_server.c
+++ b/dlls/rpcrt4/rpc_server.c
@@ -1542,7 +1542,8 @@ RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT 
 */
 RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
 {
-  HANDLE event;
+  RpcServerProtseq *protseq;
+  HANDLE event, wait_thread;

  TRACE("()\n");

@@ -1558,6 +1559,28 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
  TRACE( "done waiting\n" );

  EnterCriticalSection(&listen_cs);
+  /* wait for server threads to finish */
+  while(1)
+  {
+      if (listen_count)
+          break;
+
+      wait_thread = NULL;
+      EnterCriticalSection(&server_cs);
+      LIST_FOR_EACH_ENTRY(protseq, &protseqs, RpcServerProtseq, entry)
+      {
+          if ((wait_thread = protseq->server_thread))
+              break;
+      }
+      LeaveCriticalSection(&server_cs);
+      if (!wait_thread)
+          break;
+
+      TRACE("waiting for thread %u\n", GetThreadId(wait_thread));
+      LeaveCriticalSection(&listen_cs);
+      WaitForSingleObject(wait_thread, INFINITE);
+      EnterCriticalSection(&listen_cs);
+  }
  if (listen_done_event == event)
  {
      listen_done_event = NULL;