Changeset 47190 in vbox for trunk/src/VBox

Timestamp:

Jul 16, 2013 1:44:46 PM (11 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: restored Mouse test case, not yet building though.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (3 diffs)
• include/DisplayImpl.h (modified) (2 diffs)
• include/MouseImpl.h (modified) (3 diffs)
• include/VMMDev.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (5 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstMouseImpl.cpp (copied) (copied from trunk/src/VBox/Frontends/VBoxBFE/testcase/tstMouseImpl.cpp ) (7 diffs, 1 prop)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -49 +49 @@
 class ExtPackManager;
 #endif
+class VMMDevMouseInterface;
+class DisplayMouseInterface;
 
 #include <VBox/RemoteDesktop/VRDE.h>
@@ -89 +91 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+class ConsoleMouseInterface
+{
+public:
+    virtual VMMDevMouseInterface  *getVMMDevMouseInterface()  = 0;
+    virtual DisplayMouseInterface *getDisplayMouseInterface() = 0;
+    virtual void onMouseCapabilityChange(BOOL supportsAbsolute,
+                                         BOOL supportsRelative,
+                                         BOOL supportsMT,
+                                         BOOL needsHostCursor) = 0;
+};
+
 /** IConsole implementation class */
 class ATL_NO_VTABLE Console :
     public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IConsole)
+    VBOX_SCRIPTABLE_IMPL(IConsole), public ConsoleMouseInterface
 {
     Q_OBJECT
@@ -291 +304 @@
     HRESULT onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove,
                                  NATProtocol_T aProto, IN_BSTR aHostIp, LONG aHostPort, IN_BSTR aGuestIp, LONG aGuestPort);
+
+    // Mouse interface
+    VMMDevMouseInterface *getVMMDevMouseInterface();
+    DisplayMouseInterface *getDisplayMouseInterface();
 
 private:

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -104 +104 @@
 } DISPLAYFBINFO;
 
+class DisplayMouseInterface
+{
+public:
+    virtual int getScreenResolution(uint32_t cScreen, uint32_t *pcx,
+                                    uint32_t *pcy, uint32_t *pcBPP) = 0;
+    virtual void getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                          int32_t *px2, int32_t *py2) = 0;
+};
+
 class ATL_NO_VTABLE Display :
     public VirtualBoxBase,
     VBOX_SCRIPTABLE_IMPL(IEventListener),
-    VBOX_SCRIPTABLE_IMPL(IDisplay)
+    VBOX_SCRIPTABLE_IMPL(IDisplay),
+    public DisplayMouseInterface
 {
 public:
@@ -151 +161 @@
     }
     void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2, int32_t *py2);
+    int getScreenResolution(uint32_t cScreen, uint32_t *pcx, uint32_t *pcy,
+                            uint32_t *pcBPP)
+    {
+        return GetScreenResolution(cScreen, pcx, pcy, pcBPP);
+    }
 
     int  handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);

trunk/src/VBox/Main/include/MouseImpl.h

@@ -52 +52 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Console *parent);
+    HRESULT init(ConsoleMouseInterface *parent);
     void uninit();
 
@@ -70 +70 @@
     static const PDMDRVREG  DrvReg;
 
-    Console *getParent() const
+    ConsoleMouseInterface *getParent() const
     {
         return mParent;
@@ -112 +112 @@
     bool supportsMT(void);
 
-    Console * const         mParent;
+    ConsoleMouseInterface * const         mParent;
     /** Pointer to the associated mouse driver. */
     struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];

trunk/src/VBox/Main/include/VMMDev.h

@@ -24 +24 @@
 class Console;
 
-class VMMDev
+class VMMDevMouseInterface
+{
+public:
+    virtual PPDMIVMMDEVPORT getVMMDevPort() = 0;
+};
+
+class VMMDev : public VMMDevMouseInterface
 {
 public:
@@ -49 +55 @@
     PPDMIVMMDEVPORT getVMMDevPort();
 
+#ifdef VBOX_WITH_HGCM
     int hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName);
     int hgcmHostCall (const char *pszServiceName, uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms);
@@ -59 +66 @@
 
     bool hgcmIsActive (void) { return ASMAtomicReadBool(&m_fHGCMActive); }
+#endif /* VBOX_WITH_HGCM */
 
 private:

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -4420 +4420 @@
 }
 
