If an action fails, print out its name as well as the error code. Use

%d for error codes so it's easy to match them up to something in
winerror.h.
This commit is contained in:
Mike McCormack 2005-10-27 12:39:28 +00:00 committed by Alexandre Julliard
parent 51c6618d8d
commit 558abec8d5
2 changed files with 11 additions and 11 deletions

View File

@ -762,7 +762,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param)
rc = ERROR_SUCCESS;
if (rc != ERROR_SUCCESS)
ERR("Execution halted due to error (%i)\n",rc);
ERR("Execution halted, action %s returned %i\n", debugstr_w(action), rc);
return rc;
}

View File

@ -327,16 +327,16 @@ static UINT process_action_return_value(UINT type, HANDLE ThreadHandle)
switch (rc)
{
case ERROR_FUNCTION_NOT_CALLED:
case ERROR_SUCCESS:
case ERROR_INSTALL_USEREXIT:
case ERROR_INSTALL_FAILURE:
return rc;
case ERROR_NO_MORE_ITEMS:
return ERROR_SUCCESS;
default:
ERR("Invalid Return Code %lx\n",rc);
return ERROR_INSTALL_FAILURE;
case ERROR_FUNCTION_NOT_CALLED:
case ERROR_SUCCESS:
case ERROR_INSTALL_USEREXIT:
case ERROR_INSTALL_FAILURE:
return rc;
case ERROR_NO_MORE_ITEMS:
return ERROR_SUCCESS;
default:
ERR("Invalid Return Code %ld\n",rc);
return ERROR_INSTALL_FAILURE;
}
}