Replace windows with embedded bindings

Cargo.toml

@@ -25,11 +25,12 @@ clap = { version = "4.0", features = ["derive"] }
 ndk-glue = "0.7"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.46.0", 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"
 once_cell = "1.12"
+windows-core = "0.50"
+windows-targets = "0.48"
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"))'.dependencies]
 alsa = "0.7"

src/host/wasapi/com.rs

@@ -1,10 +1,13 @@
 //! Handles COM initialization and cleanup.
 
+#[rustfmt::skip]
+pub(super) mod bindings;
+pub(super) mod threading;
+
 use super::IoError;
 use std::marker::PhantomData;
 
-use windows::Win32::Foundation::RPC_E_CHANGED_MODE;
-use windows::Win32::System::Com::{CoInitializeEx, CoUninitialize, COINIT_APARTMENTTHREADED};
+use bindings::{CoInitializeEx, CoUninitialize, COINIT_APARTMENTTHREADED, RPC_E_CHANGED_MODE};
 
 thread_local!(static COM_INITIALIZED: ComInitialized = {
     unsafe {
@@ -14,19 +17,15 @@ thread_local!(static COM_INITIALIZED: ComInitialized = {
         // 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(None, COINIT_APARTMENTTHREADED);
-        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));
+        let result = CoInitializeEx(std::ptr::null(), COINIT_APARTMENTTHREADED);
+        if result.is_ok() || 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.0));
         }
     }
 });
@@ -36,7 +35,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: windows::core::Result<()>,
+    result: ::windows_core::HRESULT,
     _ptr: PhantomData<*mut ()>,
 }