Changeset 50592 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Feb 25, 2014 7:56:18 PM (11 years ago)

Author:

vboxsync

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

92463

Message:

6813 src-client/MouseImpl.cpp changes backed out to clear clbr burns

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstMouseImpl.cpp (modified) (4 diffs)

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

@@ -237 +237 @@
 # tstMouseImpl
 #
-tstMouseImpl_TEMPLATE = VBOXMAINCLIENTTSTEXE
+tstMouseImpl_TEMPLATE = VBOXMAINTSTEXE
 tstMouseImpl_SOURCES  = \
         tstMouseImpl.cpp \
@@ -250 +250 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
-        $(dir $(VBOX_XML_SCHEMADEFS_H)) \
-        $(VBOX_MAIN_APIWRAPPER_INCS)
-tstMouse_INTERMEDIATES   = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
-
+        $(dir $(VBOX_XML_SCHEMADEFS_H))
 tstMouseImpl_LIBS      = \
         $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) \

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

@@ -30 +30 @@
 #include <iprt/test.h>
 
+#ifndef RT_OS_WINDOWS
+NS_DECL_CLASSINFO(Mouse)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Mouse, IMouse)
+#endif
 
 PDMIVMMDEVPORT VMMDevPort;
@@ -319 +323 @@
                                                  PDMIMOUSECONNECTOR_IID);
     pConnector->pfnReportModes(pConnector, true, false, false);
-    pMouse->i_onVMMDevGuestCapsChange(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                      | VMMDEV_MOUSE_NEW_PROTOCOL);
+    pMouse->onVMMDevGuestCapsChange(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                    | VMMDEV_MOUSE_NEW_PROTOCOL);
     pMouse->PutMouseEventAbsolute(0, 0, 0, 0, 0);
     RTTESTI_CHECK_MSG(approxEq(absoluteMouse.x, 0x8000, 200),
@@ -350 +354 @@
                                                  PDMIMOUSECONNECTOR_IID);
     pConnector->pfnReportModes(pConnector, true, false, false);
-    pMouse->i_onVMMDevGuestCapsChange(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
+    pMouse->onVMMDevGuestCapsChange(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     pMouse->PutMouseEventAbsolute(320, 240, 0, 0, 0);
     RTTESTI_CHECK_MSG(approxEq(absoluteMouse.x, 0x8000, 200),
@@ -380 +384 @@
                                                  PDMIMOUSECONNECTOR_IID);
     pConnector->pfnReportModes(pConnector, false, true, false);
-    pMouse->i_onVMMDevGuestCapsChange(VMMDEV_MOUSE_NEW_PROTOCOL);
+    pMouse->onVMMDevGuestCapsChange(VMMDEV_MOUSE_NEW_PROTOCOL);
     pMouse->PutMouseEventAbsolute(0, 0, 0, 0, 0);
     RTTESTI_CHECK_MSG(approxEq(mouseEventAbs.cx, 0x8000, 200),