Changeset 41595 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jun 6, 2012 9:58:30 AM (13 years ago)

Author:

vboxsync

Message:

Main/Machine+Display: do not ignore the error code from DisplayMakePNG, create a nice error message out of it to help tracking down the root cause if it fails for no obvious reason

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -241 +241 @@
             /* Prepare a small thumbnail and a PNG screenshot. */
             displayMakeThumbnail(pu8Data, cx, cy, &pu8Thumbnail, &cbThumbnail, &cxThumbnail, &cyThumbnail);
-            DisplayMakePNG(pu8Data, cx, cy, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 1);
+            rc = DisplayMakePNG(pu8Data, cx, cy, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 1);
+            if (RT_FAILURE(rc))
+            {
+                if (pu8PNG)
+                {
+                    RTMemFree(pu8PNG);
+                    pu8PNG = NULL;
+                }
+                cbPNG = 0;
+                cxPNG = 0;
+                cyPNG = 0;
+            }
 
             /* This can be called from any thread. */
-            that->mpDrv->pUpPort->pfnFreeScreenshot (that->mpDrv->pUpPort, pu8Data);
+            that->mpDrv->pUpPort->pfnFreeScreenshot(that->mpDrv->pUpPort, pu8Data);
         }
     }
@@ -2323 +2334 @@
             int iDeltaLine = cx * 4;
 
-            BitmapScale32 (dst,
-                           dstW, dstH,
-                           src,
-                           iDeltaLine,
-                           srcW, srcH);
+            BitmapScale32(dst,
+                          dstW, dstH,
+                          src,
+                          iDeltaLine,
+                          srcW, srcH);
         }
 
@@ -2333 +2344 @@
         {
             /* This can be called from any thread. */
-            pDrv->pUpPort->pfnFreeScreenshot (pDrv->pUpPort, pu8Data);
+            pDrv->pUpPort->pfnFreeScreenshot(pDrv->pUpPort, pu8Data);
         }
         else
@@ -2344 +2355 @@
 }
 
-STDMETHODIMP Display::TakeScreenShot (ULONG aScreenId, BYTE *address, ULONG width, ULONG height)
+STDMETHODIMP Display::TakeScreenShot(ULONG aScreenId, BYTE *address, ULONG width, ULONG height)
 {
     /// @todo (r=dmik) this function may take too long to complete if the VM
@@ -2352 +2363 @@
     //  within the Console lock to make it atomic).
 
-    LogRelFlowFunc (("address=%p, width=%d, height=%d\n",
-                  address, width, height));
+    LogRelFlowFunc(("address=%p, width=%d, height=%d\n",
+                    address, width, height));
 
     CheckComArgNotNull(address);
@@ -2370 +2381 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    CHECK_CONSOLE_DRV (mpDrv);
+    CHECK_CONSOLE_DRV(mpDrv);
 
     Console::SafeVMPtr pVM(mParent);
@@ -2377 +2388 @@
     HRESULT rc = S_OK;
 
-    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc(("Sending SCREENSHOT request\n"));
 
     /* Release lock because other thread (EMT) is called and it may initiate a resize
@@ -2398 +2409 @@
                       tr("Could not take a screenshot (%Rrc)"), vrc);
 
-    LogRelFlowFunc (("rc=%08X\n", rc));
+    LogRelFlowFunc(("rc=%08X\n", rc));
     return rc;
 }
 
-STDMETHODIMP Display::TakeScreenShotToArray (ULONG aScreenId, ULONG width, ULONG height,
-                                             ComSafeArrayOut(BYTE, aScreenData))
-{
-    LogRelFlowFunc (("width=%d, height=%d\n",
-                  width, height));
+STDMETHODIMP Display::TakeScreenShotToArray(ULONG aScreenId, ULONG width, ULONG height,
+                                            ComSafeArrayOut(BYTE, aScreenData))
+{
+    LogRelFlowFunc(("width=%d, height=%d\n", width, height));
 
     CheckComArgOutSafeArrayPointerValid(aScreenData);
@@ -2423 +2433 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    CHECK_CONSOLE_DRV (mpDrv);
+    CHECK_CONSOLE_DRV(mpDrv);
 
     Console::SafeVMPtr pVM(mParent);
@@ -2430 +2440 @@
     HRESULT rc = S_OK;
 
-    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc(("Sending SCREENSHOT request\n"));
 
     /* Release lock because other thread (EMT) is called and it may initiate a resize
@@ -2462 +2472 @@
         }
 
-        com::SafeArray<BYTE> screenData (cbData);
+        com::SafeArray<BYTE> screenData(cbData);
         screenData.initFrom(pu8Data, cbData);
         screenData.detachTo(ComSafeArrayOutArg(aScreenData));
@@ -2475 +2485 @@
     RTMemFree(pu8Data);
 
-    LogRelFlowFunc (("rc=%08X\n", rc));
+    LogRelFlowFunc(("rc=%08X\n", rc));
     return rc;
 }
 
-STDMETHODIMP Display::TakeScreenShotPNGToArray (ULONG aScreenId, ULONG width, ULONG height,
-                                             ComSafeArrayOut(BYTE, aScreenData))
-{
-    LogRelFlowFunc (("width=%d, height=%d\n",
-                  width, height));
+STDMETHODIMP Display::TakeScreenShotPNGToArray(ULONG aScreenId, ULONG width, ULONG height,
+                                               ComSafeArrayOut(BYTE, aScreenData))
+{
+    LogRelFlowFunc(("width=%d, height=%d\n", width, height));
 
     CheckComArgOutSafeArrayPointerValid(aScreenData);
@@ -2500 +2509 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    CHECK_CONSOLE_DRV (mpDrv);
+    CHECK_CONSOLE_DRV(mpDrv);
 
     Console::SafeVMPtr pVM(mParent);
@@ -2507 +2516 @@
     HRESULT rc = S_OK;
 
-    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc(("Sending SCREENSHOT request\n"));
 
     /* Release lock because other thread (EMT) is called and it may initiate a resize
@@ -2531 +2540 @@
         uint32_t cyPNG = 0;
 
-        DisplayMakePNG(pu8Data, width, height, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 0);
-
-        com::SafeArray<BYTE> screenData (cbPNG);
-        screenData.initFrom(pu8PNG, cbPNG);
-        RTMemFree(pu8PNG);
-
-        screenData.detachTo(ComSafeArrayOutArg(aScreenData));
+        vrc = DisplayMakePNG(pu8Data, width, height, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 0);
+        if (RT_SUCCESS(vrc))
+        {
+            com::SafeArray<BYTE> screenData(cbPNG);
+            screenData.initFrom(pu8PNG, cbPNG);
+            if (pu8PNG)
+                RTMemFree(pu8PNG);
+
+            screenData.detachTo(ComSafeArrayOutArg(aScreenData));
+        }
+        else
+        {
+            if (pu8PNG)
+                RTMemFree(pu8PNG);
+            rc = setError(VBOX_E_IPRT_ERROR,
+                          tr("Could not convert screenshot to PNG (%Rrc)"), vrc);
+        }
     }
     else if (vrc == VERR_NOT_IMPLEMENTED)
@@ -2548 +2567 @@
     RTMemFree(pu8Data);
 
-    LogRelFlowFunc (("rc=%08X\n", rc));
+    LogRelFlowFunc(("rc=%08X\n", rc));
     return rc;
 }