Skip to content

Enable nullable: System.Management.Automation.IDispatch #14185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 3 commits into from
May 26, 2021
Merged

Enable nullable: System.Management.Automation.IDispatch #14185

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a269af3
Enable nullable: System.Management.Automation.IDispatch
powercode Nov 20, 2020
9d4ef58
Removing whitespace before/after nullable pragma
powercode Nov 20, 2020
ace35c3
Removing ununsed using
powercode May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/System.Management.Automation/engine/COM/ComDispatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

using COM = System.Runtime.InteropServices.ComTypes;

#nullable enable
namespace System.Management.Automation
{
/// <summary>
Expand All @@ -19,7 +20,7 @@ internal interface IDispatch
int GetTypeInfoCount(out int info);

[PreserveSig]
int GetTypeInfo(int iTInfo, int lcid, out COM.ITypeInfo ppTInfo);
int GetTypeInfo(int iTInfo, int lcid, out COM.ITypeInfo? ppTInfo);
Comment thread
powercode marked this conversation as resolved.

void GetIDsOfNames(
[MarshalAs(UnmanagedType.LPStruct)] Guid iid,
Expand All @@ -34,7 +35,7 @@ void Invoke(
int lcid,
COM.INVOKEKIND wFlags,
[In, Out][MarshalAs(UnmanagedType.LPArray)] COM.DISPPARAMS[] paramArray,
out object pVarResult,
out object? pVarResult,
Copy link
Copy Markdown
Collaborator Author

@powercode powercode Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VARIANT *pVarResult,

Pointer to the location where the result is to be stored, or NULL if the caller expects no result. This argument is ignored if DISPATCH_PROPERTYPUT or DISPATCH_PROPERTYPUTREF is specified.

out ComInvoker.EXCEPINFO pExcepInfo,
Copy link
Copy Markdown
Collaborator Author

@powercode powercode Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EXCEPINFO* pExcepInfo

Pointer to a structure that contains exception information. This structure should be filled in if DISP_E_EXCEPTION is returned. Can be NULL.

This can be null, but as we use a struct for ComInvoker.EXCEPTINFO, it shouldn't be marked as ?

out uint puArgErr);
}
Expand Down