[PATCH v3 4/5] kernelbase: Implement compatibility mode for GetVersion.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Wed Mar 18 11:31:54 CDT 2020
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
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 a2a0f3c..20c1b35 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;
}
--
2.21.0
More information about the wine-devel
mailing list