Changeset 52400 in vbox for trunk/src

Timestamp:

Aug 18, 2014 6:04:00 PM (11 years ago)

Author:

vboxsync

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

95562

Message:

6813 KeyboardImpl.cpp changes

Location:

trunk/src/VBox/Main

Files:

• include/KeyboardImpl.h (modified) (6 diffs)
• src-client/KeyboardImpl.cpp (modified) (15 diffs)
• src-client/xpcom/module.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #define ____H_KEYBOARDIMPL
 
-#include "VirtualBoxBase.h"
+#include "KeyboardWrap.h"
 #include "ConsoleEvents.h"
 #include "EventImpl.h"
@@ -34 +34 @@
     KeyboardEvent() : scan(-1) {}
     KeyboardEvent(int _scan) : scan(_scan) {}
-    bool isValid()
+    bool i_isValid()
     {
         return (scan & ~0x80) && !(scan & ~0xFF);
@@ -46 +46 @@
 
 class ATL_NO_VTABLE Keyboard :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IKeyboard)
+    public KeyboardWrap
 {
 public:
-
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(Keyboard, IKeyboard)
-
-    DECLARE_NOT_AGGREGATABLE(Keyboard)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(Keyboard)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IKeyboard)
-    END_COM_MAP()
 
     DECLARE_EMPTY_CTOR_DTOR(Keyboard)
@@ -70 +59 @@
     void uninit();
 
-    STDMETHOD(PutScancode)(LONG scancode);
-    STDMETHOD(PutScancodes)(ComSafeArrayIn(LONG, scancodes),
-                            ULONG *codesStored);
-    STDMETHOD(PutCAD)();
-    STDMETHOD(ReleaseKeys)();
-
-    STDMETHOD(COMGETTER(EventSource))(IEventSource ** aEventSource);
-
     static const PDMDRVREG  DrvReg;
 
-    Console *getParent() const
+    Console *i_getParent() const
     {
         return mParent;
@@ -87 +68 @@
 private:
 
-    static DECLCALLBACK(void)   keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds);
-    static DECLCALLBACK(void)   keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive);
-    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
-    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
+    // Wrapped Keyboard properties
+    HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
+    HRESULT putScancode(LONG aScancode);
+    HRESULT putScancodes(const std::vector<LONG> &aScancodes,
+                         ULONG *aCodesStored);
+
+    // Wrapped Keyboard members
+    HRESULT putCAD();
+    HRESULT releaseKeys();
+
+    static DECLCALLBACK(void)   i_keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds);
+    static DECLCALLBACK(void)   i_keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive);
+    static DECLCALLBACK(void *) i_drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
+    static DECLCALLBACK(int)    i_drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
+    static DECLCALLBACK(void)   i_drvDestruct(PPDMDRVINS pDrvIns);
 
     Console * const         mParent;

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

@@ -150 +150 @@
  *
  * @returns COM status code
