From 1533235efe94fb25f2fbe1fd15e95cfe794f17b3 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Wed, 1 Aug 2018 18:53:21 -0700 Subject: [PATCH] Fix collision with ICorDebugProcess9 to 10 Commit migrated from https://github.com/dotnet/coreclr/commit/44f9453071131406569ea6167baf494b2ab11926 --- src/coreclr/src/debug/di/process.cpp | 4 +-- src/coreclr/src/debug/di/rspriv.h | 4 +-- src/coreclr/src/inc/cordebug.idl | 2 +- src/coreclr/src/pal/prebuilt/idl/cordebug_i.cpp | 2 +- src/coreclr/src/pal/prebuilt/inc/cordebug.h | 44 ++++++++++++------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/coreclr/src/debug/di/process.cpp b/src/coreclr/src/debug/di/process.cpp index 0b6c582..99e5aa4e 100644 --- a/src/coreclr/src/debug/di/process.cpp +++ b/src/coreclr/src/debug/di/process.cpp @@ -2175,9 +2175,9 @@ HRESULT CordbProcess::QueryInterface(REFIID id, void **pInterface) { *pInterface = static_cast(this); } - else if (id == IID_ICorDebugProcess9) + else if (id == IID_ICorDebugProcess10) { - *pInterface = static_cast(this); + *pInterface = static_cast(this); } #ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL else if (id == IID_ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly) diff --git a/src/coreclr/src/debug/di/rspriv.h b/src/coreclr/src/debug/di/rspriv.h index 86df87a..d0a10be 100644 --- a/src/coreclr/src/debug/di/rspriv.h +++ b/src/coreclr/src/debug/di/rspriv.h @@ -2923,7 +2923,7 @@ class CordbProcess : public ICorDebugProcess5, public ICorDebugProcess7, public ICorDebugProcess8, - public ICorDebugProcess9, + public ICorDebugProcess10, public IDacDbiInterface::IAllocator, public IDacDbiInterface::IMetaDataLookup, public IProcessShimHooks @@ -3136,7 +3136,7 @@ public: COM_METHOD EnableExceptionCallbacksOutsideOfMyCode(BOOL enableExceptionsOutsideOfJMC); //----------------------------------------------------------- - // ICorDebugProcess9 + // ICorDebugProcess10 //----------------------------------------------------------- COM_METHOD GetContainingObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainingObject); diff --git a/src/coreclr/src/inc/cordebug.idl b/src/coreclr/src/inc/cordebug.idl index d7c2853..63adbb7 100644 --- a/src/coreclr/src/inc/cordebug.idl +++ b/src/coreclr/src/inc/cordebug.idl @@ -3268,7 +3268,7 @@ interface ICorDebugProcess8 : IUnknown uuid(8F378F6F-1017-4461-9890-ECF64C54079F), pointer_default(unique) ] -interface ICorDebugProcess9 : IUnknown +interface ICorDebugProcess10 : IUnknown { HRESULT GetContainingObject([in] CORDB_ADDRESS interiorPointer, [out] ICorDebugObjectValue** ppContainingObject); } diff --git a/src/coreclr/src/pal/prebuilt/idl/cordebug_i.cpp b/src/coreclr/src/pal/prebuilt/idl/cordebug_i.cpp index e30649c..f7f625a 100644 --- a/src/coreclr/src/pal/prebuilt/idl/cordebug_i.cpp +++ b/src/coreclr/src/pal/prebuilt/idl/cordebug_i.cpp @@ -202,7 +202,7 @@ MIDL_DEFINE_GUID(IID, IID_ICorDebugProcess7,0x9B2C54E4,0x119F,0x4D6F,0xB4,0x02,0 MIDL_DEFINE_GUID(IID, IID_ICorDebugProcess8,0x2E6F28C1,0x85EB,0x4141,0x80,0xAD,0x0A,0x90,0x94,0x4B,0x96,0x39); -MIDL_DEFINE_GUID(IID, IID_ICorDebugProcess9,0x8F378F6F,0x1017,0x4461,0x98,0x90,0xEC,0xF6,0x4C,0x54,0x07,0x9F); +MIDL_DEFINE_GUID(IID, IID_ICorDebugProcess10,0x8F378F6F,0x1017,0x4461,0x98,0x90,0xEC,0xF6,0x4C,0x54,0x07,0x9F); MIDL_DEFINE_GUID(IID, IID_ICorDebugModuleDebugEvent,0x51A15E8D,0x9FFF,0x4864,0x9B,0x87,0xF4,0xFB,0xDE,0xA7,0x47,0xA2); diff --git a/src/coreclr/src/pal/prebuilt/inc/cordebug.h b/src/coreclr/src/pal/prebuilt/inc/cordebug.h index 81dc4e0..9eccc51 100644 --- a/src/coreclr/src/pal/prebuilt/inc/cordebug.h +++ b/src/coreclr/src/pal/prebuilt/inc/cordebug.h @@ -360,11 +360,11 @@ typedef interface ICorDebugProcess8 ICorDebugProcess8; #endif /* __ICorDebugProcess8_FWD_DEFINED__ */ -#ifndef __ICorDebugProcess9_FWD_DEFINED__ -#define __ICorDebugProcess9_FWD_DEFINED__ -typedef interface ICorDebugProcess9 ICorDebugProcess9; +#ifndef __ICorDebugProcess10_FWD_DEFINED__ +#define __ICorDebugProcess10_FWD_DEFINED__ +typedef interface ICorDebugProcess10 ICorDebugProcess10; -#endif /* __ICorDebugProcess9_FWD_DEFINED__ */ +#endif /* __ICorDebugProcess10_FWD_DEFINED__ */ #ifndef __ICorDebugModuleDebugEvent_FWD_DEFINED__ @@ -7823,19 +7823,19 @@ EXTERN_C const IID IID_ICorDebugProcess8; #endif /* __ICorDebugProcess8_INTERFACE_DEFINED__ */ -#ifndef __ICorDebugProcess9_INTERFACE_DEFINED__ -#define __ICorDebugProcess9_INTERFACE_DEFINED__ +#ifndef __ICorDebugProcess10_INTERFACE_DEFINED__ +#define __ICorDebugProcess10_INTERFACE_DEFINED__ -/* interface ICorDebugProcess9 */ +/* interface ICorDebugProcess10 */ /* [unique][uuid][local][object] */ -EXTERN_C const IID IID_ICorDebugProcess9; +EXTERN_C const IID IID_ICorDebugProcess10; #if defined(__cplusplus) && !defined(CINTERFACE) MIDL_INTERFACE("8F378F6F-1017-4461-9890-ECF64C54079F") - ICorDebugProcess9 : public IUnknown + ICorDebugProcess10 : public IUnknown { public: virtual HRESULT STDMETHODCALLTYPE GetContainingObject( @@ -7847,33 +7847,33 @@ EXTERN_C const IID IID_ICorDebugProcess9; #else /* C style interface */ - typedef struct ICorDebugProcess9Vtbl + typedef struct ICorDebugProcess10Vtbl { BEGIN_INTERFACE HRESULT ( STDMETHODCALLTYPE *QueryInterface )( - ICorDebugProcess9 * This, + ICorDebugProcess10 * This, /* [in] */ REFIID riid, /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); ULONG ( STDMETHODCALLTYPE *AddRef )( - ICorDebugProcess9 * This); + ICorDebugProcess10 * This); ULONG ( STDMETHODCALLTYPE *Release )( - ICorDebugProcess9 * This); + ICorDebugProcess10 * This); HRESULT ( STDMETHODCALLTYPE *GetContainingObject )( - ICorDebugProcess9 * This, + ICorDebugProcess10 * This, /* [in] */ CORDB_ADDRESS interiorPointer, /* [out] */ ICorDebugObjectValue **ppContainingObject); END_INTERFACE - } ICorDebugProcess9Vtbl; + } ICorDebugProcess10Vtbl; - interface ICorDebugProcess9 + interface ICorDebugProcess10 { - CONST_VTBL struct ICorDebugProcess9Vtbl *lpVtbl; + CONST_VTBL struct ICorDebugProcess10Vtbl *lpVtbl; }; @@ -7881,17 +7881,17 @@ EXTERN_C const IID IID_ICorDebugProcess9; #ifdef COBJMACROS -#define ICorDebugProcess9_QueryInterface(This,riid,ppvObject) \ +#define ICorDebugProcess10_QueryInterface(This,riid,ppvObject) \ ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) -#define ICorDebugProcess9_AddRef(This) \ +#define ICorDebugProcess10_AddRef(This) \ ( (This)->lpVtbl -> AddRef(This) ) -#define ICorDebugProcess9_Release(This) \ +#define ICorDebugProcess10_Release(This) \ ( (This)->lpVtbl -> Release(This) ) -#define ICorDebugProcess9_GetContainingObject(This,interiorPointer,ppContainingObject) \ +#define ICorDebugProcess10_GetContainingObject(This,interiorPointer,ppContainingObject) \ ( (This)->lpVtbl -> GetContainingObject(This,interiorPointer,ppContainingObject) ) #endif /* COBJMACROS */ @@ -7902,7 +7902,7 @@ EXTERN_C const IID IID_ICorDebugProcess9; -#endif /* __ICorDebugProcess9_INTERFACE_DEFINED__ */ +#endif /* __ICorDebugProcess10_INTERFACE_DEFINED__ */ #ifndef __ICorDebugModuleDebugEvent_INTERFACE_DEFINED__ -- 2.7.4