Handle IDispatch edge case (#1642)

.github/workflows/build.yml

@@ -127,6 +127,7 @@ jobs:
         cargo clippy -p test_core &&
         cargo clippy -p test_debug &&
         cargo clippy -p test_deprecated &&
+        cargo clippy -p test_dispatch &&
         cargo clippy -p test_does_not_return &&
         cargo clippy -p test_enums &&
         cargo clippy -p test_error &&

.github/workflows/test.yml

@@ -80,6 +80,7 @@ jobs:
         cargo test --target ${{ matrix.target }} -p test_core &&
         cargo test --target ${{ matrix.target }} -p test_debug &&
         cargo test --target ${{ matrix.target }} -p test_deprecated &&
+        cargo test --target ${{ matrix.target }} -p test_dispatch &&
         cargo test --target ${{ matrix.target }} -p test_does_not_return &&
         cargo test --target ${{ matrix.target }} -p test_enums &&
         cargo test --target ${{ matrix.target }} -p test_error &&

crates/libs/bindgen/src/interfaces.rs

@@ -81,9 +81,8 @@ fn gen_methods(def: &TypeDef, cfg: &Cfg, gen: &Gen) -> TokenStream {
         match def {
             Type::IUnknown | Type::IInspectable => {}
             Type::TypeDef(def) => {
-                if def.type_name() != TypeName::IDispatch {
-                    methods.combine(&gen_methods_impl(&def, InterfaceKind::Default, &mut method_names, &mut virtual_names, bases, gen));
-                }
+                let kind = if def.type_name() == TypeName::IDispatch { InterfaceKind::NonDefault } else { InterfaceKind::Default };
+                methods.combine(&gen_methods_impl(&def, kind, &mut method_names, &mut virtual_names, bases, gen));
             }
             _ => unimplemented!(),
         }
@@ -116,7 +115,7 @@ fn gen_methods_impl(def: &TypeDef, kind: InterfaceKind, method_names: &mut Metho
         if is_winrt {
             methods.combine(&gen_winrt_method(def, kind, &method, method_names, virtual_names, gen));
         } else {
-            methods.combine(&gen_com_method(def, &method, method_names, virtual_names, bases, gen));
+            methods.combine(&gen_com_method(def, kind, &method, method_names, virtual_names, bases, gen));
         }
     }
 

crates/libs/bindgen/src/methods.rs

@@ -140,7 +140,7 @@ pub fn gen_winrt_method(def: &TypeDef, kind: InterfaceKind, method: &MethodDef,
     }
 }
 
-pub fn gen_com_method(def: &TypeDef, method: &MethodDef, method_names: &mut MethodNames, virtual_names: &mut MethodNames, base_count: usize, gen: &Gen) -> TokenStream {
+pub fn gen_com_method(def: &TypeDef, kind: InterfaceKind, method: &MethodDef, method_names: &mut MethodNames, virtual_names: &mut MethodNames, base_count: usize, gen: &Gen) -> TokenStream {
     let signature = method.signature(&def.generics);
     let name = method_names.add(method);
     let vname = virtual_names.add(method);
@@ -150,6 +150,10 @@ pub fn gen_com_method(def: &TypeDef, method: &MethodDef, method_names: &mut Meth
     let doc = gen.doc(&cfg);
     let features = gen.cfg(&cfg);
 
+    if kind == InterfaceKind::NonDefault {
+        return quote! {};
+    }
+
     let mut bases = quote! {};
 
     for _ in 0..base_count {

crates/libs/windows/src/Windows/Win32/System/RemoteManagement/mod.rs

@@ -2965,9 +2965,9 @@ impl IWSManSession {
     }
     #[doc = "*Required features: `\"Win32_System_RemoteManagement\"`, `\"Win32_Foundation\"`, `\"Win32_System_Com\"`, `\"Win32_System_Ole\"`*"]
     #[cfg(all(feature = "Win32_Foundation", feature = "Win32_System_Com", feature = "Win32_System_Ole"))]
-    pub unsafe fn Invoke<'a, Param0: ::windows::core::IntoParam<'a, super::super::Foundation::BSTR>, Param1: ::windows::core::IntoParam<'a, super::Com::VARIANT>, Param2: ::windows::core::IntoParam<'a, super::super::Foundation::BSTR>>(&self, actionuri: Param0, resourceuri: Param1, parameters: Param2, flags: i32) -> ::windows::core::Result<super::super::Foundation::BSTR> {
+    pub unsafe fn Invoke2<'a, Param0: ::windows::core::IntoParam<'a, super::super::Foundation::BSTR>, Param1: ::windows::core::IntoParam<'a, super::Com::VARIANT>, Param2: ::windows::core::IntoParam<'a, super::super::Foundation::BSTR>>(&self, actionuri: Param0, resourceuri: Param1, parameters: Param2, flags: i32) -> ::windows::core::Result<super::super::Foundation::BSTR> {
         let mut result__: ::core::mem::ManuallyDrop<super::super::Foundation::BSTR> = ::core::mem::zeroed();
-        (::windows::core::Interface::vtable(self).Invoke)(::core::mem::transmute_copy(self), actionuri.into_param().abi(), resourceuri.into_param().abi(), parameters.into_param().abi(), ::core::mem::transmute(flags), ::core::mem::transmute(&mut result__)).from_abi::<super::super::Foundation::BSTR>(result__)
+        (::windows::core::Interface::vtable(self).Invoke2)(::core::mem::transmute_copy(self), actionuri.into_param().abi(), resourceuri.into_param().abi(), parameters.into_param().abi(), ::core::mem::transmute(flags), ::core::mem::transmute(&mut result__)).from_abi::<super::super::Foundation::BSTR>(result__)
     }
     #[doc = "*Required features: `\"Win32_System_RemoteManagement\"`, `\"Win32_Foundation\"`, `\"Win32_System_Com\"`, `\"Win32_System_Ole\"`*"]
     #[cfg(all(feature = "Win32_Foundation", feature = "Win32_System_Com", feature = "Win32_System_Ole"))]

crates/tests/dispatch/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "test_dispatch"
+version = "0.0.0"
+authors = ["Microsoft"]
+edition = "2021"
+
+[dependencies.windows]
+path = "../../libs/windows"
+features = [
+    "Win32_Foundation",
+    "Win32_System_Com",
+    "Win32_System_Ole",
+    "Win32_System_RemoteManagement",
+]

crates/tests/dispatch/src/lib.rs

@@ -0,0 +1 @@
+

crates/tests/dispatch/tests/tests.rs

@@ -0,0 +1,2 @@
+// This test just ensures that IWSManSession is generated correctly as it has a method
+// that collides with one of IDispatch's methods.