diff options
author | Ungureanu Marius <teromario@yahoo.com> | 2014-04-25 13:24:18 +0400 |
---|---|---|
committer | Ungureanu Marius <teromario@yahoo.com> | 2014-04-25 13:24:18 +0400 |
commit | fe916ebffc97d7b0204efa3161ca3b356cb06465 (patch) | |
tree | 32c7547c84879c60b897428095bbc50fb6985ca4 /main/src/addins/MonoDevelop.Debugger.Win32 | |
parent | 738621f0052bdb7896146bd35bb8825f3e325230 (diff) | |
parent | 9f84c8f86f5a053a121e141f44371dc3054438c2 (diff) |
Merge pull request #33 from DavidKarlas/Win32PassTests
Debugger UnitTests and Win32 debugger fixes
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger.Win32')
3 files changed, 9 insertions, 5 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs index b2caeea90b..f9ce48f076 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs @@ -163,7 +163,9 @@ namespace Microsoft.Samples.Debugging.CorMetadata public override Type DeclaringType
{
- get { throw new NotImplementedException (); }
+ get {
+ return m_declaringType;
+ }
}
public override bool IsDefined (Type attributeType, bool inherit)
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ArrayAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ArrayAdaptor.cs index 2d24b28685..a25a078d10 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ArrayAdaptor.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ArrayAdaptor.cs @@ -83,6 +83,7 @@ namespace MonoDevelop.Debugger.Win32 public void SetElement (int[] indices, object val) { CorValRef it = (CorValRef) GetElement (indices); + obj.IsValid = false; it.SetValue (ctx, (CorValRef) val); } diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs index 8b54de2d37..73150317c6 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs @@ -343,7 +343,7 @@ namespace MonoDevelop.Debugger.Win32 ArrayAdaptor realArr = new ArrayAdaptor (ctx, arr, array);
realArr.SetElement (new [] { 0 }, val);
-
+ arr.IsValid = true;
CorType at = (CorType) GetType (ctx, "System.Array");
object[] argTypes = { GetType (ctx, "System.Int32") };
return (CorValRef)RuntimeInvoke (ctx, at, arr, "GetValue", argTypes, new object[] { CreateValue (ctx, 0) });
@@ -887,6 +887,8 @@ namespace MonoDevelop.Debugger.Win32 propTypes.Add (t);
}
}
+ if (cctx.Adapter.IsPrimitive (ctx, target))
+ break;
t = t.Base;
}
@@ -1492,7 +1494,7 @@ namespace MonoDevelop.Debugger.Win32 foreach (ISymbolVariable var in scope.GetLocals ()) {
if (var.Name == "$site")
continue;
- if (IsClosureReferenceLocal (var) && IsGeneratedType (var.Name)) {
+ if (IsClosureReferenceLocal (var)) {
int addr = var.AddressField1;
var vref = new CorValRef (delegate {
return ctx.Frame.GetLocalVariable (addr);
@@ -1604,8 +1606,7 @@ namespace MonoDevelop.Debugger.Win32 public override bool IsTypeLoaded (EvaluationContext ctx, object type)
{
- var t = type as Type;
- return IsTypeLoaded (ctx, t.FullName);
+ return IsTypeLoaded (ctx, GetTypeName (ctx, type));
}
// TODO: Implement GetHoistedLocalVariables
}
|