Changeset 47273 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 19, 2013 5:39:38 PM (11 years ago)

Author:

vboxsync

Message:

Main/testcase: eliminated fundamentally broken use of Assert, and made it work on COM (with major trickery)

Location:

trunk/src/VBox/Main/testcase

Files:

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

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

@@ -227 +227 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H))
 tstMouseImpl_LIBS      = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
+# Super ugly hack to make the code work well enough without having ATL/COM
+# completely initialized, without it there are crashes caused by ComObjPtr
+# and many other pieces of glue code, as the inproc code path is more picky.
+tstMouseImpl_DEFS.win  += VBOX_COM_OUTOFPROC_MODULE
 
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -138 +138 @@
 static struct PDMDRVINS *ppdmdrvIns = NULL;
 
-Mouse *pMouse;
-ConsoleMouseInterface *pConsole;
+ComObjPtr<Mouse> pMouse;
+ConsoleMouseInterface *pConsole = NULL;
 
 static struct
@@ -204 +204 @@
     VMMDevPort.pfnSetAbsoluteMouse = setAbsoluteMouse;
     VMMDevPort.pfnUpdateMouseCapabilities = updateMouseCapabilities;
-    pMouse = new Mouse;
-    Assert(SUCCEEDED(pMouse->FinalConstruct()));
+    HRESULT hrc = pMouse.createInstance();
+    AssertComRC(hrc);
+    if (FAILED(hrc))
+        return VERR_GENERAL_FAILURE;
     pConsole = new TestConsole;
     pMouse->init(pConsole);
@@ -217 +219 @@
 static void teardown(void)
 {
-    delete pMouse;
-    delete pConsole;
-    RTMemFree(ppdmdrvIns);
+    pMouse.setNull();
+    if (pConsole)
+        delete pConsole;
+    if (ppdmdrvIns)
+        RTMemFree(ppdmdrvIns);
 }
 
@@ -351 +355 @@
     for (unsigned i = 0; g_tests[i]; ++i)
     {
-        AssertRC(setup());
-        g_tests[i](hTest);
+        int rc = setup();
+        AssertRC(rc);
+        if (RT_SUCCESS(rc))
+            g_tests[i](hTest);
         teardown();
     }