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

Timestamp:

Mar 8, 2010 11:56:29 AM (15 years ago)

Author:

vboxsync

Message:

Main: use HRESULT properly

Location:

trunk/src/VBox/Main

Files:

• MouseImpl.cpp (modified) (8 diffs)
• include/MouseImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -146 +146 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int Mouse::getVMMDevMouseCaps(uint32_t *pfCaps)
+HRESULT Mouse::getVMMDevMouseCaps(uint32_t *pfCaps)
 {
     AssertPtrReturn(pfCaps, E_POINTER);
@@ -158 +158 @@
 }
 
-int Mouse::setVMMDevMouseCaps(uint32_t fCaps)
+HRESULT Mouse::setVMMDevMouseCaps(uint32_t fCaps)
 {
     VMMDev *pVMMDev = mParent->getVMMDev();
@@ -269 +269 @@
  * @returns   COM status code
  */
-int Mouse::reportRelEventToMouseDev(int32_t dx, int32_t dy, int32_t dz,
-                                    int32_t dw, uint32_t fButtons)
+HRESULT Mouse::reportRelEventToMouseDev(int32_t dx, int32_t dy, int32_t dz,
+                                        int32_t dw, uint32_t fButtons)
 {
     if (dx || dy || dz || dw || fButtons != mLastButtons)
@@ -300 +300 @@
  * @returns   COM status code
  */
-int Mouse::reportAbsEventToMouseDev(uint32_t mouseXAbs, uint32_t mouseYAbs,
-                                    int32_t dz, int32_t dw, uint32_t fButtons)
+HRESULT Mouse::reportAbsEventToMouseDev(uint32_t mouseXAbs, uint32_t mouseYAbs,
+                                        int32_t dz, int32_t dw, uint32_t fButtons)
 {
     if (   mouseXAbs != mLastAbsX || mouseYAbs != mLastAbsY
@@ -332 +332 @@
  * @returns   COM status code
  */
-int Mouse::reportAbsEventToVMMDev(uint32_t mouseXAbs, uint32_t mouseYAbs)
+HRESULT Mouse::reportAbsEventToVMMDev(uint32_t mouseXAbs, uint32_t mouseYAbs)
 {
     VMMDev *pVMMDev = mParent->getVMMDev();
@@ -396 +396 @@
  * @returns   COM status value
  */
-int Mouse::convertDisplayWidth(LONG x, uint32_t *pcX)
+HRESULT Mouse::convertDisplayWidth(LONG x, uint32_t *pcX)
 {
     AssertPtrReturn(pcX, E_POINTER);
@@ -415 +415 @@
  * @returns   COM status value
  */
-int Mouse::convertDisplayHeight(LONG y, uint32_t *pcY)
+HRESULT Mouse::convertDisplayHeight(LONG y, uint32_t *pcY)
 {
     AssertPtrReturn(pcY, E_POINTER);
@@ -532 +532 @@
                fRelDev = true;
         }
-    if (RT_SUCCESS(getVMMDevMouseCaps(&u32MouseCaps)))
+    if (SUCCEEDED(getVMMDevMouseCaps(&u32MouseCaps)))
         fVMMDevCanAbs =    (u32MouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
                         && fRelDev;

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

@@ -123 +123 @@
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
 
-    int getVMMDevMouseCaps(uint32_t *pfCaps);
-    int setVMMDevMouseCaps(uint32_t fCaps);
-    int reportRelEventToMouseDev(int32_t dx, int32_t dy, int32_t dz,
+    HRESULT getVMMDevMouseCaps(uint32_t *pfCaps);
+    HRESULT setVMMDevMouseCaps(uint32_t fCaps);
+    HRESULT reportRelEventToMouseDev(int32_t dx, int32_t dy, int32_t dz,
                                  int32_t dw, uint32_t fButtons);
-    int reportAbsEventToMouseDev(uint32_t mouseXAbs, uint32_t mouseYAbs,
+    HRESULT reportAbsEventToMouseDev(uint32_t mouseXAbs, uint32_t mouseYAbs,
                                  int32_t dz, int32_t dw, uint32_t fButtons);
-    int reportAbsEventToVMMDev(uint32_t mouseXAbs, uint32_t mouseYAbs);
-    int convertDisplayWidth(LONG x, uint32_t *pcX);
-    int convertDisplayHeight(LONG y, uint32_t *pcY);
+    HRESULT reportAbsEventToVMMDev(uint32_t mouseXAbs, uint32_t mouseYAbs);
+    HRESULT convertDisplayWidth(LONG x, uint32_t *pcX);
+    HRESULT convertDisplayHeight(LONG y, uint32_t *pcY);
 
     void sendMouseCapsNotifications(void);