Gabriel Ivăncescu : kernelbase: Implement compatibility mode for GetVersion.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 563a8c0f98f89f8e2d4988a92a69976c73b5a5ca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=563a8c0f98f89f8e2d4988a92...

Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Date:   Wed Mar 18 18:31:54 2020 +0200

kernelbase: Implement compatibility mode for GetVersion.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/kernelbase/version.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c
index 3e1cef919b..8a0394da92 100644
--- a/dlls/kernelbase/version.c
+++ b/dlls/kernelbase/version.c
@@ -1420,11 +1420,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetProductInfo( DWORD os_major, DWORD os_minor,
  */
 DWORD WINAPI GetVersion(void)
 {
-    DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion,
-                                       NtCurrentTeb()->Peb->OSMinorVersion ),
-                             (NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 );
-    if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT)
-        result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16;
+    OSVERSIONINFOEXW info;
+    DWORD result;
+
+    info.dwOSVersionInfoSize = sizeof(info);
+    if (!GetVersionExW( (OSVERSIONINFOW *)&info )) return 0;
+
+    result = MAKELONG( MAKEWORD( info.dwMajorVersion, info.dwMinorVersion ),
+                       (info.dwPlatformId ^ 2) << 14 );
+
+    if (info.dwPlatformId == VER_PLATFORM_WIN32_NT)
+        result |= LOWORD(info.dwBuildNumber) << 16;
     return result;
 }