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

Win32Main: use TCHAR where appropriate

Browse Source
This commit is contained in:
Max Kellermann
2015-02-28 23:15:29 +01:00
parent 44b9197354
commit c637b96f10
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/win32/Win32Main.cxx
View File

@@ -30,15 +30,16 @@
#include <atomic> #include <atomic>
#include <windows.h> #include <windows.h>
#include <tchar.h>
static int service_argc; static int service_argc;
static char **service_argv; static char **service_argv;
static char service_name[] = ""; static TCHAR service_name[] = _T("");
static std::atomic_bool running; static std::atomic_bool running;
static SERVICE_STATUS_HANDLE service_handle; static SERVICE_STATUS_HANDLE service_handle;
static void WINAPI static void WINAPI
service_main(DWORD argc, CHAR *argv[]); service_main(DWORD argc, LPTSTR argv[]);
static constexpr SERVICE_TABLE_ENTRY service_registry[] = { static constexpr SERVICE_TABLE_ENTRY service_registry[] = {
{service_name, service_main}, {service_name, service_main},
@@ -78,7 +79,7 @@ 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 LPTSTR argv[])
{ {
service_handle = service_handle =
RegisterServiceCtrlHandlerEx(service_name, RegisterServiceCtrlHandlerEx(service_name,
@@ -132,7 +133,7 @@ int win32_main(int argc, char *argv[])
if (error_code == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { if (error_code == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
/* running as console app */ /* running as console app */
running.store(false); running.store(false);
SetConsoleTitle("Music Player Daemon"); SetConsoleTitle(_T("Music Player Daemon"));
SetConsoleCtrlHandler(console_handler, TRUE); SetConsoleCtrlHandler(console_handler, TRUE);
return mpd_main(argc, argv); return mpd_main(argc, argv);
} }