James Hawkins : msi: Publish a few more product properties.
Alexandre Julliard
julliard at winehq.org
Tue Jun 24 06:45:51 CDT 2008
Module: wine
Branch: master
Commit: ef640a6cd5de0d4d9b3a61513a93c44a4739246d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef640a6cd5de0d4d9b3a61513a93c44a4739246d
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Mon Jun 23 23:01:44 2008 -0500
msi: Publish a few more product properties.
---
dlls/msi/action.c | 12 ++++++++++++
dlls/msi/tests/install.c | 11 ++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 751c8aa..33ce25c 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -3405,6 +3405,13 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey)
{'A','R','P','P','R','O','D','U','C','T','I','C','O','N',0};
static const WCHAR szProductVersion[] =
{'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0};
+ static const WCHAR szAssignment[] =
+ {'A','s','s','i','g','n','m','e','n','t',0};
+ static const WCHAR szAdvertiseFlags[] =
+ {'A','d','v','e','r','t','i','s','e','F','l','a','g','s',0};
+ static const WCHAR szClients[] =
+ {'C','l','i','e','n','t','s',0};
+ static const WCHAR szColon[] = {':',0};
buffer = msi_dup_property(package, INSTALLPROPERTY_PRODUCTNAMEW);
msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer);
@@ -3436,6 +3443,11 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey)
msi_free(buffer);
}
+ msi_reg_set_val_dword(hkey, szAssignment, 0);
+ msi_reg_set_val_dword(hkey, szAdvertiseFlags, 0x184);
+ msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0);
+ msi_reg_set_val_str(hkey, szClients, szColon);
+
hdb = alloc_msihandle(&package->db->hdr);
if (!hdb)
return ERROR_NOT_ENOUGH_MEMORY;
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 581c50e..c48ac8e 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2535,13 +2535,10 @@ static void test_publish_publishproduct(void)
CHECK_DEL_REG_DWORD(hkey, "Language", 1033);
CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0);
- todo_wine
- {
- CHECK_DEL_REG_DWORD(hkey, "Assignment", 0);
- CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184);
- CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);
- CHECK_DEL_REG_STR(hkey, "Clients", ":");
- }
+ CHECK_DEL_REG_DWORD(hkey, "Assignment", 0);
+ CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184);
+ CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);
+ CHECK_DEL_REG_STR(hkey, "Clients", ":");
res = RegOpenKeyA(hkey, "SourceList", &sourcelist);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
More information about the wine-cvs
mailing list