Alexander Morozov : advapi32: Regular program should not freeze forever if it calls StartServiceCtrlDispatcher .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6d6e6600ef17dd4d18ad3f2e3d3c20f296fe1e53
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6d6e6600ef17dd4d18ad3f2e3d...

Author: Alexander Morozov <amorozov(a)etersoft.ru>
Date:   Fri Mar 30 20:04:01 2012 +0400

advapi32: Regular program should not freeze forever if it calls StartServiceCtrlDispatcher.

---

 dlls/advapi32/service.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 025d6c9..0e5001a 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -242,7 +242,7 @@ static HANDLE service_open_pipe(void)
             break;
         if (GetLastError() != ERROR_PIPE_BUSY)
             break;
-    } while (WaitNamedPipeW(szPipe, NMPWAIT_WAIT_FOREVER));
+    } while (WaitNamedPipeW(szPipe, NMPWAIT_USE_DEFAULT_WAIT));
     HeapFree(GetProcessHeap(), 0, szPipe);
 
     return handle;
@@ -366,7 +366,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg)
 
     if (pipe==INVALID_HANDLE_VALUE)
     {
-        ERR("failed to create control pipe error = %d\n", GetLastError());
+        WARN("failed to create control pipe error = %d\n", GetLastError());
         return 0;
     }