+VMMDevMouseInterface *Console::getVMMDevMouseInterface()
+{
+    return m_pVMMDev;
+}
+
+DisplayMouseInterface *Console::getDisplayMouseInterface()
+{
+    return mDisplay;
+}
 
 /**

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -100 +100 @@
  * @param parent handle of our parent object
  */
-HRESULT Mouse::init (Console *parent)
+HRESULT Mouse::init (ConsoleMouseInterface *parent)
 {
     LogFlowThisFunc(("\n"));
@@ -159 +159 @@
                                      uint32_t fCapsRemoved)
 {
-    VMMDev *pVMMDev = mParent->getVMMDev();
+    VMMDevMouseInterface *pVMMDev = mParent->getVMMDevMouseInterface();
     if (!pVMMDev)
         return E_FAIL;  /* No assertion, as the front-ends can send events
@@ -384 +384 @@
 HRESULT Mouse::reportAbsEventToVMMDev(int32_t mouseXAbs, int32_t mouseYAbs)
 {
-    VMMDev *pVMMDev = mParent->getVMMDev();
+    VMMDevMouseInterface *pVMMDev = mParent->getVMMDevMouseInterface();
     ComAssertRet(pVMMDev, E_FAIL);
     PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
@@ -510 +510 @@
     AssertPtrReturn(pcY, E_POINTER);
     AssertPtrNullReturn(pfValid, E_POINTER);
-    Display *pDisplay = mParent->getDisplay();
+    DisplayMouseInterface *pDisplay = mParent->getDisplayMouseInterface();
     ComAssertRet(pDisplay, E_FAIL);
     /** The amount to add to the result (multiplied by the screen width/height)
@@ -523 +523 @@
         ULONG displayWidth, displayHeight;
         /* Takes the display lock */
-        HRESULT rc = pDisplay->GetScreenResolution(0, &displayWidth,
+        HRESULT rc = pDisplay->getScreenResolution(0, &displayWidth,
                                                    &displayHeight, NULL);
         if (FAILED(rc))

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

@@ -31 +31 @@
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,) \
-        $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlContextID,)
+        $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlContextID,) \
+        $(if ,tstMouseImpl,)
   PROGRAMS.linux += \
         $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
@@ -208 +209 @@
 
 
+#
+# tstMouseImpl
+#
+# Not yet enabled, as I still haven't managed to wrap everything into the test
+# case.
+#
+tstMouseImpl_TEMPLATE = VBOXMAINCLIENTEXE
+tstMouseImpl_INST     = $(INST_TESTCASE)
+tstMouseImpl_SOURCES  = \
+        tstMouseImpl.cpp \
+        ../src-client/MouseImpl.cpp \
+        ../src-all/EventImpl.cpp \
+        ../src-all/VirtualBoxBase.cpp
+tstMouseImpl_INCS     = ../include \
+        $(dir $(VBOX_XML_SCHEMADEFS_H))
+tstMouseImpl_LIBS     = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
+
+
 # generate rules.
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -29 +29 @@
 #include <iprt/test.h>
 
-/******************************************************************************
-*   Test infrastructure                                                       *
-******************************************************************************/
-
-class TestConsole : public Console
+NS_DECL_CLASSINFO(Mouse)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Mouse, IMouse)
+
+PDMIVMMDEVPORT VMMDevPort;
+
+class TestVMMDev : public VMMDevMouseInterface
+{
+    PPDMIVMMDEVPORT getVMMDevPort(void) { return &VMMDevPort; }
+};
+
+class TestDisplay : public DisplayMouseInterface
+{
+    void getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                  int32_t *px2, int32_t *py2);
+    int getScreenResolution(uint32_t cScreen, uint32_t *pcx, uint32_t *pcy,
+                            uint32_t *pcBPP);
+};
+
+class TestConsole : public ConsoleMouseInterface
 {
 public:
-    TestConsole() {}
-    ~TestConsole() {}
-
-    virtual void     updateTitlebar() {}
-    virtual void     updateTitlebarProgress(const char *, int) {}
-
-    virtual void     inputGrabStart() {}
-    virtual void     inputGrabEnd() {}
-
-    virtual void     mouseSendEvent(int) {}
-    virtual void     onMousePointerShapeChange(bool, bool, uint32_t,
-                                               uint32_t, uint32_t,
-                                               uint32_t, void *) {}
-    virtual void     progressInfo(PVM, unsigned, void *) {}
-
-    virtual CONEVENT eventWait()
-    {
-        AssertFailedReturn(CONEVENT_QUIT);
-    }
-    virtual void     eventQuit() {}
-    virtual void     resetCursor() {}
-    virtual void     resetKeys(void) {}
-    virtual VMMDev   *getVMMDev()
-    {
-        return &mVMMDev;
-    }
-    virtual Display  *getDisplay()
-    {
-        return &mDisplay;
-    }
+    VMMDevMouseInterface *getVMMDevMouseInterface() { return &mVMMDev; }
+    DisplayMouseInterface *getDisplayMouseInterface() { return &mDisplay; }
+    /** @todo why on earth is this not implemented? */
+    void onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative,
+                                 BOOL supportsMT, BOOL needsHostCursor) {}
 
 private:
