Skip to content

W
wine-fonts
Commit 43bb9c57 authored by Zebediah Figura's avatar Zebediah Figura Committed by Vitaly Lipatov
Browse files
Options

rpcrt4: Avoid closing the server thread handle while it is being waited on.

This, or something like this, should go upstream. This is invalid behaviour.
parent f194d453
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/rpcrt4/rpc_server.c
View file @ 43bb9c57
...@@ -699,10 +699,6 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) ...@@ -699,10 +699,6 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg)
} }
LeaveCriticalSection(&cps->cs); LeaveCriticalSection(&cps->cs);
EnterCriticalSection(&listen_cs);
CloseHandle(cps->server_thread);
cps->server_thread = NULL;
LeaveCriticalSection(&listen_cs);
TRACE("done\n"); TRACE("done\n");
return 0; return 0;
} }
...@@ -1570,7 +1566,10 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) ...@@ -1570,7 +1566,10 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
LIST_FOR_EACH_ENTRY(protseq, &protseqs, RpcServerProtseq, entry) LIST_FOR_EACH_ENTRY(protseq, &protseqs, RpcServerProtseq, entry)
{ {
if ((wait_thread = protseq->server_thread)) if ((wait_thread = protseq->server_thread))
{
protseq->server_thread = NULL;
break; break;
}
} }
LeaveCriticalSection(&server_cs); LeaveCriticalSection(&server_cs);
if (!wait_thread) if (!wait_thread)
...@@ -1579,6 +1578,7 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) ...@@ -1579,6 +1578,7 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
TRACE("waiting for thread %lu\n", GetThreadId(wait_thread)); TRACE("waiting for thread %lu\n", GetThreadId(wait_thread));
LeaveCriticalSection(&listen_cs); LeaveCriticalSection(&listen_cs);
WaitForSingleObject(wait_thread, INFINITE); WaitForSingleObject(wait_thread, INFINITE);
CloseHandle(wait_thread);
EnterCriticalSection(&listen_cs); EnterCriticalSection(&listen_cs);
} }
if (listen_done_event == event) if (listen_done_event == event)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment