Assume null for invalid handles where invalid values are not specified

Fixes #1180
microsoft · May 13, 2024 · b1c50c2 · b1c50c2
1 parent d45e56f
commit b1c50c2
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.FriendlyOverloads.cs b/src/Microsoft.Windows.CsWin32/Generator.FriendlyOverloads.cs
@@ -174,16 +174,13 @@ private IEnumerable<MethodDeclarationSyntax> DeclareFriendlyOverloads(MethodDefi
                 StatementSyntax nullHandleStatement = ThrowStatement(ObjectCreationExpression(IdentifierName(nameof(ArgumentNullException))).WithArgumentList(ArgumentList().AddArguments(Argument(NameOfExpression(IdentifierName(externParam.Identifier.ValueText))))));
                 if (isOptional)
                 {
+                    // (HANDLE)new IntPtr(-1);
                     HashSet<IntPtr> invalidValues = this.GetInvalidHandleValues(parameterHandleTypeInfo.Handle);
-                    if (invalidValues.Count > 0)
-                    {
-                        // (HANDLE)new IntPtr(-1);
-                        IntPtr invalidValue = GetPreferredInvalidHandleValue(invalidValues);
-                        ExpressionSyntax invalidExpression = CastExpression(externParam.Type, IntPtrExpr(invalidValue));
+                    IntPtr invalidValue = invalidValues.Count > 0 ? GetPreferredInvalidHandleValue(invalidValues) : IntPtr.Zero;
+                    ExpressionSyntax invalidExpression = CastExpression(externParam.Type, IntPtrExpr(invalidValue));
 
-                        // hTemplateFileLocal = invalid-handle-value;
-                        nullHandleStatement = ExpressionStatement(AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, typeDefHandleName, invalidExpression));
-                    }
+                    // hTemplateFileLocal = invalid-handle-value;
+                    nullHandleStatement = ExpressionStatement(AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, typeDefHandleName, invalidExpression));
                 }
 
                 // if (hTemplateFile is object)