Skip to content

M
mpd
Commit e5ab456d authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Win32Main: use FatalSystemError()

parent 08bf4f74
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 15 deletions
src/win32/Win32Main.cxx
View file @ e5ab456d
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <cstdlib> #include <cstdlib>
#include <atomic> #include <atomic>
#include <glib.h>
#include <windows.h> #include <windows.h>
static int service_argc; static int service_argc;
...@@ -82,19 +80,12 @@ service_dispatcher(gcc_unused DWORD control, gcc_unused DWORD event_type, ...@@ -82,19 +80,12 @@ service_dispatcher(gcc_unused DWORD control, gcc_unused DWORD event_type,
static void WINAPI static void WINAPI
service_main(gcc_unused DWORD argc, gcc_unused CHAR *argv[]) service_main(gcc_unused DWORD argc, gcc_unused CHAR *argv[])
{ {
DWORD error_code;
gchar* error_message;
service_handle = service_handle =
RegisterServiceCtrlHandlerEx(service_name, RegisterServiceCtrlHandlerEx(service_name,
service_dispatcher, nullptr); service_dispatcher, nullptr);
if (service_handle == 0) { if (service_handle == 0)
error_code = GetLastError(); FatalSystemError("RegisterServiceCtrlHandlerEx() failed");
error_message = g_win32_error_message(error_code);
FormatFatalError("RegisterServiceCtrlHandlerEx() failed: %s",
error_message);
}
service_notify_status(SERVICE_START_PENDING); service_notify_status(SERVICE_START_PENDING);
mpd_main(service_argc, service_argv); mpd_main(service_argc, service_argv);
...@@ -132,7 +123,6 @@ console_handler(DWORD event) ...@@ -132,7 +123,6 @@ console_handler(DWORD event)
int win32_main(int argc, char *argv[]) int win32_main(int argc, char *argv[])
{ {
DWORD error_code; DWORD error_code;
gchar* error_message;
service_argc = argc; service_argc = argc;
service_argv = argv; service_argv = argv;
...@@ -149,9 +139,7 @@ int win32_main(int argc, char *argv[]) ...@@ -149,9 +139,7 @@ int win32_main(int argc, char *argv[])
return mpd_main(argc, argv); return mpd_main(argc, argv);
} }
error_message = g_win32_error_message(error_code); FatalSystemError("StartServiceCtrlDispatcher() failed", error_code);
FormatFatalError("StartServiceCtrlDispatcher() failed: %s",
error_message);
} }
void win32_app_started() void win32_app_started()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment