Sync Mono.Debugger.Soft with mono repository

Author: David Karlaš

Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs

@@ -382,7 +382,8 @@ public enum ErrorCode {
 		ERR_UNLOADED = 103,
 		ERR_NO_INVOCATION = 104,
 		ABSENT_INFORMATION = 105,
-		NO_SEQ_POINT_AT_IL_OFFSET = 106
+		NO_SEQ_POINT_AT_IL_OFFSET = 106,
+		INVOKE_ABORTED = 107
 	}
 
 	public class ErrorHandlerEventArgs : EventArgs {
@@ -418,7 +419,7 @@ public abstract class Connection
 		 * with newer runtimes, and vice versa.
 		 */
 		internal const int MAJOR_VERSION = 2;
-		internal const int MINOR_VERSION = 40;
+		internal const int MINOR_VERSION = 42;
 
 		enum WPSuspendPolicy {
 			NONE = 0,
@@ -802,6 +803,13 @@ public string ReadString () {
 				return res;
 			}
 
+			public string ReadUTF16String () {
+				int len = decode_int (packet, ref offset);
+				string res = new String (Encoding.Unicode.GetChars (packet, offset, len));
+				offset += len;
+				return res;
+			}
+
 			public ValueImpl ReadValue () {
 				ElementType etype = (ElementType)ReadByte ();
 
@@ -2408,7 +2416,16 @@ internal void Array_SetValues (long id, int index, ValueImpl[] values) {
 		 * STRINGS
 		 */
 		internal string String_GetValue (long id) {
-			return SendReceive (CommandSet.STRING_REF, (int)CmdStringRef.GET_VALUE, new PacketWriter ().WriteId (id)).ReadString ();
+			var r = SendReceive (CommandSet.STRING_REF, (int)CmdStringRef.GET_VALUE, new PacketWriter ().WriteId (id));
+
+			bool is_utf16 = false;
+			if (Version.AtLeast (2, 41))
+				is_utf16 = r.ReadByte () == 1;
+
+			if (is_utf16)
+				return r.ReadUTF16String ();
+			else
+				return r.ReadString ();
 		}			
 
 		internal int String_GetLength (long id) {

Mono.Debugger.Soft/Mono.Debugger.Soft/ObjectMirror.cs

@@ -442,6 +442,9 @@ static void InvokeMultipleCB (ValueImpl v, ValueImpl exc, ValueImpl out_this, Va
 
 			Interlocked.Decrement (ref r.NumPending);
 
+			if (error != 0)
+				r.ErrorCode = error;
+
 			if (r.NumPending == 0) {
 				r.IsCompleted = true;
 				((ManualResetEvent)r.AsyncWaitHandle).Set ();