Properly fixes #78, fixes #85

CHANGELOG.md

@@ -2,12 +2,15 @@
 
 This document includes the same release notes as in the [Releases](https://github.com/valinet/ExplorerPatcher/releases) section on GitHub.
 
-## 22000.258.0.26
+## 22000.258.26.2
 
 Tested on build: 22000.258.
 
+* Compatibility with OS build 22000.258
 * Option to open Network and Sharing Center instead if Network settings when right clicking the network icon in the system tray
 * Centered network and sound right click menus and made them toggle on right click
+* Reliability enhancements for Start menu positioning (#78) (.1)
+* Fixes #85 (.2)
 
 ## 22000.194.0.25
 

ExplorerPatcher/ExplorerPatcher.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22000,258,0,26
+ FILEVERSION 22000,258,26,2
- PRODUCTVERSION 22000,258,0,26
+ PRODUCTVERSION 22000,258,26,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "VALINET Solutions SRL"
             VALUE "FileDescription", "ExplorerPatcher"
-            VALUE "FileVersion", "22000.258.0.26"
+            VALUE "FileVersion", "22000.258.26.2"
             VALUE "InternalName", "ExplorerPatcher.dll"
             VALUE "LegalCopyright", "Copyright (C) 2006-2021 VALINET Solutions SRL. All rights reserved."
             VALUE "OriginalFilename", "ExplorerPatcher.dll"
             VALUE "ProductName", "ExplorerPatcher"
-            VALUE "ProductVersion", "22000.258.0.26"
+            VALUE "ProductVersion", "22000.258.26.2"
         END
     END
     BLOCK "VarFileInfo"

ExplorerPatcher/dllmain.c

@@ -1453,11 +1453,6 @@ LRESULT ShellTrayWndProcHook(
 #pragma region "Notify shell ready (fixes delay at logon)"
 DWORD SignalShellReady(DWORD wait)
 {
-    if (wait)
-    {
-        Sleep(wait);
-    }
-
     printf("Started \"Signal shell ready\" thread.\n");
 
     while (!wait && TRUE)
@@ -1500,6 +1495,7 @@ DWORD SignalShellReady(DWORD wait)
                         0
                     );
                     */
+                    EnumDisplayMonitors(NULL, NULL, PositionStartMenuForMonitor, GetStartMenuPosition());
                     /*printf("hook show desktop\n");
                     void* ShellTrayWndProcFuncT = GetWindowLongPtrW(hWnd, GWLP_WNDPROC);
                     if (ShellTrayWndProcHook != ShellTrayWndProcFuncT)
@@ -1518,10 +1514,15 @@ DWORD SignalShellReady(DWORD wait)
     {
         Sleep(600);
     }
+    else
+    {
+        Sleep(wait);
+    }
 
     HANDLE hEvent = CreateEvent(0, 0, 0, L"ShellDesktopSwitchEvent");
     if (hEvent)
     {
+        printf(">>> Signal shell ready.\n");
         SetEvent(hEvent);
     }
 
@@ -1985,7 +1986,7 @@ __declspec(dllexport) DWORD WINAPI main(
         }
 
 
-        CreateThread(0, 0, PositionStartMenuTimeout, 0, 0, 0);
+        //CreateThread(0, 0, PositionStartMenuTimeout, 0, 0, 0);
     }
     else
     {