Changeset 45423 in vbox

Timestamp:

Apr 9, 2013 8:03:13 AM (12 years ago)

Author:

vboxsync

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

84852

Message:

ntBldSymDb.cpp: Fixes and symbol pack data.

File:

• trunk/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp

@@ -280 +280 @@
         const char *pszArch = pSet->enmArch == MYARCH_AMD64 ? "AMD64" : "X86";
         RTStrmPrintf(pOut,
-                     "#ifdef RT_ARCH_%s\n"
+                     "# ifdef RT_ARCH_%s\n"
                      "    {   /* Source: %s */\n"
                      "        /*.OsVerInfo = */\n"
@@ -320 +320 @@
         RTStrmPrintf(pOut,
                      "    },\n"
-                     "#endif\n"
+                     "# endif\n"
                      );
     }
@@ -742 +742 @@
             uint8_t     uMinorVer;
             uint8_t     uCsdNo;
-            uint8_t     uChecked;   /**< */
-            MYARCH      enmArch;
             uint32_t    uBuildNo;   /**< UINT32_MAX means the number immediately after the prefix. */
         } const s_aSymPacks[] =
         {
-            { RT_STR_TUPLE("Windows2003."),           5, 2, 0, UINT8_MAX, MYARCH_DETECT, UINT32_MAX },
-            { RT_STR_TUPLE("WindowsVista.6000."),     6, 0, 0, UINT8_MAX, MYARCH_DETECT, 6000 },
-            { RT_STR_TUPLE("Windows_Longhorn.6001."), 6, 0, 1, UINT8_MAX, MYARCH_DETECT, 6001 }, /* server 2008 */
-            { RT_STR_TUPLE("WindowsVista.6002."),     6, 0, 2, UINT8_MAX, MYARCH_DETECT, 6002 },
+            { RT_STR_TUPLE("windowsxp"),                        5, 1, 0, 2600 },
+            { RT_STR_TUPLE("xpsp1sym"),                         5, 1, 1, 2600 },
+            { RT_STR_TUPLE("WindowsXP-KB835935-SP2-"),          5, 1, 2, 2600 },
+            { RT_STR_TUPLE("WindowsXP-KB936929-SP3-"),          5, 1, 3, 2600 },
+            { RT_STR_TUPLE("Windows2003."),                     5, 2, 0, 3790 },
+            { RT_STR_TUPLE("Windows2003_sp1."),                 5, 2, 1, 3790 },
+            { RT_STR_TUPLE("WindowsServer2003-KB933548-v1"),    5, 2, 1, 3790 },
+            { RT_STR_TUPLE("WindowsVista.6000."),               6, 0, 0, 6000 },
+            { RT_STR_TUPLE("Windows_Longhorn.6001."),           6, 0, 1, 6001 }, /* incl w2k8 */
+            { RT_STR_TUPLE("WindowsVista.6002."),               6, 0, 2, 6002 }, /* incl w2k8 */
+            { RT_STR_TUPLE("Windows_Winmain.7000"),             6, 1, 0, 7000 }, /* Beta */
+            { RT_STR_TUPLE("Windows_Winmain.7100"),             6, 1, 0, 7100 }, /* RC */
+            { RT_STR_TUPLE("Windows_Win7.7600"),                6, 1, 0, 7600 }, /* RC */
+            { RT_STR_TUPLE("Windows_Win7SP1.7601"),             6, 1, 1, 7601 }, /* RC */
+            { RT_STR_TUPLE("Windows_Winmain.8102"),             6, 1, 0, 8102 }, /* preview */
+            { RT_STR_TUPLE("Windows_Winmain.8250"),             6, 1, 0, 8250 }, /* beta */
+            { RT_STR_TUPLE("Windows_Winmain.8400"),             6, 1, 0, 8400 }, /* RC */
+            { RT_STR_TUPLE("Windows_Win8.9200"),                6, 1, 0, 9200 }, /* RTM */
         };
 
@@ -764 +776 @@
         pVerInfo->uMinorVer = s_aSymPacks[j].uMinorVer;
         pVerInfo->uCsdNo    = s_aSymPacks[j].uCsdNo;
-        pVerInfo->fChecked  = s_aSymPacks[j].uChecked == 1;
+        pVerInfo->fChecked  = false;
         pVerInfo->uBuildNo  = s_aSymPacks[j].uBuildNo;
-        *penmArch           = s_aSymPacks[j].enmArch;
 
         /* Parse build number if necessary. */
@@ -1054 +1065 @@
 
     RTEXITCODE  rcExit      = RTEXITCODE_SUCCESS;
-    bool        fFoundInput = false;
     const char *pszOutput   = "-";
 
@@ -1109 +1119 @@
         }
     }
-    if (!fFoundInput)
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Not input files or directories specified.\n");
+    if (RTListIsEmpty(&g_SetList))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "No usable debug files found.\n");
 
     /*