[Wine-patches] [eter-2.0.0 1/2] advapi32: Regular program should not freeze forever if it calls StartServiceCtrlDispatcher (eterbug #7573).

Alexander Morozov amorozov на etersoft.ru
Вт Апр 17 17:24:31 MSK 2012


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

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 9543035..a64bc27 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -267,7 +267,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;
@@ -391,7 +391,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;
     }
 
-- 
1.7.9.4



Подробная информация о списке рассылки Wine-patches