Added WatchKeyboardManagerConfigs

src/runner/centralized_kb_hook.cpp

@@ -379,11 +379,10 @@ namespace CentralizedKeyboardHook
                     }
                     else
                     {
-                        std::wstring executable_path = runProgramSpec.path;
-                        auto fileNamePart = GetFileNameFromPath(executable_path);
+                        auto fileNamePart = GetFileNameFromPath(runProgramSpec.path);
                         DWORD targetPid = 0;
 
-                        if (fileNamePart != L"explorer.exe")
+                        if (fileNamePart != L"explorer.exe" && fileNamePart != L"powershell.exe" && fileNamePart != L"cmd.exe")
                         {
                             targetPid = GetProcessIdByName(fileNamePart);
                         }
@@ -476,7 +475,7 @@ namespace CentralizedKeyboardHook
                         }
                         else
                         {
-                            std::wstring executable_args = fmt::format(L"\"{}\" \"{}\"", runProgramSpec.args, runProgramSpec.args);
+                            std::wstring executable_and_args = fmt::format(L"\"{}\" {}", runProgramSpec.path, runProgramSpec.args);
                             STARTUPINFO startup_info = { sizeof(startup_info) };
                             PROCESS_INFORMATION process_info = { 0 };
 
@@ -486,7 +485,7 @@ namespace CentralizedKeyboardHook
                                 currentDir = nullptr;
                             }
 
-                            CreateProcessW(executable_path.c_str(), executable_args.data(), nullptr, nullptr, FALSE, 0, nullptr, currentDir, &startup_info, &process_info);
+                            CreateProcessW(nullptr, executable_and_args.data(), nullptr, nullptr, FALSE, 0, nullptr, currentDir, &startup_info, &process_info);
                         }
                     }
                 }

src/runner/main.cpp

@@ -46,6 +46,7 @@
 #include <common/utils/window.h>
 #include <common/version/version.h>
 #include <common/utils/string_utils.h>
+#include <modules/keyboardmanager/common/KeyboardManagerConstants.h>
 
 // disabling warning 4458 - declaration of 'identifier' hides class member
 // to avoid warnings from GDI files - can't add winRT directory to external code
@@ -89,6 +90,73 @@ void open_menu_from_another_instance(std::optional<std::string> settings_window)
     PostMessageW(hwnd_main, WM_COMMAND, ID_SETTINGS_MENU_COMMAND, msg);
 }
 
+//HANDLE PowertoyModule::hWatchDirectory = nullptr;
+
+DWORD WINAPI WatchKeyboardManagerConfigs(LPVOID lpParameter)
+{
+    // don't need but can't not use
+    if (lpParameter)
+    {
+    }
+
+    //HANDLE PowertoyModule::hWatchDirectory = nullptr;
+
+    //// make sure we don't have more than one
+    //if (PowertoyModule::hWatchDirectory != nullptr)
+    //{
+    //    return 1;
+    //}
+
+    auto directoryPath = PTSettingsHelper::get_module_save_folder_location(KeyboardManagerConstants::ModuleName);
+
+    auto hWatchDirectory = CreateFile(
+        directoryPath.c_str(),
+        FILE_LIST_DIRECTORY,
+        FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        NULL,
+        OPEN_EXISTING,
+        FILE_FLAG_BACKUP_SEMANTICS,
+        NULL);
+
+    if (hWatchDirectory == INVALID_HANDLE_VALUE)
+    {
+        Logger::trace(L"Error: Unable to open directory  {}", directoryPath);
+        return 1;
+    }
+
+    DWORD dwBufferSize = 4096;
+    BYTE* pbBuffer = new BYTE[dwBufferSize];
+    DWORD bytesReturned;
+
+    while (true)
+    {
+        // ReadDirectoryChangesW is fired twice per write and in this case it does not matter since we're just doing a reset of data, no real work.
+        if (ReadDirectoryChangesW(
+                hWatchDirectory,
+                pbBuffer,
+                sizeof(pbBuffer),
+                FALSE,
+                FILE_NOTIFY_CHANGE_LAST_WRITE,
+                &bytesReturned,
+                NULL,
+                NULL))
+        {
+            // we don't really care what changed, just refresh
+            CentralizedKeyboardHook::RefreshConfig();
+            continue;
+        }
+        else
+        {
+            Logger::trace(L"Error: Unable to read directory changes.");
+            break;
+        }
+    }
+
+    CloseHandle(hWatchDirectory);
+
+    return 0;
+}
+
 int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow, bool openOobe, bool openScoobe)
 {
     Logger::info("Runner is starting. Elevated={} openOobe={} openScoobe={}", isProcessElevated, openOobe, openScoobe);
@@ -210,7 +278,13 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
         }
 
         settings_telemetry::init();
+
+        // start WatchKeyboardManagerConfigs
+        CreateThread(NULL, 0, WatchKeyboardManagerConfigs, 0, 0, NULL);
+
         result = run_message_loop();
+
+
     }
     catch (std::runtime_error& err)
     {

src/runner/powertoy_module.cpp

@@ -9,11 +9,9 @@
 #include <common/SettingsAPI/settings_helpers.h>
 #include <modules/keyboardmanager/common/Shortcut.h>
 #include <modules/keyboardmanager/common/RemapShortcut.h>
-//#include <modules/keyboardmanager/common/RunProgramSpec.h>
-//#include <modules/keyboardmanager/common/RunProgramSpec2.h>
-//#include "modules/keyboardmanager/common/RunProgramSpec2.h"
 #include <modules/keyboardmanager/common/KeyboardManagerConstants.h>
 #include <common/interop/shared_constants.h>
+#include <thread>
 
 std::map<std::wstring, PowertoyModule>& modules()
 {

src/runner/powertoy_module.h

@@ -44,9 +44,13 @@ class PowertoyModule
     void add_run_program_shortcuts();    
     void UpdateHotkeyEx();
 
+    static HANDLE PowertoyModule::hWatchDirectory;
+
 private:
     std::unique_ptr<HMODULE, PowertoyModuleDLLDeleter> handle;
     std::unique_ptr<PowertoyModuleIface, PowertoyModuleDeleter> pt_module;
+
+
 };
 
 PowertoyModule load_powertoy(const std::wstring_view filename);