diff --git a/src/mumble_exe/mumble_exe.cpp b/src/mumble_exe/mumble_exe.cpp index 6431060bb..2ec5d64ec 100644 --- a/src/mumble_exe/mumble_exe.cpp +++ b/src/mumble_exe/mumble_exe.cpp @@ -17,7 +17,7 @@ typedef int (*DLL_DEBUG_MAIN)(int, char **); // Alert shows a fatal error dialog and waits for the user to click OK. static void Alert(LPCWSTR title, LPCWSTR msg) { - MessageBox(NULL, msg, title, MB_OK|MB_ICONERROR); + MessageBox(nullptr, msg, title, MB_OK|MB_ICONERROR); } // Get the current Mumble version built into this executable. @@ -39,7 +39,7 @@ static const std::wstring GetMumbleVersion() { static const std::wstring GetExecutableDirPath() { wchar_t path[MAX_PATH]; - if (GetModuleFileNameW(NULL, path, MAX_PATH) == 0) + if (GetModuleFileNameW(nullptr, path, MAX_PATH) == 0) return std::wstring(); if (!PathRemoveFileSpecW(path)) @@ -161,7 +161,7 @@ int main(int argc, char **argv) { return -2; } - HMODULE dll = LoadLibraryExW(abs_dll_path.c_str(), NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + HMODULE dll = LoadLibraryExW(abs_dll_path.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH); if (!dll) { Alert(L"Mumble Launcher Error -3", L"Failed to load mumble_app.dll."); return -3; @@ -204,7 +204,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, wchar_t *cmdAr return -2; } - HMODULE dll = LoadLibraryExW(abs_dll_path.c_str(), NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + HMODULE dll = LoadLibraryExW(abs_dll_path.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH); if (!dll) { Alert(L"Mumble Launcher Error -3", L"Failed to load mumble_app.dll."); return -3; @@ -217,7 +217,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, wchar_t *cmdAr } (void) cmdArg; - int rc = entry_point(instance, prevInstance, NULL, cmdShow); + int rc = entry_point(instance, prevInstance, nullptr, cmdShow); return rc; }