ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Also set the Intel property on 64-bit processors.

This commit is contained in:
Hans Leidekker 2012-03-28 15:34:06 +02:00 committed by Alexandre Julliard
parent 456961548e
commit d351a9999e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msi/package.c
View File

@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package)
GetNativeSystemInfo( &sys_info );
sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel );
msi_set_property( package->db, szIntel, bufstr );
if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
{
msi_set_property( package->db, szIntel, bufstr );
GetSystemDirectoryW( pth, MAX_PATH );
PathAddBackslashW( pth );
msi_set_property( package->db, szSystemFolder, pth );

18
dlls/msi/tests/package.c
View File

@ -10179,6 +10179,12 @@ static void test_installprops(void)
pGetSystemInfo(&si);
if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
{
buf[0] = 0;
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);
@ -10249,6 +10255,12 @@ static void test_installprops(void)
{
if (!is_wow64)
{
buf[0] = 0;
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);
@ -10311,6 +10323,12 @@ static void test_installprops(void)
}
else
{
buf[0] = 0;
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);