Changeset 11655 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 26, 2008 12:01:22 PM (16 years ago)

Author:

vboxsync

Message:

Modified IKeyboard::PutScancodes to use SafeArray

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1388 +1388 @@
                     if (ke->key() >= Key_F1 && ke->key() <= Key_F12)
                     {
-                        LONG combo [6];
+                        QValueVector <LONG> combo (6);
                         combo [0] = 0x1d; /* Ctrl down */
                         combo [1] = 0x38; /* Alt  down */
@@ -1408 +1408 @@
 
                         CKeyboard keyboard = mConsole.GetKeyboard();
-                        keyboard.PutScancodes (combo, 6);
+                        keyboard.PutScancodes (combo);
                     }
                     else if (ke->key() == Key_Home)
@@ -2615 +2615 @@
 #endif
 
-    keyboard.PutScancodes (codes, count);
+    std::vector <LONG> tmp(codes, &codes[count]);
+    QValueVector <LONG> scancodes (tmp);
+    keyboard.PutScancodes (scancodes);
 
     /* grab the key from Qt */
@@ -3185 +3187 @@
                 fSentRESEND = true;
             }
-            LONG codes [2];
+            QValueVector <LONG> codes (2);
             codes[0] = 0xE0;
             codes[1] = i | 0x80;
-            keyboard.PutScancodes (codes, 2);
+            keyboard.PutScancodes (codes);
         }
         mPressedKeys [i] = 0;
@@ -3215 +3217 @@
     AssertMsg (mAttached, ("Console must be attached"));
 
-    LONG codes [2];
+    QValueVector <LONG> codes (2);
     CKeyboard keyboard = mConsole.GetKeyboard();
     for (uint i = 0; i < SIZEOF_ARRAY (mPressedKeys); ++ i)
@@ -3234 +3236 @@
             if (!(ns & IsExtKeyPressed))
                 codes [1] |= 0x80;
-            keyboard.PutScancodes (codes, 2);
+            keyboard.PutScancodes (codes);
         }
     }