minor cleanup and improved a message in clipboard APIs

src/System.Windows.Forms/src/GlobalSuppressions.cs

@@ -230,7 +230,7 @@
 
 // Ideally these should be different exceptions, but leaving them as shipped for compatibility
 [assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.DataObject.Composition.NativeToWinFormsAdapter.ReadByteStreamFromHGLOBAL(Windows.Win32.Foundation.HGLOBAL,System.Boolean@)~System.IO.MemoryStream")]
-[assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.DataObject.Composition.NativeToRuntimeAdapter.System#Runtime#InteropServices#ComTypes#IDataObject#EnumFormatEtc(System.Runtime.InteropServices.ComTypes.DATADIR)~System.Runtime.InteropServices.ComTypes.IEnumFORMATETC")]
+[assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.DataObject.Composition.NativeToRuntimeAdapter.EnumFormatEtc(System.Runtime.InteropServices.ComTypes.DATADIR)~System.Runtime.InteropServices.ComTypes.IEnumFORMATETC")]
 [assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.Clipboard.SetDataObject(System.Object,System.Boolean,System.Int32,System.Int32)")]
 [assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.ComponentModel.Com2Interop.Com2TypeInfoProcessor.ProcessFunctions(Windows.Win32.System.Com.ITypeInfo*,System.Collections.Generic.IDictionary{System.String,System.Windows.Forms.ComponentModel.Com2Interop.Com2TypeInfoProcessor.PropertyInfo},System.Int32,System.Int32,System.Boolean@)")]
 [assembly: SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Compat", Scope = "member", Target = "~M:System.Windows.Forms.Control.ActiveXImpl.ThrowHr(Windows.Win32.Foundation.HRESULT)")]

src/System.Windows.Forms/src/Resources/SR.resx

@@ -7042,4 +7042,7 @@ Stack trace where the illegal operation occurred was:
   <data name="ClipboardOrDragDrop_CannotJsonSerializeDataObject">
     <value>An object of type 'DataObject' will serialize as empty. Use 'DataObject.SetDataAsJson' APIs on your object to JSON-serialize the data within your object, then use the '{0}' API with your object.</value>
   </data>
+  <data name="NotSupportedExceptionOnClipboard">
+    <value>Clipboard contains a 'NotSupportedException' that indicates that write operation failed. '{0}'.</value>
+  </data>
 </root>

src/System.Windows.Forms/src/System/Windows/Forms/OLE/Clipboard.cs

@@ -362,9 +362,14 @@ public static bool ContainsText(TextDataFormat format)
     {
         data = default;
         resolver.OrThrowIfNull();
+        if (!DataObject.IsValidFormatAndType<T>(format)
+            || GetDataObject() is not { } dataObject)
+        {
+            // Invalid format or no object on the clipboard at all.
+            return false;
+        }
 
-        return GetTypedDataObject<T>(format, out ITypedDataObject? typed)
-            && typed.TryGetData(format, resolver, autoConvert: false, out data);
+        return dataObject.TryGetData(format, resolver, autoConvert: false, out data);
     }
 
     /// <inheritdoc cref="TryGetData{T}(string, Func{TypeName, Type}, out T)"/>
@@ -373,30 +378,14 @@ public static bool ContainsText(TextDataFormat format)
         [NotNullWhen(true), MaybeNullWhen(false)] out T data)
     {
         data = default;
-
-        return GetTypedDataObject<T>(format, out ITypedDataObject? typed) && typed.TryGetData(format, out data);
-    }
-
-    private static bool GetTypedDataObject<T>(
-        string format,
-        [NotNullWhen(true), MaybeNullWhen(false)] out ITypedDataObject typed)
-    {
-        typed = default;
         if (!DataObject.IsValidFormatAndType<T>(format)
             || GetDataObject() is not { } dataObject)
         {
             // Invalid format or no object on the clipboard at all.
             return false;
         }
 
-        if (dataObject is not ITypedDataObject typedDataObject)
-        {
-            throw new NotSupportedException(
-                string.Format(SR.ITypeDataObject_Not_Implemented, dataObject.GetType().FullName));
-        }
-
-        typed = typedDataObject;
-        return true;
+        return dataObject.TryGetData(format, out data);
     }
 
     /// <summary>

src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.Composition.BinaryFormatUtilities.cs

@@ -116,7 +116,7 @@ record = stream.Decode(out recordMap);
                             && record.TryGetNotSupportedException(out object? @object)
                             && @object is NotSupportedException exception)
                         {
-                            throw new NotSupportedException(exception.Message);
+                            throw new NotSupportedException(string.Format(SR.NotSupportedExceptionOnClipboard, exception.Message));
                         }
 
                         return null;
@@ -135,7 +135,7 @@ record = stream.Decode(out recordMap);
                         typeof(T).FullName));
                 }
 
-                // NRBF deserializer is more secure than the BinaryFormatter is:
+                // NRBF deserializer fixes some known BinaryFormatter issues:
                 // 1. Doesn't allow arrays that have a non-zero base index (can't create these in C# or VB)
                 // 2. Only allows IObjectReference types that contain primitives (to avoid observable cycle
                 //    dependencies to indeterminate state)