reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-02 00:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Double terminate SZ_MULTI properly.

Browse Source 
ClassInfo and ExtensionInfo are also written for ADVERTISED
components.
This commit is contained in:
Aric Stewart 2005-05-23 16:24:20 +00:00 committed by Alexandre Julliard
parent fefad8fcf2
commit bec5549da6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/action.c
View File

@ -3691,6 +3691,10 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package)
deformat_string(package, name, &deformated);
/* get the double nulls to terminate SZ_MULTI */
if (type == REG_MULTI_SZ)
size +=sizeof(WCHAR);
if (!check_first)
{
TRACE("Setting value %s of %s\n",debugstr_w(deformated),
@ -4586,8 +4590,10 @@ static UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
continue;
}
if (!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL))
if ((!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL)) &&
(!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_ADVERTISED)))
{
TRACE("Skipping class reg due to disabled component\n");
msiobj_release(&row->hdr);
@ -6050,8 +6056,10 @@ static UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package)
continue;
}
if (!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL))
if ((!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL)) &&
(!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_ADVERTISED)))
{
TRACE("Skipping extension reg due to disabled component\n");
msiobj_release(&row->hdr);