From 4b3e0d5545af9a27bb3f58b2a86419630aad6aee Mon Sep 17 00:00:00 2001 From: Rahul Kumar Date: Fri, 8 Jul 2016 15:03:41 -0700 Subject: [PATCH] Fix SOS bpmd for windows Commit migrated from https://github.com/dotnet/coreclr/commit/ef6ad57a343f8796f7616926348de3baf0370957 --- src/coreclr/src/ToolBox/SOS/Strike/strike.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp index 024293c..60a8e2f 100644 --- a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp +++ b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp @@ -7116,9 +7116,13 @@ DECLARE_API(bpmd) // did we get dll and type name or file:line#? Search for a colon in the first arg // to see if it is in fact a file:line# CHAR* pColon = strchr(DllName.data, ':'); +#ifndef FEATURE_PAL + if (FAILED(g_ExtSymbols->GetModuleByModuleName(MAIN_CLR_MODULE_NAME_A, 0, NULL, NULL))) { +#else if (FAILED(g_ExtSymbols->GetModuleByModuleName(MAIN_CLR_DLL_NAME_A, 0, NULL, NULL))) { - ExtOut("File name:Line number not supported\n"); - fBadParam = true; +#endif + ExtOut("%s not loaded yet\n", MAIN_CLR_DLL_NAME_A); + return Status; } if(NULL != pColon) -- 2.7.4