Correct a few mistakes in the ComInterop code (#40234)

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComHresults.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComHresults.cs
index 991f408..68ef4e6 100644 (file)
--- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComHresults.cs
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComHresults.cs
@@ -24,7 +24,6 @@ namespace Microsoft.CSharp.RuntimeBinder.ComInterop
 
         internal const int E_NOINTERFACE = unchecked((int)0x80004002);
         internal const int E_FAIL = unchecked((int)0x80004005);
-        internal const int E_NOTIMPL = unchecked((int)0x80000001);
 
         internal const int TYPE_E_LIBNOTREGISTERED = unchecked((int)0x8002801D);
 

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VarEnumSelector.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VarEnumSelector.cs
index 0397e0c..d8318cd 100644 (file)
--- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VarEnumSelector.cs
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VarEnumSelector.cs
@@ -97,8 +97,8 @@ namespace Microsoft.CSharp.RuntimeBinder.ComInterop
                 { VarEnum.VT_UI2,       typeof(ushort) },
                 { VarEnum.VT_UI4,       typeof(uint) },
                 { VarEnum.VT_UI8,       typeof(ulong) },
-                { VarEnum.VT_INT,       typeof(IntPtr) },
-                { VarEnum.VT_UINT,      typeof(UIntPtr) },
+                { VarEnum.VT_INT,       typeof(int) },
+                { VarEnum.VT_UINT,      typeof(uint) },
                 { VarEnum.VT_BOOL,      typeof(bool) },
                 { VarEnum.VT_R4,        typeof(float) },
                 { VarEnum.VT_R8,        typeof(double) },

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/Variant.Extended.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/Variant.Extended.cs
index 5736b36..777518d 100644 (file)
--- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/Variant.Extended.cs
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/Variant.Extended.cs
@@ -69,14 +69,14 @@ namespace System.Runtime.InteropServices
 
         // VT_INT
 
-        public void SetAsByrefInt(ref IntPtr value)
+        public void SetAsByrefInt(ref int value)
         {
             SetAsByref(ref value, VarEnum.VT_INT);
         }
 
         // VT_UINT
 
-        public void SetAsByrefUint(ref UIntPtr value)
+        public void SetAsByrefUint(ref uint value)
         {
             SetAsByref(ref value, VarEnum.VT_UINT);
         }