Directly use the PEB version fields in GetVersion.

This commit is contained in:
Alexandre Julliard 2005-08-10 15:02:28 +00:00
parent 1c088a43f7
commit d05532e2d6

View File

@ -107,15 +107,11 @@ DWORD WINAPI GetVersion16(void)
*/ */
DWORD WINAPI GetVersion(void) DWORD WINAPI GetVersion(void)
{ {
RTL_OSVERSIONINFOEXW info; DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion,
DWORD result; NtCurrentTeb()->Peb->OSMinorVersion ),
(NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 );
info.dwOSVersionInfoSize = sizeof(info); if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT)
if (RtlGetVersion( &info ) != STATUS_SUCCESS) return 0; result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16;
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; return result;
} }