diff options
author | Jan Kotas <jkotas@microsoft.com> | 2019-05-22 11:21:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-22 11:21:47 -0700 |
commit | dc86291b53793e2d2d7d7961195cf74471accc82 (patch) | |
tree | 0146cf20093b53ee538000856daf9d901af73bd4 /src/debug | |
parent | ce5a35f001b08470518ed85f78db7f360f9f77b8 (diff) | |
download | coreclr-dc86291b53793e2d2d7d7961195cf74471accc82.tar.gz coreclr-dc86291b53793e2d2d7d7961195cf74471accc82.tar.bz2 coreclr-dc86291b53793e2d2d7d7961195cf74471accc82.zip |
Delete FEATURE_WINDOWSPHONE (#24718)
Diffstat (limited to 'src/debug')
-rw-r--r-- | src/debug/daccess/daccess.cpp | 7 | ||||
-rw-r--r-- | src/debug/di/process.cpp | 20 | ||||
-rw-r--r-- | src/debug/di/rspriv.h | 13 |
3 files changed, 2 insertions, 38 deletions
diff --git a/src/debug/daccess/daccess.cpp b/src/debug/daccess/daccess.cpp index 08c44e2b8c..3985ed2c98 100644 --- a/src/debug/daccess/daccess.cpp +++ b/src/debug/daccess/daccess.cpp @@ -7845,13 +7845,10 @@ STDAPI OutOfProcessExceptionEventSignatureCallback(__in PDWORD pContext, } EX_CATCH_HRESULT(hr); -#ifndef FEATURE_WINDOWSPHONE - // we can't assert this on phone as it's possible for the OS to kill + // it's possible for the OS to kill // the faulting process before WER crash reporting has completed. - _ASSERTE(hr == S_OK); -#else _ASSERTE(hr == S_OK || hr == CORDBG_E_READVIRTUAL_FAILURE); -#endif + if (hr != S_OK) { // S_FALSE means either it is not a managed exception or we do not have Watson buckets. diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp index ae1dd03314..243e21d15b 100644 --- a/src/debug/di/process.cpp +++ b/src/debug/di/process.cpp @@ -2181,12 +2181,6 @@ HRESULT CordbProcess::QueryInterface(REFIID id, void **pInterface) { *pInterface = static_cast<ICorDebugProcess10*>(this); } -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - else if (id == IID_ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly) - { - *pInterface = static_cast<ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly*>(this); - } -#endif else if (id == IID_IUnknown) { *pInterface = static_cast<IUnknown*>(static_cast<ICorDebugProcess*>(this)); @@ -2545,20 +2539,6 @@ COM_METHOD CordbProcess::EnableGCNotificationEvents(BOOL fEnable) return hr; } -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - -COM_METHOD CordbProcess::InvokePauseCallback() -{ - return S_OK; -} - -COM_METHOD CordbProcess::InvokeResumeCallback() -{ - return S_OK; -} - -#endif - HRESULT CordbProcess::GetTypeForObject(CORDB_ADDRESS addr, CordbAppDomain* pAppDomainOverride, CordbType **ppType, CordbAppDomain **pAppDomain) { VMPTR_AppDomain appDomain; diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h index 64d1fae3db..a6cfcf9749 100644 --- a/src/debug/di/rspriv.h +++ b/src/debug/di/rspriv.h @@ -2934,9 +2934,6 @@ class CordbProcess : public IDacDbiInterface::IAllocator, public IDacDbiInterface::IMetaDataLookup, public IProcessShimHooks -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - , public ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly -#endif { // Ctor is private. Use OpenVirtualProcess instead. CordbProcess(ULONG64 clrInstanceId, IUnknown * pDataTarget, HMODULE hDacModule, Cordb * pCordb, const ProcessDescriptor * pProcessDescriptor, ShimProcess * pShim); @@ -3147,16 +3144,6 @@ public: //----------------------------------------------------------- COM_METHOD EnableGCNotificationEvents(BOOL fEnable); -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - // --------------------------------------------------------------- - // ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly - // --------------------------------------------------------------- - - COM_METHOD InvokePauseCallback(); - COM_METHOD InvokeResumeCallback(); - -#endif - //----------------------------------------------------------- // Methods not exposed via a COM interface. //----------------------------------------------------------- |