Skip to content

W
wine-cw
Commit 658183a8 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

msi: Report the real NT version number up to 6.3.

MSI always reports 6.3 even without a manifest, but does not report anything higher. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 17d0da9f
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
dlls/msi/package.c
View file @ 658183a8
......@@ -27,6 +27,7 @@
#include "winbase.h"
#include "winreg.h"
#include "winnls.h"
#include "winternl.h"
#include "shlwapi.h"
#include "wingdi.h"
#include "msi.h"
......@@ -668,7 +669,7 @@ done:
static VOID set_installer_properties(MSIPACKAGE *package)
{
WCHAR *ptr;
OSVERSIONINFOEXW OSVersion;
RTL_OSVERSIONINFOEXW OSVersion;
MEMORYSTATUSEX msex;
DWORD verval, len, type;
WCHAR pth[MAX_PATH], verstr[11], bufstr[22];
......@@ -860,9 +861,14 @@ static VOID set_installer_properties(MSIPACKAGE *package)
msi_set_property( package->db, szPrivileged, szOne, -1 );
/* set the os things */
OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
GetVersionExW((OSVERSIONINFOW *)&OSVersion);
OSVersion.dwOSVersionInfoSize = sizeof(OSVersion);
RtlGetVersion(&OSVersion);
verval = OSVersion.dwMinorVersion + OSVersion.dwMajorVersion * 100;
if (verval > 603)
{
verval = 603;
OSVersion.dwBuildNumber = 9600;
}
len = swprintf( verstr, ARRAY_SIZE(verstr), szFormat, verval );
switch (OSVersion.dwPlatformId)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment