Changeset 46864 in vbox for trunk

Timestamp:

Jun 28, 2013 1:08:55 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: UI frame-buffer interface: Extended release (gui flow) logging.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -22 +22 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Local includes */
+/* GUI includes: */
 # include "UIMachineView.h"
 # include "UIFrameBuffer.h"
@@ -28 +28 @@
 # include "VBoxGlobal.h"
 
+/* Other VBox includes: */
 # include <VBox/VBoxVideo3D.h>
 
@@ -168 +169 @@
                                           BOOL *pbFinished)
 {
+    LogRelFlow(("UIFrameBuffer::RequestResize: "
+                "Screen=%lu, Format=%lu, "
+                "BitsPerPixel=%lu, BytesPerLine=%lu, "
+                "Size=%lux%lu\n",
+                (unsigned long)uScreenId, (unsigned long)uPixelFormat,
+                (unsigned long)uBitsPerPixel, (unsigned long)uBytesPerLine,
+                (unsigned long)uWidth, (unsigned long)uHeight));
+
     /* Make sure frame-buffer is not yet scheduled for removal: */
     if (m_fIsScheduledToDelete)
@@ -173 +182 @@
 
     /* Currently screen ID is not used: */
-    NOREF(uScreenId);
+    Q_UNUSED(uScreenId);
 
     /* Mark request as not-yet-finished: */
@@ -200 +209 @@
 STDMETHODIMP UIFrameBuffer::NotifyUpdate(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight)
 {
+    LogRelFlow(("UIFrameBuffer::NotifyUpdate: Origin=%lux%lu, Size=%lux%lu\n",
+                (unsigned long)uX, (unsigned long)uY,
+                (unsigned long)uWidth, (unsigned long)uHeight));
+
     /* Make sure frame-buffer is not yet scheduled for removal: */
     if (m_fIsScheduledToDelete)
@@ -221 +234 @@
 STDMETHODIMP UIFrameBuffer::VideoModeSupported(ULONG uWidth, ULONG uHeight, ULONG uBPP, BOOL *pbSupported)
 {
-    NOREF(uBPP);
-    LogFlowThisFunc(("width=%lu, height=%lu, BPP=%lu\n",
-                    (unsigned long)uWidth, (unsigned long)uHeight, (unsigned long)uBPP));
+    LogRelFlow(("UIFrameBuffer::VideoModeSupported: Mode: BPP=%lu, Size=%lux%lu\n",
+                (unsigned long)uBPP, (unsigned long)uWidth, (unsigned long)uHeight));
+
+    /* Make sure frame-buffer is not yet scheduled for removal: */
+    if (m_fIsScheduledToDelete)
+        return E_FAIL;
 
     if (!pbSupported)
@@ -229 +245 @@
     *pbSupported = TRUE;
 
-    lock(); /* See comment in setView(). */
-    QSize screen;
-    if (m_pMachineView)
-        screen = m_pMachineView->maxGuestSize();
+    /* Currently BPP is not used: */
+    Q_UNUSED(uBPP);
+
+    /* See comment in setView(): */
+    lock();
+
+    QSize screenSize;
+    if (m_pMachineView)
+        screenSize = m_pMachineView->maxGuestSize();
+
+    /* Unlock thread finally: */
     unlock();
-    if (   (screen.width() != 0)
-        && (uWidth > (ULONG)screen.width())
+
+    if (   (screenSize.width() != 0)
+        && (uWidth > (ULONG)screenSize.width())
         && (uWidth > (ULONG)width()))
         *pbSupported = FALSE;
 
-    if (   (screen.height() != 0)
-        && (uHeight > (ULONG)screen.height())
+    if (   (screenSize.height() != 0)
+        && (uHeight > (ULONG)screenSize.height())
         && (uHeight > (ULONG)height()))
         *pbSupported = FALSE;
 
-    LogFlowThisFunc(("screenW=%lu, screenH=%lu -> aSupported=%s\n",
-                    screen.width(), screen.height(), *pbSupported ? "TRUE" : "FALSE"));
-
+    LogRelFlow(("UIFrameBuffer::VideoModeSupported: Verdict: Supported=%s\n",
+                *pbSupported ? "TRUE" : "FALSE"));
+
+    /* Confirm VideoModeSupported: */
     return S_OK;
 }
@@ -257 +282 @@
         return E_POINTER;
 
-    NOREF(uCount);
-    NOREF(puCountCopied);
+    Q_UNUSED(uCount);
+    Q_UNUSED(puCountCopied);
 
     return S_OK;
@@ -265 +290 @@
 STDMETHODIMP UIFrameBuffer::SetVisibleRegion(BYTE *pRectangles, ULONG uCount)
 {
+    LogRelFlow(("UIFrameBuffer::SetVisibleRegion: Rectangle count=%lu\n", (unsigned long)uCount));
+
     /* Make sure frame-buffer is not yet scheduled for removal: */
     if (m_fIsScheduledToDelete)
@@ -334 +361 @@
     AssertBreakpoint();
 }
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
 void UIFrameBuffer::setView(UIMachineView * pView)