Fix: Added copilots suggestions

**Major Changes:**

1. **Window Subclassing System Overhaul (Comments [1](ramensoftware#2267 (comment)), [10](ramensoftware#2267 (comment)
   - Replaced `SetWindowLongPtrW` with `WindhawkUtils::SetWindowSubclassFromAnyThread` for all window subclassing
   - Updated subclass callbacks to use the standard `DWORD_PTR` refData parameter (matches `SetWindowSubclass`/WindhawkUtils expectations)
   - Removed fallback ListView subclassing (SHELLDLL_DefView handles input properly)
   - Added proper cleanup with `RemoveWindowSubclassFromAnyThread` in WM_NCDESTROY handlers
   - Updated function signatures to use `DefSubclassProc` instead of `CallWindowProcW`

2. **Process Isolation (Comments [4](ramensoftware#2267 (comment)), [6](ramensoftware#2267 (comment)
   - Added `IsWindowInCurrentProcess()` helper function
   - Now verifies ListView and ShellView belong to current explorer.exe process
   - Added a process check for `SHELLDLL_DefView` under Progman; if not current-process, falls back to WorkerW search
   - Prevents the mod from affecting other explorer processes

3. **Settings API Fixes (Comments [2](ramensoftware#2267 (comment)), [3](ramensoftware#2267 (comment)
   - Fixed `Wh_GetIntSetting` calls to use single argument (removed incorrect TRUE parameter)
   - Added `Wh_FreeStringSetting` to properly free string memory
   - Changed settings structure to nested `modifierKeys` object (matches Windhawk patterns)

4. **Initialization Improvements (Comments [7](ramensoftware#2267 (comment)), [8](ramensoftware#2267 (comment)
   - Removed `Sleep(2000)` hack from `Wh_ModAfterInit`
   - Removed unnecessary `bInitialized` flag
   - Added `EnsureValidListView()` helper for dynamic ListView validation
   - ListView now re-discovered on-demand if window becomes invalid
   - After settings changes, re-discovers shell/ListView handles and refreshes visibility state before re-establishing subclasses (hotkeys keep working)

5. **Code Cleanup (Comments [5](ramensoftware#2267 (comment)), [9](ramensoftware#2267 (comment)
   - Removed redundant `RestoreIconsToVisible` call from `Wh_ModBeforeUninit` (already in Wh_ModUninit)
   - Added null checks and proper error handling throughout
   - Added `ToUpperCase()` helper for case-insensitive key matching
   - WM_CHAR handling now requires Ctrl when configured and respects Alt, preventing false positives from control codes

**Additional Improvements:**
- Added `<commctrl.h>` and `<windhawk_utils.h>` includes
- Added `--optimize=0 --debug` compiler options
- Enhanced documentation in readme with modifier key details
- Better logging and error messages throughout

Author: Cinabutts

mods/desktop-icons-toggle.wh.cpp

@@ -89,9 +89,9 @@ BOOL SetupHotkeyHandling();
 void CleanupHotkeyHandling();
 void RestoreIconsToVisible();
 BOOL IsWindowInCurrentProcess(HWND hwnd);
-LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass);
-LRESULT CALLBACK CustomListViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass);
-LRESULT CALLBACK CustomProgmanWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass);
+LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData);
+LRESULT CALLBACK CustomListViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData);
+LRESULT CALLBACK CustomProgmanWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData);
 
 // Helper function to convert character to uppercase
 WCHAR ToUpperCase(WCHAR ch) {
@@ -173,6 +173,10 @@ HWND FindDesktopListView() {
 
     // Find SHELLDLL_DefView under Program Manager
     HWND hShellView = FindWindowExW(hProgman, nullptr, L"SHELLDLL_DefView", nullptr);
+    if (hShellView && !IsWindowInCurrentProcess(hShellView)) {
+        Wh_Log(L"SHELLDLL_DefView under Progman not in current process, ignoring");
+        hShellView = nullptr;
+    }
 
     // If not found under Progman, try WorkerW windows
     if (!hShellView) {
@@ -251,7 +255,7 @@ void ToggleDesktopIcons() {
 }
 
 // Custom window procedure for SHELLDLL_DefView
-LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass) {
+LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData) {
     switch (uMsg) {
         case WM_KEYDOWN:
         case WM_SYSKEYDOWN:
@@ -264,14 +268,22 @@ LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPA
 
         case WM_CHAR:
             // Handle Ctrl+character combinations that produce control codes
-            if (wParam > 0 && wParam < 32) {
+            if (wParam > 0 && wParam < 32 && g_state.bUseCtrl) {
+                SHORT ctrlState = GetAsyncKeyState(VK_CONTROL);
+                if ((ctrlState & 0x8000) == 0) {
+                    break; // Control not pressed; ignore
+                }
+
                 WCHAR expectedChar = (WCHAR)(wParam + 64); // Convert control code back to character
                 WCHAR upperExpected = ToUpperCase(expectedChar);
                 WCHAR upperConfig = ToUpperCase(g_state.cHotkeyChar);
 
                 if (upperExpected == upperConfig) {
+                    BOOL altRequired = g_state.bUseAlt;
                     SHORT altState = GetAsyncKeyState(VK_MENU);
-                    if ((altState & 0x8000) && g_state.bUseAlt) {
+                    BOOL altPressed = (altState & 0x8000) != 0;
+
+                    if (!altRequired || altPressed) {
                         Wh_Log(L"Hotkey detected via WM_CHAR in ShellView window");
                         ToggleDesktopIcons();
                         return 0;
@@ -289,7 +301,7 @@ LRESULT CALLBACK CustomShellViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPA
 }
 
 // Custom window procedure for ListView
-LRESULT CALLBACK CustomListViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass) {
+LRESULT CALLBACK CustomListViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData) {
     switch (uMsg) {
         case WM_KEYDOWN:
         case WM_SYSKEYDOWN:
@@ -309,7 +321,7 @@ LRESULT CALLBACK CustomListViewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
 }
 
 // Custom window procedure for Program Manager (for global hotkey handling)
-LRESULT CALLBACK CustomProgmanWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass) {
+LRESULT CALLBACK CustomProgmanWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, DWORD_PTR dwRefData) {
     switch (uMsg) {
         case WM_HOTKEY:
             if (wParam == HOTKEY_ID) {
@@ -545,6 +557,16 @@ void Wh_ModSettingsChanged() {
 
     // Reload settings
     LoadSettings();
+
+    // Refresh handles after settings change
+    g_state.hDesktopListView = FindDesktopListView();
+    if (g_state.hDesktopListView && !IsWindowInCurrentProcess(g_state.hDesktopListView)) {
+        Wh_Log(L"Desktop ListView belongs to a different process after settings change, ignoring");
+        g_state.hDesktopListView = nullptr;
+    }
+    if (g_state.hDesktopListView) {
+        g_state.bIconsVisible = IsWindowVisible(g_state.hDesktopListView);
+    }
 
     // Setup hotkey handling with new settings
     SetupHotkeyHandling();