Index: /trunk/src/VBox/Main/src-client/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 53757)
+++ /trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 53758)
@@ -255,7 +255,7 @@
 
 static DECLCALLBACK(void) displaySaveScreenshotReport(void *pvCtx, uint32_t uScreen,
-        uint32_t x, uint32_t y, uint32_t uBitsPerPixel,
-        uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
-        uint8_t *pu8BufferAddress, uint64_t u64TimeStamp)
+                                                      uint32_t x, uint32_t y, uint32_t uBitsPerPixel,
+                                                      uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
+                                                      uint8_t *pu8BufferAddress, uint64_t u64TimeStamp)
 {
     VBOX_DISPLAY_SAVESCREENSHOT_DATA *pData = (VBOX_DISPLAY_SAVESCREENSHOT_DATA*)pvCtx;
@@ -266,5 +266,5 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("DisplayMakePNG failed %d\n", rc));
+        AssertMsgFailed(("DisplayMakePNG failed (rc=%Rrc)\n", rc));
         if (pData->pu8PNG)
         {
@@ -357,5 +357,5 @@
                     }
                     else
-                        AssertMsgFailed(("SHCRGL_HOST_FN_TAKE_SCREENSHOT failed %d\n", rc));
+                        AssertMsgFailed(("SHCRGL_HOST_FN_TAKE_SCREENSHOT failed (rc=%Rrc)\n", rc));
 
 
@@ -772,5 +772,5 @@
     else
     {
-        AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
+        AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
         RTMemFree(pData);
     }
@@ -815,5 +815,5 @@
                     if (RT_FAILURE(rc))
                     {
-                        AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
+                        AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
                         RTMemFree(pCtl);
                     }
@@ -1246,5 +1246,5 @@
                 if (!RT_SUCCESS(rc))
                 {
-                    AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
+                    AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
                     RTMemFree(pCtl);
                 }
@@ -1746,5 +1746,5 @@
             if (!RT_SUCCESS(rc))
             {
-                AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
+                AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
                 RTMemFree(pData);
             }
@@ -1794,9 +1794,6 @@
                 if (RT_SUCCESS(rc))
                     return TRUE;
-                else
-                {
-                    AssertMsgFailed(("failed to get screenshot data from crOgl %d\n", rc));
-                    /* fall back to the non-3d mechanism */
-                }
+                AssertMsgFailed(("failed to get screenshot data from crOgl (rc=%Rrc)\n", rc));
+                /* fall back to the non-3d mechanism */
             }
         }
@@ -2824,5 +2821,5 @@
             mCrOglCallbacks = Completion.MainInterface;
         else
-            AssertMsgFailed(("VBOXVDMACMD_CHROMIUM_CTL_TYPE_CRHGSMI_SETUP_COMPLETION failed rc %d", rc));
+            AssertMsgFailed(("VBOXVDMACMD_CHROMIUM_CTL_TYPE_CRHGSMI_SETUP_COMPLETION failed (rc=%Rrc)\n", rc));
     }
 
@@ -2968,5 +2965,5 @@
                         if (RT_SUCCESS(rc))
                             break;
-                        AssertMsgFailed(("crCtlSubmit failed rc %d\n", rc));
+                        AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
                     }
 
@@ -3205,5 +3202,5 @@
                         else
                         {
-                            AssertMsgFailed(("crViewportNotify failed %d\n", rc));
+                            AssertMsgFailed(("crViewportNotify failed (rc=%Rrc)\n", rc));
                             rc = VINF_SUCCESS;
                         }
@@ -3240,5 +3237,5 @@
                                                               void *pvContext)
 {
-    AssertMsgFailed(("not expected!"));
+    AssertMsgFailed(("not expected!\n"));
     Display *pDisplay = (Display *)pvContext;
     pDisplay->i_handleCrHgsmiCommandCompletion(result, u32Function, pParam);
@@ -3284,5 +3281,5 @@
                                             pvCompletion);
     if (!RT_SUCCESS(rc))
-        AssertMsgFailed(("hgcmHostFastCallAsync failed rc %d\n", rc));
+        AssertMsgFailed(("hgcmHostFastCallAsync failed (rc=%Rrc)\n", rc));
 
     return rc;
@@ -3343,5 +3340,5 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("crCtlSubmit failed %d\n", rc));
+        LogRel(("crCtlSubmit failed (rc=%Rrc)\n", rc));
         RTMemFree(pCmdCopy);
         return rc;
@@ -3448,7 +3445,7 @@
     if (pThis->maFramebuffers[uScreenId].fVBVAEnabled && pThis->maFramebuffers[uScreenId].fRenderThreadMode != fRenderThreadMode)
     {
-        LogRel(("enabling different vbva mode"));
+        LogRel(("Enabling different vbva mode\n"));
 #ifdef DEBUG_misha
-        AssertMsgFailed(("enabling different vbva mode"));
+        AssertMsgFailed(("enabling different vbva mode\n"));
 #endif
         return VERR_INVALID_STATE;