Simpler code gen for Boolean parameters (#3373)

microsoft · Dec 10, 2024 · 1332b65 · 1332b65
1 parent 65acfb7
commit 1332b65
Show file tree

Hide file tree

Showing 226 changed files with 3,682 additions and 9,447 deletions.
diff --git a/crates/libs/bindgen/src/types/cpp_method.rs b/crates/libs/bindgen/src/types/cpp_method.rs
@@ -31,6 +31,7 @@ pub enum ParamHint {
     Optional,
     ValueType,
     Blittable,
+    Bool,
 }
 
 impl ParamHint {
@@ -150,29 +151,25 @@ impl CppMethod {
 
         for (position, hint) in param_hints.iter_mut().enumerate() {
             if *hint == ParamHint::None {
-                if is_convertible(
-                    &signature.params[position].0,
-                    signature.params[position].1,
-                    *hint,
-                ) {
+                let ty = &signature.params[position].0;
+                let param = signature.params[position].1;
+                let flags = param.flags();
+
+                if is_convertible(ty, param, *hint) {
                     *hint = ParamHint::IntoParam;
-                } else {
-                    let flags = signature.params[position].1.flags();
-                    if signature.params[position].0.is_copyable()
-                        && (flags.contains(ParamAttributes::Optional)
-                            || signature.params[position]
-                                .1
-                                .has_attribute("ReservedAttribute"))
-                    {
-                        *hint = ParamHint::Optional;
-                    } else if signature.params[position].0.is_primitive()
-                        && (!signature.params[position].0.is_pointer()
-                            || signature.params[position].0.deref().is_copyable())
-                    {
-                        *hint = ParamHint::ValueType;
-                    } else if signature.params[position].0.is_copyable() {
-                        *hint = ParamHint::Blittable;
-                    }
+                } else if ty.is_copyable()
+                    && (flags.contains(ParamAttributes::Optional)
+                        || param.has_attribute("ReservedAttribute"))
+                {
+                    *hint = ParamHint::Optional;
+                } else if !flags.contains(ParamAttributes::Out)
+                    && matches!(ty.type_name(), TypeName::BOOL | TypeName::BOOLEAN)
+                {
+                    *hint = ParamHint::Bool;
+                } else if ty.is_primitive() && (!ty.is_pointer() || ty.deref().is_copyable()) {
+                    *hint = ParamHint::ValueType;
+                } else if ty.is_copyable() {
+                    *hint = ParamHint::Blittable;
                 }
             }
         }
@@ -612,6 +609,9 @@ impl CppMethod {
                     let kind = ty.write_default(writer);
                     tokens.combine(&quote! { #name: Option<#kind>, });
                 }
+                ParamHint::Bool => {
+                    tokens.combine(&quote! { #name: bool, });
+                }
                 ParamHint::ValueType | ParamHint::Blittable => {
                     let kind = ty.write_default(writer);
                     tokens.combine(&quote! { #name: #kind, });
@@ -677,6 +677,9 @@ impl CppMethod {
                         ParamHint::Optional => {
                             quote! { core::mem::transmute(#name.unwrap_or(core::mem::zeroed())), }
                         }
+                        ParamHint::Bool => {
+                            quote! { #name.into(), }
+                        }
                         ParamHint::ValueType => {
                             quote! { core::mem::transmute(#name), }
                         }

diff --git a/crates/libs/bindgen/src/types/cpp_struct.rs b/crates/libs/bindgen/src/types/cpp_struct.rs
@@ -240,10 +240,6 @@ impl CppStruct {
         }
     }
 
-    pub fn is_convertible(&self) -> bool {
-        matches!(self.def.type_name(), TypeName::BOOL | TypeName::BOOLEAN)
-    }
-
     pub fn is_copyable(&self) -> bool {
         if matches!(
             self.def.type_name(),

diff --git a/crates/libs/bindgen/src/types/mod.rs b/crates/libs/bindgen/src/types/mod.rs
@@ -721,14 +721,18 @@ impl Type {
     }
 
     pub fn is_convertible(&self) -> bool {
-        match self {
-            Self::CppStruct(ty) => ty.is_convertible(),
-            Self::Delegate(..) | Self::Interface(..) | Self::Class(..) | Self::CppInterface(..) => {
-                true
-            }
-            Self::PCSTR | Self::PCWSTR | Self::Object | Self::IUnknown | Self::Param(_) => true,
-            _ => false,
-        }
+        matches!(
+            self,
+            Self::Delegate(..)
+                | Self::Interface(..)
+                | Self::Class(..)
+                | Self::CppInterface(..)
+                | Self::PCSTR
+                | Self::PCWSTR
+                | Self::Object
+                | Self::IUnknown
+                | Self::Param(_)
+        )
     }
 
     pub fn is_const_ref(&self) -> bool {
@@ -950,7 +954,7 @@ impl Type {
             Self::String => TypeName("", "String"),
             Self::Object => TypeName("", "Object"),
 
-            rest => panic!("{rest:?}"),
+            _ => TypeName("", ""),
         }
     }
 

diff --git a/crates/libs/bindgen/src/writer/cpp_handle.rs b/crates/libs/bindgen/src/writer/cpp_handle.rs
@@ -104,9 +104,6 @@ impl Writer {
                 #[repr(transparent)]
                 #[derive(#derive)]
                 pub struct #name(pub #ty_name);
-                impl windows_core::TypeKind for #name { // TODO: get rid of TypeKind on Win32 types
-                    type TypeKind = windows_core::CopyType;
-                }
                 #is_invalid
                 #free
                 #default

diff --git a/crates/libs/windows/src/Windows/Wdk/Devices/HumanInterfaceDevice/mod.rs b/crates/libs/windows/src/Windows/Wdk/Devices/HumanInterfaceDevice/mod.rs
@@ -9,12 +9,9 @@ pub unsafe fn VhfCreate(vhfconfig: *const VHF_CONFIG, vhfhandle: *mut *mut core:
     VhfCreate(core::mem::transmute(vhfconfig), core::mem::transmute(vhfhandle))
 }
 #[inline]
-pub unsafe fn VhfDelete<P1>(vhfhandle: *const core::ffi::c_void, wait: P1)
-where
-    P1: windows_core::Param<super::super::super::Win32::Foundation::BOOLEAN>,
-{
+pub unsafe fn VhfDelete(vhfhandle: *const core::ffi::c_void, wait: bool) {
     windows_targets::link!("vhfum.dll" "system" fn VhfDelete(vhfhandle : *const core::ffi::c_void, wait : super::super::super::Win32::Foundation:: BOOLEAN));
-    VhfDelete(core::mem::transmute(vhfhandle), wait.param().abi())
+    VhfDelete(core::mem::transmute(vhfhandle), wait.into())
 }
 #[inline]
 pub unsafe fn VhfReadReportSubmit(vhfhandle: *const core::ffi::c_void, hidtransferpacket: *const HID_XFER_PACKET) -> super::super::super::Win32::Foundation::NTSTATUS {