Changeset 6783 in vbox

Timestamp:

Feb 4, 2008 1:26:21 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: Seamless and solaris specifics.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp (modified) (1 diff)
• x11/xclient/seamless-guest.h (modified) (1 diff)
• x11/xclient/seamless-host.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -604 +604 @@
     {
         pInfo->u32Result = VBOXGUEST_WAITEVENT_TIMEOUT;
-        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VINF_TIMEOUT\n"));
+        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_TIMEOUT\n"));
         return VERR_TIMEOUT;
     }
@@ -668 +668 @@
     {
         pInfo->u32Result = VBOXGUEST_WAITEVENT_TIMEOUT;
-        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VINF_TIMEOUT\n"));
+        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_TIMEOUT\n"));
     }
     else if (rc == VERR_INTERRUPTED)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp

@@ -111 +111 @@
     int rc;
 
-    if (0 == cRects)
+    if (!cRects || !pRects)
         return VINF_SUCCESS;
     rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq,

trunk/src/VBox/Additions/x11/xclient/seamless-guest.h

@@ -79 +79 @@
 };
 
-#if defined(RT_OS_LINUX)
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
 # include "seamless-x11.h"  /* for VBoxGuestSeamlessGuestImpl */
 #else

trunk/src/VBox/Additions/x11/xclient/seamless-host.cpp

@@ -135 +135 @@
         return;
     }
-    VbglR3SeamlessSendRects(pRects.get()->size(), pRects.get()->data());
+    VbglR3SeamlessSendRects(pRects.get()->size(), pRects.get()->empty() ? NULL : &pRects.get()->front());
 }