Addendum #2 to 6e19a73

Dutchman101 · Dutchman101 · commit 22c62f761a3d · 2025-10-06T02:46:10.000+08:00
diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp
@@ -653,8 +653,6 @@ static SString ReadRegistryStringValue(HKEY hkRoot, const char* szSubKey, const
 #endif
     accessMasks[maskCount++] = KEY_READ;
 
-    using UniqueHKey = std::unique_ptr<std::remove_pointer_t<HKEY>, decltype(&RegCloseKey)>;
-
     for (size_t maskIndex = 0; maskIndex < maskCount && !success; ++maskIndex)
     {
         HKEY hkTemp = nullptr;
@@ -665,7 +663,7 @@ static SString ReadRegistryStringValue(HKEY hkRoot, const char* szSubKey, const
             continue;
         }
 
-        UniqueHKey keyGuard(hkTemp, &RegCloseKey);
+        UniqueHKey keyGuard(hkTemp);
 
         if (PopulateValueFromKey(hkTemp, pValueName, status, strOutResult))
         {

Original file line number	Diff line number	Diff line change
`@@ -653,8 +653,6 @@ static SString ReadRegistryStringValue(HKEY hkRoot, const char* szSubKey, const`
`653`	`653`	`#endif`
`654`	`654`	`accessMasks[maskCount++] = KEY_READ;`
`655`	`655`
`656`		`- using UniqueHKey = std::unique_ptr<std::remove_pointer_t<HKEY>, decltype(&RegCloseKey)>;`
`657`		`-`
`658`	`656`	`for (size_t maskIndex = 0; maskIndex < maskCount && !success; ++maskIndex)`
`659`	`657`	`{`
`660`	`658`	`HKEY hkTemp = nullptr;`
`@@ -665,7 +663,7 @@ static SString ReadRegistryStringValue(HKEY hkRoot, const char* szSubKey, const`
`665`	`663`	`continue;`
`666`	`664`	`}`
`667`	`665`
`668`		`- UniqueHKey keyGuard(hkTemp, &RegCloseKey);`
	`666`	`+ UniqueHKey keyGuard(hkTemp);`
`669`	`667`
`670`	`668`	`if (PopulateValueFromKey(hkTemp, pValueName, status, strOutResult))`
`671`	`669`	`{`