[2/2] programs/msiexec: MSI service should report SERVICE_STOPPED when appropriate.
Dmitry Timoshkov
dmitry at baikal.ru
Wed Dec 11 02:16:07 CST 2013
---
programs/msiexec/service.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c
index 4b72fe0..fdd29bd 100644
--- a/programs/msiexec/service.c
+++ b/programs/msiexec/service.c
@@ -81,6 +81,8 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode,
static void WINAPI ServiceCtrlHandler(DWORD code)
{
+ DWORD state = SERVICE_RUNNING;
+
WINE_TRACE("%d\n", code);
switch (code)
@@ -89,13 +91,14 @@ static void WINAPI ServiceCtrlHandler(DWORD code)
case SERVICE_CONTROL_STOP:
UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0);
KillService();
+ state = SERVICE_STOPPED;
return;
default:
fprintf(stderr, "Unhandled service control code: %d\n", code);
break;
}
- UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0);
+ UpdateSCMStatus(state, NO_ERROR, 0);
}
static DWORD WINAPI ServiceExecutionThread(LPVOID param)
@@ -135,12 +138,14 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv)
{
fprintf(stderr, "Failed to create event\n");
KillService();
+ UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0);
return;
}
if (!StartServiceThread())
{
KillService();
+ UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0);
return;
}
@@ -148,6 +153,8 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv)
WaitForSingleObject(kill_event, INFINITE);
KillService();
+
+ UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0);
}
DWORD DoService(void)
--
1.8.5.1
More information about the wine-patches
mailing list