Skip to content

W
wine-winehq
Commit bec5549d authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

Double terminate SZ_MULTI properly.

ClassInfo and ExtensionInfo are also written for ADVERTISED components.
parent fefad8fc
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
dlls/msi/action.c
View file @ bec5549d
...@@ -3691,6 +3691,10 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) ...@@ -3691,6 +3691,10 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package)
deformat_string(package, name, &deformated); deformat_string(package, name, &deformated);
/* get the double nulls to terminate SZ_MULTI */
if (type == REG_MULTI_SZ)
size +=sizeof(WCHAR);
if (!check_first) if (!check_first)
{ {
TRACE("Setting value %s of %s\n",debugstr_w(deformated), TRACE("Setting value %s of %s\n",debugstr_w(deformated),
...@@ -4586,8 +4590,10 @@ static UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) ...@@ -4586,8 +4590,10 @@ static UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
continue; continue;
} }
if (!ACTION_VerifyComponentForAction(package, index, if ((!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL)) INSTALLSTATE_LOCAL)) &&
(!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_ADVERTISED)))
{ {
TRACE("Skipping class reg due to disabled component\n"); TRACE("Skipping class reg due to disabled component\n");
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
...@@ -6050,8 +6056,10 @@ static UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) ...@@ -6050,8 +6056,10 @@ static UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package)
continue; continue;
} }
if (!ACTION_VerifyComponentForAction(package, index, if ((!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_LOCAL)) INSTALLSTATE_LOCAL)) &&
(!ACTION_VerifyComponentForAction(package, index,
INSTALLSTATE_ADVERTISED)))
{ {
TRACE("Skipping extension reg due to disabled component\n"); TRACE("Skipping extension reg due to disabled component\n");
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment