Merge pull request #14213 from cscd98/readvalue

Dentomologist · web-flow · commit 30429189524d · 2026-01-17T11:37:27.000-08:00
mingw: move ReadValue definitions into cpp to fix visibility
diff --git a/Source/Core/Common/WindowsRegistry.cpp b/Source/Core/Common/WindowsRegistry.cpp
@@ -46,6 +46,11 @@ bool ReadValue(std::string* value, const std::string& subkey, const std::string&
   return true;
 }
 
+// These explicit instantiations are needed to prevent linker errors when calling
+// ReadValue in WinUpdater/Platform.cpp (for u32) and ArmCPUDetect.cpp (for u64)
+template bool ReadValue(u32* value, const std::string& subkey, const std::string& name);
+template bool ReadValue(u64* value, const std::string& subkey, const std::string& name);
+
 OSVERSIONINFOW GetOSVersion()
 {
   // PEB may have faked data if the binary is launched with "compatibility mode" enabled.
diff --git a/Source/Core/Common/WindowsRegistry.h b/Source/Core/Common/WindowsRegistry.h
@@ -9,8 +9,6 @@ namespace WindowsRegistry
 {
 template <typename T>
 bool ReadValue(T* value, const std::string& subkey, const std::string& name);
-template bool ReadValue(u32* value, const std::string& subkey, const std::string& name);
-template bool ReadValue(u64* value, const std::string& subkey, const std::string& name);
 template <>
 bool ReadValue(std::string* value, const std::string& subkey, const std::string& name);
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,11 @@ bool ReadValue(std::string* value, const std::string& subkey, const std::string&`
`46`	`46`	`return true;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+// These explicit instantiations are needed to prevent linker errors when calling`
	`50`	`+// ReadValue in WinUpdater/Platform.cpp (for u32) and ArmCPUDetect.cpp (for u64)`
	`51`	`+template bool ReadValue(u32* value, const std::string& subkey, const std::string& name);`
	`52`	`+template bool ReadValue(u64* value, const std::string& subkey, const std::string& name);`
	`53`	`+`
`49`	`54`	`OSVERSIONINFOW GetOSVersion()`
`50`	`55`	`{`
`51`	`56`	`// PEB may have faked data if the binary is launched with "compatibility mode" enabled.`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@ namespace WindowsRegistry`
`9`	`9`	`{`
`10`	`10`	`template <typename T>`
`11`	`11`	`bool ReadValue(T* value, const std::string& subkey, const std::string& name);`
`12`		`-template bool ReadValue(u32* value, const std::string& subkey, const std::string& name);`
`13`		`-template bool ReadValue(u64* value, const std::string& subkey, const std::string& name);`
`14`	`12`	`template <>`
`15`	`13`	`bool ReadValue(std::string* value, const std::string& subkey, const std::string& name);`
`16`	`14`