Update windows-bindgen to support unsafe_op_in_unsafe_fn (#3393)

microsoft · Dec 13, 2024 · aca1a34 · aca1a34
1 parent 103d38b
commit aca1a34
Show file tree

Hide file tree

Showing 501 changed files with 356,363 additions and 236,903 deletions.
diff --git a/.github/workflows/msrv-windows-registry.yml b/.github/workflows/msrv-windows-registry.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     strategy:
       matrix:
-        rust: [1.60.0, stable, nightly]
+        rust: [1.74.0, stable, nightly]
     runs-on: windows-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/msrv-windows-result.yml b/.github/workflows/msrv-windows-result.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     strategy:
       matrix:
-        rust: [1.60.0, stable, nightly]
+        rust: [1.74.0, stable, nightly]
         runs-on:
           - windows-latest
           - ubuntu-latest

diff --git a/.github/workflows/msrv-windows-strings.yml b/.github/workflows/msrv-windows-strings.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     strategy:
       matrix:
-        rust: [1.60.0, stable, nightly]
+        rust: [1.74.0, stable, nightly]
     runs-on: windows-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/msrv-windows-version.yml b/.github/workflows/msrv-windows-version.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     strategy:
       matrix:
-        rust: [1.60.0, stable, nightly]
+        rust: [1.74.0, stable, nightly]
     runs-on: windows-latest
     steps:
       - name: Checkout

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ exclude = [
 [workspace.lints.rust]
 rust_2018_idioms = { level = "warn", priority = -1 }
 missing_docs = "warn"
+unsafe_op_in_unsafe_fn = "warn"
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_raw_dylib, windows_debugger_visualizer, windows_slim_errors)'] }
 
 [workspace.dependencies]

diff --git a/crates/libs/bindgen/src/types/cpp_fn.rs b/crates/libs/bindgen/src/types/cpp_fn.rs
@@ -110,7 +110,7 @@ impl CppFn {
                     pub unsafe fn #name<#generics T>(#params) -> windows_core::Result<T> #where_clause {
                         #link
                         let mut result__ = core::ptr::null_mut();
-                        #name(#args).and_then(||windows_core::Type::from_abi(result__))
+                        unsafe { #name(#args).and_then(||windows_core::Type::from_abi(result__)) }
                     }
                 }
             }
@@ -122,7 +122,7 @@ impl CppFn {
                     #[inline]
                     pub unsafe fn #name<#generics T>(#params result__: *mut Option<T>) -> windows_core::Result<()> #where_clause {
                         #link
-                        #name(#args).ok()
+                        unsafe { #name(#args).ok() }
                     }
                 }
             }
@@ -143,8 +143,10 @@ impl CppFn {
                     #[inline]
                     pub unsafe fn #name<#generics>(#params) -> windows_core::Result<#return_type> #where_clause {
                         #link
-                        let mut result__ = core::mem::zeroed();
-                        #name(#args).#map
+                        unsafe {
+                            let mut result__ = core::mem::zeroed();
+                            #name(#args).#map
+                        }
                     }
                 }
             }
@@ -156,7 +158,7 @@ impl CppFn {
                     #[inline]
                     pub unsafe fn #name<#generics>(#params) -> windows_core::Result<()> #where_clause {
                         #link
-                        #name(#args).ok()
+                        unsafe { #name(#args).ok() }
                     }
                 }
             }
@@ -175,9 +177,11 @@ impl CppFn {
                         #[inline]
                         pub unsafe fn #name<#generics>(#params) -> windows_core::Result<#return_type> #where_clause {
                             #link
-                            let mut result__ = core::mem::zeroed();
-                            #name(#args);
-                            windows_core::Type::from_abi(result__)
+                            unsafe {
+                                let mut result__ = core::mem::zeroed();
+                                #name(#args);
+                                windows_core::Type::from_abi(result__)
+                            }
                         }
                     }
                 } else {
@@ -195,9 +199,11 @@ impl CppFn {
                         #[inline]
                         pub unsafe fn #name<#generics>(#params) -> #return_type #where_clause {
                             #link
-                            let mut result__ = core::mem::zeroed();
-                            #name(#args);
-                            #map
+                            unsafe {
+                                let mut result__ = core::mem::zeroed();
+                                #name(#args);
+                                #map
+                            }
                         }
                     }
                 }
@@ -213,7 +219,7 @@ impl CppFn {
                         #[inline]
                         pub unsafe fn #name<#generics>(#params) -> windows_core::Result<#return_type> #where_clause {
                             #link
-                            let result__ = #name(#args);
+                            let result__ = unsafe { #name(#args) };
                             (!result__.is_invalid()).then_some(result__).ok_or_else(windows_core::Error::from_win32)
                         }
                     }
