diff options
| -rw-r--r-- | qga/service-win32.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/qga/service-win32.c b/qga/service-win32.c index 6de8be46be..1cf81fc96d 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -38,10 +38,12 @@ static int printf_win_error(const char *text) int ga_install_service(const char *path, const char *logfile, const char *state_dir) { + int ret = EXIT_FAILURE; SC_HANDLE manager; SC_HANDLE service; TCHAR module_fname[MAX_PATH]; GString *cmdline; + SERVICE_DESCRIPTION desc = { (char *)QGA_SERVICE_DESCRIPTION }; if (GetModuleFileName(NULL, module_fname, MAX_PATH) == 0) { printf_win_error("No full path to service's executable"); @@ -66,28 +68,28 @@ int ga_install_service(const char *path, const char *logfile, manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (manager == NULL) { printf_win_error("No handle to service control manager"); - g_string_free(cmdline, TRUE); - return EXIT_FAILURE; + goto out_strings; } service = CreateService(manager, QGA_SERVICE_NAME, QGA_SERVICE_DISPLAY_NAME, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, cmdline->str, NULL, NULL, NULL, NULL, NULL); - - if (service) { - SERVICE_DESCRIPTION desc = { (char *)QGA_SERVICE_DESCRIPTION }; - ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &desc); - - fprintf(stderr, "Service was installed successfully.\n"); - } else { + if (service == NULL) { printf_win_error("Failed to install service"); + goto out_manager; } + ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &desc); + fprintf(stderr, "Service was installed successfully.\n"); + ret = EXIT_SUCCESS; CloseServiceHandle(service); + +out_manager: CloseServiceHandle(manager); +out_strings: g_string_free(cmdline, TRUE); - return (service == NULL); + return ret; } int ga_uninstall_service(void) |