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

Timestamp:

Aug 26, 2008 12:32:46 PM (16 years ago)

Author:

vboxsync

Message:

Backed out r35359

Location:

trunk/src/VBox/Main

Files:

• KeyboardImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/KeyboardImpl.h (modified) (1 diff)

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -25 +25 @@
 #include "Logging.h"
 
-#include <VBox/com/array.h>
 #include <VBox/pdmdrv.h>
 #include <iprt/asm.h>
@@ -149 +148 @@
                       This value can be NULL.
  */
-STDMETHODIMP Keyboard::PutScancodes(ComSafeArrayIn (LONG, scancodes),
+STDMETHODIMP Keyboard::PutScancodes(LONG *scancodes,
+                                    ULONG count,
                                     ULONG *codesStored)
 {
-    if (ComSafeArrayInIsNull(scancodes))
+    if (!scancodes)
         return E_INVALIDARG;
 
@@ -160 +160 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    com::SafeArray <LONG> keys(ComSafeArrayInArg(scancodes));
+    LONG *currentScancode = scancodes;
     int rcVBox = VINF_SUCCESS;
 
-    for (uint32_t i = 0; (i < keys.size()) && VBOX_SUCCESS(rcVBox); i++)
-    {
-        rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]);
+    for (uint32_t i = 0; (i < count) && VBOX_SUCCESS(rcVBox); i++, currentScancode++)
+    {
+        rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, *(uint8_t*)currentScancode);
     }
 
@@ -174 +174 @@
     /// @todo is it actually possible that not all scancodes can be transmitted?
     if (codesStored)
-        *codesStored = keys.size();
+        *codesStored = count;
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7707 +7707 @@
   <interface
      name="IKeyboard" extends="$unknown"
-     uuid="2d1a531b-4c6e-49cc-8af6-5c857b78b5d7"
+     uuid="FD443EC1-000A-4F5B-9282-D72760A66916"
      wsmap="managed"
      >
@@ -7724 +7724 @@
     <method name="putScancodes">
       <desc>Sends an array of scancode to the keyboard.</desc>
-      <param name="scancodes" type="long" dir="in" safearray="yes"/>
+      <param name="scancodes" type="long" dir="in" array="count"/>
+      <param name="count" type="unsigned long" dir="in"/>
       <param name="codesStored" type="unsigned long" dir="return"/>
     </method>

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

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