From 1ff0b8f69fece22eadca01389ff99364333c93c0 Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Tue, 18 Jul 2023 20:40:15 +0000
Subject: [PATCH] Removes caching Windows version in wversion.

Differential Revision: https://code.wildfiregames.com/D5063
This was SVN commit r27766.
---
 source/lib/sysdep/os/win/wversion.cpp | 85 ++++++++++-----------------
 source/lib/sysdep/os/win/wversion.h   | 14 +----
 2 files changed, 32 insertions(+), 67 deletions(-)

diff --git a/source/lib/sysdep/os/win/wversion.cpp b/source/lib/sysdep/os/win/wversion.cpp
index cdfac5bd8a..5c6ebfbda4 100644
--- a/source/lib/sysdep/os/win/wversion.cpp
+++ b/source/lib/sysdep/os/win/wversion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2023 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -24,19 +24,40 @@
 #include "lib/sysdep/os/win/wversion.h"
 
 #include "lib/sysdep/os/win/win.h"
-#include "lib/sysdep/os/win/winit.h"
 
 #include <sstream>
 
-WINIT_REGISTER_EARLY_INIT(wversion_Init);
-
-
-static wchar_t windowsVersionString[20];
-static size_t windowsVersion;	// see WVERSION_*
-
-
 const char* wversion_Family()
 {
+	size_t windowsVersion = 0;
+	// note: don't use GetVersion[Ex] because it gives the version of the
+	// emulated OS when running an app with compatibility shims enabled.
+	HKEY hKey;
+	if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+	{
+		wchar_t windowsVersionString[32];
+		DWORD size = sizeof(windowsVersionString);
+		UNUSED2(RegQueryValueExW(hKey, L"CurrentVersion", 0, 0, reinterpret_cast<LPBYTE>(windowsVersionString), &size));
+
+		unsigned major = 0, minor = 0;
+		// ICC 11.1.082 generates incorrect code for the following:
+		// const int ret = swscanf_s(windowsVersionString, L"%u.%u", &major, &minor);
+		std::wstringstream ss(windowsVersionString);
+		ss >> major;
+		wchar_t dot;
+		ss >> dot;
+		ENSURE(dot == '.');
+		ss >> minor;
+
+		ENSURE(4 <= major && major <= 0xFF);
+		ENSURE(minor <= 0xFF);
+		windowsVersion = (major << 8) | minor;
+
+		RegCloseKey(hKey);
+	}
+	else
+		DEBUG_WARN_ERR(ERR::LOGIC);
+
 	ENSURE(windowsVersion != 0);
 	switch(windowsVersion)
 	{
@@ -60,49 +81,3 @@ const char* wversion_Family()
 		return "Windows";
 	}
 }
-
-
-const wchar_t* wversion_String()
-{
-	ENSURE(windowsVersionString[0] != '\0');
-	return windowsVersionString;
-}
-
-size_t wversion_Number()
-{
-	ENSURE(windowsVersion != 0);
-	return windowsVersion;
-}
-
-
-static Status wversion_Init()
-{
-	// note: don't use GetVersion[Ex] because it gives the version of the
-	// emulated OS when running an app with compatibility shims enabled.
-	HKEY hKey;
-	if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
-	{
-		DWORD size = sizeof(windowsVersionString);
-		(void)RegQueryValueExW(hKey, L"CurrentVersion", 0, 0, (LPBYTE)windowsVersionString, &size);
-
-		unsigned major = 0, minor = 0;
-		// ICC 11.1.082 generates incorrect code for the following:
-		// const int ret = swscanf_s(windowsVersionString, L"%u.%u", &major, &minor);
-		std::wstringstream ss(windowsVersionString);
-		ss >> major;
-		wchar_t dot;
-		ss >> dot;
-		ENSURE(dot == '.');
-		ss >> minor;
-
-		ENSURE(4 <= major && major <= 0xFF);
-		ENSURE(minor <= 0xFF);
-		windowsVersion = (major << 8) | minor;
-
-		RegCloseKey(hKey);
-	}
-	else
-		DEBUG_WARN_ERR(ERR::LOGIC);
-
-	return INFO::OK;
-}
diff --git a/source/lib/sysdep/os/win/wversion.h b/source/lib/sysdep/os/win/wversion.h
index 3495ab2640..3203f81af8 100644
--- a/source/lib/sysdep/os/win/wversion.h
+++ b/source/lib/sysdep/os/win/wversion.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2023 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -23,11 +23,6 @@
 #ifndef INCLUDED_WVERSION
 #define INCLUDED_WVERSION
 
-/**
- * @return CurrentVersion string from registry
- **/
-extern const wchar_t* wversion_String();
-
 // (same format as WINVER)
 const size_t WVERSION_2K    = 0x0500;
 const size_t WVERSION_XP    = 0x0501;
@@ -38,14 +33,9 @@ const size_t WVERSION_8     = 0x0602;
 const size_t WVERSION_8_1   = 0x0603;
 const size_t WVERSION_10    = 0x0604;
 
-/**
- * @return one of the above WVERSION* values
- **/
-size_t wversion_Number();
-
 /**
  * @return short textual representation of the version
  **/
-extern const char* wversion_Family();
+const char* wversion_Family();
 
 #endif	// #ifndef INCLUDED_WVERSION