2006-11-27 Jonathan Chambers <joncham@gmail.com>

Add definitions for IUnknown and IDispatch. Remove old IDispatchMono
hack definition.

svn path=/trunk/mcs/; revision=68550

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index bcad7876c9eae5d5e433c3b4dc7c8cde89fd636c..68302a894d5ba5e5af87803696b578f64da9191c 100644 (file)
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-27  Jonathan Chambers  <joncham@gmail.com>
+
+       * corlib.dll.sources: Added Mono.Interop/IUnknown.cs
+       and Mono.Interop/IDispatch.cs.
+       
 2006-11-01  Sebastien Pouliot  <sebastien@ximian.com> 
 
        * corlib_test.dll.sources: Added unit tests and CAS tests for 

diff --git a/mcs/class/corlib/Mono.Interop/ChangeLog b/mcs/class/corlib/Mono.Interop/ChangeLog
index f29bdf233cb8adf6e9a10094709d01eeee6a73cc..da416597ed7648ebf15c714d01c6510c653dc8f6 100644 (file)
--- a/mcs/class/corlib/Mono.Interop/ChangeLog
+++ b/mcs/class/corlib/Mono.Interop/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-18  Jonathan Chambers  <joncham@gmail.com>
+
+       * IUnknown.cs: Added.
+       * IDispatch.cs: Added.
+
 2006-08-10  Jonathan Chambers  <joncham@gmail.com>
 
        * ComInteropProxy.cs: Fix default constructor being always

diff --git a/mcs/class/corlib/Mono.Interop/IDispatch.cs b/mcs/class/corlib/Mono.Interop/IDispatch.cs
new file mode 100644 (file)
index 0000000..4d42f16
--- /dev/null
+++ b/mcs/class/corlib/Mono.Interop/IDispatch.cs
@@ -0,0 +1,41 @@
+//
+// Mono.Interop.IDispatch
+//
+// Authors:
+//   Jonathan Chambers <joncham@gmail.com>
+//
+// Copyright (C) 2006 Jonathan Chambers
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+
+namespace Mono.Interop
+{
+       [Guid ("00020400-0000-0000-C000-000000000046")]
+       internal interface IDispatch
+       {
+       }
+}

diff --git a/mcs/class/corlib/Mono.Interop/IUnknown.cs b/mcs/class/corlib/Mono.Interop/IUnknown.cs
new file mode 100644 (file)
index 0000000..1970589
--- /dev/null
+++ b/mcs/class/corlib/Mono.Interop/IUnknown.cs
@@ -0,0 +1,41 @@
+//
+// Mono.Interop.IUnknown
+//
+// Authors:
+//   Jonathan Chambers <joncham@gmail.com>
+//
+// Copyright (C) 2006 Jonathan Chambers
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+
+namespace Mono.Interop
+{
+       [Guid ("00000000-0000-0000-C000-000000000046")]
+       internal interface IUnknown
+       {
+       }
+}

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index dfb5274524f52fd5ef23ec15305516f93e9a1ca3..101d9ef234cc89c0b97906062694e01a0467c5ef 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-27  Jonathan Chambers  <joncham@gmail.com>
+
+       * __ComObject.cs: Removed IDispatchMono.
+       
 2006-11-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * TermInfoDriver.cs:

diff --git a/mcs/class/corlib/System/__ComObject.cs b/mcs/class/corlib/System/__ComObject.cs
index 83e372b86a10e5b5b695fa86fc3881c3bbf3c115..54a76adc1db1767071833d65ae0b7c89ec83e00a 100644 (file)
--- a/mcs/class/corlib/System/__ComObject.cs
+++ b/mcs/class/corlib/System/__ComObject.cs
@@ -188,7 +188,7 @@ namespace System
                {
                        get
                        {
-                               IntPtr pUnk = GetInterface (typeof (IDispatchMono));
+                               IntPtr pUnk = GetInterface (typeof (IDispatch));
                                if (pUnk == IntPtr.Zero)
                                        throw new InvalidComObjectException ("COM object that has been separated from its underlying RCW cannot be used.");
                                return pUnk;
@@ -211,11 +211,6 @@ namespace System
                        }
                }
 
-               [Guid ("00020400-0000-0000-C000-000000000046")]
-               internal interface IDispatchMono
-               {
-               }
-
                public override bool Equals (object obj)
                {
                        if (obj == null)

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index ff68d48cce50b81c4d3d83ebfdd057700685fff3..ac34c5d90efb1e45d0b776beaffa955f60277ece 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -22,6 +22,8 @@ Mono.Globalization.Unicode/Normalization.cs
 Mono.Globalization.Unicode/NormalizationTableUtil.cs
 Mono/Runtime.cs
 Mono.Interop/ComInteropProxy.cs
+Mono.Interop/IDispatch.cs
+Mono.Interop/IUnknown.cs
 Mono.Math/BigInteger.cs
 Mono.Math.Prime/ConfidenceFactor.cs
 Mono.Math.Prime/PrimalityTests.cs