Changeset 33557 in vbox

Timestamp:

Oct 28, 2010 1:27:45 PM (14 years ago)

Author:

vboxsync

Message:

VRDE: More API changes for the VRDP server separation (warnings).

Location:

trunk/src/VBox/Main

Files:

• SystemPropertiesImpl.cpp (modified) (2 diffs)
• xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -743 +743 @@
     HRESULT rc = mParent->VRDEIsLibraryRegistered(Bstr(m->strDefaultVRDELibrary).raw(), &fFound);
 
-    if (!fFound)
+    if (FAILED(rc)|| !fFound)
         return setError(E_FAIL, "The library is not registered\n");
 
@@ -765 +765 @@
     {
         BOOL fFound = FALSE;
-        HRESULT rc = mParent->VRDEIsLibraryRegistered(bstrLibrary.raw(), &fFound);
-
-        if (!fFound)
+        rc = mParent->VRDEIsLibraryRegistered(bstrLibrary.raw(), &fFound);
+
+        if (FAILED(rc) || !fFound)
             return setError(E_FAIL, "The library is not registered\n");
     }

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4371 +4371 @@
          * then increase the version to VBox 4.0.
          */
-        int cOldProperties = 0;
+        unsigned cOldProperties = 0;
 
         StringsMap::const_iterator it = hardwareMachine.vrdeSettings.mapProperties.find("TCP/Ports");