THUMBNAILER: windows explorer dll fixes

see issue #85
vengi-voxel · May 21, 2024 · 42a3956 · 42a3956
1 parent f8114f4
commit 42a3956
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/tools/thumbnailer/windows/ThumbnailerProvider.cpp b/src/tools/thumbnailer/windows/ThumbnailerProvider.cpp
@@ -8,10 +8,15 @@
 #include "core/TimeProvider.h"
 #include "io/Filesystem.h"
 
+#include <Windows.h>
 #include <Shlwapi.h>
+#include <tchar.h>
 #include <stdint.h>
 #include <stdio.h>
 
+extern void DllAddRef();
+extern void DllRelease();
+
 class DLLThumbnailer : public Thumbnailer {
 private:
 	using Super = Thumbnailer;
@@ -49,15 +54,17 @@ class DLLThumbnailer : public Thumbnailer {
 };
 
 ThumbnailerProvider::ThumbnailerProvider() : count(1) {
+	DllAddRef();
 }
 
 ThumbnailerProvider::~ThumbnailerProvider() {
+	DllRelease();
 }
 
 IFACEMETHODIMP ThumbnailerProvider::QueryInterface(REFIID riid, void **ppv) {
 	static const QITAB qit[] = {
+		QITABENT(ThumbnailerProvider, IInitializeWithFile),
 		QITABENT(ThumbnailerProvider, IThumbnailProvider),
-		QITABENT(ThumbnailerProvider, IInitializeWithStream),
 		{0},
 	};
 	return QISearch(this, qit, riid, ppv);
@@ -75,13 +82,12 @@ IFACEMETHODIMP_(ULONG) ThumbnailerProvider::Release() {
 	return refs;
 }
 
-IFACEMETHODIMP ThumbnailerProvider::Initialize(LPCWSTR pfilePath, DWORD grfMode) {
-	HRESULT hr = E_INVALIDARG;
+HRESULT ThumbnailerProvider::Initialize(LPCWSTR pfilePath, DWORD grfMode) {
 	char filename[10240];
 	size_t size;
 	wcstombs_s(&size, filename, 10240, pfilePath, 10240);
 	m_pPathFile = core::String(filename);
-	return hr;
+	return S_OK;
 }
 
 IFACEMETHODIMP ThumbnailerProvider::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE *pdwAlpha) {
@@ -100,13 +106,16 @@ IFACEMETHODIMP ThumbnailerProvider::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_AL
 	core::string::formatBuf(argv5, sizeof(argv5), "%s", m_pPathFile.c_str());
 	char *argv[] = {argv1, argv2, argv3, argv4, argv5};
 	app.startMainLoop(5, argv);
+	*pdwAlpha = WTSAT_ARGB;
 	return (*phbmp) ? S_OK : S_FALSE;
 }
 
 ThumbnailerProviderFactory::ThumbnailerProviderFactory() : count(1) {
+	DllAddRef();
 }
 
 ThumbnailerProviderFactory::~ThumbnailerProviderFactory() {
+	DllRelease();
 }
 
 IFACEMETHODIMP ThumbnailerProviderFactory::QueryInterface(REFIID riid, void **ppv) {

diff --git a/src/tools/thumbnailer/windows/ThumbnailerProvider.h b/src/tools/thumbnailer/windows/ThumbnailerProvider.h
@@ -29,7 +29,7 @@ class ThumbnailerProvider : public IInitializeWithFile, public IThumbnailProvide
 	IFACEMETHODIMP_(ULONG) Release() override;
 
 	// IInitializeWithFile::Initialize()
-	IFACEMETHODIMP Initialize(LPCWSTR pfilePath, DWORD grfMode) override;
+	HRESULT Initialize(LPCWSTR pszFilePath, DWORD grfMode) override;
 
 	// IThumbnailProvider::GetThumbnail()
 	IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE *pdwAlpha) override;