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

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-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -6024 +6024 @@
     *aHeight = u32Height;
 
+    HRESULT rc = S_OK;
     uint8_t *pu8PNG = NULL;
     uint32_t cbPNG = 0;
@@ -6029 +6030 @@
     uint32_t cyPNG = 0;
 
-    DisplayMakePNG(pu8Data, u32Width, u32Height, &pu8PNG, &cbPNG, &cxPNG, &cyPNG, 0);
-
-    com::SafeArray<BYTE> screenData(cbPNG);
-    screenData.initFrom(pu8PNG, cbPNG);
-    RTMemFree(pu8PNG);
-
-    screenData.detachTo(ComSafeArrayOutArg(aData));
+    vrc = DisplayMakePNG(pu8Data, u32Width, u32Height, &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(aData));
+    }
+    else
+    {
+        if (pu8PNG)
+            RTMemFree(pu8PNG);
+            return setError(VBOX_E_IPRT_ERROR,
+                            tr("Could not convert screenshot to PNG (%Rrc)"),
+                            vrc);
+    }
 
     freeSavedDisplayScreenshot(pu8Data);
 
-    return S_OK;
+    return rc;
 }