From 892ae13680a30d71b489ca754ddaa2b17828f85e Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Sun, 13 Aug 2023 14:48:54 +0200
Subject: [PATCH] Log Windows version + Fix logging crash on Linux

---
 src/Cafe/CafeSystem.cpp | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Cafe/CafeSystem.cpp b/src/Cafe/CafeSystem.cpp
index 10b49c60..8c2344ce 100644
--- a/src/Cafe/CafeSystem.cpp
+++ b/src/Cafe/CafeSystem.cpp
@@ -484,26 +484,53 @@ namespace CafeSystem
 		#endif
 	}
 
+	#if BOOST_OS_WINDOWS
+	std::string GetWindowsNamedVersion(uint32& buildNumber)
+	{
+		static char productName[256];
+		HKEY hKey;
+		DWORD dwType = REG_SZ;
+		DWORD dwSize = sizeof(productName);
+		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+		{
+			if (RegQueryValueExA(hKey, "ProductName", NULL, &dwType, (LPBYTE)productName, &dwSize) != ERROR_SUCCESS)
+				strcpy(productName, "Windows");
+			RegCloseKey(hKey);
+		}
+		OSVERSIONINFO osvi;
+		ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+		GetVersionEx(&osvi);
+		buildNumber = osvi.dwBuildNumber;
+		return std::string(productName);
+	}
+	#endif
+
 	void logPlatformInfo()
 	{
+		std::string buffer;
 		const char* platform = NULL;
 		#if BOOST_OS_WINDOWS
-		platform = "Windows";
+		uint32 buildNumber;
+		std::string windowsVersionName = GetWindowsNamedVersion(buildNumber);
+		buffer = fmt::format("{} (Build {})", windowsVersionName, buildNumber);
+		platform = buffer.c_str();
 		#elif BOOST_OS_LINUX
 		if (getenv ("APPIMAGE"))
 			platform = "Linux (AppImage)";
 		else if (getenv ("SNAP"))
 			platform = "Linux (Snap)";
 		else if (platform = getenv ("container"))
+		{
 			if (strcmp (platform, "flatpak") == 0)
 				platform = "Linux (Flatpak)";
+		}
 		else
 			platform = "Linux";
 		#elif BOOST_OS_MACOS
 		platform = "MacOS";
 		#endif
 		cemuLog_log(LogType::Force, "Platform: {}", platform);
-
 	}
 
 	// initialize all subsystems which are persistent and don't depend on a game running