Changeset 26853 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 26, 2010 1:59:35 PM (15 years ago)

Author:

vboxsync

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

58131

Message:

VBoxBFE: Attempt to fix burn caused by r58109.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• SDLConsole.cpp (modified) (6 diffs)
• VirtualBoxBase.h (modified) (1 diff)

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

@@ -293 +293 @@
         case SDL_MOUSEMOTION:
         {
-            bool fMouseAbsolute;
+            BOOL fMouseAbsolute;
             gMouse->COMGETTER(AbsoluteSupported)(&fMouseAbsolute);
             if (mfInputGrab || fMouseAbsolute)
@@ -306 +306 @@
         case SDL_MOUSEBUTTONUP:
         {
-            bool fMouseAbsolute;
+            BOOL fMouseAbsolute;
             gMouse->COMGETTER(AbsoluteSupported)(&fMouseAbsolute);
             SDL_MouseButtonEvent *bev = &ev->button;
@@ -1157 +1157 @@
 void SDLConsole::inputGrabStart()
 {
-    bool fNeedsHostCursor;
+    BOOL fNeedsHostCursor;
     gMouse->COMGETTER(NeedsHostCursor)(&fNeedsHostCursor);
 #ifdef RT_OS_DARWIN
@@ -1176 +1176 @@
 void SDLConsole::inputGrabEnd()
 {
-    bool fNeedsHostCursor;
+    BOOL fNeedsHostCursor;
     gMouse->COMGETTER(NeedsHostCursor)(&fNeedsHostCursor);
     SDL_WM_GrabInput(SDL_GRAB_OFF);
@@ -1201 +1201 @@
     int x, y, state, buttons;
     bool abs;
-    bool fMouseAbsolute;
-    bool fNeedsHostCursor;
+    BOOL fMouseAbsolute;
+    BOOL fNeedsHostCursor;
 
     gMouse->COMGETTER(AbsoluteSupported)(&fMouseAbsolute);
@@ -1353 +1353 @@
      * don't do anything if there are no guest additions loaded (anymore)
      */
-    bool fMouseAbsolute;
+    BOOL fMouseAbsolute;
     gMouse->COMGETTER(AbsoluteSupported)(&fMouseAbsolute);
     if (!fMouseAbsolute)

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

@@ -40 +40 @@
 #include <list>
 #include <map>
+
+// defines
+////////////////////////////////////////////////////////////////////////////////
+
+#define VBOX_E_OBJECT_NOT_FOUND 0x80BB0001
+#define VBOX_E_INVALID_VM_STATE 0x80BB0002
+#define VBOX_E_VM_ERROR 0x80BB0003
+#define VBOX_E_FILE_ERROR 0x80BB0004
+#define VBOX_E_IPRT_ERROR 0x80BB0005
+#define VBOX_E_PDM_ERROR 0x80BB0006
+#define VBOX_E_INVALID_OBJECT_STATE 0x80BB0007
+#define VBOX_E_HOST_ERROR 0x80BB0008
+#define VBOX_E_NOT_SUPPORTED 0x80BB0009
+#define VBOX_E_XML_ERROR 0x80BB000A
+#define VBOX_E_INVALID_SESSION_STATE 0x80BB000B
+#define VBOX_E_OBJECT_IN_USE 0x80BB000C
 
 // macros and inlines