Signed bits and fixed a problem with ip2md when inherited token is th…

…e same of the class token for a method

ClrMemDiagExt/COMInterop.cs

@@ -3724,9 +3724,9 @@ public int MakeSourceInternal(ulong IP=0)
         {
 
             Module mod = IP == 0 ? DebugApi.ModuleFromScope : DebugApi.GetModuleFromIp(IP);
-            if (!mod.IsClr)
+            if (mod == null || !mod.IsClr)
             {
-                Exports.WriteLine("Module {0} is not managed. No source will be created.", mod.Name);
+                Exports.WriteLine("Module {0} is not managed or could not be found. No source will be created.", mod.Name);
                 Exports.WriteLine("Move to the frame context in the stack where you want the code created (example .frame 3)");
                 return HRESULTS.E_FAIL;
             }

ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Desktop/runtimebase.cs

@@ -295,7 +295,10 @@ public override ClrMethod GetMethodByHandle(ulong methodHandle)
             ClrType type = Heap.GetTypeByMethodTable(methodDesc.MethodTable);
             if (type == null)
                 return null;
-
+#if DEBUG
+            var p = type.GetMethod(methodDesc.MDToken);
+            var name = p.Name;
+#endif
             return type.GetMethod(methodDesc.MDToken);
         }
 

ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Desktop/types.cs

@@ -1416,7 +1416,7 @@ private void InitFields()
 
         internal override ClrMethod GetMethod(uint token)
         {
-            return Methods.Where(m => m.MetadataToken == token).FirstOrDefault();
+            return Methods.Where(m => m.MetadataToken == token).LastOrDefault();
         }
 
         public override IList<ClrMethod> Methods

ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Utilities/PDB/PdbFile.cs

@@ -463,9 +463,11 @@ internal static PdbFunction[] LoadFunctions(Stream read,
             dir._streams[1].Read(reader, bits);
             Dictionary<string, int> nameIndex = LoadNameIndex(bits, out ver, out sig, out age, out guid);
             int nameStream;
+            List<PdbFunction> funcList = new List<PdbFunction>();
             if (!nameIndex.TryGetValue("/NAMES", out nameStream))
             {
-                throw new PdbException("No `name' stream");
+                return funcList.ToArray(); // It's a public symbol with no method information
+                //throw new PdbException("No `name' stream");
             }
 
             dir._streams[nameStream].Read(reader, bits);
@@ -474,7 +476,7 @@ internal static PdbFunction[] LoadFunctions(Stream read,
             dir._streams[3].Read(reader, bits);
             LoadDbiStream(bits, out modules, out header, readAllStrings);
 
-            List<PdbFunction> funcList = new List<PdbFunction>();
+
             Dictionary<string, PdbSource> sourceDictionary = new Dictionary<string, PdbSource>();
             if (modules != null)
             {

ClrMemDiagExt/Properties/AssemblyInfo.cs

@@ -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.62.5000")]
-[assembly: AssemblyFileVersion("2.1.62.5000")]
+[assembly: AssemblyVersion("2.1.63.5000")]
+[assembly: AssemblyFileVersion("2.1.63.5000")]

NetExt/Release32/NetExt.write.1.tlog

@@ -118,3 +118,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

NetExt/VersionInfo.h

@@ -8,7 +8,7 @@
 #ifndef ver_major
 #define ver_major 2
 #define ver_minor 1
-#define ver_release 62
+#define ver_release 63
 #define ver_build 5000
 #define ver_all(a,b,c,d) a,b,c,d
 #define ver_expand(s) #s