Add InterfaceRc::from_raw

Author: rylev

src/interface_ptr.rs

@@ -1,9 +1,7 @@
 use crate::ComInterface;
 
-use std::ptr::NonNull;
-
-use std::ffi::c_void;
 use std::marker::PhantomData;
+use std::ptr::NonNull;
 
 /// A transparent ptr to a COM interface.
 ///
@@ -13,7 +11,7 @@ use std::marker::PhantomData;
 ///
 /// [`InterfaceRc`]: struct.InterfaceRc.html
 pub struct InterfacePtr<T: ?Sized + ComInterface> {
-    ptr: NonNull<c_void>,
+    ptr: NonNull<*mut <T as ComInterface>::VTable>,
     phantom: PhantomData<T>,
 }
 
@@ -32,7 +30,7 @@ impl<T: ?Sized + ComInterface> InterfacePtr<T> {
     /// # Panics
     ///
     /// Panics if `ptr` is null
-    pub unsafe fn new(ptr: *mut c_void) -> InterfacePtr<T> {
+    pub unsafe fn new(ptr: *mut *mut <T as ComInterface>::VTable) -> InterfacePtr<T> {
         InterfacePtr {
             ptr: NonNull::new(ptr).expect("ptr was null"),
             phantom: PhantomData,
@@ -41,7 +39,7 @@ impl<T: ?Sized + ComInterface> InterfacePtr<T> {
 
     /// Gets the underlying interface ptr. This ptr is only guarnteed to live for
     /// as long as the current `InterfacePtr` is alive.
-    pub fn as_raw(&self) -> *mut c_void {
+    pub fn as_raw(&self) -> *mut *mut <T as ComInterface>::VTable {
         self.ptr.as_ptr()
     }
 }

src/interface_rc.rs

@@ -21,9 +21,13 @@ impl<T: ?Sized + ComInterface> InterfaceRc<T> {
         InterfaceRc { ptr }
     }
 
+    pub unsafe fn from_raw(ptr: *mut *mut <T as ComInterface>::VTable) -> Self {
+        Self::new(InterfacePtr::new(ptr))
+    }
+
     /// Gets the underlying interface ptr. This ptr is only guarnteed to live for
     /// as long as the current `InterfaceRc` is alive.
-    pub fn as_raw(&self) -> *mut c_void {
+    pub fn as_raw(&self) -> *mut *mut <T as ComInterface>::VTable {
         self.ptr.as_raw()
     }
 
@@ -41,7 +45,9 @@ impl<T: ?Sized + ComInterface> InterfaceRc<T> {
             return None;
         }
         assert!(!ppv.is_null(), "The pointer to the interface returned from a successful call to QueryInterface was null");
-        Some(InterfaceRc::new(unsafe { InterfacePtr::new(ppv) }))
+        Some(InterfaceRc::new(unsafe {
+            InterfacePtr::new(ppv as *mut *mut _)
+        }))
     }
 }
 

src/interfaces/iclass_factory.rs

@@ -4,7 +4,7 @@ use std::ffi::c_void;
 
 use crate::{
     interfaces::iunknown::{IUnknown, IUnknownVPtr},
-    ComInterface, InterfacePtr, InterfaceRc,
+    ComInterface, InterfaceRc,
 };
 
 #[com_interface("00000001-0000-0000-c000-000000000046")]
@@ -27,6 +27,6 @@ impl InterfaceRc<dyn IClassFactory> {
             // TODO: decide what failures are possible
             return None;
         }
-        Some(InterfaceRc::new(unsafe { InterfacePtr::new(ppv) }))
+        Some(unsafe { InterfaceRc::from_raw(ppv as *mut _) })
     }
 }

src/runtime.rs

@@ -50,9 +50,7 @@ impl ApartmentThreadedRuntime {
             return Err(hr);
         }
 
-        Ok(InterfaceRc::new(unsafe {
-            InterfacePtr::new(class_factory)
-        }))
+        Ok(unsafe { InterfaceRc::from_raw(class_factory as *mut *mut _) })
     }
 
     pub fn create_instance<T: ComInterface + ?Sized>(
@@ -91,7 +89,7 @@ impl ApartmentThreadedRuntime {
             return Err(hr);
         }
 
-        Ok(InterfacePtr::new(instance))
+        Ok(InterfacePtr::new(instance as *mut _))
     }
 }
 

src/sys.rs

@@ -21,7 +21,7 @@ pub const COINIT_APARTMENTTHREADED: u32 = 0x2;
 pub const CLSCTX_INPROC_SERVER: u32 = 0x1;
 
 #[repr(C)]
-#[derive(PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub struct IID {
     pub data1: u32,
     pub data2: u16,