From d55f3c73c911e030225ef1f6229698a433c1bb31 Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Sun, 7 Aug 2022 20:44:55 +0300
Subject: [PATCH] GUI: Support disabling File Explorer modern search bar in
 32-bit applications

---
 ExplorerPatcher/GUI.c          | 21 +++++++++++++++++++++
 ExplorerPatcher/settings.reg   |  6 +++---
 ExplorerPatcher/settings10.reg |  6 +++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ExplorerPatcher/GUI.c b/ExplorerPatcher/GUI.c
index b8fa505..23609e4 100644
--- a/ExplorerPatcher/GUI.c
+++ b/ExplorerPatcher/GUI.c
@@ -551,6 +551,16 @@ LSTATUS GUI_Internal_RegSetValueExW(
         }
         return ERROR_SUCCESS;
     }
+    else if (!wcscmp(lpValueName, L"Virtualized_" _T(EP_CLSID) L"_DisableModernSearchBar"))
+    {
+        BOOL rv = FALSE;
+        if (!*(DWORD*)lpData) RegDeleteTreeW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\WOW6432Node\\CLSID\\{1d64637d-31e9-4b06-9124-e83fb178ac6e}");
+        else RegSetKeyValueW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\WOW6432Node\\CLSID\\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\\TreatAs", L"", REG_SZ, L"{64bc32b5-4eec-4de7-972d-bd8bd0324537}", 39 * sizeof(TCHAR));
+        if (!*(DWORD*)lpData) rv = RegDeleteTreeW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\CLSID\\{1d64637d-31e9-4b06-9124-e83fb178ac6e}");
+        else rv = RegSetKeyValueW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\CLSID\\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\\TreatAs", L"", REG_SZ, L"{64bc32b5-4eec-4de7-972d-bd8bd0324537}", 39 * sizeof(TCHAR));
+        return rv;
+    }
+
 }
 
 LSTATUS GUI_RegSetValueExW(
@@ -741,6 +751,17 @@ LSTATUS GUI_Internal_RegQueryValueExW(
             *(DWORD*)lpData = 1;
             RegCloseKey(hKey2);
         }
+        return ERROR_SUCCESS;
+    }
+    else if (!wcscmp(lpValueName, L"Virtualized_" _T(EP_CLSID) L"_DisableModernSearchBar"))
+    {
+        *lpcbData = sizeof(DWORD);
+        *(DWORD*)lpData = 0;
+        TCHAR wszGUID[39];
+        DWORD dwSize = 39 * sizeof(TCHAR);
+        BOOL rv = RegGetValueW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\CLSID\\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\\TreatAs", L"", RRF_RT_REG_SZ, NULL, wszGUID, &dwSize);
+        if (rv == ERROR_SUCCESS && !wcscmp(wszGUID, L"{64bc32b5-4eec-4de7-972d-bd8bd0324537}")) *(DWORD*)lpData = 1;
+        return ERROR_SUCCESS;
     }
 }
 
diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg
index b838f4b..7c9a625 100644
--- a/ExplorerPatcher/settings.reg
+++ b/ExplorerPatcher/settings.reg
@@ -219,9 +219,9 @@
 [-HKEY_CURRENT_USER\Software\Classes\CLSID\{056440FD-8568-48e7-A632-72157243B55B}\InprocServer32]
 ;d Disable navigation bar **
 @=""
-[-HKEY_CURRENT_USER\Software\Classes\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\TreatAs]
-;d Disable modern search bar
-@="{64bc32b5-4eec-4de7-972d-bd8bd0324537}"
+[HKEY_CURRENT_USER\Software\ExplorerPatcher]
+;b Disable modern search bar
+;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_DisableModernSearchBar"=dword:00000000
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;b Shrink address bar height **
 "ShrinkExplorerAddressBar"=dword:00000000
diff --git a/ExplorerPatcher/settings10.reg b/ExplorerPatcher/settings10.reg
index 1221439..af4cde4 100644
--- a/ExplorerPatcher/settings10.reg
+++ b/ExplorerPatcher/settings10.reg
@@ -165,9 +165,9 @@
 [-HKEY_CURRENT_USER\Software\Classes\CLSID\{056440FD-8568-48e7-A632-72157243B55B}\InprocServer32]
 ;d Disable navigation bar **
 @=""
-[-HKEY_CURRENT_USER\Software\Classes\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\TreatAs]
-;d Disable modern search bar
-@="{64bc32b5-4eec-4de7-972d-bd8bd0324537}"
+[HKEY_CURRENT_USER\Software\ExplorerPatcher]
+;b Disable modern search bar
+;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_DisableModernSearchBar"=dword:00000000
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;b Shrink address bar height **
 "ShrinkExplorerAddressBar"=dword:00000000