Changeset 26054 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jan 26, 2010 8:46:38 PM (15 years ago)

Author:

vboxsync

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

56971

Message:

Additions/x11/vboxvideo: use vboxvideo_70 for the XFree86 driver too

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• VBoxGuestR3Lib.cpp (modified) (2 diffs)
• VBoxGuestR3LibMisc.cpp (modified) (7 diffs)
• VBoxGuestR3LibVideo.cpp (modified) (4 diffs)

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

@@ -204 +204 @@
 #endif
 
+#ifndef VBOX_VBGLR3_XFREE86
     /*
      * Create release logger
@@ -215 +216 @@
     if (RT_SUCCESS(rc2))
         RTLogRelSetDefaultInstance(pReleaseLogger);
+#endif
 
     return VINF_SUCCESS;

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

@@ -49 +49 @@
 VBGLR3DECL(int) VbglR3WaitEvent(uint32_t fMask, uint32_t cMillies, uint32_t *pfEvents)
 {
+#ifndef VBOX_VBGLR3_XFREE86
     LogFlow(("VbglR3WaitEvent: fMask=0x%x, cMillies=%u, pfEvents=%p\n",
              fMask, cMillies, pfEvents));
     AssertReturn((fMask & ~VMMDEV_EVENT_VALID_EVENT_MASK) == 0, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pfEvents, VERR_INVALID_POINTER);
+#endif
 
     VBoxGuestWaitEventInfo waitEvent;
@@ -62 +64 @@
     if (RT_SUCCESS(rc))
     {
+#ifndef VBOX_VBGLR3_XFREE86
         AssertMsg(waitEvent.u32Result == VBOXGUEST_WAITEVENT_OK, ("%d\n", waitEvent.u32Result));
+#endif
         if (pfEvents)
             *pfEvents = waitEvent.u32EventFlagsOut;
     }
 
+#ifndef VBOX_VBGLR3_XFREE86
     LogFlow(("VbglR3WaitEvent: rc=%Rrc, u32EventFlagsOut=0x%x. u32Result=%d\n",
              rc, waitEvent.u32EventFlagsOut, waitEvent.u32Result));
+#endif
     return rc;
 }
@@ -183 +189 @@
     Req.u32NotMask = fNot;
     int rc = vbglR3GRPerform(&Req.header);
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(VBOX_VBGLR3_XFREE86)
     if (RT_SUCCESS(rc))
         LogRel(("Successfully changed guest capabilities: or mask 0x%x, not mask 0x%x.\n", fOr, fNot));
@@ -193 +199 @@
 
 
+#ifndef VBOX_VBGLR3_XFREE86
 /**
  * Fallback for vbglR3GetAdditionsVersion.
@@ -223 +230 @@
     return VINF_SUCCESS;
 }
+#endif
 
 
@@ -281 +289 @@
 
 
+#ifndef VBOX_VBGLR3_XFREE86
 /**
  * Retrieves the installed Guest Additions version and/or revision.
@@ -375 +384 @@
 #endif /* !RT_OS_WINDOWS */
 }
-
+#endif /* !VBOX_VBGLR3_XFREE86 */
 
 /**

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

@@ -202 +202 @@
 VBGLR3DECL(int) VbglR3SaveVideoMode(const char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
 {
-#ifdef VBOX_WITH_GUEST_PROPS
+#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_VBGLR3_XFREE86)
     using namespace guestProp;
 
@@ -216 +216 @@
         VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
     return rc;
-#else /* VBOX_WITH_GUEST_PROPS not defined */
+#else /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
     return VERR_NOT_IMPLEMENTED;
-#endif /* VBOX_WITH_GUEST_PROPS not defined */
+#endif /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
 }
 
@@ -233 +233 @@
 VBGLR3DECL(int) VbglR3RetrieveVideoMode(const char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
 {
-#ifdef VBOX_WITH_GUEST_PROPS
+#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_VBGLR3_XFREE86)
     using namespace guestProp;
 
@@ -294 +294 @@
     }
     return rc;
-#else /* VBOX_WITH_GUEST_PROPS not defined */
+#else /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
     return VERR_NOT_IMPLEMENTED;
-#endif /* VBOX_WITH_GUEST_PROPS not defined */
-}
+#endif /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
+}