Changeset 46128 in vbox for trunk/src/VBox/Debugger

Timestamp:

May 16, 2013 2:22:11 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85819

Message:

WinNT Digger: Some adjustments to the 32-bit detection code. print arch in version string.

File:

• trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp (modified) (6 diffs)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp ¶

@@ -746 +746 @@
         default:                        pszNtProductType = "";              break;
     }
-    RTStrPrintf(pszVersion, cchVersion, "%u.%u%s", pThis->NtMajorVersion, pThis->NtMinorVersion, pszNtProductType);
+    RTStrPrintf(pszVersion, cchVersion, "%u.%u-%s%s", pThis->NtMajorVersion, pThis->NtMinorVersion,
+                pThis->f32Bit ? "x86" : "AMD64", pszNtProductType);
     return VINF_SUCCESS;
 }
@@ -1004 +1005 @@
                             &&  uMte2.v32.SizeOfImage == uMte.v32.SizeOfImage
                             &&  WINNT32_VALID_ADDRESS(uMte2.v32.InLoadOrderLinks.Flink)
-                            &&  uMte2.v32.InLoadOrderLinks.Blink > KernelAddr.FlatPtr    /* list head inside ntoskrnl */
-                            &&  uMte2.v32.InLoadOrderLinks.Blink < KernelAddr.FlatPtr + uMte.v32.SizeOfImage
                             &&  WINNT32_VALID_ADDRESS(uMte2.v32.BaseDllName.Buffer)
                             &&  WINNT32_VALID_ADDRESS(uMte2.v32.FullDllName.Buffer)
-                            &&  uMte2.v32.BaseDllName.Length <= uMte2.v32.BaseDllName.MaximumLength
-                            &&  uMte2.v32.BaseDllName.Length == WINNT_KERNEL_BASE_NAME_LEN * 2
-                            &&  uMte2.v32.FullDllName.Length <= uMte2.v32.FullDllName.MaximumLength
-                            &&  uMte2.v32.FullDllName.Length <= 256
+                            &&  uMte2.v32.BaseDllName.Length <= 128
+                            &&  uMte2.v32.FullDllName.Length <= 260
                            )
                         {
@@ -1038 +1035 @@
                                     return true;
                                 }
+                            }
+                            else if (RT_SUCCESS(rc))
+                            {
+                                Log2(("DigWinNt: Wrong module: MteAddr=%RGv ImageAddr=%RGv SizeOfImage=%#x '%ls'\n",
+                                      MteAddr.FlatPtr, KernelAddr.FlatPtr, uMte2.v32.SizeOfImage, u.wsz));
+                                break; /* Not NT kernel */
                             }
                         }
@@ -1070 +1073 @@
                     DBGFADDRESS ScanAddr;
                     DBGFADDRESS HitAddr;
-                    rc = DBGFR3MemScan(pUVM, 0 /*idCpu*/,
-                                       DBGFR3AddrFromFlat(pUVM, &ScanAddr, uStart),
-                                       uEnd - uStart,
-                                       4 /*align*/, &uMte.v64.DllBase, 5 * sizeof(uint32_t), &HitAddr);
+                    rc = DBGFR3MemScan(pUVM, 0 /*idCpu*/, DBGFR3AddrFromFlat(pUVM, &ScanAddr, uStart),
+                                       uEnd - uStart, 8 /*align*/, &uMte.v64.DllBase, 5 * sizeof(uint32_t), &HitAddr);
                     while (RT_SUCCESS(rc))
                     {
@@ -1087 +1088 @@
                             &&  WINNT64_VALID_ADDRESS(uMte2.v64.BaseDllName.Buffer)
                             &&  WINNT64_VALID_ADDRESS(uMte2.v64.FullDllName.Buffer)
+                            &&  uMte2.v64.BaseDllName.Length <= 128
+                            &&  uMte2.v64.FullDllName.Length <= 260
                             )
                         {
@@ -1123 +1126 @@
 
                         /* next */
-                        DBGFR3AddrAdd(&HitAddr, 4);
+                        DBGFR3AddrAdd(&HitAddr, 8);
                         if (HitAddr.FlatPtr < uEnd)
                             rc = DBGFR3MemScan(pUVM, 0 /*idCpu*/, &HitAddr, uEnd - HitAddr.FlatPtr,
-                                               4 /*align*/, &uMte.v64.DllBase, 3 * sizeof(uint32_t), &HitAddr);
+                                               8 /*align*/, &uMte.v64.DllBase, 3 * sizeof(uint32_t), &HitAddr);
                         else
                             rc = VERR_DBGF_MEM_NOT_FOUND;