-    VMMDev mVMMDev;
-    Display mDisplay;
+    TestVMMDev mVMMDev;
+    TestDisplay mDisplay;
 };
 
@@ -147 +136 @@
 static struct PDMDRVINS *ppdmdrvIns = NULL;
 
-PDMIVMMDEVPORT VMMDevPort;
 Mouse *pMouse;
-Console *pConsole;
+ConsoleMouseInterface *pConsole;
 
 static struct
@@ -169 +157 @@
 }
 
-PPDMIVMMDEVPORT VMMDev::getVMMDevPort(void)
-{
-    return &VMMDevPort;
-}
-
-VMMDev::VMMDev() {}
-
-VMMDev::~VMMDev() {}
-
-void Display::getFramebufferDimensions(int32_t *px1, int32_t *py1,
-                                       int32_t *px2, int32_t *py2)
+void TestDisplay::getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                           int32_t *px2, int32_t *py2)
 {
     if (px1)
@@ -191 +170 @@
 }
 
-STDMETHODIMP Display::GetScreenResolution(ULONG aScreenId,
-                                          ULONG *aWidth,
-                                          ULONG *aHeight,
-                                          ULONG *aBitsPerPixel)
-{
-    if (aWidth)
-        *aWidth = 640;
-    if (aHeight)
-        *aHeight = 480;
-    if (aBitsPerPixel)
-        *aBitsPerPixel = 32;
+int TestDisplay::getScreenResolution(uint32_t cScreen, uint32_t *pcx,
+                                     uint32_t *pcy, uint32_t *pcBPP)
+{
+    NOREF(cScreen);
+    if (pcx)
+        *pcx = 640;
+    if (pcy)
+        *pcy = 480;
+    if (pcBPP)
+        *pcBPP = 32;
     return S_OK;
 }
-
-Display::Display() {}
-
-Display::~Display() {}
 
 DECLEXPORT(bool) CFGMR3AreValuesValid(PCFGMNODE, const char *)
@@ -261 +235 @@
     pConnector = (PPDMIMOUSECONNECTOR)pBase->pfnQueryInterface(pBase,
                                                  PDMIMOUSECONNECTOR_IID);
-    pConnector->pfnReportModes(pConnector, true, false);
+    pConnector->pfnReportModes(pConnector, true, false, false);
     pMouse->onVMMDevGuestCapsChange(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
                                     | VMMDEV_MOUSE_NEW_PROTOCOL);
@@ -292 +266 @@
     pConnector = (PPDMIMOUSECONNECTOR)pBase->pfnQueryInterface(pBase,
                                                  PDMIMOUSECONNECTOR_IID);
-    pConnector->pfnReportModes(pConnector, true, false);
+    pConnector->pfnReportModes(pConnector, true, false, false);
     pMouse->onVMMDevGuestCapsChange(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     pMouse->PutMouseEventAbsolute(320, 240, 0, 0, 0);
@@ -322 +296 @@
     pConnector = (PPDMIMOUSECONNECTOR)pBase->pfnQueryInterface(pBase,
                                                  PDMIMOUSECONNECTOR_IID);
-    pConnector->pfnReportModes(pConnector, false, true);
+    pConnector->pfnReportModes(pConnector, false, true, false);
     pMouse->onVMMDevGuestCapsChange(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
                                     | VMMDEV_MOUSE_NEW_PROTOCOL);