diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-09-11 00:03:28 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-09-11 00:03:28 +0200 |
| commit | d2f2defca9eac0d7f779296bf52f36b161fc6b31 (patch) | |
| tree | 37146ca9339171563af3916e5d571c55e8812f42 /src/Common | |
| parent | aa311a6fad13357772c6e3c85a4bfe393df9382e (diff) | |
| download | VeraCrypt-d2f2defca9eac0d7f779296bf52f36b161fc6b31.tar.gz VeraCrypt-d2f2defca9eac0d7f779296bf52f36b161fc6b31.zip | |
Windows: replace CoInitialize calls with CoInitializeEx
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/BootEncryption.cpp | 2 | ||||
| -rw-r--r-- | src/Common/Dlgcode.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp index 752fac01..ddee14b1 100644 --- a/src/Common/BootEncryption.cpp +++ b/src/Common/BootEncryption.cpp @@ -712,7 +712,7 @@ namespace VeraCrypt if (!ElevatedComInstance || ElevatedComInstanceThreadId != GetCurrentThreadId()) { - CoInitialize (NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); ElevatedComInstance = GetElevatedInstance (GetActiveWindow() ? GetActiveWindow() : MainDlg); ElevatedComInstanceThreadId = GetCurrentThreadId(); } diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 3dd508fa..7282b2ec 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -3487,7 +3487,7 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine) hInst = hInstance; SetErrorMode (SetErrorMode (0) | SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); - CoInitialize (NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); #ifndef SETUP // Application ID @@ -14351,7 +14351,7 @@ HRESULT GetShellDispatchFromView(IShellView *psv, REFIID riid, void **ppv) HRESULT ShellExecInExplorerProcess(PCWSTR pszFile) { IShellView *psv; - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); HRESULT hr = GetShellViewForDesktop(IID_PPV_ARGS(&psv)); if (SUCCEEDED(hr)) { @@ -14526,7 +14526,7 @@ BitLockerEncryptionStatus GetBitLockerEncryptionStatus(WCHAR driveLetter) wchar_t szDllPath[MAX_PATH] = { 0 }; HMODULE hPropsys = NULL; - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); if (GetSystemDirectory(szDllPath, MAX_PATH)) StringCchCatW(szDllPath, MAX_PATH, L"\\Propsys.dll"); @@ -15082,7 +15082,7 @@ bool GetKbList (std::vector<std::wstring>& kbList) kbList.clear(); // Initialize COM. - hres = CoInitialize(NULL); + hres = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); if (FAILED(hres)) { return false; |