Attachment 311470 Details for Bug 497175

[patch] A better patch to introduce exception propagation to Control.Invoke

fix-control-invoke.patch (text/plain), 2.33 KB, created by Tom Spink on 2009-08-09 10:46:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Spink

Created: 2009-08-09 10:46:40 UTC

Size: 2.33 KB

patch

obsolete

>Index: class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
>===================================================================
>--- class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs	(revision 139601)
>+++ class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs	(working copy)
>@@ -476,7 +476,19 @@
> 		{
> 			AsyncMethodData data = (AsyncMethodData) state;
> 			AsyncMethodResult result = data.Result;
>-			object ret = data.Method.DynamicInvoke (data.Args);
>+			
>+			object ret;
>+			try {
>+				ret = data.Method.DynamicInvoke (data.Args);
>+			} catch (Exception ex) {
>+				if (result != null) {
>+					result.CompleteWithException (ex);
>+					return;
>+				}
>+				
>+				throw;
>+			}
>+		
> 			if (result != null) {
> 				result.Complete (ret);
> 			}
>@@ -511,12 +523,16 @@
> 			}
> #endif
> 
>+			AsyncMethodResult result = data.Result;
>+			object ret;
>+
> 			try {
>-				AsyncMethodResult result = data.Result;
>-				object ret = data.Method.DynamicInvoke (data.Args);
>+				ret = data.Method.DynamicInvoke (data.Args);
> 				result.Complete (ret);
>-			}
>-			finally {
>+			} catch (Exception ex) {
>+				result.CompleteWithException (ex);
>+				return;
>+			} finally {
> #if !MWF_ON_MSRUNTIME
> 				if (data.Stack != null) {
> 					// whatever occurs we must revert to the original compressed
>Index: class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodResult.cs
>===================================================================
>--- class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodResult.cs	(revision 139601)
>+++ class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodResult.cs	(working copy)
>@@ -34,6 +34,7 @@
> 		private object state;
> 		private bool completed;
> 		private object return_value;
>+		private Exception exception;
> 
> 		public AsyncMethodResult ()
> 		{
>@@ -68,10 +69,18 @@
> 		public object EndInvoke ()
> 		{
> 			lock (this) {
>-				if (completed)
>-					return return_value;
>+				if (completed) {
>+					if (exception == null)
>+						return return_value;
>+					else
>+						throw exception;
>+				}
> 			}
> 			handle.WaitOne ();
>+			
>+			if (exception != null)
>+				throw exception;
>+				
> 			return return_value;
> 		}
> 
>@@ -83,6 +92,15 @@
> 				handle.Set ();
> 			}
> 		}
>+		
>+		public void CompleteWithException (Exception ex)
>+		{
>+			lock (this) {
>+				completed = true;
>+				exception = ex;
>+				handle.Set ();
>+			}
>+		}
> 	}
> 
> }

Actions: View | Diff

Attachments on bug 497175: 289405 | 311470