Changeset 11661 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Aug 26, 2008 1:49:29 PM (16 years ago)

Author:

vboxsync

Message:

Modified IKeyboard::PutScancodes to use SafeArray (including webservice)

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• COMDefs.h (modified) (1 diff)
• KeyboardImpl.cpp (modified) (4 diffs)
• KeyboardImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/COMDefs.h

@@ -74 +74 @@
 #endif /* !RT_OS_WINDOWS */
 
+#define ComSafeArrayIn(aType, aArg)         unsigned aArg##Size, aType *aArg
+#define ComSafeArrayInIsNull(aArg)          (aArg == NULL)
+#define ComSafeArrayInArg(aArg)             aArg##Size, aArg
+#define ComSafeArrayAsInParam(aArray)   \
+    (aArray).size(), aArray.raw()
+
+
+namespace com
+{
+    template<class T> class SafeArray {
+        T t;
+    public:
+        SafeArray (size_t aSize) {}
+        SafeArray (ComSafeArrayIn (T, aArg)) {}
+        T &operator[] (size_t aIdx) { return t; }
+        size_t size() const { return 0; }
+        T *raw() { return &t; }
+    };
+}
 #endif

trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp

@@ -25 +25 @@
 #else
 # include <VBox/com/defs.h>
+//# include <VBox/com/array.h>
 #endif
 #include <VBox/pdm.h>
@@ -99 +100 @@
  *
  * @returns COM status code
- * @param scancodes   Pointer to the first scancode
- * @param count       Number of scancodes
+ * @param scancodes   Safe array 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(LONG *scancodes,
-                                    ULONG count,
+STDMETHODIMP Keyboard::PutScancodes(ComSafeArrayIn (LONG, scancodes),
                                     ULONG *codesStored)
 {
-    if (!scancodes)
+    if (ComSafeArrayInIsNull(scancodes))
         return E_INVALIDARG;
     if (!mpDrv)
         return S_OK;
 
-    LONG *currentScancode = scancodes;
+    com::SafeArray <LONG> keys(ComSafeArrayInArg(scancodes));
     int rcVBox = VINF_SUCCESS;
 
-    for (uint32_t i = 0; (i < count) && VBOX_SUCCESS(rcVBox); i++, currentScancode++)
-    {
-        rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, *(uint8_t*)currentScancode);
+    for (uint32_t i = 0; (i < keys.size()) && VBOX_SUCCESS(rcVBox); i++)
+    {
+        rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]);
     }
 
@@ -127 +126 @@
     /// @todo is it actually possible that not all scancodes can be transmitted?
     if (codesStored)
-        *codesStored = count;
+        *codesStored = keys.size();
 
     return S_OK;
@@ -141 +140 @@
 STDMETHODIMP Keyboard::PutCAD()
 {
-    static LONG cadSequence[] = {
-        0x1d, // Ctrl down
-        0x38, // Alt down
-        0x53, // Del down
-        0xd3, // Del up
-        0xb8, // Alt up
-        0x9d  // Ctrl up
-    };
-
-    return PutScancodes (cadSequence, ELEMENTS (cadSequence), NULL);
+    static com::SafeArray<LONG> cadSequence(6);
+    
+    cadSequence[0] = 0x1d; // Ctrl down
+    cadSequence[1] = 0x38; // Alt down
+    cadSequence[2] = 0x53; // Del down
+    cadSequence[3] = 0xd3; // Del up
+    cadSequence[4] = 0xb8; // Alt up
+    cadSequence[5] = 0x9d; // Ctrl up
+
+    return PutScancodes (ComSafeArrayAsInParam(cadSequence), NULL);
 }
 

trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h

@@ -48 +48 @@
 
     STDMETHOD(PutScancode)(LONG scancode);
-    STDMETHOD(PutScancodes)(LONG *scancodes,
-                            ULONG count,
+    STDMETHOD(PutScancodes)(ComSafeArrayIn (LONG, scancodes),
                             ULONG *codesStored);
     STDMETHOD(PutCAD)();