seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #75881 from bruvzg/win_coinit

Browse Source 
[Windows] Cleanup COM library initialization/uninitialization.
This commit is contained in:
Rémi Verschelde
2023-04-18 23:40:06 +02:00
parent c4dba9a5ef 83dc545ea2
commit c2edf14faf
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/windows/os_windows.cpp
View File

@ -201,7 +201,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);
@ -468,8 +467,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>();
@ -1600,6 +1597,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
@ -1627,4 +1626,5 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
}
OS_Windows::~OS_Windows() {
CoUninitialize();
}