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

msi: Eliminate the last parameter from ACTION_PerformActionSequence.

Browse Source
This commit is contained in:
Hans Leidekker 2009-10-15 12:49:10 +02:00 committed by Alexandre Julliard
parent e3aa2f33d9
commit a187b43ddd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/msi/action.c
View File

@ -6323,10 +6323,10 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip
return rc; return rc;
} }
static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
{ {
UINT rc = ERROR_SUCCESS; UINT rc = ERROR_SUCCESS;
MSIRECORD *row = 0; MSIRECORD *row;
static const WCHAR ExecSeqQuery[] = static const WCHAR ExecSeqQuery[] =
{'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
@ -6339,7 +6339,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI)
'`', ' ', 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`', '`', ' ', 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',
' ', '=',' ','%','i',0}; ' ', '=',' ','%','i',0};
if (UI) if (needs_ui_sequence(package))
row = MSI_QueryGetRecord(package->db, UISeqQuery, seq); row = MSI_QueryGetRecord(package->db, UISeqQuery, seq);
else else
row = MSI_QueryGetRecord(package->db, ExecSeqQuery, seq); row = MSI_QueryGetRecord(package->db, ExecSeqQuery, seq);
@ -6355,25 +6355,26 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI)
/* this is a hack to skip errors in the condition code */ /* this is a hack to skip errors in the condition code */
if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE)
goto end; {
msiobj_release(&row->hdr);
return ERROR_SUCCESS;
}
action = MSI_RecordGetString(row, 1); action = MSI_RecordGetString(row, 1);
if (!action) if (!action)
{ {
ERR("failed to fetch action\n"); ERR("failed to fetch action\n");
rc = ERROR_FUNCTION_FAILED; msiobj_release(&row->hdr);
goto end; return ERROR_FUNCTION_FAILED;
} }
if (UI) if (needs_ui_sequence(package))
rc = ACTION_PerformUIAction(package, action, -1); rc = ACTION_PerformUIAction(package, action, -1);
else else
rc = ACTION_PerformAction(package, action, -1, FALSE); rc = ACTION_PerformAction(package, action, -1, FALSE);
end:
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
} }
else
rc = ERROR_SUCCESS;
return rc; return rc;
} }
@ -6386,7 +6387,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
LPCWSTR szCommandLine ) LPCWSTR szCommandLine )
{ {
UINT rc; UINT rc;
BOOL ui = FALSE, ui_exists; BOOL ui_exists;
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};
@ -6451,7 +6452,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
{ {
package->script->InWhatSequence |= SEQUENCE_UI; package->script->InWhatSequence |= SEQUENCE_UI;
rc = ACTION_ProcessUISequence(package); rc = ACTION_ProcessUISequence(package);
ui = TRUE;
ui_exists = ui_sequence_exists(package); ui_exists = ui_sequence_exists(package);
if (rc == ERROR_SUCCESS || !ui_exists) if (rc == ERROR_SUCCESS || !ui_exists)
{ {
@ -6466,13 +6466,13 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
/* process the ending type action */ /* process the ending type action */
if (rc == ERROR_SUCCESS) if (rc == ERROR_SUCCESS)
ACTION_PerformActionSequence(package, -1, ui); ACTION_PerformActionSequence(package, -1);
else if (rc == ERROR_INSTALL_USEREXIT) else if (rc == ERROR_INSTALL_USEREXIT)
ACTION_PerformActionSequence(package, -2, ui); ACTION_PerformActionSequence(package, -2);
else if (rc == ERROR_INSTALL_SUSPEND) else if (rc == ERROR_INSTALL_SUSPEND)
ACTION_PerformActionSequence(package, -4, ui); ACTION_PerformActionSequence(package, -4);
else /* failed */ else /* failed */
ACTION_PerformActionSequence(package, -3, ui); ACTION_PerformActionSequence(package, -3);
/* finish up running custom actions */ /* finish up running custom actions */
ACTION_FinishCustomActions(package); ACTION_FinishCustomActions(package);