[Wine-devel] Eter's patch is applied to winehq repo 04/04/12

[builder на builder.office.etersoft.ru]

New Etersoft's patches since last build time:
commit 6d6e6600ef17dd4d18ad3f2e3d3c20f296fe1e53
Author: Alexander Morozov <amorozov на etersoft.ru>

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

---

commit 6d6e6600ef17dd4d18ad3f2e3d3c20f296fe1e53
Author: Alexander Morozov <amorozov на etersoft.ru>
Date:   Fri Mar 30 20:04:01 2012 +0400

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

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;
     }