Amebis/MSICA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Popravki, da se prevede tudi Release in Debug (ne-Unicode).

Browse Source
This commit is contained in:
Simon Rozman 2013-01-10 09:31:09 +00:00
parent 9077414554
commit d73a800beb
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MSICALib/MSITSCA.cpp
View File

@ -59,7 +59,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
// Check and add the rollback enabled state. // Check and add the rollback enabled state.
uiResult = ::MsiGetProperty(hInstall, _T("RollbackDisabled"), sValue); uiResult = ::MsiGetProperty(hInstall, _T("RollbackDisabled"), sValue);
bRollbackEnabled = uiResult == ERROR_SUCCESS ? bRollbackEnabled = uiResult == ERROR_SUCCESS ?
_wtoi(sValue) || !sValue.IsEmpty() && towlower(sValue.GetAt(0)) == L'y' ? FALSE : TRUE : _ttoi(sValue) || !sValue.IsEmpty() && _totlower(sValue.GetAt(0)) == _T('y') ? FALSE : TRUE :
TRUE; TRUE;
olExecute.AddTail(new CMSITSCAOpRollbackEnable(bRollbackEnabled)); olExecute.AddTail(new CMSITSCAOpRollbackEnable(bRollbackEnabled));
@ -269,8 +269,20 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
sSequenceFilenameCM.Format(_T("%.*ls-cm%ls"), pszExtension - (LPCTSTR)sSequenceFilename, (LPCTSTR)sSequenceFilename, pszExtension); sSequenceFilenameCM.Format(_T("%.*ls-cm%ls"), pszExtension - (LPCTSTR)sSequenceFilename, (LPCTSTR)sSequenceFilename, pszExtension);
// After end of commit, delete rollback file too. After end of rollback, delete commit file too. // After end of commit, delete rollback file too. After end of rollback, delete commit file too.
session.m_olCommit.AddTail(new CMSITSCAOpFileDelete(sSequenceFilenameRB)); session.m_olCommit.AddTail(new CMSITSCAOpFileDelete(
session.m_olRollback.AddTail(new CMSITSCAOpFileDelete(sSequenceFilenameCM)); #ifdef _UNICODE
sSequenceFilenameRB
#else
CStringW(sSequenceFilenameRB)
#endif
));
session.m_olRollback.AddTail(new CMSITSCAOpFileDelete(
#ifdef _UNICODE
sSequenceFilenameCM
#else
CStringW(sSequenceFilenameCM)
#endif
));
// Save commit file first. // Save commit file first.
hr = session.m_olCommit.SaveToFile(sSequenceFilenameCM); hr = session.m_olCommit.SaveToFile(sSequenceFilenameCM);

4
MSICALib/MSITSCAOp.cpp
View File

@ -802,7 +802,7 @@ HRESULT CMSITSCAOpTaskDelete::Execute(CMSITSCASession *pSession)
TASK_LOGON_TYPE logonType; TASK_LOGON_TYPE logonType;
CComBSTR sSSDL; CComBSTR sSSDL;
CComVariant vSSDL; CComVariant vSSDL;
CString sDisplayNameOrig; CStringW sDisplayNameOrig;
UINT uiCount = 0; UINT uiCount = 0;
// Get the source task. // Get the source task.
@ -887,7 +887,7 @@ HRESULT CMSITSCAOpTaskDelete::Execute(CMSITSCASession *pSession)
if (pSession->m_bRollbackEnabled) { if (pSession->m_bRollbackEnabled) {
CComPtr<ITask> pTask; CComPtr<ITask> pTask;
DWORD dwFlags; DWORD dwFlags;
CString sDisplayNameOrig; CStringW sDisplayNameOrig;
UINT uiCount = 0; UINT uiCount = 0;
// Load the task. // Load the task.