marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Allow ARM64 installations. 

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
André Hentschel 2018-11-10 15:13:47 +01:00 committed by Alexandre Julliard
parent f17df0543d
commit d5a169463b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/msipriv.h
View File

@ -361,7 +361,8 @@ enum platform
PLATFORM_INTEL,
PLATFORM_INTEL64,
PLATFORM_X64,
PLATFORM_ARM
PLATFORM_ARM,
PLATFORM_ARM64
};
enum clr_version
@ -1185,6 +1186,7 @@ static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0};
static const WCHAR szX64[] = {'x','6','4',0};
static const WCHAR szAMD64[] = {'A','M','D','6','4',0};
static const WCHAR szARM[] = {'A','r','m',0};
static const WCHAR szARM64[] = {'A','r','m','6','4',0};
static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0};
static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0};
static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0};

5
dlls/msi/package.c
View File

@ -1208,6 +1208,7 @@ static enum platform parse_platform( const WCHAR *str )
else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64;
else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64;
else if (!strcmpW( str, szARM )) return PLATFORM_ARM;
else if (!strcmpW( str, szARM64 )) return PLATFORM_ARM64;
return PLATFORM_UNKNOWN;
}
@ -1289,6 +1290,10 @@ static UINT validate_package( MSIPACKAGE *package )
#ifndef __arm__
if (package->platform == PLATFORM_ARM)
return ERROR_INSTALL_PLATFORM_UNSUPPORTED;
#endif
#ifndef __aarch64__
if (package->platform == PLATFORM_ARM64)
return ERROR_INSTALL_PLATFORM_UNSUPPORTED;
#endif
if (package->platform == PLATFORM_X64)
{