@@ -223,7 +229,7 @@ impl CppFn {
                         #[inline]
                         pub unsafe fn #name<#generics>(#params) #abi_return_type #where_clause {
                             #link
-                            #name(#args)
+                            unsafe { #name(#args) }
                         }
                     }
                 }

diff --git a/crates/libs/bindgen/src/types/cpp_interface.rs b/crates/libs/bindgen/src/types/cpp_interface.rs
@@ -270,16 +270,20 @@ impl CppInterface {
                     if has_unknown_base {
                     quote! {
                         unsafe extern "system" fn #name<Identity: #impl_name, const OFFSET: isize> #signature {
-                            let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
-                            #upcall
+                            unsafe {
+                                let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
+                                #upcall
+                            }
                         }
                     }
                 } else {
                     quote! {
                         unsafe extern "system" fn #name<Identity: #impl_name> #signature {
-                            let this = (this as *mut *mut core::ffi::c_void) as *const windows_core::ScopedHeap;
-                            let this = &*((*this).this as *const Identity);
-                            #upcall
+                            unsafe {
+                                let this = (this as *mut *mut core::ffi::c_void) as *const windows_core::ScopedHeap;
+                                let this = &*((*this).this as *const Identity);
+                                #upcall
+                            }
                         }
                     }
                 }

diff --git a/crates/libs/bindgen/src/types/cpp_method.rs b/crates/libs/bindgen/src/types/cpp_method.rs
@@ -284,7 +284,7 @@ impl CppMethod {
                 quote! {
                     pub unsafe fn #name<#generics T>(&self, #params) -> windows_core::Result<T> #where_clause {
                         let mut result__ = core::ptr::null_mut();
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).and_then(||windows_core::Type::from_abi(result__))
+                        unsafe { (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).and_then(||windows_core::Type::from_abi(result__)) }
                     }
                 }
             }
@@ -293,7 +293,7 @@ impl CppMethod {
 
                 quote! {
                     pub unsafe fn #name<#generics T>(&self, #params result__: *mut Option<T>) -> windows_core::Result<()> #where_clause {
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).ok()
+                        unsafe { (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).ok() }
                     }
                 }
             }
@@ -316,8 +316,10 @@ impl CppMethod {
 
                 quote! {
                     pub unsafe fn #name<#generics>(&self, #params) -> windows_core::Result<#return_type> #where_clause {
-                        let mut result__ = core::mem::zeroed();
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).#map
+                        unsafe {
+                            let mut result__ = core::mem::zeroed();
+                            (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).#map
+                        }
                     }
                 }
             }
@@ -326,7 +328,7 @@ impl CppMethod {
 
                 quote! {
                     pub unsafe fn #name<#generics>(&self, #params) -> windows_core::Result<()> #where_clause {
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).ok()
+                        unsafe { (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args).ok() }
                     }
                 }
             }
@@ -342,9 +344,11 @@ impl CppMethod {
 
                     quote! {
                         pub unsafe fn #name<#generics>(&self, #params) -> windows_core::Result<#return_type> #where_clause {
-                            let mut result__ = core::mem::zeroed();
-                            (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args);
-                            windows_core::Type::from_abi(result__)
+                            unsafe {
+                                let mut result__ = core::mem::zeroed();
+                                (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args);
+                                windows_core::Type::from_abi(result__)
+                            }
                         }
                     }
                 } else {
@@ -359,9 +363,11 @@ impl CppMethod {
 
                     quote! {
                         pub unsafe fn #name<#generics>(&self, #params) -> #return_type #where_clause {
-                            let mut result__ = core::mem::zeroed();
-                            (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args);
-                            #map
+                            unsafe {
+                                let mut result__ = core::mem::zeroed();
+                                (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args);
+                                #map
+                            }
                         }
                     }
                 }
@@ -372,9 +378,11 @@ impl CppMethod {
 
                 quote! {
                     pub unsafe fn #name<#generics>(&self, #params) -> #return_type #where_clause {
-                        let mut result__ = core::mem::zeroed();
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), &mut result__, #args);
-                        result__
+                        unsafe {
+                            let mut result__ = core::mem::zeroed();
+                            (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), &mut result__, #args);
+                            result__
+                        }
                     }
                 }
             }
@@ -383,7 +391,7 @@ impl CppMethod {
 
                 quote! {
                     pub unsafe fn #name<#generics>(&self, #params) #abi_return_type #where_clause {
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args)
+                        unsafe { (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args) }
                     }
                 }
             }

