Changeset 7305 in vbox for trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

Timestamp:

Mar 5, 2008 1:02:53 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VBoxHeadless: cleaner error reporting

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -62 +62 @@
     do { \
         Log (("VBoxHeadless: ERROR: " m " [rc=0x%08X]\n", rc)); \
-        RTPrintf (m " (rc = 0x%08X)\n", rc); \
+        RTPrintf ("%s", m); \
     } while (0)
 
@@ -672 +672 @@
         if (fFFMPEG)
         {
+            int rrc = VINF_SUCCESS, rcc = S_OK;
+
             Log2(("VBoxHeadless: loading VBoxFFmpegFB shared library\n"));
-            rc = RTLdrLoad("VBoxFFmpegFB", &hLdrFFmpegFB);
-
-            if (rc == VINF_SUCCESS)
+            rrc = RTLdrLoad("VBoxFFmpegFB", &hLdrFFmpegFB);
+
+            if (RT_SUCCESS(rrc))
             {
                 Log2(("VBoxHeadless: looking up symbol VBoxRegisterFFmpegFB\n"));
-                rc = RTLdrGetSymbol(hLdrFFmpegFB, "VBoxRegisterFFmpegFB",
-                                    reinterpret_cast<void **>(&pfnRegisterFFmpegFB));
-
-                if (rc == VINF_SUCCESS)
-                {
-                    Log2(("VBoxHeadless: calling pfnRegisterFFmpegFB\n"));
-                    rc = pfnRegisterFFmpegFB(ulFrameWidth, ulFrameHeight, ulBitRate,
-                                             pszMPEGFile, &pFramebuffer);
-
-                    if (rc == S_OK)
-                    {
-                        Log2(("VBoxHeadless: Registering framebuffer\n"));
-                        pFramebuffer->AddRef();
-                        display->RegisterExternalFramebuffer(pFramebuffer);
-                    }
-                    else
-                        LogError("Failed to initialise video capturing - make sure that the file format\n"
-                                 "you wish to use is supported on your system\n", 1);
-                }
-            }
+                rrc = RTLdrGetSymbol(hLdrFFmpegFB, "VBoxRegisterFFmpegFB",
+                                     reinterpret_cast<void **>(&pfnRegisterFFmpegFB));
+                if (RT_FAILURE(rrc))
+                    LogError("Failed to load the video capture extension, possibly due to a damaged file\n", rrc);
+            }
+            else
+                LogError("Failed to load the video capture extension\n", rrc);
+            if (RT_SUCCESS(rrc))
+            {
+                Log2(("VBoxHeadless: calling pfnRegisterFFmpegFB\n"));
+                rcc = pfnRegisterFFmpegFB(ulFrameWidth, ulFrameHeight, ulBitRate,
+                                         pszMPEGFile, &pFramebuffer);
+                if (rcc != S_OK)
+                    LogError("Failed to initialise video capturing - make sure that the file format\n"
+                             "you wish to use is supported on your system\n", rcc);
+            }
+            if (RT_SUCCESS(rrc) && (S_OK == rcc))
+            {
+                Log2(("VBoxHeadless: Registering framebuffer\n"));
+                pFramebuffer->AddRef();
+                display->RegisterExternalFramebuffer(pFramebuffer);
+            }
+            if (!RT_SUCCESS(rrc) || (rcc != S_OK))
+                rc = E_FAIL;
         }
         if (rc != S_OK)
         {
-            LogError ("Failed to set up video capturing\n", 1);
             return -1;
         }