Remove local CoTaskMemAlloc and CoTaskMemFree.

src/libraries/System.Data.OleDb/src/DbPropSet.cs

@@ -24,13 +24,13 @@ public DBPropSet() : base(IntPtr.Zero, true)
         internal DBPropSet(int propertysetCount) : this()
         {
             this.propertySetCount = propertysetCount;
-            IntPtr countOfBytes = (IntPtr)(propertysetCount * ODB.SizeOf_tagDBPROPSET);
+            nuint countOfBytes = (nuint)(propertysetCount * ODB.SizeOf_tagDBPROPSET);
             RuntimeHelpers.PrepareConstrainedRegions();
             try
             { }
             finally
             {
-                base.handle = SafeNativeMethods.CoTaskMemAlloc(countOfBytes);
+                base.handle = Interop.Ole32.CoTaskMemAlloc(countOfBytes);
                 if (ADP.PtrZero != base.handle)
                 {
                     SafeNativeMethods.ZeroMemory(base.handle, (int)countOfBytes);
@@ -147,10 +147,10 @@ protected override bool ReleaseHandle()
                         {
                             SafeNativeMethods.VariantClear(vptr);
                         }
-                        SafeNativeMethods.CoTaskMemFree(rgProperties);
+                        Interop.Ole32.CoTaskMemFree(rgProperties);
                     }
                 }
-                SafeNativeMethods.CoTaskMemFree(ptr);
+                Interop.Ole32.CoTaskMemFree(ptr);
             }
             return true;
         }
@@ -227,7 +227,7 @@ internal void SetPropertySet(int index, Guid propertySet, ItagDBPROP[] propertie
             Debug.Assert(Guid.Empty != propertySet, "invalid propertySet");
             Debug.Assert((null != properties) && (0 < properties.Length), "invalid properties");
 
-            IntPtr countOfBytes = (IntPtr)(properties.Length * ODB.SizeOf_tagDBPROP);
+            nuint countOfBytes = (nuint)(properties.Length * ODB.SizeOf_tagDBPROP);
             tagDBPROPSET propset = new tagDBPROPSET(properties.Length, propertySet);
 
             bool mustRelease = false;
@@ -244,7 +244,7 @@ internal void SetPropertySet(int index, Guid propertySet, ItagDBPROP[] propertie
                 finally
                 {
                     // must allocate and clear the memory without interruption
-                    propset.rgProperties = SafeNativeMethods.CoTaskMemAlloc(countOfBytes);
+                    propset.rgProperties = Interop.Ole32.CoTaskMemAlloc(countOfBytes);
                     if (ADP.PtrZero != propset.rgProperties)
                     {
                         // clearing is important so that we don't treat existing

src/libraries/System.Data.OleDb/src/PropertyInfoSet.cs

@@ -129,17 +129,17 @@ protected override bool ReleaseHandle()
                             IntPtr valuePtr = ADP.IntPtrOffset(infoPtr, (k * ODB.SizeOf_tagDBPROPINFO) + ODB.OffsetOf_tagDBPROPINFO_Value);
                             SafeNativeMethods.VariantClear(valuePtr);
                         }
-                        SafeNativeMethods.CoTaskMemFree(infoPtr); // was allocated by provider
+                        Interop.Ole32.CoTaskMemFree(infoPtr); // was allocated by provider
                     }
                 }
-                SafeNativeMethods.CoTaskMemFree(ptr);
+                Interop.Ole32.CoTaskMemFree(ptr);
             }
 
             ptr = this.descBuffer;
             this.descBuffer = IntPtr.Zero;
             if (IntPtr.Zero != ptr)
             {
-                SafeNativeMethods.CoTaskMemFree(ptr);
+                Interop.Ole32.CoTaskMemFree(ptr);
             }
             return true;
         }

src/libraries/System.Data.OleDb/src/RowBinding.cs

@@ -529,7 +529,7 @@ private static void FreeCoTaskMem(IntPtr buffer, int valueOffset)
                 // originalValue is pinned managed memory or pointer to emptyStringOffset
                 if ((ADP.PtrZero != currentValue) && (currentValue != originalValue))
                 {
-                    SafeNativeMethods.CoTaskMemFree(currentValue);
+                    Interop.Ole32.CoTaskMemFree(currentValue);
                 }
 
                 // for debugability - delay clearing memory until after CoTaskMemFree

src/libraries/System.Data.OleDb/src/SafeHandles.cs

@@ -66,14 +66,14 @@ protected override bool ReleaseHandle()
             base.handle = IntPtr.Zero;
             if (IntPtr.Zero != ptr)
             {
-                SafeNativeMethods.CoTaskMemFree(ptr);
+                Interop.Ole32.CoTaskMemFree(ptr);
             }
 
             ptr = this.handle2;
             this.handle2 = IntPtr.Zero;
             if (IntPtr.Zero != ptr)
             {
-                SafeNativeMethods.CoTaskMemFree(ptr);
+                Interop.Ole32.CoTaskMemFree(ptr);
             }
             return true;
         }

src/libraries/System.Data.OleDb/src/SafeNativeMethods.cs

@@ -12,12 +12,6 @@ namespace System.Data.Common
     [SuppressUnmanagedCodeSecurity]
     internal static partial class SafeNativeMethods
     {
-        [GeneratedDllImport(Interop.Libraries.Ole32, SetLastError = false)]
-        internal static partial IntPtr CoTaskMemAlloc(IntPtr cb);
-
-        [GeneratedDllImport(Interop.Libraries.Ole32, SetLastError = false)]
-        internal static partial void CoTaskMemFree(IntPtr handle);
-
         [GeneratedDllImport(Interop.Libraries.Kernel32, CharSet = CharSet.Unicode, PreserveSig = true)]
         internal static partial int GetUserDefaultLCID();
 

src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj

@@ -34,6 +34,8 @@ System.Data.OleDb.OleDbTransaction</PackageDescription>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
              Link="Common\Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs"
+             Link="Common\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\MultipartIdentifier.cs"
              Link="Common\System\Data\Common\MultipartIdentifier.cs" />
     <Compile Include="AdapterSwitches.cs" />