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

Merge pull request #79693 from bruvzg/com_ath 

[Windows] Initialize COM as apartment-threaded.
This commit is contained in:
Rémi Verschelde 2023-08-07 14:48:40 +02:00
parent 7eb047a5ed 4bfb820d32
commit 048a164083
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/wasapi/audio_driver_wasapi.cpp
View File

@ -706,7 +706,7 @@ void AudioDriverWASAPI::write_sample(WORD format_tag, int bits_per_sample, BYTE
} }
void AudioDriverWASAPI::thread_func(void *p_udata) { void AudioDriverWASAPI::thread_func(void *p_udata) {
CoInitializeEx(nullptr, COINIT_MULTITHREADED); CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
AudioDriverWASAPI *ad = static_cast<AudioDriverWASAPI *>(p_udata); AudioDriverWASAPI *ad = static_cast<AudioDriverWASAPI *>(p_udata);
uint32_t avail_frames = 0; uint32_t avail_frames = 0;

7
platform/windows/display_server_windows.cpp
View File

@ -278,7 +278,12 @@ Error DisplayServerWindows::file_dialog_show(const String &p_title, const String
pfd->SetFileTypes(filters.size(), filters.ptr()); pfd->SetFileTypes(filters.size(), filters.ptr());
pfd->SetFileTypeIndex(0); pfd->SetFileTypeIndex(0);
hr = pfd->Show(nullptr); WindowID window_id = _get_focused_window_or_popup();
if (!windows.has(window_id)) {
window_id = MAIN_WINDOW_ID;
}
hr = pfd->Show(windows[window_id].hWnd);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
Vector<String> file_names; Vector<String> file_names;

2
platform/windows/os_windows.cpp
View File

@ -1714,7 +1714,7 @@ String OS_Windows::get_system_ca_certificates() {
OS_Windows::OS_Windows(HINSTANCE _hInstance) { OS_Windows::OS_Windows(HINSTANCE _hInstance) {
hInstance = _hInstance; hInstance = _hInstance;
CoInitializeEx(nullptr, COINIT_MULTITHREADED); CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
#ifdef WASAPI_ENABLED #ifdef WASAPI_ENABLED
AudioDriverManager::add_driver(&driver_wasapi); AudioDriverManager::add_driver(&driver_wasapi);