Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c000cbaf
Commit
c000cbaf
authored
Mar 18, 2012
by
André Hentschel
Committed by
Alexandre Julliard
Mar 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Allow ARM installations.
parent
36217c20
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
msipriv.h
dlls/msi/msipriv.h
+3
-1
package.c
dlls/msi/package.c
+6
-2
No files found.
dlls/msi/msipriv.h
View file @
c000cbaf
...
@@ -338,7 +338,8 @@ enum platform
...
@@ -338,7 +338,8 @@ enum platform
{
{
PLATFORM_INTEL
,
PLATFORM_INTEL
,
PLATFORM_INTEL64
,
PLATFORM_INTEL64
,
PLATFORM_X64
PLATFORM_X64
,
PLATFORM_ARM
};
};
enum
clr_version
enum
clr_version
...
@@ -1148,6 +1149,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0};
...
@@ -1148,6 +1149,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0};
static
const
WCHAR
szIntel64
[]
=
{
'I'
,
'n'
,
't'
,
'e'
,
'l'
,
'6'
,
'4'
,
0
};
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
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
szWow6432Node
[]
=
{
'W'
,
'o'
,
'w'
,
'6'
,
'4'
,
'3'
,
'2'
,
'N'
,
'o'
,
'd'
,
'e'
,
0
};
static
const
WCHAR
szWow6432Node
[]
=
{
'W'
,
'o'
,
'w'
,
'6'
,
'4'
,
'3'
,
'2'
,
'N'
,
'o'
,
'd'
,
'e'
,
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
};
...
...
dlls/msi/package.c
View file @
c000cbaf
...
@@ -1297,6 +1297,8 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package )
...
@@ -1297,6 +1297,8 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package )
package
->
platform
=
PLATFORM_INTEL64
;
package
->
platform
=
PLATFORM_INTEL64
;
else
if
(
!
strcmpW
(
template
,
szX64
)
||
!
strcmpW
(
template
,
szAMD64
))
else
if
(
!
strcmpW
(
template
,
szX64
)
||
!
strcmpW
(
template
,
szAMD64
))
package
->
platform
=
PLATFORM_X64
;
package
->
platform
=
PLATFORM_X64
;
else
if
(
!
strcmpW
(
template
,
szARM
))
package
->
platform
=
PLATFORM_ARM
;
else
else
{
{
WARN
(
"unknown platform %s
\n
"
,
debugstr_w
(
template
));
WARN
(
"unknown platform %s
\n
"
,
debugstr_w
(
template
));
...
@@ -1341,9 +1343,11 @@ static UINT validate_package( MSIPACKAGE *package )
...
@@ -1341,9 +1343,11 @@ static UINT validate_package( MSIPACKAGE *package )
UINT
i
;
UINT
i
;
if
(
package
->
platform
==
PLATFORM_INTEL64
)
if
(
package
->
platform
==
PLATFORM_INTEL64
)
{
return
ERROR_INSTALL_PLATFORM_UNSUPPORTED
;
return
ERROR_INSTALL_PLATFORM_UNSUPPORTED
;
}
#ifndef __arm__
if
(
package
->
platform
==
PLATFORM_ARM
)
return
ERROR_INSTALL_PLATFORM_UNSUPPORTED
;
#endif
IsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
);
IsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
);
if
(
package
->
platform
==
PLATFORM_X64
)
if
(
package
->
platform
==
PLATFORM_X64
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment