Merge pull request #1337 from microsoft/fix1332

Fix build break when friendly methods are turned off and IUnknown is generated
microsoft · Jan 22, 2025 · 22d9475 · 22d9475
2 parents c5a4ec4 + 84f9c6e
commit 22d9475
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.Com.cs b/src/Microsoft.Windows.CsWin32/Generator.Com.cs
@@ -499,7 +499,7 @@ static ExpressionSyntax ThisPointer(PointerTypeSyntax? typedPointer = null)
         }
 
         // Add helper methods when appropriate.
-        if (hasIUnknownMembers)
+        if (hasIUnknownMembers && this.Options.FriendlyOverloads.Enabled)
         {
             members.AddRange(this.ExtractMembersFromTemplate("IUnknownHelperMethods"));
         }

diff --git a/src/Microsoft.Windows.CsWin32/templates/IUnknownHelperMethods.cs b/src/Microsoft.Windows.CsWin32/templates/IUnknownHelperMethods.cs
@@ -3,7 +3,9 @@
 	internal unsafe global::Windows.Win32.Foundation.HRESULT QueryInterface<T>(out T* ppv)
 		where T : unmanaged
 	{
-		var hr = this.QueryInterface(typeof(T).GUID, out void* pv);
+		Guid guid = typeof(T).GUID;
+		void* pv;
+		var hr = this.QueryInterface(&guid, &pv);
 		if (hr.Succeeded)
 		{
 			ppv = (T*)pv;

diff --git a/test/Microsoft.Windows.CsWin32.Tests/COMTests.cs b/test/Microsoft.Windows.CsWin32.Tests/COMTests.cs
@@ -457,13 +457,14 @@ a is
             }));
     }
 
-    [Fact]
-    public void IUnknown_QueryInterfaceGenericHelper()
+    [Theory, PairwiseData]
+    public void IUnknown_QueryInterfaceGenericHelper(bool friendlyOverloads)
     {
-        this.generator = this.CreateGenerator(new GeneratorOptions { AllowMarshaling = false });
+        this.generator = this.CreateGenerator(new GeneratorOptions { AllowMarshaling = false, FriendlyOverloads = new GeneratorOptions.FriendlyOverloadOptions { Enabled = friendlyOverloads } });
 
         this.GenerateApi("IUnknown");
-        Assert.Contains(this.FindGeneratedMethod("QueryInterface"), m => m.TypeParameterList?.Parameters.Count == 1);
+        bool matchFound = this.FindGeneratedMethod("QueryInterface").Any(m => m.TypeParameterList?.Parameters.Count == 1);
+        Assert.Equal(friendlyOverloads, matchFound);
     }
 
     [Fact]