Implement BufferSize::Fixed in wasapi, and migrate wasapi to officially-supported Windows crate

Cargo.toml

@@ -25,7 +25,7 @@ clap = { version = "3.1", default-features = false, features = ["std"] }
 ndk-glue = "0.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3", features = ["audiosessiontypes", "audioclient", "coml2api", "combaseapi", "debug", "devpkey", "errhandlingapi", "handleapi", "ksmedia", "mmdeviceapi", "objbase", "profileapi", "std", "synchapi", "winbase", "winuser"] }
+windows = { version = "0.37", features = ["Win32_Media_Audio", "Win32_Foundation", "Win32_System_Com", "Win32_Devices_Properties", "Win32_Media_KernelStreaming", "Win32_System_Com_StructuredStorage", "Win32_System_Ole", "Win32_System_Threading", "Win32_Security", "Win32_System_SystemServices", "Win32_System_WindowsProgramming", "Win32_Media_Multimedia", "Win32_UI_Shell_PropertiesSystem"]}
 asio-sys = { version = "0.2", path = "asio-sys", optional = true }
 num-traits = { version = "0.2.6", optional = true }
 parking_lot = "0.12"

src/host/wasapi/com.rs

@@ -4,9 +4,8 @@ use super::IoError;
 use std::marker::PhantomData;
 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::objbase::COINIT_APARTMENTTHREADED;
+use windows::Win32::Foundation::RPC_E_CHANGED_MODE;
+use windows::Win32::System::Com::{CoInitializeEx, CoUninitialize, COINIT_APARTMENTTHREADED};
 
 thread_local!(static COM_INITIALIZED: ComInitialized = {
  unsafe {
@@ -17,14 +16,18 @@ thread_local!(static COM_INITIALIZED: ComInitialized = {
  // 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,
+ match result.clone().map_err(|e| e.code()) {
+ Ok(_) |
+ Err(RPC_E_CHANGED_MODE) => {
+ ComInitialized {
+ result,
+ _ptr: PhantomData,
+ }
+ },
+ Err(e) => {
+ // COM initialization failed in another way, something is really wrong.
+ panic!("Failed to initialize COM: {}", IoError::from_raw_os_error(e.0));
  }
- } else {
- // COM initialization failed in another way, something is really wrong.
- panic!("Failed to initialize COM: {}", IoError::from_raw_os_error(result));
  }
  }
 });
@@ -34,7 +37,7 @@ 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
 // object.
 struct ComInitialized {
- result: HRESULT,
+ result: windows::core::Result<()>,
  _ptr: PhantomData<*mut ()>,
 }
 
@@ -43,7 +46,7 @@ impl Drop for ComInitialized {
  fn drop(&mut self) {
  // 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) {
+ if self.result.is_ok() {
  unsafe { CoUninitialize() };
  }
  }