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

Adopt WinStd changes

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2025-08-11 17:20:40 +02:00
parent 3fbf1b80ae
commit a34ea845dd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MSICALib.cpp
View File

@@ -88,7 +88,7 @@ COpList::COpList(int iTicks) : COperation(iTicks)
DWORD COpList::LoadFromFile(LPCTSTR pszFileName) DWORD COpList::LoadFromFile(LPCTSTR pszFileName)
{ {
CStream fSequence(CreateFile(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)); CStream fSequence(CreateFile(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL));
if (!fSequence) if (!fSequence.valid())
return GetLastError(); return GetLastError();
// Load operation sequence. // Load operation sequence.
@@ -102,7 +102,7 @@ DWORD COpList::LoadFromFile(LPCTSTR pszFileName)
DWORD COpList::SaveToFile(LPCTSTR pszFileName) const DWORD COpList::SaveToFile(LPCTSTR pszFileName) const
{ {
CStream fSequence(CreateFile(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)); CStream fSequence(CreateFile(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL));
if (!fSequence) if (!fSequence.valid())
return GetLastError(); return GetLastError();
// Save execute sequence to file. // Save execute sequence to file.

10
src/OpTS.cpp
View File

@@ -412,7 +412,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession)
// Save the task. // Save the task.
winstd::com_obj<IPersistFile> pTaskFile(pTask); winstd::com_obj<IPersistFile> pTaskFile(pTask);
if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; } if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
hr = pTaskFile->Save(NULL, TRUE); hr = pTaskFile->Save(NULL, TRUE);
} }
@@ -761,7 +761,7 @@ HRESULT COpTaskDelete::Execute(CSession *pSession)
// Save the backup copy. // Save the backup copy.
winstd::com_obj<IPersistFile> pTaskFile(pTask); winstd::com_obj<IPersistFile> pTaskFile(pTask);
if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; } if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
hr = pTaskFile->Save(NULL, TRUE); hr = pTaskFile->Save(NULL, TRUE);
if (FAILED(hr)) goto finish; if (FAILED(hr)) goto finish;
@@ -896,7 +896,7 @@ HRESULT COpTaskEnable::Execute(CSession *pSession)
// Save the task. // Save the task.
winstd::com_obj<IPersistFile> pTaskFile(pTask); winstd::com_obj<IPersistFile> pTaskFile(pTask);
if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; } if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
hr = pTaskFile->Save(NULL, TRUE); hr = pTaskFile->Save(NULL, TRUE);
if (FAILED(hr)) goto finish; if (FAILED(hr)) goto finish;
} }
@@ -975,7 +975,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession)
vEmpty, // userId vEmpty, // userId
vEmpty, // password vEmpty, // password
logonType, // logonType logonType, // logonType
winstd::variant(sSSDL), // sddl winstd::variant((BSTR)sSSDL), // sddl
&pTaskOrig); // ppTask &pTaskOrig); // ppTask
if (FAILED(hr)) goto finish; if (FAILED(hr)) goto finish;
} else { } else {
@@ -1001,7 +1001,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession)
// Save the task. // Save the task.
winstd::com_obj<IPersistFile> pTaskFile(pTask); winstd::com_obj<IPersistFile> pTaskFile(pTask);
if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; } if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
hr = pTaskFile->Save(NULL, TRUE); hr = pTaskFile->Save(NULL, TRUE);
if (FAILED(hr)) goto finish; if (FAILED(hr)) goto finish;
} }