[Launcher] Kill the Launcher immediately (#6747)

* Kill the Launcher immediately * Also rename the shared file
microsoft · Sep 21, 2020 · 6e89ef6 · 6e89ef6
1 parent b266e33
commit 6e89ef6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp
@@ -11,7 +11,7 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 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_WIN[] = L"win";
     const wchar_t JSON_KEY_ALT[] = L"alt";
@@ -294,12 +294,16 @@ class Microsoft_Launcher : public PowertoyModuleIface
     void terminateProcess()
     {
         DWORD processID = GetProcessId(m_hProcess);
+        TerminateProcess(m_hProcess, 1);
+        // Temporarily disable sending a message to close
+        /*
         EnumWindows(&requestMainWindowClose, processID);
         const DWORD result = WaitForSingleObject(m_hProcess, MAX_WAIT_MILLISEC);
         if (result == WAIT_TIMEOUT || result == WAIT_FAILED)
         {
             TerminateProcess(m_hProcess, 1);
         }
+        */
     }
 };
 
@@ -311,7 +315,7 @@ void Microsoft_Launcher::init_settings()
         // Load and parse the settings file for this PowerToy.
         PowerToysSettings::PowerToyValues settings =
             PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
-        
+
         parse_hotkey(settings);
     }
     catch (std::exception ex)
@@ -335,7 +339,7 @@ void Microsoft_Launcher::parse_hotkey(PowerToysSettings::PowerToyValues& setting
     {
         m_hotkey.key = 0;
     }
-}    
+}
 
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {