[PATCH 2/4] kernelbase: Implement compatibility mode for GetVersion.

Gabriel Ivăncescu gabrielopcode at gmail.com
Mon Mar 16 08:05:59 CDT 2020


Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
 dlls/kernelbase/version.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c
index d07c1c9..d0c5186 100644
--- a/dlls/kernelbase/version.c
+++ b/dlls/kernelbase/version.c
@@ -1305,11 +1305,20 @@ 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;
+    const RTL_OSVERSIONINFOEXW *ver;
+    DWORD result;
+
+    if (!(ver = __wine_get_compat_win_version()))
+    {
+        ERR( "failed to get version (not enough memory)\n" );
+        return 0;
+    }
+
+    result = MAKELONG( MAKEWORD( ver->dwMajorVersion, ver->dwMinorVersion ),
+                      (ver->dwPlatformId ^ 2) << 14 );
+
+    if (ver->dwPlatformId == VER_PLATFORM_WIN32_NT)
+        result |= LOWORD(ver->dwBuildNumber) << 16;
     return result;
 }
 
-- 
2.21.0




More information about the wine-devel mailing list