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

msi: Squash the package code property.

This commit is contained in:
James Hawkins 2008-06-23 23:00:21 -05:00 committed by Alexandre Julliard
parent ebeb537939
commit db2e8d2fdf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/action.c
View File

@ -3392,6 +3392,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey)
{ {
MSIHANDLE hdb, suminfo; MSIHANDLE hdb, suminfo;
WCHAR guids[MAX_PATH]; WCHAR guids[MAX_PATH];
WCHAR packcode[SQUISH_GUID_SIZE];
LPWSTR buffer; LPWSTR buffer;
LPWSTR ptr; LPWSTR ptr;
DWORD langid; DWORD langid;
@ -3452,7 +3453,8 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey)
ptr = strchrW(guids, ';'); ptr = strchrW(guids, ';');
if (ptr) *ptr = 0; if (ptr) *ptr = 0;
msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, guids); squash_guid(guids, packcode);
msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, packcode);
done: done:
MsiCloseHandle(suminfo); MsiCloseHandle(suminfo);

2
dlls/msi/tests/install.c
View File

@ -2530,12 +2530,12 @@ static void test_publish_publishproduct(void)
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST");
CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F");
CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Language", 1033);
CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0);
todo_wine todo_wine
{ {
CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F");
CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "Assignment", 0);
CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184);
CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);