diff --git a/MSICALib.sln b/MSICALib.sln index 6991e71..6f5330f 100644 --- a/MSICALib.sln +++ b/MSICALib.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "..\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 @@ -29,18 +27,6 @@ Global {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/include/MSICALib.h b/include/MSICALib.h index 0f04330..58ce945 100644 --- a/include/MSICALib.h +++ b/include/MSICALib.h @@ -68,9 +68,7 @@ class CSession; // CStream //////////////////////////////////////////////////////////////////////////// -class CStream : public winstd::file -{ -}; +typedef winstd::file CStream; //////////////////////////////////////////////////////////////////////////// diff --git a/src/MSICALib.cpp b/src/MSICALib.cpp index 884074a..d991645 100644 --- a/src/MSICALib.cpp +++ b/src/MSICALib.cpp @@ -87,8 +87,8 @@ COpList::COpList(int iTicks) : COperation(iTicks) DWORD COpList::LoadFromFile(LPCTSTR pszFileName) { - CStream fSequence; - if (!fSequence.create(pszFileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN)) + CStream fSequence(CreateFile(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)); + if (!fSequence) return GetLastError(); // Load operation sequence. @@ -101,8 +101,8 @@ DWORD COpList::LoadFromFile(LPCTSTR pszFileName) DWORD COpList::SaveToFile(LPCTSTR pszFileName) const { - CStream fSequence; - if (!fSequence.create(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN)) + CStream fSequence(CreateFile(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)); + if (!fSequence) return GetLastError(); // Save execute sequence to file. diff --git a/src/OpTS.cpp b/src/OpTS.cpp index 9135703..0802a52 100644 --- a/src/OpTS.cpp +++ b/src/OpTS.cpp @@ -46,7 +46,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) if (FAILED(hr)) goto finish; } - hr = pService.create(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER); + hr = CoCreateInstance(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, pService); if (SUCCEEDED(hr)) { // Windows Vista or newer. winstd::variant vEmpty; @@ -328,7 +328,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) winstd::com_obj pTask; // Get task scheduler object. - hr = pTaskScheduler.create(CLSID_CTaskScheduler, NULL, CLSCTX_ALL); + hr = CoCreateInstance(CLSID_CTaskScheduler, NULL, CLSCTX_ALL, pTaskScheduler); if (FAILED(hr)) goto finish; // Create the new task. @@ -620,7 +620,7 @@ HRESULT COpTaskDelete::Execute(CSession *pSession) HRESULT hr; winstd::com_obj pService; - hr = pService.create(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER); + hr = CoCreateInstance(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, pService); if (SUCCEEDED(hr)) { // Windows Vista or newer. winstd::variant vEmpty; @@ -721,7 +721,7 @@ HRESULT COpTaskDelete::Execute(CSession *pSession) winstd::com_obj pTaskScheduler; // Get task scheduler object. - hr = pTaskScheduler.create(CLSID_CTaskScheduler, NULL, CLSCTX_ALL); + hr = CoCreateInstance(CLSID_CTaskScheduler, NULL, CLSCTX_ALL, pTaskScheduler); if (FAILED(hr)) goto finish; if (pSession->m_bRollbackEnabled) { @@ -809,7 +809,7 @@ HRESULT COpTaskEnable::Execute(CSession *pSession) HRESULT hr; winstd::com_obj pService; - hr = pService.create(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER); + hr = CoCreateInstance(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, pService); if (SUCCEEDED(hr)) { // Windows Vista or newer. winstd::variant vEmpty; @@ -861,7 +861,7 @@ HRESULT COpTaskEnable::Execute(CSession *pSession) DWORD dwFlags; // Get task scheduler object. - hr = pTaskScheduler.create(CLSID_CTaskScheduler, NULL, CLSCTX_ALL); + hr = CoCreateInstance(CLSID_CTaskScheduler, NULL, CLSCTX_ALL, pTaskScheduler); if (FAILED(hr)) goto finish; // Load the task. @@ -928,7 +928,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession) HRESULT hr; winstd::com_obj pService; - hr = pService.create(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER); + hr = CoCreateInstance(CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, pService); if (SUCCEEDED(hr)) { // Windows Vista or newer. winstd::variant vEmpty; @@ -984,7 +984,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession) winstd::com_obj pTask; // Get task scheduler object. - hr = pTaskScheduler.create(CLSID_CTaskScheduler, NULL, CLSCTX_ALL); + hr = CoCreateInstance(CLSID_CTaskScheduler, NULL, CLSCTX_ALL, pTaskScheduler); if (FAILED(hr)) goto finish; // Load the source task.