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

msi: Initialize the installation context from the registry if the product is installed.

This commit is contained in:
Hans Leidekker 2011-08-23 14:42:15 +02:00 committed by Alexandre Julliard
parent 70e3790707
commit db6dbcf2a2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/msi/action.c
View File

@ -488,14 +488,15 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package)
UINT msi_set_context(MSIPACKAGE *package) UINT msi_set_context(MSIPACKAGE *package)
{ {
int num; UINT r = msi_locate_product( package->ProductCode, &package->Context );
if (r != ERROR_SUCCESS)
package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; {
int num = msi_get_property_int( package->db, szAllUsers, 0 );
num = msi_get_property_int(package->db, szAllUsers, 0); if (num == 1 || num == 2)
if (num == 1 || num == 2) package->Context = MSIINSTALLCONTEXT_MACHINE;
package->Context = MSIINSTALLCONTEXT_MACHINE; else
package->Context = MSIINSTALLCONTEXT_USERUNMANAGED;
}
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }

1
dlls/msi/msi.c
View File

@ -54,6 +54,7 @@ UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context)
HKEY hkey = NULL; HKEY hkey = NULL;
*context = MSIINSTALLCONTEXT_NONE; *context = MSIINSTALLCONTEXT_NONE;
if (!szProduct) return ERROR_UNKNOWN_PRODUCT;
if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED,
&hkey, FALSE) == ERROR_SUCCESS) &hkey, FALSE) == ERROR_SUCCESS)