Author: atsushi
Date: 2007-09-06 01:16:16 -0400 (Thu, 06 Sep 2007)
New Revision: 85388
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
Log:
2007-09-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* LogicalCallContext.cs, MethodCall.cs, MethodCallMessageWrapper.cs,
IMethodMessage.cs, ReturnMessage.cs, MethodResponse.cs
MethodReturnMessageWrapper.cs : couple more of (2.0/1.1) API fixes.
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
2007-09-06 00:25:26 UTC (rev 85387)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
2007-09-06 05:16:16 UTC (rev 85388)
@@ -1,3 +1,9 @@
+2007-09-06 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * LogicalCallContext.cs, MethodCall.cs, MethodCallMessageWrapper.cs,
+ IMethodMessage.cs, ReturnMessage.cs, MethodResponse.cs
+ MethodReturnMessageWrapper.cs : couple more of (2.0/1.1) API fixes.
+
2007-08-15 Atsushi Enomoto <[EMAIL PROTECTED]>
* LogicalCallContext.cs IMethodMessage.cs CallContext.cs :
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -35,7 +35,7 @@
namespace System.Runtime.Remoting.Messaging {
#if NET_2_0
- [System.Runtime.InteropServices.ComVisible (false)]
+ [System.Runtime.InteropServices.ComVisible (true)]
#endif
public interface IMethodMessage : IMessage {
int ArgCount {
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -38,7 +38,7 @@
{
[Serializable]
#if NET_2_0
- [System.Runtime.InteropServices.ComVisible (false)]
+ [System.Runtime.InteropServices.ComVisible (true)]
#endif
public sealed class LogicalCallContext : ISerializable, ICloneable
{
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -272,6 +272,11 @@
set { _uri = value; }
}
+ string IInternalMessage.Uri {
+ get { return Uri; }
+ set { Uri = value; }
+ }
+
public object GetArg (int argNum)
{
return _args[argNum];
@@ -393,6 +398,7 @@
set { _targetIdentity = value; }
}
+#if !NET_2_0
public override string ToString ()
{
string s = _typeName.Split(',')[0] + "." + _methodName
+ " (";
@@ -410,6 +416,7 @@
s += ")";
return s;
}
+#endif
#if NET_2_0
Type[] GenericArguments {
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -65,13 +65,21 @@
get { return
((IMethodCallMessage)WrappedMessage).HasVarArgs; }
}
- public int InArgCount {
+ public virtual int InArgCount {
get { return _inArgInfo.GetInOutArgCount(); }
}
- public object[] InArgs {
+ int IMethodCallMessage.InArgCount {
+ get { return InArgCount; }
+ }
+
+ public virtual object[] InArgs {
get { return _inArgInfo.GetInOutArgs (_args); }
}
+
+ object[] IMethodCallMessage.InArgs {
+ get { return InArgs; }
+ }
public virtual LogicalCallContext LogicalCallContext {
get { return
((IMethodCallMessage)WrappedMessage).LogicalCallContext; }
@@ -121,16 +129,26 @@
return ((IMethodCallMessage)WrappedMessage).GetArgName
(index);
}
- public object GetInArg (int argNum)
+ public virtual object GetInArg (int argNum)
{
return _args[_inArgInfo.GetInOutArgIndex (argNum)];
}
- public string GetInArgName (int index)
+ object IMethodCallMessage.GetInArg (int argNum)
{
+ return GetInArg (argNum);
+ }
+
+ public virtual string GetInArgName (int index)
+ {
return _inArgInfo.GetInOutArgName(index);
}
+ string IMethodCallMessage.GetInArgName (int index)
+ {
+ return GetInArgName (index);
+ }
+
class DictionaryWrapper : MethodCallDictionary
{
IDictionary _wrappedDictionary;
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -272,6 +272,11 @@
}
}
+ string IInternalMessage.Uri {
+ get { return Uri; }
+ set { Uri = value; }
+ }
+
public object GetArg (int argNum)
{
if (null == _args)
@@ -341,6 +346,7 @@
set { _targetIdentity = value; }
}
+#if !NET_2_0
public override string ToString ()
{
string s = _typeName.Split(',')[0] + "." + _methodName
+ " (";
@@ -365,6 +371,6 @@
}
return s;
}
-
+#endif
}
}
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -122,7 +122,7 @@
get { return
((IMethodReturnMessage)WrappedMessage).TypeName; }
}
- public virtual string Uri
+ public string Uri
{
get { return
((IMethodReturnMessage)WrappedMessage).Uri; }
set { Properties["__Uri"] = value; }
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
2007-09-06 00:25:26 UTC (rev 85387)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
2007-09-06 05:16:16 UTC (rev 85388)
@@ -166,6 +166,11 @@
}
}
+ string IInternalMessage.Uri {
+ get { return Uri; }
+ set { Uri = value; }
+ }
+
public object GetArg (int arg_num)
{
return _args [arg_num];
@@ -224,6 +229,7 @@
set { _targetIdentity = value; }
}
+#if !NET_2_0
public override string ToString ()
{
string s = TypeName.Split(',')[0] + "." + MethodName +
" (";
@@ -245,5 +251,6 @@
}
return s;
}
+#endif
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
