Skip to content

Commit

Permalink
Fixed issue with wow6432 dumps
Browse files Browse the repository at this point in the history
  • Loading branch information
rodneyviana committed Jan 30, 2021
1 parent d227b85 commit 8c4ca94
Show file tree
Hide file tree
Showing 24 changed files with 30 additions and 9 deletions.
Binary file added Binaries/Archive/NetExt-2.1.60.5000.zip
Binary file not shown.
Binary file added Binaries/Archive/NetExt-2.1.61.5000.zip
Binary file not shown.
Binary file added Binaries/NetExt-2.1.62.5000.zip
Binary file not shown.
Binary file modified Binaries/README.md
Binary file not shown.
Binary file modified Binaries/x64/NetExt.dll
Binary file not shown.
Binary file modified Binaries/x64/NetExt.pdb
Binary file not shown.
Binary file modified Binaries/x64/NetExtShim.dll
Binary file not shown.
Binary file modified Binaries/x64/NetExtShim.pdb
Binary file not shown.
Binary file modified Binaries/x86/NetExt.dll
Binary file not shown.
Binary file modified Binaries/x86/NetExtShim.dll
Binary file not shown.
15 changes: 14 additions & 1 deletion ClrMemDiagExt/COMInterop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3223,7 +3223,20 @@ public int CreateRuntimeFromIXCLR(object ixCLRProcess, out IMDRuntime ppRuntime)
if (m_target == null || m_target.ClrVersions == null)
return HRESULTS.E_FAIL;


if (m_target.ClrVersions.Count == 1)
{
try
{
DebugApi.Runtime = m_target.ClrVersions[0].CreateRuntime(ixCLRProcess);
ppRuntime = new MDRuntime(DebugApi.Runtime);
runTimeIndex = 0;
Runtimes = new List<ClrRuntime>();
Runtimes.Add(DebugApi.Runtime);
return HRESULTS.S_OK;
}
catch
{ }
}
if (runTimeIndex != -1 && runTimeIndex < m_target.ClrVersions.Count)
{
#if DEBUG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,10 @@ private string GetPhysicalFileFromServer(string serverPath, string pdbIndexPath,
var fullDestPath = Path.Combine(symbolCacheDir, pdbIndexPath);
if (File.Exists(fullDestPath))
return fullDestPath;

// replace .dl_ by .dll
//var fullDestPathNoZip = fullDestPath.Substring(0, fullDestPath.Length - 1) + "l";
//if (File.Exists(fullDestPathNoZip))
// return fullDestPathNoZip;
if (serverPath.StartsWith("http:"))
{
var fullUri = serverPath + "/" + pdbIndexPath.Replace('\\', '/');
Expand Down
4 changes: 2 additions & 2 deletions ClrMemDiagExt/Microsoft.Diagnostics.Runtime/datatarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1111,13 +1111,13 @@ private ClrInfo[] InitVersions()
break;
}

string dacLocation = Path.Combine(Path.GetDirectoryName(module.FileName), DacInfo.GetDacFileName(flavor, Architecture));
string dacLocation = Path.Combine(Path.GetDirectoryName(module.FileName), DacInfo.GetDacFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64));
if (!File.Exists(dacLocation) || !NativeMethods.IsEqualFileVersion(dacLocation, module.Version))
dacLocation = null;

VersionInfo version = module.Version;
string dacAgnosticName = DacInfo.GetDacRequestFileName(flavor, Architecture, Architecture, version);
string dacFileName = DacInfo.GetDacRequestFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, Architecture, version);
string dacFileName = DacInfo.GetDacRequestFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, version);

DacInfo dacInfo = new DacInfo(_dataReader, dacAgnosticName, Architecture)
{
Expand Down
4 changes: 2 additions & 2 deletions ClrMemDiagExt/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f12c38b7-0893-4208-ab3d-54c3f8d1c01e")]

[assembly: AssemblyVersion("2.1.61.5000")]
[assembly: AssemblyFileVersion("2.1.61.5000")]
[assembly: AssemblyVersion("2.1.62.5000")]
[assembly: AssemblyFileVersion("2.1.62.5000")]
4 changes: 2 additions & 2 deletions NetExt/NetExt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ HRESULT INIT_API()
HRESULT hr = S_OK;

if(pTarget != NULL) hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE;
EXITPOINTEXT("Init was performed but it could not start CLR");
EXITPOINTEXT("Init was performed but it could not start CLR\nTry running .cordll -l");

if(!clrData)
{
Expand All @@ -413,7 +413,7 @@ HRESULT INIT_API()
}

if(!clrData) hr=E_APPLICATION_ACTIVATION_EXEC_FAILURE;
EXITPOINTEXT("Unable to acquire .NET debugger interface");
EXITPOINTEXT("Unable to acquire .NET debugger interface\nTry running .cordll -l");

using namespace NetExtShim;
::CoInitialize(NULL);
Expand Down
Binary file modified NetExt/Release32/CL.read.1.tlog
Binary file not shown.
Binary file modified NetExt/Release32/NetExt.res
Binary file not shown.
5 changes: 5 additions & 0 deletions NetExt/Release32/NetExt.write.1.tlog
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,8 @@ C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
^C:\Users\rviana\OneDrive\Projects\netext\NetExt\NetExt.vcxproj
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
2 changes: 1 addition & 1 deletion NetExt/VersionInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef ver_major
#define ver_major 2
#define ver_minor 1
#define ver_release 61
#define ver_release 62
#define ver_build 5000
#define ver_all(a,b,c,d) a,b,c,d
#define ver_expand(s) #s
Expand Down
Binary file modified README.md
Binary file not shown.
Binary file modified Release32/NetExt.exp
Binary file not shown.
Binary file modified Release32/NetExt.lib
Binary file not shown.
Binary file modified x86/Release32/NetExt.dll
Binary file not shown.
Binary file modified x86/Release32/NetExtShim.dll
Binary file not shown.

0 comments on commit 8c4ca94

Please sign in to comment.