[Launcher] Kill the Launcher immediately (#6747)

* Kill the Launcher immediately

* Also rename the shared file
This commit is contained in:
Ivan Stošić
2020-09-21 13:51:30 +02:00
committed by GitHub
parent b266e336b5
commit 6e89ef62e4

View File

@@ -11,7 +11,7 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
namespace namespace
{ {
const wchar_t POWER_LAUNCHER_PID_SHARED_FILE[] = L"Local\\3cbfbad4-199b-4e2c-9825-942d5d3d3c74"; const wchar_t POWER_LAUNCHER_PID_SHARED_FILE[] = L"Local\\PowerLauncherPidSharedFile-3cbfbad4-199b-4e2c-9825-942d5d3d3c74";
const wchar_t JSON_KEY_PROPERTIES[] = L"properties"; const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
const wchar_t JSON_KEY_WIN[] = L"win"; const wchar_t JSON_KEY_WIN[] = L"win";
const wchar_t JSON_KEY_ALT[] = L"alt"; const wchar_t JSON_KEY_ALT[] = L"alt";
@@ -294,12 +294,16 @@ public:
void terminateProcess() void terminateProcess()
{ {
DWORD processID = GetProcessId(m_hProcess); DWORD processID = GetProcessId(m_hProcess);
TerminateProcess(m_hProcess, 1);
// Temporarily disable sending a message to close
/*
EnumWindows(&requestMainWindowClose, processID); EnumWindows(&requestMainWindowClose, processID);
const DWORD result = WaitForSingleObject(m_hProcess, MAX_WAIT_MILLISEC); const DWORD result = WaitForSingleObject(m_hProcess, MAX_WAIT_MILLISEC);
if (result == WAIT_TIMEOUT || result == WAIT_FAILED) if (result == WAIT_TIMEOUT || result == WAIT_FAILED)
{ {
TerminateProcess(m_hProcess, 1); TerminateProcess(m_hProcess, 1);
} }
*/
} }
}; };