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

msi: Fix the registry actions to revert components to the installed state during rollback.

This commit is contained in:
Hans Leidekker 2011-05-24 10:51:00 +02:00 committed by Alexandre Julliard
parent c88f128537
commit 50dd7b498a
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/msi/action.c
View File

@ -2582,20 +2582,13 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param)
if (!comp) if (!comp)
return ERROR_SUCCESS; return ERROR_SUCCESS;
if (!comp->Enabled) comp->Action = msi_get_component_action( package, comp );
if (comp->Action != INSTALLSTATE_LOCAL)
{ {
TRACE("component is disabled\n"); TRACE("component not scheduled for installation %s\n", debugstr_w(component));
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
if (comp->ActionRequest != INSTALLSTATE_LOCAL)
{
TRACE("Component not scheduled for installation: %s\n", debugstr_w(component));
comp->Action = comp->Installed;
return ERROR_SUCCESS;
}
comp->Action = INSTALLSTATE_LOCAL;
name = MSI_RecordGetString(row, 4); name = MSI_RecordGetString(row, 4);
if( MSI_RecordIsNull(row,5) && name ) if( MSI_RecordIsNull(row,5) && name )
{ {
@ -2758,20 +2751,13 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para
if (!comp) if (!comp)
return ERROR_SUCCESS; return ERROR_SUCCESS;
if (!comp->Enabled) comp->Action = msi_get_component_action( package, comp );
if (comp->Action != INSTALLSTATE_ABSENT)
{ {
TRACE("component is disabled\n"); TRACE("component not scheduled for removal %s\n", debugstr_w(component));
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
if (comp->ActionRequest != INSTALLSTATE_ABSENT)
{
TRACE("Component not scheduled for removal: %s\n", debugstr_w(component));
comp->Action = comp->Installed;
return ERROR_SUCCESS;
}
comp->Action = INSTALLSTATE_ABSENT;
name = MSI_RecordGetString( row, 4 ); name = MSI_RecordGetString( row, 4 );
if (MSI_RecordIsNull( row, 5 ) && name ) if (MSI_RecordIsNull( row, 5 ) && name )
{ {
@ -2835,20 +2821,13 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param
if (!comp) if (!comp)
return ERROR_SUCCESS; return ERROR_SUCCESS;
if (!comp->Enabled) comp->Action = msi_get_component_action( package, comp );
if (comp->Action != INSTALLSTATE_LOCAL)
{ {
TRACE("component is disabled\n"); TRACE("component not scheduled for installation %s\n", debugstr_w(component));
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
if (comp->ActionRequest != INSTALLSTATE_LOCAL)
{
TRACE("Component not scheduled for installation: %s\n", debugstr_w(component));
comp->Action = comp->Installed;
return ERROR_SUCCESS;
}
comp->Action = INSTALLSTATE_LOCAL;
if ((name = MSI_RecordGetString( row, 4 ))) if ((name = MSI_RecordGetString( row, 4 )))
{ {
if (name[0] == '-' && !name[1]) if (name[0] == '-' && !name[1])
@ -3252,8 +3231,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
comp->RefCount, comp->RefCount,
comp->ActionRequest); comp->ActionRequest);
if (comp->ActionRequest == INSTALLSTATE_LOCAL || comp->Action = msi_get_component_action( package, comp );
comp->ActionRequest == INSTALLSTATE_SOURCE) if (comp->Action == INSTALLSTATE_LOCAL ||
comp->Action == INSTALLSTATE_SOURCE)
{ {
if (package->Context == MSIINSTALLCONTEXT_MACHINE) if (package->Context == MSIINSTALLCONTEXT_MACHINE)
rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE);
@ -3273,7 +3253,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
msi_reg_set_val_str(hkey, szPermKey, comp->FullKeypath); msi_reg_set_val_str(hkey, szPermKey, comp->FullKeypath);
} }
if (comp->ActionRequest == INSTALLSTATE_LOCAL) if (comp->Action == INSTALLSTATE_LOCAL)
msi_reg_set_val_str(hkey, squished_pc, comp->FullKeypath); msi_reg_set_val_str(hkey, squished_pc, comp->FullKeypath);
else else
{ {
@ -3313,14 +3293,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
} }
RegCloseKey(hkey); RegCloseKey(hkey);
} }
else if (comp->ActionRequest == INSTALLSTATE_ABSENT) else if (comp->Action == INSTALLSTATE_ABSENT)
{ {
if (package->Context == MSIINSTALLCONTEXT_MACHINE) if (package->Context == MSIINSTALLCONTEXT_MACHINE)
MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid); MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid);
else else
MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL); MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL);
} }
comp->Action = comp->ActionRequest;
/* UI stuff */ /* UI stuff */
uirow = MSI_CreateRecord(3); uirow = MSI_CreateRecord(3);
@ -3330,7 +3309,6 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
msi_ui_actiondata( package, szProcessComponents, uirow ); msi_ui_actiondata( package, szProcessComponents, uirow );
msiobj_release( &uirow->hdr ); msiobj_release( &uirow->hdr );
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }