儲存庫 vbox 的更動 12435

時間撮記:

2008-9-12 下午04:12:53 (16 年 以前)

作者:

vboxsync

訊息:

DBGGui / VirtualBox4: check the vtable version.

位置:

trunk

檔案:

• include/VBox/dbggui.h (修改) (1 筆差異)
• src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (修改) (2 筆差異)

trunk/include/VBox/dbggui.h

@@ -69 +69 @@
  * The first byte is the minor version, the 2nd byte is major version number.
  * The high 16-bit word is a magic.  */
-#define DBGGUIVT_VERSION 0xbead0100
+#define DBGGUIVT_VERSION    UINT32_C(0xbead0100)
+/** Macro for determining whether two versions are compatible or not.
+ * @returns boolean result.
+ * @param   uVer1   The first version number.
+ * @param   uVer2   The second version number.
+ */
+#define DBGGUIVT_ARE_VERSIONS_COMPATIBLE(uVer1, uVer2) \
+    ( ((uVer1) & UINT32_C(0xffffff00)) == ((uVer2) & UINT32_C(0xffffff00)) )
 
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -270 +270 @@
         dbgStatisticsAction = new QAction (this);
         dbgCommandLineAction = new QAction (this);
+        if (vboxGlobal().getDebuggerModule()== NIL_RTLDRMOD)
+        {
+            dbgStatisticsAction->setEnabled (false);
+            dbgCommandLineAction->setEnabled (false);
+        }
         dbgLoggingAction = new QAction (this);
         dbgLoggingAction->setCheckable (true);
-        dbgLoggingAction->setIcon (VBoxGlobal::iconSet (":/start_16px.png")); /// @todo find the default check boxes.
     }
     else
@@ -3462 +3466 @@
         if (RT_SUCCESS (rc))
         {
-            dbgAdjustRelativePos();
-            return true;
-        }
-        LogRel(("DBGGuiCreate failed, rc=%Rrc\n", rc));
+            if (    DBGGUIVT_ARE_VERSIONS_COMPATIBLE(mDbgGuiVT->u32Version, DBGGUIVT_VERSION)
+                ||  mDbgGuiVT->u32EndVersion != mDbgGuiVT->u32Version)
+            {
+                dbgAdjustRelativePos();
+                return true;
+            }
+
+            LogRel(("DBGGuiCreate failed, incompatible versions (loaded %#x/%#x, expected %#x)\n",
+                    mDbgGuiVT->u32Version, mDbgGuiVT->u32EndVersion, DBGGUIVT_VERSION));
+        }
+        else
+            LogRel(("DBGGuiCreate failed, rc=%Rrc\n", rc));
     }
     else