Merge pull request #28 from jewlexx/cominit-refactoring

COM_INIT refactoring

src/win/mod.rs

@@ -4,35 +4,34 @@ use std::sync::Mutex;
 
 use windows::Win32::System::Com::{CoInitializeEx, CoUninitialize, COINIT_MULTITHREADED};
 
-pub(crate) static COM_INIT: Mutex<ComInit> = Mutex::new(ComInit { initialized: false });
-
 #[cfg(feature = "network")]
 pub mod network;
 #[cfg(feature = "root")]
 pub mod root;
 
+pub(crate) static COM_INIT: Mutex<ComInit> = Mutex::new(ComInit { initialized: false });
+
 #[derive(Debug, Clone)]
 pub(crate) struct ComInit {
     initialized: bool,
 }
 
-impl ComInit {
-    pub(crate) fn init() {
-        let is_init = unsafe { Self::init_com() }.is_ok();
-        COM_INIT.lock().unwrap().initialized = is_init;
-    }
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum ComError {
+    #[error("Failed to lock COM_INIT variable: {0}")]
+    LockError(#[from] std::sync::PoisonError<std::sync::MutexGuard<'static, ComInit>>),
+}
 
-    unsafe fn init_com() -> Result<(), windows::core::Error> {
-        let mut com_init = COM_INIT.lock().unwrap();
+impl ComInit {
+    pub(crate) unsafe fn init() {
+        let mut com_init = COM_INIT.lock().expect("unpoisoned mutex");
         if !com_init.initialized {
-            CoInitializeEx(None, COINIT_MULTITHREADED)?;
-            com_init.initialized = true;
+            com_init.initialized = CoInitializeEx(None, COINIT_MULTITHREADED).is_ok();
         }
-
-        Ok(())
     }
 }
 
+// As COM_INIT is a static variable this will be dropped at the end of the program.
 impl Drop for ComInit {
     fn drop(&mut self) {
         unsafe { CoUninitialize() }