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
d351a999
Commit
d351a999
authored
Mar 28, 2012
by
Hans Leidekker
Committed by
Alexandre Julliard
Mar 28, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Also set the Intel property on 64-bit processors.
parent
45696154
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
package.c
dlls/msi/package.c
+1
-2
package.c
dlls/msi/tests/package.c
+18
-0
No files found.
dlls/msi/package.c
View file @
d351a999
...
@@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package)
...
@@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package)
GetNativeSystemInfo
(
&
sys_info
);
GetNativeSystemInfo
(
&
sys_info
);
sprintfW
(
bufstr
,
szIntFormat
,
sys_info
.
wProcessorLevel
);
sprintfW
(
bufstr
,
szIntFormat
,
sys_info
.
wProcessorLevel
);
msi_set_property
(
package
->
db
,
szIntel
,
bufstr
);
if
(
sys_info
.
u
.
s
.
wProcessorArchitecture
==
PROCESSOR_ARCHITECTURE_INTEL
)
if
(
sys_info
.
u
.
s
.
wProcessorArchitecture
==
PROCESSOR_ARCHITECTURE_INTEL
)
{
{
msi_set_property
(
package
->
db
,
szIntel
,
bufstr
);
GetSystemDirectoryW
(
pth
,
MAX_PATH
);
GetSystemDirectoryW
(
pth
,
MAX_PATH
);
PathAddBackslashW
(
pth
);
PathAddBackslashW
(
pth
);
msi_set_property
(
package
->
db
,
szSystemFolder
,
pth
);
msi_set_property
(
package
->
db
,
szSystemFolder
,
pth
);
...
...
dlls/msi/tests/package.c
View file @
d351a999
...
@@ -10181,6 +10181,12 @@ static void test_installprops(void)
...
@@ -10181,6 +10181,12 @@ static void test_installprops(void)
{
{
buf
[
0
]
=
0
;
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"Intel"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
buf
[
0
],
"property not set
\n
"
);
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
buf
[
0
],
"property not set
\n
"
);
ok
(
buf
[
0
],
"property not set
\n
"
);
...
@@ -10251,6 +10257,12 @@ static void test_installprops(void)
...
@@ -10251,6 +10257,12 @@ static void test_installprops(void)
{
{
buf
[
0
]
=
0
;
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"Intel"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
buf
[
0
],
"property not set
\n
"
);
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
!
buf
[
0
],
"property set
\n
"
);
ok
(
!
buf
[
0
],
"property set
\n
"
);
...
@@ -10313,6 +10325,12 @@ static void test_installprops(void)
...
@@ -10313,6 +10325,12 @@ static void test_installprops(void)
{
{
buf
[
0
]
=
0
;
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"Intel"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
buf
[
0
],
"property not set
\n
"
);
buf
[
0
]
=
0
;
size
=
MAX_PATH
;
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
r
=
MsiGetProperty
(
hpkg
,
"MsiAMD64"
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to get property: %d
\n
"
,
r
);
ok
(
buf
[
0
],
"property not set
\n
"
);
ok
(
buf
[
0
],
"property not set
\n
"
);
...
...
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