From c8c690a19af80c308d5ed4b28ce5da7534f50b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Srbeck=C3=BD?= Date: Sat, 1 Apr 2006 18:47:20 +0000 Subject: [PATCH] Fixed SD2-708: Cannot set breakpoints in .NET 1.1 applications git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1247 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Debugger/Internal/ManagedCallback.cs | 3 ++- .../Project/Src/Debugger/Internal/ManagedCallbackProxy.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs index 25e13a94f3..bad0732ffe 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs @@ -133,7 +133,8 @@ namespace Debugger } } - public void Breakpoint(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, ICorDebugBreakpoint pBreakpoint) + // Do not pass the pBreakpoint parameter as ICorDebugBreakpoint - marshaling of it fails in .NET 1.1 + public void Breakpoint(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, IntPtr pBreakpoint) { EnterCallback("Breakpoint", pThread); diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs index 0a7af5e088..d509fd1009 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs @@ -93,7 +93,7 @@ namespace Debugger realCallback.Breakpoint( MTA2STA.MarshalIntPtrTo(pAppDomain), MTA2STA.MarshalIntPtrTo(pThread), - MTA2STA.MarshalIntPtrTo(pBreakpoint) + pBreakpoint // Do not marshal this one - it fails in .NET 1.1 ); }); }