Partially enable nullability in Control (#6901)

dotnet · Apr 29, 2022 · 498073f · 498073f
1 parent fb24bc0
commit 498073f
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 58 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs
@@ -21,7 +21,7 @@ HRESULT SetClientSite(
 
  [PreserveSig]
  HRESULT GetClientSite(
- out IOleClientSite ppClientSite);
+ out IOleClientSite? ppClientSite);
 
  [PreserveSig]
  HRESULT SetHostNames(
@@ -52,7 +52,7 @@ HRESULT InitFromData(
  [PreserveSig]
  HRESULT GetClipboardData(
  uint dwReserved,
- out IDataObject ppDataObject);
+ out IDataObject? ppDataObject);
 
  [PreserveSig]
  HRESULT DoVerb(
@@ -103,7 +103,7 @@ HRESULT Unadvise(
 
  [PreserveSig]
  HRESULT EnumAdvise(
- out IEnumSTATDATA e);
+ out IEnumSTATDATA? e);
 
  [PreserveSig]
  HRESULT GetMiscStatus(

diff --git a/...ystem.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs b/...ystem.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs
@@ -9,9 +9,9 @@ internal partial class Interop
  internal static partial class UiaCore
  {
  [DllImport(Libraries.UiaCore, CharSet = CharSet.Unicode)]
- public static extern nint UiaReturnRawElementProvider(IntPtr hwnd, nint wParam, nint lParam, IRawElementProviderSimple el);
+ public static extern nint UiaReturnRawElementProvider(IntPtr hwnd, nint wParam, nint lParam, IRawElementProviderSimple? el);
 
- public static nint UiaReturnRawElementProvider(IHandle hwnd, nint wParam, nint lParam, IRawElementProviderSimple el)
+ public static nint UiaReturnRawElementProvider(IHandle hwnd, nint wParam, nint lParam, IRawElementProviderSimple? el)
  {
  nint result = UiaReturnRawElementProvider(hwnd.Handle, wParam, lParam, el);
  GC.KeepAlive(hwnd);

diff --git a/src/System.Windows.Forms/src/PublicAPI.Shipped.txt b/src/System.Windows.Forms/src/PublicAPI.Shipped.txt
@@ -1047,7 +1047,7 @@ System.Windows.Forms.AxHost.State.State(System.Runtime.Serialization.Serializati
 ~System.Windows.Forms.Control.Region.get -> System.Drawing.Region
 ~System.Windows.Forms.Control.Region.set -> void
 ~System.Windows.Forms.Control.ScaleBitmapLogicalToDevice(ref System.Drawing.Bitmap logicalBitmap) -> void
-~System.Windows.Forms.Control.SelectNextControl(System.Windows.Forms.Control ctl, bool forward, bool tabStopOnly, bool nested, bool wrap) -> bool
+System.Windows.Forms.Control.SelectNextControl(System.Windows.Forms.Control? ctl, bool forward, bool tabStopOnly, bool nested, bool wrap) -> bool
 ~System.Windows.Forms.Control.Tag.get -> object
 ~System.Windows.Forms.Control.Tag.set -> void
 ~System.Windows.Forms.Control.TopLevelControl.get -> System.Windows.Forms.Control