Merge pull request #347 from JamesB7/master

.NET 4.5 .cctor crash fix for ComIStreamMarshaler

diff --git a/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs b/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
index 1abe9afd2affdcd7880e41ea1138053ae9729695..5064cae15d46d1309660181a87aa652941653ef0 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
@@ -105,7 +105,7 @@ namespace System.Drawing
 
                        private static readonly Guid IID_IUnknown = new Guid("00000000-0000-0000-C000-000000000046");
                        private static readonly Guid IID_IStream = new Guid("0000000C-0000-0000-C000-000000000046");
-                       private static readonly MethodInfo exceptionGetHResult = typeof(Exception).GetProperty("HResult", BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.ExactBinding, null, typeof(int), new Type[] {}, null).GetGetMethod(true);
+                       private static readonly MethodInfo exceptionGetHResult = typeof(Exception).GetProperty("HResult", BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.ExactBinding, null, typeof(int), new Type[] {}, null).GetGetMethod(true);
                        // Keeps delegates alive while they are marshaled
                        private static readonly IStreamVtbl managedVtable;
                        private static IntPtr comVtable;