diff options
| -rw-r--r-- | src/debug/di/process.cpp | 11 | ||||
| -rw-r--r-- | src/debug/di/rspriv.h | 2 | ||||
| -rw-r--r-- | src/inc/cordebug.idl | 2 | ||||
| -rw-r--r-- | src/pal/prebuilt/inc/cordebug.h | 4 |
4 files changed, 6 insertions, 13 deletions
diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp index 3f817c951b..46429376fd 100644 --- a/src/debug/di/process.cpp +++ b/src/debug/di/process.cpp @@ -2529,7 +2529,7 @@ COM_METHOD CordbProcess::EnableExceptionCallbacksOutsideOfMyCode(BOOL enableExce return hr; } -COM_METHOD CordbProcess::GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugValue** ppContainerObject) +COM_METHOD CordbProcess::GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainerObject) { HRESULT hr = S_OK; // TODO, databp, I don't know what I am doing, NO_LOCK doesn't sound right @@ -2552,14 +2552,7 @@ COM_METHOD CordbProcess::GetContainerObject(CORDB_ADDRESS interiorPointer, ICorD { _ASSERTE(event.type == DB_IPCE_GET_CONTAINER_RESULT); CORDB_ADDRESS containerAddress = PTR_TO_CORDB_ADDRESS(event.GetContainerResult.answer); - ICorDebugObjectValue* pResult; - hr = this->GetObject(containerAddress, &pResult); - if (SUCCEEDED(hr)) - { - hr = pResult->QueryInterface(__uuidof(ICorDebugValue), (void**)ppContainerObject); - // TODO, databp, smart pointer - pResult->Release(); - } + hr = this->GetObject(containerAddress, ppContainerObject); } PUBLIC_API_END(hr); diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h index b80bf62e00..d5a8e606d9 100644 --- a/src/debug/di/rspriv.h +++ b/src/debug/di/rspriv.h @@ -3165,7 +3165,7 @@ public: //----------------------------------------------------------- // ICorDebugProcess9 //----------------------------------------------------------- - COM_METHOD GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugValue** ppContainerObject); + COM_METHOD GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainerObject); COM_METHOD CreateBreakpoint(CORDB_ADDRESS address, ICorDebugValueBreakpoint **ppBreakpoint); diff --git a/src/inc/cordebug.idl b/src/inc/cordebug.idl index 0faaa7a505..7f13bf680c 100644 --- a/src/inc/cordebug.idl +++ b/src/inc/cordebug.idl @@ -3267,7 +3267,7 @@ interface ICorDebugProcess8 : IUnknown ] interface ICorDebugProcess9 : IUnknown { - HRESULT GetContainerObject([in] CORDB_ADDRESS interiorPointer, [out] ICorDebugValue** ppContainerObject); + HRESULT GetContainerObject([in] CORDB_ADDRESS interiorPointer, [out] ICorDebugObjectValue** ppContainerObject); } // Event types MODULE_LOADED and MODULE_UNLOADED implement this interface diff --git a/src/pal/prebuilt/inc/cordebug.h b/src/pal/prebuilt/inc/cordebug.h index f89a745abf..c8ad1616b0 100644 --- a/src/pal/prebuilt/inc/cordebug.h +++ b/src/pal/prebuilt/inc/cordebug.h @@ -7828,7 +7828,7 @@ EXTERN_C const IID IID_ICorDebugProcess9; public: virtual HRESULT STDMETHODCALLTYPE GetContainerObject( /* [in] */ CORDB_ADDRESS interiorPointer, - /* [out] */ ICorDebugValue **ppContainerObject) = 0; + /* [out] */ ICorDebugObjectValue **ppContainerObject) = 0; }; @@ -7854,7 +7854,7 @@ EXTERN_C const IID IID_ICorDebugProcess9; HRESULT ( STDMETHODCALLTYPE *GetContainerObject )( ICorDebugProcess9 * This, /* [in] */ CORDB_ADDRESS interiorPointer, - /* [out] */ ICorDebugValue **ppContainerObject); + /* [out] */ ICorDebugObjectValue **ppContainerObject); END_INTERFACE } ICorDebugProcess9Vtbl; |