From d05532e2d6da9e143297991a81ab403b9e2f5067 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 10 Aug 2005 15:02:28 +0000 Subject: [PATCH] Directly use the PEB version fields in GetVersion. --- dlls/kernel/version.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/version.c b/dlls/kernel/version.c index 751c2108a22..6978b481d93 100644 --- a/dlls/kernel/version.c +++ b/dlls/kernel/version.c @@ -107,15 +107,11 @@ DWORD WINAPI GetVersion16(void) */ DWORD WINAPI GetVersion(void) { - RTL_OSVERSIONINFOEXW info; - DWORD result; - - info.dwOSVersionInfoSize = sizeof(info); - if (RtlGetVersion( &info ) != STATUS_SUCCESS) 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; + 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; return result; }