diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2016-03-04 16:24:42 -0800 |
|---|---|---|
| committer | Mike McLaughlin <mikem@microsoft.com> | 2016-03-04 16:24:42 -0800 |
| commit | 3eecbb687cd9144e317479eb11952f0761caead3 (patch) | |
| tree | bab863fa32ecd9285b89927ae0a688ea69ed1969 /src/ToolBox/SOS | |
| parent | ab96aff81523554fd21e8e89fc3363049ac21121 (diff) | |
| parent | cffbe7fd0ede76a9e0277c525f494e5e96267775 (diff) | |
| download | coreclr-3eecbb687cd9144e317479eb11952f0761caead3.tar.gz coreclr-3eecbb687cd9144e317479eb11952f0761caead3.tar.bz2 coreclr-3eecbb687cd9144e317479eb11952f0761caead3.zip | |
Merge pull request #3513 from mikem8361/soschanges
Fix two sos issues.
Diffstat (limited to 'src/ToolBox/SOS')
| -rw-r--r-- | src/ToolBox/SOS/Strike/exts.cpp | 9 | ||||
| -rw-r--r-- | src/ToolBox/SOS/lldbplugin/services.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ToolBox/SOS/Strike/exts.cpp b/src/ToolBox/SOS/Strike/exts.cpp index 5084d0aa98..804363a9a1 100644 --- a/src/ToolBox/SOS/Strike/exts.cpp +++ b/src/ToolBox/SOS/Strike/exts.cpp @@ -191,6 +191,8 @@ void CleanupEventCallbacks() } } +bool g_Initialized = false; + extern "C" HRESULT CALLBACK @@ -202,7 +204,12 @@ DebugExtensionInitialize(PULONG Version, PULONG Flags) *Version = DEBUG_EXTENSION_VERSION(1, 0); *Flags = 0; - + + if (g_Initialized) + { + return S_OK; + } + g_Initialized = true; if ((Hr = DebugCreate(__uuidof(IDebugClient), (void **)&DebugClient)) != S_OK) diff --git a/src/ToolBox/SOS/lldbplugin/services.cpp b/src/ToolBox/SOS/lldbplugin/services.cpp index e66f29be6a..21d1a2c13c 100644 --- a/src/ToolBox/SOS/lldbplugin/services.cpp +++ b/src/ToolBox/SOS/lldbplugin/services.cpp @@ -560,7 +560,7 @@ LLDBServices::Disassemble( hr = E_FAIL; goto exit; } - cch = snprintf(buffer, bufferSize, "%016lx ", offset); + cch = snprintf(buffer, bufferSize, "%016llx ", (unsigned long long)offset); buffer += cch; bufferSize -= cch; |