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

msi: Look at the requested action when deleting services, not the action taken.

This commit is contained in:
Hans Leidekker 2010-03-02 14:56:51 +01:00 committed by Alexandre Julliard
parent 2d3676d912
commit c13d84fffc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/action.c
View File

@ -5224,6 +5224,7 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param )
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
MSICOMPONENT *comp; MSICOMPONENT *comp;
LPCWSTR component;
LPWSTR name = NULL; LPWSTR name = NULL;
DWORD event; DWORD event;
SC_HANDLE scm = NULL, service = NULL; SC_HANDLE scm = NULL, service = NULL;
@ -5232,10 +5233,19 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param )
if (!(event & msidbServiceControlEventDelete)) if (!(event & msidbServiceControlEventDelete))
return ERROR_SUCCESS; return ERROR_SUCCESS;
comp = get_loaded_component( package, MSI_RecordGetString(rec, 6) ); component = MSI_RecordGetString(rec, 6);
if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) comp = get_loaded_component(package, component);
if (!comp)
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;
deformat_string( package, MSI_RecordGetString(rec, 2), &name ); deformat_string( package, MSI_RecordGetString(rec, 2), &name );
stop_service( name ); stop_service( name );