Index: src/ch/WindowsVersion.h
===================================================================
diff -u -N -rd5fd15320ef765fd5225b10e764bca458c2e317c -r50ad2dc9f0b42ba432bb54e4a042582277410773
--- src/ch/WindowsVersion.h	(.../WindowsVersion.h)	(revision d5fd15320ef765fd5225b10e764bca458c2e317c)
+++ src/ch/WindowsVersion.h	(.../WindowsVersion.h)	(revision 50ad2dc9f0b42ba432bb54e4a042582277410773)
@@ -24,8 +24,23 @@
 class WindowsVersion
 {
 public:
-	static std::wstring GetWindowsVersion();
-	static std::wstring GetCpuArch();
+	std::wstring GetWindowsVersion();
+	std::wstring GetWindowsVersionNumeric();
+	std::wstring GetWindowsVersionLongName();
+	std::wstring GetWindowsInstallType();
+	std::wstring GetCpuArch();
+
+private:
+	void UpdateCachedData();
+
+private:
+	bool m_bCacheFilled = false;
+	std::wstring m_wstrVersion;
+	std::wstring m_wstrProductName;
+	std::wstring m_wstrInstallType;
+	std::wstring m_wstrBuildNumber;
+	std::wstring m_wstrServicePack;
+	std::wstring m_wstrCpuArch;
 };
 
 #endif