Changeset 6589 in vbox for trunk

Timestamp:

Jan 30, 2008 8:10:34 AM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: vboxGetDisplayChangeRequest returns bool, not iprt status!

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c (modified) (9 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c

@@ -48 +48 @@
  */
 
-#define DEBUG_VERB 2
+#ifdef DEBUG
 
 #define TRACE \
@@ -65 +65 @@
     xf86Msg(X_INFO, __VA_ARGS__); \
 } while(0)
+
+#else  /* DEBUG not defined */
+
+#define TRACE
+#define TRACE2
+#define TRACE3(...)
+
+#endif  /* DEBUG not defined */
+
 #ifdef XFree86LOADER
 # include "xorg-server.h"
@@ -198 +207 @@
     Bool rc = TRUE;
 
+    TRACE3("width=%d, height=%d\n", width, height);
     /* We only support horizontal resolutions which are a multiple of 8.  Round down if
        necessary. */
@@ -238 +248 @@
         scrn->displayWidth = width;
     }
+    TRACE3("returning %d\n", rc);
     return rc;
 }
@@ -261 +272 @@
 
     (void) mode;
+    TRACE3("name=%s, HDisplay=%d, VDisplay=%d\n", adjusted_mode->name,
+           adjusted_mode->HDisplay, adjusted_mode->VDisplay);
     /* We only support horizontal resolutions which are a multiple of 8.  Round down if
        necessary. */
@@ -282 +295 @@
 {
     (void) mode;
+    TRACE3("name=%s, HDisplay=%d, VDisplay=%d, x=%d, y=%d\n", adjusted_mode->name,
+           adjusted_mode->HDisplay, adjusted_mode->VDisplay, x, y);
     VBOXSetMode(crtc->scrn, adjusted_mode);
     VBOXAdjustFrame(crtc->scrn->scrnIndex, x, y, 0);
@@ -355 +370 @@
                       Bool isPreferred)
 {
+    TRACE3("pszName=%s, x=%d, y=%d\n", pszName, x, y);
     DisplayModePtr pMode = xnfcalloc(1, sizeof(DisplayModeRec));
 
@@ -381 +397 @@
 {
     uint32_t x, y, bpp;
-    int rc;
+    bool rc;
     DisplayModePtr pModes = NULL;
     ScrnInfoPtr pScrn = output->scrn;
 
+    TRACE;
     rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, 0, 0);
-    if (RT_SUCCESS(rc) && (0 != x) && (0 != y)) {
+    if (rc && (0 != x) && (0 != y)) {
         vbox_output_add_mode(&pModes, NULL, x, y, TRUE);
         vbox_output_add_mode(&pModes, "1024x768", 1024, 768, FALSE);
@@ -396 +413 @@
         vbox_output_add_mode(&pModes, "640x480", 640, 480, FALSE);
     }
+    TRACE2;
     return pModes;
 }