Fix ThemeTool on Win8.1

Author: namazso

ThemeTool/ThemeTool.vcxproj

@@ -244,20 +244,6 @@
     <ClInclude Include="utl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\SecureUxTheme\avrf.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NO_ATOMS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NO_ATOMS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NO_ATOMS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NO_ATOMS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NO_ATOMS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">THEME_TOOL;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="main.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

ThemeTool/ThemeTool.vcxproj.filters

@@ -27,9 +27,6 @@
     <ClCompile Include="signature.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\SecureUxTheme\avrf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="utl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

ThemeTool/main.cpp

@@ -36,8 +36,6 @@
 // we use the builtin one so all our crt methods aren't resolved from ntdll
 #pragma comment(lib, "ntdll.lib")
 
-extern void dll_loaded(PVOID base, PCWSTR name);
-
 HINSTANCE g_instance;
 CComPtr<IThemeManager2> g_pThemeManager2;
 
@@ -66,11 +64,37 @@ static int main_gui(int nCmdShow)
   if (FAILED(hr))
     return POST_ERROR(L"g_pThemeManager2->Init failed, hr = %08X", hr);
 
-  const auto themeui = LoadLibraryW(L"themeui");
-  if (!themeui)
-    return POST_ERROR(L"LoadLibrary(themeui) failed, LastError = %08X", GetLastError());
+  const auto advapi32 = LoadLibraryW(L"advapi32");
+  if (!advapi32)
+    return POST_ERROR(L"Loading advapi32 failed, GetLastError() = %08X", GetLastError());
+
+  const auto pfn = GetProcAddress(advapi32, "CryptVerifySignatureW");
+  if (!pfn)
+    return POST_ERROR(L"CryptVerifySignatureW not found, GetLastError() = %08X", GetLastError());
+
+  // We can just do a dirty patch here since noone else would be calling CryptVerifySignatureW in our process
+
+#if defined(_M_IX86) || defined(__i386__)
+
+  constexpr BYTE bytes[] = {
+    0xB8, 0x01, 0x00, 0x00, 0x00,   // mov eax, 1
+    0xC2, 0x18, 0x00                // ret 18
+  };
+  const auto ret = WriteProcessMemory(
+    GetCurrentProcess(),
+    (PVOID)pfn,
+    bytes,
+    sizeof(bytes),
+    nullptr
+  );
+
+#else
+#error ThemeTool only supports x86 builds
+#endif
+
 
-  dll_loaded(themeui, L"themeui");
+  if (!ret)
+    return POST_ERROR(L"WriteProcessMemory failed, GetLastError() = %08X", GetLastError());
 
   const auto dialog = CreateDialogParam(
     g_instance,