Changeset 47746 in vbox

Timestamp:

Aug 15, 2013 7:44:17 AM (11 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: use real CFGM in test case instead of faking APIs.

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstMouseImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -226 +226 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
         $(dir $(VBOX_XML_SCHEMADEFS_H))
-tstMouseImpl_LIBS      = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
+tstMouseImpl_LIBS      = \
+        $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) \
+        $(LIB_VMM)
 # Super ugly hack to make the code work well enough without having ATL/COM
 # completely initialized, without it there are crashes caused by ComObjPtr

trunk/src/VBox/Main/testcase/tstMouseImpl.cpp

@@ -253 +253 @@
 }
 
-DECLEXPORT(bool) CFGMR3AreValuesValid(PCFGMNODE, const char *)
-{
-    return true;
-}
-
-DECLEXPORT(int) CFGMR3QueryPtr(PCFGMNODE, const char *, void **pv)
-{
-    *pv = pMouse;
-    return VINF_SUCCESS;
-}
-
 /******************************************************************************
 *   Main test code                                                            *
@@ -270 +259 @@
 static int setup(void)
 {
+    PCFGMNODE pCfg = NULL;
+    Mouse *pMouse2;
+    int rc;
     VMMDevPort.pfnSetAbsoluteMouse = setAbsoluteMouse;
     VMMDevPort.pfnUpdateMouseCapabilities = updateMouseCapabilities;
@@ -281 +273 @@
                                                   + Mouse::DrvReg.cbInstance);
     *ppdmdrvIns = pdmdrvInsCore;
-    Mouse::DrvReg.pfnConstruct(ppdmdrvIns, NULL, 0);
-    return VINF_SUCCESS;
+    pMouse2 = pMouse;
+    pCfg = CFGMR3CreateTree(NULL);
+    if (pCfg)
+        rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pMouse2);
+    if (RT_SUCCESS(rc))
+        Mouse::DrvReg.pfnConstruct(ppdmdrvIns, pCfg, 0);
+    return rc;
 }