Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
c000cbaf
Commit
c000cbaf
authored
13 years ago
by
André Zwing
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msi: Allow ARM installations.
parent
36217c20
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msi/msipriv.h
+3
-1
3 additions, 1 deletion
dlls/msi/msipriv.h
dlls/msi/package.c
+6
-2
6 additions, 2 deletions
dlls/msi/package.c
with
9 additions
and
3 deletions
dlls/msi/msipriv.h
+
3
−
1
View file @
c000cbaf
...
...
@@ -338,7 +338,8 @@ enum platform
{
PLATFORM_INTEL
,
PLATFORM_INTEL64
,
PLATFORM_X64
PLATFORM_X64
,
PLATFORM_ARM
};
enum
clr_version
...
...
@@ -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
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
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
szStreams
[]
=
{
'_'
,
'S'
,
't'
,
'r'
,
'e'
,
'a'
,
'm'
,
's'
,
0
};
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/package.c
+
6
−
2
View file @
c000cbaf
...
...
@@ -1297,6 +1297,8 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package )
package
->
platform
=
PLATFORM_INTEL64
;
else
if
(
!
strcmpW
(
template
,
szX64
)
||
!
strcmpW
(
template
,
szAMD64
))
package
->
platform
=
PLATFORM_X64
;
else
if
(
!
strcmpW
(
template
,
szARM
))
package
->
platform
=
PLATFORM_ARM
;
else
{
WARN
(
"unknown platform %s
\n
"
,
debugstr_w
(
template
));
...
...
@@ -1341,9 +1343,11 @@ static UINT validate_package( MSIPACKAGE *package )
UINT
i
;
if
(
package
->
platform
==
PLATFORM_INTEL64
)
{
return
ERROR_INSTALL_PLATFORM_UNSUPPORTED
;
}
#ifndef __arm__
if
(
package
->
platform
==
PLATFORM_ARM
)
return
ERROR_INSTALL_PLATFORM_UNSUPPORTED
;
#endif
IsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
);
if
(
package
->
platform
==
PLATFORM_X64
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment