Make the matches function safe (#2761)

microsoft · Dec 29, 2023 · 8a25767 · 8a25767
1 parent 12231a0
commit 8a25767
Show file tree

Hide file tree

Showing 283 changed files with 14,546 additions and 14,544 deletions.
diff --git a/crates/libs/bindgen/src/rust/implements.rs b/crates/libs/bindgen/src/rust/implements.rs
@@ -29,7 +29,7 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
         }
     }
 
-    let mut matches = quote! { *iid == <#type_ident as ::windows_core::ComInterface>::IID };
+    let mut matches = quote! { iid == &<#type_ident as ::windows_core::ComInterface>::IID };
 
     if let Some(metadata::Type::TypeDef(def, _)) = vtables.last() {
         requires.combine(&gen_required_trait(writer, *def, &[]))
@@ -40,7 +40,7 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
             let name = writer.type_def_name(*def, generics);
 
             matches.combine(&quote! {
-                || *iid == <#name as ::windows_core::ComInterface>::IID
+                || iid == &<#name as ::windows_core::ComInterface>::IID
             })
         }
     }
@@ -143,7 +143,7 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
                         #(#named_phantoms)*
                     }
                 }
-                pub unsafe fn matches(iid: *const ::windows_core::GUID) -> bool {
+                pub fn matches(iid: &::windows_core::GUID) -> bool {
                     #matches
                 }
             }

diff --git a/crates/libs/core/src/imp/weak_ref_count.rs b/crates/libs/core/src/imp/weak_ref_count.rs
@@ -32,8 +32,8 @@ impl WeakRefCount {
     }
 
     /// # Safety
-    pub unsafe fn query(&self, iid: *const crate::GUID, object: *mut std::ffi::c_void) -> *mut std::ffi::c_void {
-        if *iid != IWeakReferenceSource::IID {
+    pub unsafe fn query(&self, iid: &crate::GUID, object: *mut std::ffi::c_void) -> *mut std::ffi::c_void {
+        if iid != &IWeakReferenceSource::IID {
             return std::ptr::null_mut();
         }
 

diff --git a/crates/libs/implement/src/lib.rs b/crates/libs/implement/src/lib.rs
@@ -133,9 +133,11 @@ pub fn implement(attributes: proc_macro::TokenStream, original_type: proc_macro:
                     return ::windows::core::HRESULT(-2147467261); // E_POINTER
                 }
 
-                *interface = if *iid == <::windows::core::IUnknown as ::windows::core::ComInterface>::IID
-                    || *iid == <::windows::core::IInspectable as ::windows::core::ComInterface>::IID
-                    || *iid == <::windows::core::imp::IAgileObject as ::windows::core::ComInterface>::IID {
+                let iid = &*iid;
+
+                *interface = if iid == &<::windows::core::IUnknown as ::windows::core::ComInterface>::IID
+                    || iid == &<::windows::core::IInspectable as ::windows::core::ComInterface>::IID
+                    || iid == &<::windows::core::imp::IAgileObject as ::windows::core::ComInterface>::IID {
                         &self.identity as *const _ as *mut _
                 } #(#queries)* else {
                     ::core::ptr::null_mut()

diff --git a/crates/libs/interface/src/lib.rs b/crates/libs/interface/src/lib.rs
@@ -258,8 +258,8 @@ impl Interface {
                         Self { base__: #parent_vtable::new::<#parent_vtable_generics>(), #(#entries),* }
                     }
 
-                    pub unsafe fn matches(iid: *const windows::core::GUID) -> bool {
-                        *iid == <#name as ::windows::core::ComInterface>::IID
+                    pub fn matches(iid: &windows::core::GUID) -> bool {
+                        iid == &<#name as ::windows::core::ComInterface>::IID
                     }
                 }
             }

diff --git a/crates/libs/windows/src/Windows/AI/MachineLearning/impl.rs b/crates/libs/windows/src/Windows/AI/MachineLearning/impl.rs
@@ -63,8 +63,8 @@ impl ILearningModelFeatureDescriptor_Vtbl {
             IsRequired: IsRequired::<Identity, Impl, OFFSET>,
         }
     }
-    pub unsafe fn matches(iid: *const ::windows_core::GUID) -> bool {
-        *iid == <ILearningModelFeatureDescriptor as ::windows_core::ComInterface>::IID
+    pub fn matches(iid: &::windows_core::GUID) -> bool {
+        iid == &<ILearningModelFeatureDescriptor as ::windows_core::ComInterface>::IID
     }
 }
 pub trait ILearningModelFeatureValue_Impl: Sized {
@@ -88,8 +88,8 @@ impl ILearningModelFeatureValue_Vtbl {
         }
         Self { base__: ::windows_core::IInspectable_Vtbl::new::<Identity, ILearningModelFeatureValue, OFFSET>(), Kind: Kind::<Identity, Impl, OFFSET> }
     }
-    pub unsafe fn matches(iid: *const ::windows_core::GUID) -> bool {
-        *iid == <ILearningModelFeatureValue as ::windows_core::ComInterface>::IID
+    pub fn matches(iid: &::windows_core::GUID) -> bool {
+        iid == &<ILearningModelFeatureValue as ::windows_core::ComInterface>::IID
     }
 }
 pub trait ILearningModelOperatorProvider_Impl: Sized {}
@@ -100,8 +100,8 @@ impl ILearningModelOperatorProvider_Vtbl {
     pub const fn new<Identity: ::windows_core::IUnknownImpl<Impl = Impl>, Impl: ILearningModelOperatorProvider_Impl, const OFFSET: isize>() -> ILearningModelOperatorProvider_Vtbl {
         Self { base__: ::windows_core::IInspectable_Vtbl::new::<Identity, ILearningModelOperatorProvider, OFFSET>() }
     }
-    pub unsafe fn matches(iid: *const ::windows_core::GUID) -> bool {
-        *iid == <ILearningModelOperatorProvider as ::windows_core::ComInterface>::IID
+    pub fn matches(iid: &::windows_core::GUID) -> bool {
+        iid == &<ILearningModelOperatorProvider as ::windows_core::ComInterface>::IID
     }
 }
 #[doc = "Required features: `\"Foundation_Collections\"`"]
@@ -146,7 +146,7 @@ impl ITensor_Vtbl {
             Shape: Shape::<Identity, Impl, OFFSET>,
         }
     }
-    pub unsafe fn matches(iid: *const ::windows_core::GUID) -> bool {
-        *iid == <ITensor as ::windows_core::ComInterface>::IID
+    pub fn matches(iid: &::windows_core::GUID) -> bool {
+        iid == &<ITensor as ::windows_core::ComInterface>::IID
     }
 }