diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-04-26 17:57:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 17:57:45 +0200 |
| commit | ba004ea1c3b00c5516548edde7bdfe2d72d51ea1 (patch) | |
| tree | 534f23706b47017760b8d5e9395b00ef3ebd385a /platform/windows/os_windows.cpp | |
| parent | d78691d44fe6e4f38dce3a89164cdae688772031 (diff) | |
| parent | e7f4af091331ef10dd2088d82bc552a097d3d4ce (diff) | |
Merge pull request #76476 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.3) - 3rd batch
Diffstat (limited to 'platform/windows/os_windows.cpp')
| -rw-r--r-- | platform/windows/os_windows.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 6e219fb929..66b7d1284e 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -195,7 +195,6 @@ void OS_Windows::initialize() { IPUnix::make_default(); main_loop = nullptr; - CoInitialize(nullptr); HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast<IUnknown **>(&dwrite_factory)); if (SUCCEEDED(hr)) { hr = dwrite_factory->GetSystemFontCollection(&font_collection, false); @@ -373,8 +372,6 @@ Vector<String> OS_Windows::get_video_adapter_driver_info() const { return Vector<String>(); } - CoInitialize(nullptr); - HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, uuid, (LPVOID *)&wbemLocator); if (hr != S_OK) { return Vector<String>(); @@ -1505,6 +1502,8 @@ Error OS_Windows::move_to_trash(const String &p_path) { OS_Windows::OS_Windows(HINSTANCE _hInstance) { hInstance = _hInstance; + CoInitializeEx(nullptr, COINIT_MULTITHREADED); + #ifdef WASAPI_ENABLED AudioDriverManager::add_driver(&driver_wasapi); #endif @@ -1532,4 +1531,5 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) { } OS_Windows::~OS_Windows() { + CoUninitialize(); } |