Commit fe8cd388 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

msi: Remove some unnecessary indent.

parent 0b9960a1
......@@ -2557,18 +2557,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
rc = MSIREG_OpenComponents(&hkey);
if (rc != ERROR_SUCCESS)
goto end;
return rc;
squash_guid(package->ProductCode,squished_pc);
ui_progress(package,1,COMPONENT_PROGRESS_VALUE,1,0);
LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry )
{
ui_progress(package,2,0,0,0);
if (comp->ComponentId)
{
MSIRECORD * uirow;
ui_progress(package,2,0,0,0);
if (!comp->ComponentId)
continue;
squash_guid(comp->ComponentId,squished_cc);
msi_free(comp->FullKeypath);
......@@ -2592,8 +2593,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
if (rc != ERROR_SUCCESS)
continue;
if (comp->FullKeypath)
{
if (!comp->FullKeypath)
continue;
msi_reg_set_val_str( hkey2, squished_pc, comp->FullKeypath );
if (comp->Attributes & msidbComponentAttributesPermanent)
......@@ -2601,7 +2603,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
static const WCHAR szPermKey[] =
{ '0','0','0','0','0','0','0','0','0','0','0','0',
'0','0','0','0','0','0','0','0','0','0','0','0',
'0','0','0','0','0','0','0','0',0};
'0','0','0','0','0','0','0','0',0 };
msi_reg_set_val_str( hkey2, szPermKey, comp->FullKeypath );
}
......@@ -2616,7 +2618,6 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
ui_actiondata(package,szProcessComponents,uirow);
msiobj_release( &uirow->hdr );
}
}
else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT))
{
DWORD res;
......@@ -2641,8 +2642,6 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
msiobj_release( &uirow->hdr );
}
}
}
end:
RegCloseKey(hkey);
return rc;
}
......
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