forked from Mirrors/wine-wine
cmd: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix.
Signed-off-by: Brendan Shanks <bshanks@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>feature/deterministic
parent
5b47a2db6c
commit
e8f16fcbcc
|
@ -22,6 +22,7 @@
|
||||||
#define IDI_ICON1 1
|
#define IDI_ICON1 1
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
|
#include <winternl.h>
|
||||||
#ifndef RC_INVOKED
|
#ifndef RC_INVOKED
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -2437,7 +2437,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[])
|
||||||
static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0};
|
static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0};
|
||||||
WCHAR comspec[MAX_PATH];
|
WCHAR comspec[MAX_PATH];
|
||||||
CMD_LIST *toExecute = NULL; /* Commands left to be executed */
|
CMD_LIST *toExecute = NULL; /* Commands left to be executed */
|
||||||
OSVERSIONINFOW osv;
|
RTL_OSVERSIONINFOEXW osv;
|
||||||
char osver[50];
|
char osver[50];
|
||||||
STARTUPINFOW startupInfo;
|
STARTUPINFOW startupInfo;
|
||||||
|
|
||||||
|
@ -2452,7 +2452,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[])
|
||||||
|
|
||||||
/* Get the windows version being emulated */
|
/* Get the windows version being emulated */
|
||||||
osv.dwOSVersionInfoSize = sizeof(osv);
|
osv.dwOSVersionInfoSize = sizeof(osv);
|
||||||
GetVersionExW(&osv);
|
RtlGetVersion(&osv);
|
||||||
|
|
||||||
/* Pre initialize some messages */
|
/* Pre initialize some messages */
|
||||||
lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY));
|
lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY));
|
||||||
|
|
Loading…
Reference in New Issue