Merge branch 'valinet:master' into master

CHANGELOG.md

@@ -32,6 +32,10 @@ Please make sure you are connected to the Internet while installing, the applica
 * sws: Fixed a bug that could prevent hotkey associations from being properly cleaned up when you disabled the setting to have a per-application window list (https://github.com/valinet/sws/commit/c5776e5a6a0c5495892a15e16a1def31b225fc51).
 * sws: Fixed a bug that could prevent correct reload of settings when entries were directly deleted from the registry (cbc5f19).
 
+##### 4
+
+* Windows 11 taskbar: Fixed a bug that could crash `explorer.exe` when right clicking certain system tray icons on 22621-based builds. Thanks for the reports about this issue. (a6a88b1)
+
 ## 22622.450.50
 
 Tested on OS build 22622.450.

ExplorerPatcher/dllmain.c

@@ -2235,7 +2235,7 @@ BOOL IsPointOnEmptyAreaOfNewTaskbar(POINT pt)
     }
     if (SUCCEEDED(hr) && bIsWindows11Version22H2OrHigher)
     {
-        bRet = (!wcscmp(elemName, L"") && !wcscmp(elemType, L"Taskbar.TaskbarFrameAutomationPeer"));
+        bRet = elemName && elemType && (!wcscmp(elemName, L"") && !wcscmp(elemType, L"Taskbar.TaskbarFrameAutomationPeer"));
     }
     if (SUCCEEDED(hr) && !bIsWindows11Version22H2OrHigher)
     {

version.h

@@ -1,7 +1,7 @@
 #define VER_MAJOR 22621
 #define VER_MINOR 608
 #define VER_BUILD_HI    51
-#define VER_BUILD_LO 3
+#define VER_BUILD_LO 4
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22621.608.51.3"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.608.51.3"
+#define VER_FILE_STRING VALUE "FileVersion", "22621.608.51.4"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.608.51.4"