Ensure external references to static factories are generated correctly (

#3392)
microsoft · Dec 13, 2024 · 103d38b · 103d38b
1 parent 198c61a
commit 103d38b
Show file tree

Hide file tree

Showing 8 changed files with 348 additions and 7 deletions.
diff --git a/crates/libs/bindgen/src/types/class.rs b/crates/libs/bindgen/src/types/class.rs
@@ -55,7 +55,7 @@ impl Class {
 
                 let method = method.write(
                     writer,
-                    interface.write_name(writer),
+                    Some(interface),
                     interface.kind,
                     &mut method_names,
                     &mut virtual_names,
@@ -88,12 +88,13 @@ impl Class {
                 if interface.def.methods().next().is_none() {
                     None
                 } else {
+                        let method_name = to_ident(interface.def.name());
                         let interface_type = interface.write_name(writer);
                         let cfg = quote! {};
 
                         Some(quote! {
                             #cfg
-                            fn #interface_type<R, F: FnOnce(&#interface_type) -> windows_core::Result<R>>(
+                            fn #method_name<R, F: FnOnce(&#interface_type) -> windows_core::Result<R>>(
                                 callback: F,
                             ) -> windows_core::Result<R> {
                                 static SHARED: windows_core::imp::FactoryCache<#name, #interface_type> =

diff --git a/crates/libs/bindgen/src/types/delegate.rs b/crates/libs/bindgen/src/types/delegate.rs
@@ -33,7 +33,7 @@ impl Delegate {
 
         let invoke = method.write(
             writer,
-            self.write_name(writer),
+            None,
             InterfaceKind::Default,
             &mut MethodNames::new(),
             &mut MethodNames::new(),

diff --git a/crates/libs/bindgen/src/types/interface.rs b/crates/libs/bindgen/src/types/interface.rs
@@ -240,7 +240,7 @@ impl Interface {
 
                     let method = method.write(
                         writer,
-                        self.write_name(writer),
+                        Some(self),
                         InterfaceKind::Default,
                         method_names,
                         virtual_names,
@@ -275,7 +275,7 @@ impl Interface {
 
                         let method = method.write(
                             writer,
-                            interface.write_name(writer),
+                            Some(interface),
                             interface.kind,
                             method_names,
                             virtual_names,

diff --git a/crates/libs/bindgen/src/types/method.rs b/crates/libs/bindgen/src/types/method.rs
@@ -280,7 +280,7 @@ impl Method {
     pub fn write(
         &self,
         writer: &Writer,
-        interface_name: TokenStream,
+        interface: Option<&Interface>,
         kind: InterfaceKind,
         method_names: &mut MethodNames,
         virtual_names: &mut MethodNames,
@@ -525,6 +525,8 @@ impl Method {
                     quote! { ? }
                 };
 
+                let interface_name = interface.unwrap().write_name(writer);
+
                 quote! {
                     pub fn #name<#(#generics,)*>(&self, #(#params)*) #return_type #where_clause {
                         let this = &windows_core::Interface::cast::<#interface_name>(self)#unwrap;
@@ -535,6 +537,8 @@ impl Method {
                 }
             }
             InterfaceKind::Static | InterfaceKind::Composable => {
+                let interface_name = to_ident(interface.unwrap().def.name());
+
                 quote! {
                     pub fn #name<#(#generics,)*>(#(#params)*) #return_type #where_clause {
                         Self::#interface_name(|this| unsafe { #vcall })

diff --git a/crates/tests/bindgen/Cargo.toml b/crates/tests/bindgen/Cargo.toml
@@ -17,7 +17,7 @@ workspace = true
 [dependencies.windows]
 workspace = true
 features = [
-    "Foundation",
+    "Foundation_Collections",
     "Win32_Foundation",
     "Win32_Security",
 ]

diff --git a/crates/tests/bindgen/src/lib.rs b/crates/tests/bindgen/src/lib.rs
@@ -68,6 +68,7 @@ pub mod reference_async_action_reference_type;
 pub mod reference_async_info_no_status;
 pub mod reference_async_info_status_filter;
 pub mod reference_async_info_status_reference;
+pub mod reference_class_ref_static;
 pub mod reference_dependency_flat;
 pub mod reference_dependency_full;
 pub mod reference_dependency_skip_root;