summaryrefslogtreecommitdiff
path: root/src/debug/di/process.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug/di/process.cpp')
-rw-r--r--src/debug/di/process.cpp115
1 files changed, 4 insertions, 111 deletions
diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index a5496eee54..b6d49c218d 100644
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -2363,18 +2363,7 @@ HRESULT CordbProcess::EnumerateHandles(CorGCReferenceType types, ICorDebugGCRefe
HRESULT CordbProcess::EnableNGENPolicy(CorDebugNGENPolicy ePolicy)
{
-#ifdef FEATURE_CORECLR
return E_NOTIMPL;
-#else
- HRESULT hr = S_OK;
- PUBLIC_API_BEGIN(this);
-
- IDacDbiInterface* pDAC = GetProcess()->GetDAC();
- hr = pDAC->EnableNGENPolicy(ePolicy);
-
- PUBLIC_API_END(hr);
- return hr;
-#endif
}
@@ -4502,12 +4491,6 @@ void CordbProcess::GetModulesInLoadOrder(
// static
void CordbProcess::CountConnectionsCallback(DWORD id, LPCWSTR pName, void * pUserData)
{
-#if defined(FEATURE_INCLUDE_ALL_INTERFACES)
- EnumerateConnectionsData * pCallbackData = reinterpret_cast<EnumerateConnectionsData *>(pUserData);
- INTERNAL_DAC_CALLBACK(pCallbackData->m_pThis);
-
- pCallbackData->m_uIndex += 1;
-#endif // FEATURE_INCLUDE_ALL_INTERFACES
}
//---------------------------------------------------------------------------------------
@@ -4524,20 +4507,6 @@ void CordbProcess::CountConnectionsCallback(DWORD id, LPCWSTR pName, void * pUse
// static
void CordbProcess::EnumerateConnectionsCallback(DWORD id, LPCWSTR pName, void * pUserData)
{
-#if defined(FEATURE_INCLUDE_ALL_INTERFACES)
- EnumerateConnectionsData * pCallbackData = reinterpret_cast<EnumerateConnectionsData *>(pUserData);
- INTERNAL_DAC_CALLBACK(pCallbackData->m_pThis);
-
- // get the next entry in the array to be filled in
- EnumerateConnectionsEntry * pEntry = &(pCallbackData->m_pEntryArray[pCallbackData->m_uIndex]);
-
- // initialize the StringCopyHolder in the entry and copy over the name of the connection
- new (&(pEntry->m_pName)) StringCopyHolder;
- pEntry->m_pName.AssignCopy(pName);
- pEntry->m_dwID = id;
-
- pCallbackData->m_uIndex += 1;
-#endif // FEATURE_INCLUDE_ALL_INTERFACES
}
//---------------------------------------------------------------------------------------
@@ -4549,51 +4518,6 @@ void CordbProcess::QueueFakeConnectionEvents()
{
PUBLIC_API_ENTRY_FOR_SHIM(this);
-#ifdef FEATURE_INCLUDE_ALL_INTERFACES
- EnumerateConnectionsData callbackData;
- callbackData.m_pThis = this;
- callbackData.m_uIndex = 0;
- callbackData.m_pEntryArray = NULL;
-
- UINT32 uSize = 0;
-
- // We must take the process lock before calling DAC primitives which will call back into DBI.
- // On the other hand, we must NOT be holding the lock when we call out to the shim.
- // So introduce a new scope here.
- {
- RSLockHolder lockHolder(GetProcessLock());
- GetDAC()->EnumerateConnections(CountConnectionsCallback, &callbackData);
-
- // save the size for later
- uSize = callbackData.m_uIndex;
-
- // Allocate the array to store the connections. This array will be released when the dtor runs.
- callbackData.m_uIndex = 0;
- callbackData.m_pEntryArray = new EnumerateConnectionsEntry[uSize];
- GetDAC()->EnumerateConnections(EnumerateConnectionsCallback, &callbackData);
- _ASSERTE(uSize == callbackData.m_uIndex);
- }
-
- {
- // V2 would send CreateConnection for all connections, and then ChangeConnection
- // for all connections.
- PUBLIC_CALLBACK_IN_THIS_SCOPE0_NO_LOCK(this);
- for (UINT32 i = 0; i < uSize; i++)
- {
- EnumerateConnectionsEntry * pEntry = &(callbackData.m_pEntryArray[i]);
- GetShim()->GetShimCallback()->CreateConnection(
- this,
- (CONNID)pEntry->m_dwID,
- const_cast<WCHAR *>((const WCHAR *)(pEntry->m_pName)));
- }
-
- for (UINT32 i = 0; i < uSize; i++)
- {
- EnumerateConnectionsEntry * pEntry = &(callbackData.m_pEntryArray[i]);
- GetShim()->GetShimCallback()->ChangeConnection(this, (CONNID)pEntry->m_dwID);
- }
- }
-#endif
}
//
@@ -4601,10 +4525,6 @@ void CordbProcess::QueueFakeConnectionEvents()
// from the runtime controller. This represents the last amount of processing
// the DI gets to do on an event before giving it to the user.
//
-#ifdef _PREFAST_
-#pragma warning(push)
-#pragma warning(disable:21000) // Suppress PREFast warning about overly large function
-#endif
void CordbProcess::DispatchRCEvent()
{
INTERNAL_API_ENTRY(this);
@@ -4805,6 +4725,10 @@ void CordbProcess::DbgAssertAppDomainDeleted(VMPTR_AppDomain vmAppDomainDeleted)
// A V2 shim can provide a proxy calllack that takes these events and queues them and
// does the real dispatch to the user to emulate V2 semantics.
//
+#ifdef _PREFAST_
+#pragma warning(push)
+#pragma warning(disable:21000) // Suppress PREFast warning about overly large function
+#endif
void CordbProcess::RawDispatchEvent(
DebuggerIPCEvent * pEvent,
RSLockHolder * pLockHolder,
@@ -7509,33 +7433,6 @@ void CordbProcess::VerifyControlBlock()
// For Telesto, Dbi and Wks have a more flexible versioning allowed, as described by the Debugger
// Version Protocol String in DEBUGGER_PROTOCOL_STRING in DbgIpcEvents.h. This allows different build
// numbers, but the other protocol numbers should still match.
-#if !defined(FEATURE_CORECLR)
- bool fSkipVerCheck = false;
-#if _DEBUG
- // In debug builds, allow us to disable the version check to help with applying hotfixes.
- // The hotfix may be built against a compatible IPC protocol, but have a slightly different build number.
- fSkipVerCheck = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_DbgSkipVerCheck) != 0;
-#endif
-
- if (!fSkipVerCheck)
- {
- //
- // These asserts double check that the version of the Right Side matches the version of the left side.
- //
- // If you hit these asserts, it is probably because you rebuilt mscordbi without rebuilding mscorwks, or rebuilt
- // mscorwks without rebuilding mscordbi. You might be able to ignore these asserts, but proceed at your own risk.
- //
- CONSISTENCY_CHECK_MSGF(VER_PRODUCTBUILD == GetDCB()->m_verMajor,
- ("version of %s (%d) in the debuggee does not match version of mscordbi.dll (%d) in the debugger.\n"
- "This means your setup is wrong. You can ignore this but proceed at your own risk.\n",
- MAIN_CLR_DLL_NAME_A, GetDCB()->m_verMajor, VER_PRODUCTBUILD));
- CONSISTENCY_CHECK_MSGF(VER_PRODUCTBUILD_QFE == GetDCB()->m_verMinor,
- ("QFE version of %s (%d) in the debuggee does not match QFE version of mscordbi.dll (%d) in the debugger.\n"
- "Both dlls have build # (%d).\n"
- "This means your setup is wrong. You can ignore this but proceed at your own risk.\n",
- MAIN_CLR_DLL_NAME_A, GetDCB()->m_verMinor, VER_PRODUCTBUILD_QFE, VER_PRODUCTBUILD));
- }
-#endif // !FEATURE_CORECLR
// These assertions verify that the debug manager is behaving correctly.
// An assertion failure here means that the runtime version of the debuggee is different from the runtime version of
@@ -15210,11 +15107,7 @@ bool CordbProcess::IsCompatibleWith(DWORD clrMajorVersion)
// honored for SLv4.
if (requiredVersion <= 0)
{
-#if defined(FEATURE_CORECLR)
requiredVersion = 2;
-#else
- requiredVersion = 4;
-#endif
}
// Compare the version we were created for against the minimum required
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 03:20:14 +0000