Changeset 6658 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 31, 2008 2:32:58 PM (17 years ago)

Author:

vboxsync

Message:

VRDP server: fixed error handling if the VRDP library could not be loaded

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleVRDPServer.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5816 +5816 @@
                     break;
                 }
+                case VERR_FILE_NOT_FOUND:
+                {
+                    errMsg = Utf8StrFmt (tr ("Could not load the VRDP library"));
+                    break;
+                }
                 default:
                     errMsg = Utf8StrFmt (tr ("Failed to launch VRDP server (%Vrc)"),

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1092 +1092 @@
     AssertComRC(rc2);
 
-    if (SUCCEEDED (rc2)
-        && vrdpEnabled
-        && loadVRDPLibrary ())
-    {
-        rc = mpfnVRDPCreateServer (&mCallbacks.header, this, (VRDPINTERFACEHDR **)&mpEntryPoints, &mhServer);
-
-        if (VBOX_SUCCESS(rc))
-        {
+    if (SUCCEEDED (rc2) && vrdpEnabled)
+    {
+        if (loadVRDPLibrary ())
+        {
+            rc = mpfnVRDPCreateServer (&mCallbacks.header, this, (VRDPINTERFACEHDR **)&mpEntryPoints, &mhServer);
+
+            if (VBOX_SUCCESS(rc))
+            {
 #ifdef VBOX_WITH_USB
-            remoteUSBThreadStart ();
+                remoteUSBThreadStart ();
 #endif /* VBOX_WITH_USB */
+            }
+            else
+                AssertMsgFailed(("Could not start VRDP server: rc = %Vrc\n", rc));
         }
         else
-            AssertMsgFailed(("Could not start VRDP server: rc = %Vrc\n", rc));
+        {
+            AssertMsgFailed(("Could not load the VRDP library\n"));
+            rc = VERR_FILE_NOT_FOUND;
+        }
     }
 #else