- * @param scancode The scancode to send
- */
-STDMETHODIMP Keyboard::PutScancode(LONG scancode)
-{
-    com::SafeArray<LONG> scancodes(1);
-    scancodes[0] = scancode;
-    return PutScancodes(ComSafeArrayAsInParam(scancodes), NULL);
+ * @param aScancode The scancode to send
+ */
+HRESULT Keyboard::putScancode(LONG aScancode)
+{
+    std::vector<LONG> scancodes;
+    scancodes.resize(1);
+    scancodes[0] = aScancode;
+    return putScancodes(scancodes, NULL);
 }
 
@@ -163 +164 @@
  *
  * @returns COM status code
- * @param scancodes   Pointer to the first scancode
- * @param count       Number of scancodes
- * @param codesStored Address of variable to store the number
- *                    of scancodes that were sent to the keyboard.
-                      This value can be NULL.
- */
-STDMETHODIMP Keyboard::PutScancodes(ComSafeArrayIn(LONG, scancodes),
-                                    ULONG *codesStored)
-{
-    if (ComSafeArrayInIsNull(scancodes))
-        return E_INVALIDARG;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    com::SafeArray<LONG> keys(ComSafeArrayInArg(scancodes));
+ * @param aScancodes   Pointer to the first scancode
+ * @param aCodesStored Address of variable to store the number
+ *                     of scancodes that were sent to the keyboard.
+                       This value can be NULL.
+ */
+HRESULT Keyboard::putScancodes(const std::vector<LONG> &aScancodes,
+                               ULONG *aCodesStored)
+{
+    com::SafeArray<LONG> keys;
+    keys.resize(aScancodes.size());
+    for (size_t i = 0; i < aScancodes.size(); ++i)
+        keys[i] = aScancodes[i];
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -196 +193 @@
         }
     }
+
     /* No enabled keyboard - throw the input away. */
     if (!pUpPort)
     {
-        if (codesStored)
-            *codesStored = (uint32_t)keys.size();
+        if (aCodesStored)
+            *aCodesStored = (uint32_t)aScancodes.size();
         return S_OK;
     }
@@ -207 +205 @@
 
     uint32_t sent;
-    for (sent = 0; (sent < keys.size()) && RT_SUCCESS(vrc); sent++)
-        vrc = pUpPort->pfnPutEventScan(pUpPort, (uint8_t)keys[sent]);
-
-    if (codesStored)
-        *codesStored = sent;
-
-    /* Only signal the keys in the event which have been actually sent. */
-    com::SafeArray<LONG> keysSent(sent);
-    memcpy(keysSent.raw(), keys.raw(), sent*sizeof(LONG));
+    for (sent = 0; (sent < aScancodes.size()) && RT_SUCCESS(vrc); ++sent)
+        vrc = pUpPort->pfnPutEventScan(pUpPort, (uint8_t)aScancodes[sent]);
+
+    if (aCodesStored)
+        *aCodesStored = sent;
 
     VBoxEventDesc evDesc;
@@ -236 +230 @@
  *
  */
-STDMETHODIMP Keyboard::PutCAD()
-{
-    static com::SafeArray<LONG> cadSequence(8);
+HRESULT Keyboard::putCAD()
+{
+    static std::vector<LONG> cadSequence;
+    cadSequence.resize(8);
 
     cadSequence[0] = 0x1d; // Ctrl down
@@ -249 +244 @@
     cadSequence[7] = 0x9d; // Ctrl up
 
-    return PutScancodes(ComSafeArrayAsInParam(cadSequence), NULL);
+    return putScancodes(cadSequence, NULL);
 }
 
@@ -258 +253 @@
  *
  */
-STDMETHODIMP Keyboard::ReleaseKeys()
-{
-    com::SafeArray<LONG> scancodes(1);
+HRESULT Keyboard::releaseKeys()
+{
+    std::vector<LONG> scancodes;
+    scancodes.resize(1);
     scancodes[0] = 0xFC;    /* Magic scancode, see PS/2 and USB keyboard devices. */
-    return PutScancodes(ComSafeArrayAsInParam(scancodes), NULL);
-}
-
-STDMETHODIMP Keyboard::COMGETTER(EventSource)(IEventSource ** aEventSource)
-{
-    CheckComArgOutPointerValid(aEventSource);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    // no need to lock - lifetime constant
-    mEventSource.queryInterfaceTo(aEventSource);
+    return putScancodes(scancodes, NULL);
+}
+
+
+HRESULT Keyboard::getEventSource(ComPtr<IEventSource> &aEventSource)
+{
+    // No need to lock - lifetime constant
+    mEventSource.queryInterfaceTo(aEventSource.asOutParam());
 
     return S_OK;
@@ -281 +273 @@
 // private methods
 //
-
-DECLCALLBACK(void) Keyboard::keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds)
+DECLCALLBACK(void) Keyboard::i_keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds)
 {
     PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
-    pDrv->pKeyboard->getParent()->i_onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
-                                                         RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
-                                                         RT_BOOL(enmLeds & PDMKEYBLEDS_SCROLLLOCK));
+    pDrv->pKeyboard->i_getParent()->i_onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
+                                                           RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
+                                                           RT_BOOL(enmLeds & PDMKEYBLEDS_SCROLLLOCK));
 }
 
@@ -293 +284 @@
  * @interface_method_impl{PDMIKEYBOARDCONNECTOR,pfnSetActive}
  */
-DECLCALLBACK(void) Keyboard::keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive)
+DECLCALLBACK(void) Keyboard::i_keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive)
 {
     PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
@@ -306 +297 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-DECLCALLBACK(void *) Keyboard::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+DECLCALLBACK(void *) Keyboard::i_drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS          pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
@@ -323 +314 @@
  * @param   pDrvIns     The driver instance data.
  */
-DECLCALLBACK(void) Keyboard::drvDestruct(PPDMDRVINS pDrvIns)
+DECLCALLBACK(void) Keyboard::i_drvDestruct(PPDMDRVINS pDrvIns)
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
@@ -338 +329 @@
                 break;
             }
-        pThis->pKeyboard->mpVMMDev = NULL;
+            pThis->pKeyboard->mpVMMDev = NULL;
     }
 }
@@ -347 +338 @@
  * @copydoc FNPDMDRVCONSTRUCT
  */
-DECLCALLBACK(int) Keyboard::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+DECLCALLBACK(int) Keyboard::i_drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
@@ -365 +356 @@
      * IBase.
      */
-    pDrvIns->IBase.pfnQueryInterface        = Keyboard::drvQueryInterface;
-
-    pThis->IConnector.pfnLedStatusChange    = keyboardLedStatusChange;
-    pThis->IConnector.pfnSetActive          = Keyboard::keyboardSetActive;
+    pDrvIns->IBase.pfnQueryInterface      = Keyboard::i_drvQueryInterface;
+
+    pThis->IConnector.pfnLedStatusChange  = i_keyboardLedStatusChange;
+    pThis->IConnector.pfnSetActive        = Keyboard::i_keyboardSetActive;
 
     /*
@@ -429 +420 @@
     sizeof(DRVMAINKEYBOARD),
     /* pfnConstruct */
-    Keyboard::drvConstruct,
+    Keyboard::i_drvConstruct,
     /* pfnDestruct */
-    Keyboard::drvDestruct,
+    Keyboard::i_drvDestruct,
     /* pfnRelocate */
     NULL,

trunk/src/VBox/Main/src-client/xpcom/module.cpp

@@ -64 +64 @@
 
 #ifndef VBOX_COM_INPROC_API_CLIENT
-NS_DECL_CLASSINFO(Keyboard)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Keyboard, IKeyboard)
 NS_DECL_CLASSINFO(RemoteUSBDevice)
 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(RemoteUSBDevice, IHostUSBDevice, IUSBDevice)