oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: move top-level exception handler to main()

Browse Source 
Allows win32_main() to throw exceptions.
This commit is contained in:
Max Kellermann
2021-10-13 16:13:30 +02:00
parent 0712314d23
commit 0a8886704a
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/win32/Win32Main.cxx
View File

@@ -21,6 +21,7 @@
#include "util/Compiler.h"
#include "Instance.hxx"
#include "system/FatalError.hxx"
#include "Log.hxx"
#include <cstdlib>
#include <atomic>
@@ -76,7 +77,7 @@ service_dispatcher([[maybe_unused]] DWORD control, [[maybe_unused]] DWORD event_
static void WINAPI
service_main([[maybe_unused]] DWORD argc, [[maybe_unused]] LPTSTR argv[])
{
try {
service_handle =
RegisterServiceCtrlHandlerEx(service_name,
service_dispatcher, nullptr);
@@ -87,6 +88,8 @@ service_main([[maybe_unused]] DWORD argc, [[maybe_unused]] LPTSTR argv[])
service_notify_status(SERVICE_START_PENDING);
mpd_main(service_argc, service_argv);
service_notify_status(SERVICE_STOPPED);
} catch (...) {
LogError(std::current_exception());
}
static BOOL WINAPI