Merge pull request #597 from ishitatsuyuki/com
wasapi: Allow both threading models and switch the default to STA
This commit is contained in:
commit
508618d558
1 changed files with 29 additions and 8 deletions
|
|
@ -1,17 +1,31 @@
|
||||||
//! Handles COM initialization and cleanup.
|
//! Handles COM initialization and cleanup.
|
||||||
|
|
||||||
use super::check_result;
|
use super::IoError;
|
||||||
|
use std::marker::PhantomData;
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
|
|
||||||
|
use super::winapi::shared::winerror::{HRESULT, RPC_E_CHANGED_MODE, SUCCEEDED};
|
||||||
use super::winapi::um::combaseapi::{CoInitializeEx, CoUninitialize};
|
use super::winapi::um::combaseapi::{CoInitializeEx, CoUninitialize};
|
||||||
use super::winapi::um::objbase::COINIT_MULTITHREADED;
|
use super::winapi::um::objbase::COINIT_APARTMENTTHREADED;
|
||||||
|
|
||||||
thread_local!(static COM_INITIALIZED: ComInitialized = {
|
thread_local!(static COM_INITIALIZED: ComInitialized = {
|
||||||
unsafe {
|
unsafe {
|
||||||
// this call can fail if another library initialized COM in single-threaded mode
|
// Try to initialize COM with STA by default to avoid compatibility issues with the ASIO
|
||||||
// handling this situation properly would make the API more annoying, so we just don't care
|
// backend (where CoInitialize() is called by the ASIO SDK) or winit (where drag and drop
|
||||||
check_result(CoInitializeEx(ptr::null_mut(), COINIT_MULTITHREADED)).unwrap();
|
// requires STA).
|
||||||
ComInitialized(ptr::null_mut())
|
// This call can fail with RPC_E_CHANGED_MODE if another library initialized COM with MTA.
|
||||||
|
// That's OK though since COM ensures thread-safety/compatibility through marshalling when
|
||||||
|
// necessary.
|
||||||
|
let result = CoInitializeEx(ptr::null_mut(), COINIT_APARTMENTTHREADED);
|
||||||
|
if SUCCEEDED(result) || result == RPC_E_CHANGED_MODE {
|
||||||
|
ComInitialized {
|
||||||
|
result,
|
||||||
|
_ptr: PhantomData,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// COM initialization failed in another way, something is really wrong.
|
||||||
|
panic!("Failed to initialize COM: {}", IoError::from_raw_os_error(result));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -19,12 +33,19 @@ thread_local!(static COM_INITIALIZED: ComInitialized = {
|
||||||
///
|
///
|
||||||
// We store a raw pointer because it's the only way at the moment to remove `Send`/`Sync` from the
|
// We store a raw pointer because it's the only way at the moment to remove `Send`/`Sync` from the
|
||||||
// object.
|
// object.
|
||||||
struct ComInitialized(*mut ());
|
struct ComInitialized {
|
||||||
|
result: HRESULT,
|
||||||
|
_ptr: PhantomData<*mut ()>,
|
||||||
|
}
|
||||||
|
|
||||||
impl Drop for ComInitialized {
|
impl Drop for ComInitialized {
|
||||||
#[inline]
|
#[inline]
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
unsafe { CoUninitialize() };
|
// Need to avoid calling CoUninitialize() if CoInitializeEx failed since it may have
|
||||||
|
// returned RPC_E_MODE_CHANGED - which is OK, see above.
|
||||||
|
if SUCCEEDED(self.result) {
|
||||||
|
unsafe { CoUninitialize() };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue