Tons of bug fixes, quality improvements, proper startup, avoid double patching

Author: valinet

ExplorerPatcher/ExplorerPatcher.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22000,258,31,1
- PRODUCTVERSION 22000,258,31,1
+ FILEVERSION 22000,258,32,0
+ PRODUCTVERSION 22000,258,32,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.31.1"
+            VALUE "FileVersion", "22000.258.32.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.31.1"
+            VALUE "ProductVersion", "22000.258.32.0"
         END
     END
     BLOCK "VarFileInfo"

ExplorerPatcher/ExplorerPatcher.vcxproj

@@ -157,6 +157,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)libs\funchook\include;$(SolutionDir)libs\libvalinet;$(SolutionDir)libs\funchook\distorm\include;$(SolutionDir)libs\Detours\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CallingConvention>Cdecl</CallingConvention>
+      <ForcedIncludeFiles>$(SolutionDir)debug.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -211,6 +212,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\libs\sws\SimpleWindowSwitcher\sws_window.c" />
     <ClCompile Include="..\libs\sws\SimpleWindowSwitcher\sws_WindowHelpers.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -270,6 +272,7 @@
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_error.h" />
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_RegistryMonitor.h" />
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_vector.h" />
+    <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_window.h" />
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_WindowHelpers.h" />
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_WindowSwitcher.h" />
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_WindowSwitcherLayout.h" />

ExplorerPatcher/ExplorerPatcher.vcxproj.filters

@@ -25,6 +25,9 @@
     <Filter Include="Source Files\internal">
       <UniqueIdentifier>{08cd1a6f-9a8f-45ef-a50b-142a1725c106}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Settings">
+      <UniqueIdentifier>{190d08ad-4a1d-4b58-81a1-6403eeb3cd2a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
@@ -96,6 +99,9 @@
     <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_RegistryMonitor.h">
       <Filter>Header Files\sws</Filter>
     </ClInclude>
+    <ClInclude Include="..\libs\sws\SimpleWindowSwitcher\sws_window.h">
+      <Filter>Header Files\sws</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ExplorerPatcher.rc">
@@ -160,8 +166,13 @@
     <ClCompile Include="..\libs\sws\SimpleWindowSwitcher\sws_RegistryMonitor.c">
       <Filter>Source Files\sws</Filter>
     </ClCompile>
+    <ClCompile Include="..\libs\sws\SimpleWindowSwitcher\sws_window.c">
+      <Filter>Source Files\sws</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="settings.reg" />
+    <None Include="settings.reg">
+      <Filter>Settings</Filter>
+    </None>
   </ItemGroup>
 </Project>

ExplorerPatcher/GUI.c

@@ -1431,7 +1431,6 @@ __declspec(dllexport) int ZZGUI(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLin
     {
         RegCloseKey(hKey);
     }
-    wprintf(L"%d\n", locale);
 
     wchar_t wszPath[MAX_PATH];
     ZeroMemory(