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

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

This commit is contained in:
Hans Leidekker 2011-05-24 10:50:28 +02:00 committed by Alexandre Julliard
parent 6ec7306948
commit b7950cfe68
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/msi/action.c
View File

@ -816,6 +816,17 @@ void msi_ui_actiondata( MSIPACKAGE *package, const WCHAR *action, MSIRECORD *rec
msiobj_release( &row->hdr ); msiobj_release( &row->hdr );
} }
INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp )
{
if (!comp->Enabled)
{
TRACE("component is disabled: %s\n", debugstr_w(comp->Component));
return INSTALLSTATE_UNKNOWN;
}
if (package->need_rollback) return comp->Installed;
return comp->ActionRequest;
}
static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
@ -832,20 +843,13 @@ static UINT ITERATE_CreateFolders(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;
dir = MSI_RecordGetString(row,1); dir = MSI_RecordGetString(row,1);
if (!dir) if (!dir)
{ {
@ -907,20 +911,13 @@ static UINT ITERATE_RemoveFolders( 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_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;
dir = MSI_RecordGetString( row, 1 ); dir = MSI_RecordGetString( row, 1 );
if (!dir) if (!dir)
{ {
@ -7468,7 +7465,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
LPCWSTR szCommandLine ) LPCWSTR szCommandLine )
{ {
UINT rc; UINT rc;
BOOL ui_exists, needs_rollback = FALSE; BOOL ui_exists;
static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0};
static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0};
static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0};
@ -7565,13 +7562,16 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
else /* failed */ else /* failed */
{ {
ACTION_PerformActionSequence(package, -3); ACTION_PerformActionSequence(package, -3);
needs_rollback = TRUE; if (!msi_get_property_int( package->db, szRollbackDisabled, 0 ))
{
package->need_rollback = TRUE;
}
} }
/* finish up running custom actions */ /* finish up running custom actions */
ACTION_FinishCustomActions(package); ACTION_FinishCustomActions(package);
if (needs_rollback && !msi_get_property_int( package->db, szRollbackDisabled, 0 )) if (package->need_rollback)
{ {
WARN("installation failed, running rollback script\n"); WARN("installation failed, running rollback script\n");
msi_set_property( package->db, szRollbackDisabled, NULL ); msi_set_property( package->db, szRollbackDisabled, NULL );

2
dlls/msi/msipriv.h
View File

@ -400,6 +400,7 @@ typedef struct tagMSIPACKAGE
unsigned char commit_action_running : 1; unsigned char commit_action_running : 1;
unsigned char rollback_action_running : 1; unsigned char rollback_action_running : 1;
unsigned char need_reboot : 1; unsigned char need_reboot : 1;
unsigned char need_rollback : 1;
} MSIPACKAGE; } MSIPACKAGE;
typedef struct tagMSIPREVIEW typedef struct tagMSIPREVIEW
@ -771,6 +772,7 @@ extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMod
extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN;
extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) DECLSPEC_HIDDEN; extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) DECLSPEC_HIDDEN;
extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) DECLSPEC_HIDDEN; extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) DECLSPEC_HIDDEN;
extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) DECLSPEC_HIDDEN;
/* record internals */ /* record internals */
extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN; extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN;