Re-enable using composite image, Restore stream->Release

Agamnentzar · Agamnentzar · commit 57c1d291277b · 2025-08-28T02:11:28.000+02:00
diff --git a/PsdThumbnailProvider/GetThumbnail.cpp b/PsdThumbnailProvider/GetThumbnail.cpp
@@ -124,7 +124,7 @@ HBITMAP GetPSDThumbnail(IStream* stream) {
 	}
 
 	// read composite image
-	if (false && colorMode == 3 && ((width <= 256 && height <= 256) || !thumbnailOffset)) {
+	if (colorMode == 3 && ((width <= 256 && height <= 256) || !thumbnailOffset)) {
 		Seek(stream, reasourceOffset + resourcesLength, STREAM_SEEK_SET);
 
 		auto layerAndMaskInfoLength = ReadSectionLength(stream);
diff --git a/PsdThumbnailProvider/PsdThumbnailProvider.cpp b/PsdThumbnailProvider/PsdThumbnailProvider.cpp
@@ -57,7 +57,7 @@ IFACEMETHODIMP PsdThumbnailProvider::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_A
 	*pdwAlpha = WTSAT_ARGB;
 	*phbmp = GetPSDThumbnail(m_pStream);
 
-	// m_pStream->Release();
+	m_pStream->Release();
 
 	return *phbmp != NULL ? NOERROR : E_NOTIMPL;
 }
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="PSD Thumbnail Provider" Language="1033" Version="1.6.0.0" Manufacturer="Agamnentzar" UpgradeCode="cb88ff56-355c-48fd-8343-8d3f40ef02ce">
+	<Product Id="*" Name="PSD Thumbnail Provider" Language="1033" Version="1.6.1.0" Manufacturer="Agamnentzar" UpgradeCode="cb88ff56-355c-48fd-8343-8d3f40ef02ce">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 		<Condition Message="You need to be an administrator to install this product.">Privileged</Condition>
 		<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of PSD Thumbnail Provider is already installed." />

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ HBITMAP GetPSDThumbnail(IStream* stream) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// read composite image`
`127`		`- if (false && colorMode == 3 && ((width <= 256 && height <= 256) \|\| !thumbnailOffset)) {`
	`127`	`+ if (colorMode == 3 && ((width <= 256 && height <= 256) \|\| !thumbnailOffset)) {`
`128`	`128`	`Seek(stream, reasourceOffset + resourcesLength, STREAM_SEEK_SET);`
`129`	`129`
`130`	`130`	`auto layerAndMaskInfoLength = ReadSectionLength(stream);`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ IFACEMETHODIMP PsdThumbnailProvider::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_A`
`57`	`57`	`*pdwAlpha = WTSAT_ARGB;`
`58`	`58`	`*phbmp = GetPSDThumbnail(m_pStream);`
`59`	`59`
`60`		`- // m_pStream->Release();`
	`60`	`+ m_pStream->Release();`
`61`	`61`
`62`	`62`	`return *phbmp != NULL ? NOERROR : E_NOTIMPL;`
`63`	`63`	`}`