[win32] RP_ShellIconOverlayIdentifier: Use HMODULE_deleter.

Author: GerbilSoft

src/win32/RP_ShellIconOverlayIdentifier.cpp

@@ -2,7 +2,7 @@
  * ROM Properties Page shell extension. (Win32)                            *
  * RP_ShellIconOverlayIdentifier.cpp: IShellIconOverlayIdentifier          *
  *                                                                         *
- * Copyright (c) 2016-2025 by David Korth.                                 *
+ * Copyright (c) 2016-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -16,8 +16,9 @@ using namespace LibRpBase;
 using namespace LibRpFile;
 using namespace LibRomData;
 
-// C++ STL classes.
+// C++ STL classes
 using std::string;
+using std::unique_ptr;
 
 // CLSID
 const CLSID CLSID_RP_ShellIconOverlayIdentifier =
@@ -32,20 +33,12 @@ RP_ShellIconOverlayIdentifier_Private::RP_ShellIconOverlayIdentifier_Private()
 #if 0
 	: romData(nullptr)
 #endif
-	: hShell32_dll(nullptr)
-	, pfnSHGetStockIconInfo(nullptr)
+	: pfnSHGetStockIconInfo(nullptr)
 {
 	// Get SHGetStockIconInfo().
-	hShell32_dll = LoadLibraryEx(_T("shell32.dll"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+	hShell32_dll.reset(LoadLibraryEx(_T("shell32.dll"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32));
 	if (hShell32_dll) {
-		pfnSHGetStockIconInfo = (pfnSHGetStockIconInfo_t)GetProcAddress(hShell32_dll, "SHGetStockIconInfo");
-	}
-}
-
-RP_ShellIconOverlayIdentifier_Private::~RP_ShellIconOverlayIdentifier_Private()
-{
-	if (hShell32_dll) {
-		FreeLibrary(hShell32_dll);
+		pfnSHGetStockIconInfo = (pfnSHGetStockIconInfo_t)GetProcAddress(hShell32_dll.get(), "SHGetStockIconInfo");
 	}
 }
 

src/win32/RP_ShellIconOverlayIdentifier_p.hpp

@@ -3,7 +3,7 @@
  * RP_ShellIconOverlayIdentifier_p.hpp: IShellIconOverlayIdentifier        *
  * (PRIVATE CLASS)                                                         *
  *                                                                         *
- * Copyright (c) 2016-2025 by David Korth.                                 *
+ * Copyright (c) 2016-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -15,6 +15,12 @@
 #include "librpbase/RomData.hpp"
 #include "librpfile/IRpFile.hpp"
 
+// C++ STL classes
+#include <memory>
+
+// HMODULE deleter for std::unique_ptr<>
+#include "HMODULE_deleter.hpp"
+
 // Workaround for RP_D() expecting the no-underscore naming convention.
 #define RP_ShellIconOverlayIdentifierPrivate RP_ShellIconOverlayIdentifier_Private
 
@@ -25,14 +31,13 @@ class RP_ShellIconOverlayIdentifier_Private
 {
 public:
 	RP_ShellIconOverlayIdentifier_Private();
-	~RP_ShellIconOverlayIdentifier_Private();
 
 private:
 	RP_DISABLE_COPY(RP_ShellIconOverlayIdentifier_Private)
 
 public:
 	// SHGetStockIconInfo() for the UAC shield icon.
+	std::unique_ptr<HMODULE, HMODULE_deleter> hShell32_dll;
 	typedef HRESULT (STDAPICALLTYPE *pfnSHGetStockIconInfo_t)(_In_ SHSTOCKICONID siid, _In_ UINT uFlags, _Out_ SHSTOCKICONINFO *psii);
-	HMODULE hShell32_dll;
 	pfnSHGetStockIconInfo_t pfnSHGetStockIconInfo;
 };