Updated to v31

Author: valinet

CHANGELOG.md

@@ -2,7 +2,41 @@
 
 This document includes the same release notes as in the [Releases](https://github.com/valinet/ExplorerPatcher/releases) section on GitHub.
 
-## 22000.258.30.3
+## 22000.258.31.0
+
+Tested on build: 22000.258.
+
+#### New features
+
+* Cortana button now opens the Widgets panel
+* Ability to choose what happens when clicking the Network icon in the system tray
+* Possibility to use the legacy clock flyout
+* Possibility to use the legacy volume flyout
+* Fixes to fully support the classic theme, with a functional taskbar, system tray, Explorer windows, working context menus; read more about this feature [here](https://github.com/valinet/ExplorerPatcher/discussions/101)
+
+#### Feature enhancements
+
+* Reorganized settings in the GUI
+* Added option not to have an accelerator for the `Properties` menu entry in `Win`+`X` (#162)
+
+#### Fixes
+
+* Fixed an issue where the Windows 10 window switcher failed to display some windows (#161)
+* Fixed an issue that prevented Start from opening again until Explorer was restarted after opening File Explorer via the Start menu Explorer icon (#145)
+* Fixed patching in libvalinet
+* Fixed GUI launch path; GUI now launches in an external process, survives Explorer restarts
+
+#### Experimental
+
+The application can now be registered as a shell extension. This will enable the Explorer related functionality to work in Open/Save file dialogs as well. This is especially useful for users wanting proper support of the classic theme in Windows 11.
+
+Please note that this is experimental. For the moment, the preferred installation method remains dropping the DLL in `C:\Windows`. For interested users, I invite you to test this functionality and report your findings in the discussions board.
+
+To enable this, put the 2 DLLs (`ExplorerPatcher.amd64.dll` and `ExplorerPatcher.IA-32.dll`) in a secure folder (for example, `C:\Program Files\ExplorerPatcher`). Then, in that folder, run this command: `regsvr32 ExplorerPatcher.amd64.dll`. After elevation, a message will display informing you of the operation outcome, and if it went well, Explorer will restart displaying the old taskbar.
+
+To uninstall, run `regsvr32 /u ExplorerPatcher.amd64.dll` in the same folder and preferably reboot the computer to unload the DLLs from all applications. Then, the files can be deleted just fine.
+
+## 22000.258.30.6
 
 Tested on build: 22000.258.
 

ExplorerPatcher/ExplorerPatcher.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22000,258,30,6
- PRODUCTVERSION 22000,258,30,6
+ FILEVERSION 22000,258,31,0
+ PRODUCTVERSION 22000,258,31,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "VALINET Solutions SRL"
             VALUE "FileDescription", "ExplorerPatcher"
-            VALUE "FileVersion", "22000.258.30.6"
+            VALUE "FileVersion", "22000.258.31.0"
             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.30.6"
+            VALUE "ProductVersion", "22000.258.31.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -106,6 +106,15 @@ BEGIN
     IDS_VISITGITHUB         "Visit project Github"
     IDS_VISITWEBSITE        "Visit web site"
     IDS_LICENSEINFO         "E-mail author"
+    IDS_INSTALL_SUCCESS_TEXT "Installation succeeded."
+    IDS_INSTALL_ERROR_TEXT  "Installation failed."
+    IDS_UNINSTALL_SUCCESS_TEXT "Uninstallation succeeded."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_UNINSTALL_ERROR_TEXT "Uninstallation failed."
+    IDS_OPERATION_NONE      "No action has been taken."
 END
 
 #endif    // English (United States) resources

ExplorerPatcher/GUI.c

@@ -4,8 +4,6 @@ void* GUI_FileMapping = NULL;
 DWORD GUI_FileSize = 0;
 BOOL g_darkModeEnabled = FALSE;
 static void(*RefreshImmersiveColorPolicyState)() = NULL;
-static int(*SetPreferredAppMode)(int bAllowDark) = NULL;
-static BOOL(*AllowDarkModeForWindow)(HWND hWnd, BOOL bAllowDark) = NULL;
 static BOOL(*ShouldAppsUseDarkMode)() = NULL;
 BOOL IsHighContrast()
 {
@@ -21,7 +19,6 @@ BOOL IsColorSchemeChangeMessage(LPARAM lParam)
     BOOL is = FALSE;
     if (lParam && CompareStringOrdinal(lParam, -1, L"ImmersiveColorSet", -1, TRUE) == CSTR_EQUAL)
     {
-        RefreshImmersiveColorPolicyState();
         is = TRUE;
     }
     return is;
@@ -143,7 +140,8 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
     logFont.lfHeight = GUI_CAPTION_FONT_SIZE * dy;
     logFont.lfWeight = FW_BOLD;
     HFONT hFontCaption = CreateFontIndirect(&logFont);
-    logFont.lfHeight = GUI_TITLE_FONT_SIZE * dy;
+    logFont = ncm.lfMenuFont;
+    if (IsThemeActive()) logFont.lfHeight = GUI_TITLE_FONT_SIZE * dy;
     HFONT hFontTitle = CreateFontIndirect(&logFont);
     logFont.lfWeight = FW_REGULAR;
     logFont.lfUnderline = 1;
@@ -152,7 +150,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
     logFont.lfUnderline = 0;
     HFONT hFontRegular = CreateFontIndirect(&logFont);
     logFont.lfWeight = FW_DEMIBOLD;
-    logFont.lfHeight = GUI_SECTION_FONT_SIZE * dy;
+    if (IsThemeActive()) logFont.lfHeight = GUI_SECTION_FONT_SIZE * dy;
     HFONT hFontSection = CreateFontIndirect(&logFont);
     logFont.lfUnderline = 1;
     HFONT hFontSectionSel = CreateFontIndirect(&logFont);
@@ -184,10 +182,11 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
 
         if (!IsThemeActive() && hDC)
         {
-            COLORREF oldcr = SetBkColor(hdcPaint, GetSysColor(COLOR_WINDOW));
+            COLORREF oldcr = SetBkColor(hdcPaint, GetSysColor(COLOR_MENU));
             ExtTextOutW(hdcPaint, 0, 0, ETO_OPAQUE, &rc, L"", 0, 0);
             SetBkColor(hdcPaint, oldcr);
             SetTextColor(hdcPaint, GetSysColor(COLOR_WINDOWTEXT));
+            SetBkMode(hdcPaint, TRANSPARENT);
         }
 
         FILE* f = fmemopen(pRscr, cbRscr, "r");
@@ -433,7 +432,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                             bTabOrderHit = TRUE;
                             if (!IsThemeActive())
                             {
-                                cr = SetTextColor(hdcPaint, GetSysColor(COLOR_HIGHLIGHT));
+                                cr = SetTextColor(hdcPaint, GetSysColor(COLOR_HIGHLIGHTTEXT));
                             }
                             else
                             {
@@ -1255,6 +1254,7 @@ static LRESULT CALLBACK GUI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
         {
             if (IsThemeActive() && ShouldAppsUseDarkMode)
             {
+                RefreshImmersiveColorPolicyState();
                 BOOL bIsCompositionEnabled = TRUE;
                 DwmIsCompositionEnabled(&bIsCompositionEnabled);
                 BOOL bDarkModeEnabled = IsThemeActive() && bIsCompositionEnabled && ShouldAppsUseDarkMode() && !IsHighContrast();
@@ -1486,14 +1486,14 @@ __declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLin
         wszPath,
         (MAX_PATH) * sizeof(wchar_t)
     );
-    GetWindowsDirectoryW(
+    GetSystemDirectoryW(
         wszPath,
         MAX_PATH
     );
     wcscat_s(
         wszPath,
         MAX_PATH,
-        L"\\explorer.exe"
+        L"\\shell32.dll"
     );
 
     WNDCLASS wc = { 0 };
@@ -1504,18 +1504,32 @@ __declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLin
     wc.hInstance = hModule;
     wc.lpszClassName = L"ExplorerPatcherGUI";
     wc.hCursor = LoadCursorW(NULL, IDC_ARROW);
-    HMODULE hExplorer = LoadLibraryExW(wszPath, NULL, LOAD_LIBRARY_AS_DATAFILE);
-    if (hExplorer)
+    HMODULE hShell32 = LoadLibraryExW(wszPath, NULL, LOAD_LIBRARY_AS_DATAFILE);
+    if (hShell32)
     {
-        _this.hIcon = LoadIconW(hExplorer, L"ICO_MYCOMPUTER");
+        _this.hIcon = LoadIconW(hShell32, MAKEINTRESOURCEW(40));
         wc.hIcon = _this.hIcon;
     }
     RegisterClassW(&wc);
 
     TCHAR title[260];
     HMODULE hExplorerFrame = LoadLibraryExW(L"ExplorerFrame.dll", NULL, LOAD_LIBRARY_AS_DATAFILE);
-    LoadStringW(hExplorerFrame, 726, title, 260);
+    LoadStringW(hExplorerFrame, 50222, title, 260); // 726 = File Explorer
     FreeLibrary(hExplorerFrame);
+    wchar_t* p = wcschr(title, L'(');
+    if (p)
+    {
+        p--;
+        if (p == L' ')
+        {
+            *p = 0;
+        }
+        else
+        {
+            p++;
+            *p = 0;
+        }
+    }
     if (title[0] == 0)
     {
         LoadStringW(hModule, IDS_PRODUCTNAME, title, 260);
@@ -1587,10 +1601,10 @@ __declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLin
         DispatchMessage(&msg);
     }
 
-    if (hExplorer)
+    if (hShell32)
     {
         CloseHandle(_this.hIcon);
-        FreeLibrary(hExplorer);
+        FreeLibrary(hShell32);
     }
 
     if (bHasLoadedUxtheme && hUxtheme)

ExplorerPatcher/HideExplorerSearchBar.c

@@ -94,7 +94,7 @@ VOID HideExplorerSearchBar(HWND hWnd)
     );
 }
 
-LRESULT HideExplorerSearchBarSubClass(
+LRESULT CALLBACK HideExplorerSearchBarSubClass(
     HWND hWnd,
     UINT uMsg,
     WPARAM wParam,

ExplorerPatcher/HideExplorerSearchBar.h

@@ -13,7 +13,7 @@ HWND FindChildWindow(
 // https://github.com/Open-Shell/Open-Shell-Menu/blob/master/Src/ClassicExplorer/ExplorerBHO.cpp
 VOID HideExplorerSearchBar(HWND hWnd);
 
-LRESULT HideExplorerSearchBarSubClass(
+LRESULT CALLBACK HideExplorerSearchBarSubClass(
     HWND hWnd,
     UINT uMsg,
     WPARAM wParam,

ExplorerPatcher/SettingsMonitor.c

@@ -1,10 +1,12 @@
 #include "SettingsMonitor.h"
 
-DWORD MonitorSettings(SettingsChangeParameters* params)
+DWORD WINAPI MonitorSettings(SettingsChangeParameters* params)
 {
+	BOOL bShouldExit = FALSE;
+
 	while (TRUE)
 	{
-		HANDLE* handles = malloc(sizeof(HANDLE) * params->size);
+		HANDLE* handles = malloc(sizeof(HANDLE) * (params->size + 1));
 		if (!handles)
 		{
 			return 0;
@@ -42,23 +44,35 @@ DWORD MonitorSettings(SettingsChangeParameters* params)
 				return 0;
 			}
 		}
+		handles[params->size] = params->hExitEvent;
 		DWORD dwRes = WaitForMultipleObjects(
-			params->size,
+			params->size + (params->hExitEvent ? 1 : 0),
 			handles,
 			FALSE,
 			INFINITE
 		);
 		if (dwRes != WAIT_FAILED)
 		{
 			unsigned int i = dwRes - WAIT_OBJECT_0;
-			params->settings[i].callback(params->settings[i].data);
+			if (i >= 0 && i < params->size)
+			{
+				params->settings[i].callback(params->settings[i].data);
+			}
+			else if (i == params->size)
+			{
+				bShouldExit = TRUE;
+			}
 		}
 		free(handles);
 		for (unsigned int i = 0; i < params->size; ++i)
 		{
 			CloseHandle(params->settings[i].hEvent);
 			RegCloseKey(params->settings[i].hKey);
 		}
+		if (bShouldExit)
+		{
+			break;
+		}
 	}
 }
 

ExplorerPatcher/SettingsMonitor.h

@@ -10,13 +10,14 @@ typedef struct _Setting
     wchar_t name[MAX_PATH];
     HKEY hKey;
     HANDLE hEvent;
-    void(*callback)(void*);
+    void(__stdcall *callback)(void*);
     void* data;
 } Setting;
 typedef struct _SettingsChangeParameters
 {
     Setting* settings;
     DWORD size;
+    HANDLE hExitEvent;
 } SettingsChangeParameters;
-DWORD MonitorSettings(SettingsChangeParameters*);
+DWORD WINAPI MonitorSettings(SettingsChangeParameters*);
 #endif