Merge pull request #765 from microsoft/revert-762-fix754

Revert "Observe `DangerousAddRef` result before proceeding."
microsoft · Nov 11, 2022 · 6abc778 · 6abc778
2 parents 0d43ba7 + 48221ca
commit 6abc778
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -4745,12 +4745,6 @@ private IEnumerable<MethodDeclarationSyntax> DeclareFriendlyOverloads(MethodDefi
                     //// hTemplateFile.DangerousAddRef(ref hTemplateFileAddRef);
                     ExpressionStatement(InvocationExpression(MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, origName, IdentifierName(nameof(SafeHandle.DangerousAddRef))))
                         .WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(refAddedName).WithRefKindKeyword(TokenWithSpace(SyntaxKind.RefKeyword)))))),
-                    //// if (!hTemplateFileAddRef) throw new ArgumentException("Already released.", nameof(hTemplateFile));
-                    IfStatement(
-                        PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, refAddedName),
-                        ThrowStatement(ObjectCreationExpression(IdentifierName(nameof(ArgumentException))).AddArgumentListArguments(
-                            Argument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal("Already released."))),
-                            Argument(NameOfExpression(origName))))),
                     //// hTemplateFileLocal = (HANDLE)hTemplateFile.DangerousGetHandle();
                     ExpressionStatement(
                         AssignmentExpression(

diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -2651,7 +2651,6 @@ internal static unsafe Microsoft.Win32.SafeHandles.SafeFileHandle CreateFile(str
 					if (hTemplateFile is object)
 					{{
 						hTemplateFile.DangerousAddRef(ref hTemplateFileAddRef);
-						if (!hTemplateFileAddRef)throw new ArgumentException(""Already released."", nameof(hTemplateFile));
 						hTemplateFileLocal = (winmdroot.Foundation.HANDLE)hTemplateFile.DangerousGetHandle();
 					}}
 					else