using System.Runtime.Remoting.Contexts;
using System.Runtime.CompilerServices;
using System.Runtime.Serialization;
-
+using System.Runtime.InteropServices;
namespace System.Runtime.Remoting.Proxies
{
+#pragma warning disable 169, 649
+ [StructLayout (LayoutKind.Sequential)]
internal class TransparentProxy {
public RealProxy _rp;
IntPtr _class;
bool _custom_type_info;
}
+#pragma warning restore 169, 649
+ [ComVisible (true)]
+ [StructLayout (LayoutKind.Sequential)]
public abstract class RealProxy {
-
+ // other classes visible to the runtime
+ // derive from this class so keep these locals
+ // in sync with the definition RealProxy
+ // in object-internals.h
+
+#pragma warning disable 169, 414
#region Sync with object-internals.h
Type class_to_proxy;
internal Context _targetContext;
MarshalByRefObject _server;
int _targetDomainId = -1;
internal string _targetUri;
- #endregion
-
internal Identity _objectIdentity;
Object _objTP;
object _stubData;
+ #endregion
+#pragma warning restore 169, 414
protected RealProxy ()
{
public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
{
- Object obj = GetTransparentProxy();\r
- RemotingServices.GetObjectData (obj, info, context); \r
+ Object obj = GetTransparentProxy();
+ RemotingServices.GetObjectData (obj, info, context);
}
internal Identity ObjectIdentity
MonoMethodMessage mMsg = (MonoMethodMessage) msg;
mMsg.LogicalCallContext = CallContext.CreateLogicalCallContext (true);
CallType call_type = mMsg.CallType;
- bool is_remproxy = (rp as RemotingProxy) != null;
+ bool is_remproxy = (rp is RemotingProxy);
+ out_args = null;
IMethodReturnMessage res_msg = null;
- if (call_type == CallType.BeginInvoke) \r
+ if (call_type == CallType.BeginInvoke)
// todo: set CallMessage in runtime instead
mMsg.AsyncResult.CallMessage = mMsg;
res_msg = (IMethodReturnMessage)mMsg.AsyncResult.EndInvoke ();
// Check for constructor msg
- if (mMsg.MethodBase.IsConstructor) \r
+ if (mMsg.MethodBase.IsConstructor)
{
- if (is_remproxy) \r
+ if (is_remproxy)
res_msg = (IMethodReturnMessage) (rp as RemotingProxy).ActivateRemoteObject ((IMethodMessage) msg);
- else \r
+ else
msg = new ConstructionCall (rp.GetProxiedType ());
}
if (null == res_msg)
{
- res_msg = (IMethodReturnMessage)rp.Invoke (msg);
-\r
- // Note, from begining this code used AsyncResult.IsCompleted for\r
- // checking if it was a remoting or custom proxy, but in some\r
- // cases the remoting proxy finish before the call returns\r
- // causing this method to be called, therefore causing all kind of bugs.\r
- if ((!is_remproxy) && call_type == CallType.BeginInvoke)\r
- {\r
+ bool failed = false;
+
+ try {
+ res_msg = (IMethodReturnMessage)rp.Invoke (msg);
+ } catch (Exception ex) {
+ failed = true;
+ if (call_type == CallType.BeginInvoke) {
+ // If async dispatch crashes, don't propagate the exception.
+ // The exception will be raised when calling EndInvoke.
+ mMsg.AsyncResult.SyncProcessMessage (new ReturnMessage (ex, msg as IMethodCallMessage));
+ res_msg = new ReturnMessage (null, null, 0, null, msg as IMethodCallMessage);
+ } else
+ throw;
+ }
+
+ // Note, from begining this code used AsyncResult.IsCompleted for
+ // checking if it was a remoting or custom proxy, but in some
+ // cases the remoting proxy finish before the call returns
+ // causing this method to be called, therefore causing all kind of bugs.
+ if ((!is_remproxy) && call_type == CallType.BeginInvoke && !failed)
+ {
IMessage asyncMsg = null;
// allow calltype EndInvoke to finish
asyncMsg = mMsg.AsyncResult.SyncProcessMessage (res_msg as IMessage);
+ out_args = res_msg.OutArgs;
res_msg = new ReturnMessage (asyncMsg, null, 0, null, res_msg as IMethodCallMessage);
- }\r
+ }
}
if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)
- CallContext.UpdateCurrentCallContext (res_msg.LogicalCallContext);
+ CallContext.UpdateCurrentLogicalCallContext (res_msg.LogicalCallContext);
exc = res_msg.Exception;
out_args = null;
throw exc.FixRemotingException();
}
- else if (res_msg is IConstructionReturnMessage || mMsg.CallType == CallType.BeginInvoke) {
- out_args = res_msg.OutArgs;
+ else if (res_msg is IConstructionReturnMessage) {
+ if (out_args == null)
+ out_args = res_msg.OutArgs;
+ }
+ else if (mMsg.CallType == CallType.BeginInvoke) {
+ // We don't have OutArgs in this case.
}
else if (mMsg.CallType == CallType.Sync) {
out_args = ProcessResponse (res_msg, mMsg);
out_args = ProcessResponse (res_msg, mMsg.AsyncResult.CallMessage);
}
else {
- out_args = res_msg.OutArgs;
+ if (out_args == null)
+ out_args = res_msg.OutArgs;
}
return res_msg.ReturnValue;
}
[MonoTODO]
+ [ComVisible (true)]
public IConstructionReturnMessage InitializeServerObject(IConstructionCallMessage ctorMsg)
{
throw new NotImplementedException();
return _server;
}
- static object[] ProcessResponse (IMethodReturnMessage mrm, IMethodCallMessage call)
+ static object[] ProcessResponse (IMethodReturnMessage mrm, MonoMethodMessage call)
{
// Check return type
MethodInfo mi = (MethodInfo) call.MethodBase;
if (mrm.ReturnValue != null && !mi.ReturnType.IsInstanceOfType (mrm.ReturnValue))
- throw new RemotingException ("Return value has an invalid type");
+ throw new InvalidCastException ("Return value has an invalid type");
// Check out parameters
- if (mrm.OutArgCount > 0)
+
+ int no;
+
+ if (call.NeedsOutProcessing (out no))
{
ParameterInfo[] parameters = mi.GetParameters();
- int no = 0;
- foreach (ParameterInfo par in parameters)
- if (par.ParameterType.IsByRef) no++;
-
object[] outArgs = new object [no];
int narg = 0;
- int nout = 0;
foreach (ParameterInfo par in parameters)
{
if (par.IsOut && !par.ParameterType.IsByRef)
{
// Special marshalling required
-
- object outArg = mrm.GetOutArg (nout++);
+ object outArg = par.Position < mrm.ArgCount ? mrm.GetArg (par.Position) : null;
if (outArg != null) {
object local = call.GetArg (par.Position);
- if (local == null) throw new RemotingException ("Unexpected null value in local out parameter '" + par.Position + " " + par.Name + "'");
+ if (local == null) throw new RemotingException ("Unexpected null value in local out parameter '" + par.Name + "'");
RemotingServices.UpdateOutArgObject (par, local, outArg);
}
}
else if (par.ParameterType.IsByRef)
{
- object outArg = mrm.GetOutArg (nout++);
- if (outArg != null && !par.ParameterType.IsInstanceOfType (outArg))
+ object outArg = par.Position < mrm.ArgCount ? mrm.GetArg (par.Position) : null;
+ if (outArg != null && !par.ParameterType.GetElementType ().IsInstanceOfType (outArg))
{
- throw new RemotingException ("Return argument '" + par.Name + "' has an invalid type");
+ throw new InvalidCastException ("Return argument '" + par.Name + "' has an invalid type");
}
outArgs [narg++] = outArg;
}
projects / mono.git / blobdiff