Fix error when unregistering

Fix release x64 compilation error
SCell555 · Nov 19, 2020 · 777124f · 777124f
1 parent 43c8cff
commit 777124f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 12 deletions.
diff --git a/README.MD b/README.MD
@@ -0,0 +1,7 @@
+# VTF Shell Extensions
+Provides thumbnails for VTF files and advanced VTF information in File properties dialog.
+
+## Screenshots
+![Thumbnails](./screenshots/thumbnail_provider.png)
+
+![File Properties](./screenshots/shell_info.png)
diff --git a/ThumbnailProvider/Main.cpp b/ThumbnailProvider/Main.cpp
@@ -61,8 +61,8 @@ STDAPI DllRegisterServer()
 STDAPI DllUnregisterServer()
 {
 	REGKEY_DELETEKEY keys[] = {
-		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFThumbnailProvider },
 		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFThumbnailProvider L"\\InprocServer32" },
+		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFThumbnailProvider },
 		{ HKEY_CLASSES_ROOT, L".vtf\\ShellEx\\{E357FCCD-A995-4576-B01F-234630154E96}" }
 	};
 	return DeleteRegistryKeys( keys, ARRAYSIZE( keys ) );

diff --git a/ThumbnailProvider/ThumbnailProvider.vcxproj b/ThumbnailProvider/ThumbnailProvider.vcxproj
@@ -146,15 +146,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <MinimalRebuild />
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;propsys.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>ThumbnailProvider.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -173,20 +173,20 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <MinimalRebuild />
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;propsys.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>ThumbnailProvider.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/VTFShellInfo/Main.cpp b/VTFShellInfo/Main.cpp
@@ -96,8 +96,8 @@ STDAPI DllUnregisterServer()
 		return hr;
 
 	REGKEY_DELETEKEY keys[] = {
-		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFShellInfo },
 		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFShellInfo L"\\InprocServer32" },
+		{ HKEY_CLASSES_ROOT, L"CLSID\\" szCLSID_VTFShellInfo },
 		{ HKEY_CLASSES_ROOT, L"SystemFileAssociations\\.vtf" },
 		{ HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\PropertySystem\\PropertyHandlers\\.vtf" }
 	};

diff --git a/VTFShellInfo/VTFShellInfo.vcxproj b/VTFShellInfo/VTFShellInfo.vcxproj
@@ -146,15 +146,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <MinimalRebuild />
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;propsys.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>VTFShellInfo.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -173,20 +173,20 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <MinimalRebuild />
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;propsys.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>VTFShellInfo.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/output/register.bat b/output/register.bat
@@ -0,0 +1,6 @@
+@echo off
+cd /d %~dp0
+regsvr32 /s VTFThumbnailProvider64.dll
+regsvr32 /s VTFShellInfo64.dll
+C:\Windows\SysWOW64\regsvr32 /s VTFThumbnailProvider32.dll
+C:\Windows\SysWOW64\regsvr32 /s VTFShellInfo32.dll
diff --git a/output/unregister.bat b/output/unregister.bat
@@ -0,0 +1,6 @@
+@echo off
+cd /d %~dp0
+regsvr32 /s /u VTFThumbnailProvider64.dll
+regsvr32 /s /u VTFShellInfo64.dll
+C:\Windows\SysWOW64\regsvr32 /s /u VTFThumbnailProvider32.dll
+C:\Windows\SysWOW64\regsvr32 /s /u VTFShellInfo32.dll
diff --git a/screenshots/shell_info.png b/screenshots/shell_info.png
diff --git a/screenshots/thumbnail_provider.png b/screenshots/thumbnail_provider.png