Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Allow ARM64 installations.

Browse source 
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d5a169463b30af229368a5559b20f9ae415c3048 by André Hentschel <nerv@dawncrow.de>
This commit is contained in:
winesync 2022-03-13 00:16:15 +01:00 • committed by Mark Jansen
parent 3dfa0cce09
commit de59794f36
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/msi/msipriv.h
View file

@ -361,7 +361,8 @@ enum platform
PLATFORM_INTEL, PLATFORM_INTEL,
PLATFORM_INTEL64, PLATFORM_INTEL64,
PLATFORM_X64, PLATFORM_X64,
PLATFORM_ARM PLATFORM_ARM,
PLATFORM_ARM64
}; };
enum clr_version enum clr_version
@ -1186,6 +1187,7 @@ static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0};
static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0};
static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0};
static const WCHAR szARM[] = {'A','r','m',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 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 szStreams[] = {'_','S','t','r','e','a','m','s',0};
static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0};

5
dll/win32/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, szIntel64 )) return PLATFORM_INTEL64;
else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64; else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64;
else if (!strcmpW( str, szARM )) return PLATFORM_ARM; else if (!strcmpW( str, szARM )) return PLATFORM_ARM;
else if (!strcmpW( str, szARM64 )) return PLATFORM_ARM64;
return PLATFORM_UNKNOWN; return PLATFORM_UNKNOWN;
} }
@ -1289,6 +1290,10 @@ static UINT validate_package( MSIPACKAGE *package )
#ifndef __arm__ #ifndef __arm__
if (package->platform == PLATFORM_ARM) if (package->platform == PLATFORM_ARM)
return ERROR_INSTALL_PLATFORM_UNSUPPORTED; return ERROR_INSTALL_PLATFORM_UNSUPPORTED;
#endif
#ifndef __aarch64__
if (package->platform == PLATFORM_ARM64)
return ERROR_INSTALL_PLATFORM_UNSUPPORTED;
#endif #endif
if (package->platform == PLATFORM_X64) if (package->platform == PLATFORM_X64)
{ {