diff --git a/crates/libs/bindgen/src/types/delegate.rs b/crates/libs/bindgen/src/types/delegate.rs
@@ -128,44 +128,52 @@ impl Delegate {
                     #named_phantoms
                 };
                 unsafe extern "system" fn QueryInterface(this: *mut core::ffi::c_void, iid: *const windows_core::GUID, interface: *mut *mut core::ffi::c_void) -> windows_core::HRESULT {
-                    let this = this as *mut *mut core::ffi::c_void as *mut Self;
-
-                    if iid.is_null() || interface.is_null() {
-                        return windows_core::HRESULT(-2147467261); // E_POINTER
-                    }
-
-                    *interface = if *iid == <#name as windows_core::Interface>::IID ||
-                        *iid == <windows_core::IUnknown as windows_core::Interface>::IID ||
-                        *iid == <windows_core::imp::IAgileObject as windows_core::Interface>::IID {
-                            &mut (*this).vtable as *mut _ as _
+                    unsafe {
+                        let this = this as *mut *mut core::ffi::c_void as *mut Self;
+
+                        if iid.is_null() || interface.is_null() {
+                            return windows_core::HRESULT(-2147467261); // E_POINTER
+                        }
+
+                        *interface = if *iid == <#name as windows_core::Interface>::IID ||
+                            *iid == <windows_core::IUnknown as windows_core::Interface>::IID ||
+                            *iid == <windows_core::imp::IAgileObject as windows_core::Interface>::IID {
+                                &mut (*this).vtable as *mut _ as _
+                            } else {
+                                core::ptr::null_mut()
+                            };
+
+                        if (*interface).is_null() {
+                            windows_core::HRESULT(-2147467262) // E_NOINTERFACE
                         } else {
-                            core::ptr::null_mut()
-                        };
-
-                    if (*interface).is_null() {
-                        windows_core::HRESULT(-2147467262) // E_NOINTERFACE
-                    } else {
-                        (*this).count.add_ref();
-                        windows_core::HRESULT(0)
+                            (*this).count.add_ref();
+                            windows_core::HRESULT(0)
+                        }
                     }
                 }
                 unsafe extern "system" fn AddRef(this: *mut core::ffi::c_void) -> u32 {
-                    let this = this as *mut *mut core::ffi::c_void as *mut Self;
-                    (*this).count.add_ref()
+                    unsafe {
+                        let this = this as *mut *mut core::ffi::c_void as *mut Self;
+                        (*this).count.add_ref()
+                    }
                 }
                 unsafe extern "system" fn Release(this: *mut core::ffi::c_void) -> u32 {
-                    let this = this as *mut *mut core::ffi::c_void as *mut Self;
-                    let remaining = (*this).count.release();
+                    unsafe {
+                        let this = this as *mut *mut core::ffi::c_void as *mut Self;
+                        let remaining = (*this).count.release();
 
-                    if remaining == 0 {
-                        let _ = windows_core::imp::Box::from_raw(this);
-                    }
+                        if remaining == 0 {
+                            let _ = windows_core::imp::Box::from_raw(this);
+                        }
 
-                    remaining
+                        remaining
+                    }
                 }
                 unsafe extern "system" fn Invoke(#invoke_vtbl) -> windows_core::HRESULT {
-                    let this = &mut *(this as *mut *mut core::ffi::c_void as *mut Self);
-                    #invoke_upcall
+                    unsafe {
+                        let this = &mut *(this as *mut *mut core::ffi::c_void as *mut Self);
+                        #invoke_upcall
+                    }
                 }
             }
         }

diff --git a/crates/libs/bindgen/src/types/interface.rs b/crates/libs/bindgen/src/types/interface.rs
@@ -402,8 +402,10 @@ impl Interface {
 
                     quote! {
                         unsafe extern "system" fn #name<#constraints Identity: #impl_name <#(#generics,)*>, const OFFSET: isize> (#signature) -> windows_core::HRESULT {
-                            let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
-                            #upcall
+                            unsafe {
+                                let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
+                                #upcall
+                            }
                         }
                     }
                 }

diff --git a/crates/libs/bindgen/src/writer/cpp_handle.rs b/crates/libs/bindgen/src/writer/cpp_handle.rs
@@ -80,7 +80,7 @@ impl Writer {
                             unsafe fn free(&mut self) {
                                 if !self.is_invalid() {
                                     #link
-                                    #free(self.0 #tail);
+                                    unsafe { #free(self.0 #tail); }
                                 }
                             }
                         }

diff --git a/crates/libs/core/src/as_impl.rs b/crates/libs/core/src/as_impl.rs
@@ -7,7 +7,7 @@ pub trait AsImpl<T> {
     /// The caller needs to ensure that `self` is actually implemented by the
     /// implementation `T`.
     unsafe fn as_impl(&self) -> &T {
-        self.as_impl_ptr().as_ref()
+        unsafe { self.as_impl_ptr().as_ref() }
     }
 
     /// Returns a pointer to the implementation object.