Use LibraryImport in some Interop Oleaut32 (#7287)

dotnet · Jun 15, 2022 · 7afcb6c · 7afcb6c
1 parent 1a9c4f5
commit 7afcb6c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.GetErrorInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.GetErrorInfo.cs
@@ -8,8 +8,8 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        private static extern HRESULT GetErrorInfo(uint dwReserved, out IntPtr pperrinfo);
+        [LibraryImport(Libraries.Oleaut32)]
+        private static partial HRESULT GetErrorInfo(uint dwReserved, out IntPtr pperrinfo);
 
         public static void GetErrorInfo(out WinFormsComWrappers.ErrorInfoWrapper? errinfo)
         {

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs
@@ -9,8 +9,8 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true, CharSet = CharSet.Unicode, PreserveSig = false)]
-        public unsafe static extern void OleCreatePropertyFrame(
+        [LibraryImport(Libraries.Oleaut32, StringMarshalling = StringMarshalling.Utf16)]
+        public static unsafe partial int OleCreatePropertyFrame(
             IntPtr hwndOwner,
             int x,
             int y,

diff --git a/...m.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrameIndirect.cs b/...m.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrameIndirect.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public static extern void OleCreatePropertyFrameIndirect(ref OCPFIPARAMS lpParams);
+        [LibraryImport(Libraries.Oleaut32)]
+        public static partial void OleCreatePropertyFrameIndirect(ref OCPFIPARAMS lpParams);
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayGetVartype.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayGetVartype.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public unsafe static extern HRESULT SafeArrayGetVartype(SAFEARRAY* psa, Ole32.VARENUM* pvt);
+        [LibraryImport(Libraries.Oleaut32)]
+        public static unsafe partial HRESULT SafeArrayGetVartype(SAFEARRAY* psa, Ole32.VARENUM* pvt);
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayLock.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayLock.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public unsafe static extern HRESULT SafeArrayLock(SAFEARRAY* psa);
+        [LibraryImport(Libraries.Oleaut32)]
+        public static unsafe partial HRESULT SafeArrayLock(SAFEARRAY* psa);
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayUnlock.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SafeArrayUnlock.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public unsafe static extern HRESULT SafeArrayUnlock(SAFEARRAY* psa);
+        [LibraryImport(Libraries.Oleaut32)]
+        public static unsafe partial HRESULT SafeArrayUnlock(SAFEARRAY* psa);
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public static extern void SysFreeString(IntPtr bstrString);
+        [LibraryImport(Libraries.Oleaut32)]
+        public static partial void SysFreeString(IntPtr bstrString);
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs
@@ -8,8 +8,8 @@ internal partial class Interop
 {
     internal static partial class Oleaut32
     {
-        [DllImport(Libraries.Oleaut32, ExactSpelling = true)]
-        public static extern HRESULT VarFormat(
+        [LibraryImport(Libraries.Oleaut32)]
+        public static partial HRESULT VarFormat(
             IntPtr pvarIn,
             IntPtr pstrFormat,
             Ole32.VarFormatFirstDayOfWeek iFirstDay,