Changeset 33556 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 28, 2010 1:16:42 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67160

Message:

VRDE: More API changes for the VRDP server separation.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)
• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VBoxManage/VBoxManage.h (modified) (2 diffs)
• VBoxManage/VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManage/VBoxManageList.cpp (modified) (4 diffs)
• VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)

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

@@ -584 +584 @@
         { "-vrde", 'v', RTGETOPT_REQ_STRING },
         { "--vrde", 'v', RTGETOPT_REQ_STRING },
-        { "-vrdesetproperty", 'e', RTGETOPT_REQ_STRING },
-        { "--vrdesetproperty", 'e', RTGETOPT_REQ_STRING },
+        { "-vrdeproperty", 'e', RTGETOPT_REQ_STRING },
+        { "--vrdeproperty", 'e', RTGETOPT_REQ_STRING },
 #endif /* VBOX_WITH_VRDP defined */
 #ifdef VBOX_WITH_VNC

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -399 +399 @@
 #endif
         { "dhcpserver",       USAGE_DHCPSERVER,        handleDHCPServer},
+        { "vrde",             USAGE_VRDE,              handleVRDE},
         { NULL,               0,                       NULL }
     };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -97 +97 @@
 #define USAGE_SETHDPARENTUUID       RT_BIT_64(53)
 #define USAGE_PASSWORDHASH          RT_BIT_64(54)
+#define USAGE_VRDE                  RT_BIT_64(55)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -209 +210 @@
 int handleSharedFolder(HandlerArg *a);
 int handleVMStatistics(HandlerArg *a);
+int handleVRDE(HandlerArg *a);
 
 /* VBoxManageDisk.cpp */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -120 +120 @@
 #endif
                      "                            hostcpuids|hddbackends|hdds|dvds|floppies|\n"
-                     "                            usbhost|usbfilters|systemproperties\n"
+                     "                            usbhost|usbfilters|systemproperties|\n"
+                     "                            vrdelibraries\n"
                      "\n");
     }
@@ -313 +314 @@
             RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"
+                     "                            [--vrdelibrary default|<name>\n"
                      "                            [--vrdesetproperty <name=[value]>]\n"
                      "                            [--vrdeauthtype null|external|guest]\n"
@@ -730 +732 @@
                      "\n");
     }
+    if (u64Cmd & USAGE_VRDE)
+    {
+        RTStrmPrintf(pStrm,
+                     "VBoxManage vrde             register <name>\n"
+                     "VBoxManage vrde             unregister <name>\n"
+                     "\n");
+    }
 }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -206 +206 @@
     LISTUSBFILTERS,
     LISTSYSTEMPROPERTIES,
-    LISTDHCPSERVERS
+    LISTDHCPSERVERS,
+    LISTVRDELIBRARIES
 };
 
@@ -232 +233 @@
         { "systemproperties",   LISTSYSTEMPROPERTIES,   RTGETOPT_REQ_NOTHING },
         { "dhcpservers",        LISTDHCPSERVERS,        RTGETOPT_REQ_NOTHING },
+        { "vrdelibraries",      LISTVRDELIBRARIES,      RTGETOPT_REQ_NOTHING },
       };
 
@@ -274 +276 @@
             case LISTSYSTEMPROPERTIES:
             case LISTDHCPSERVERS:
+            case LISTVRDELIBRARIES:
                 if (command)
                     return errorSyntax(USAGE_LIST, "Too many subcommands for \"list\" command.\n");
@@ -936 +939 @@
         }
         break;
+        case LISTVRDELIBRARIES:
+        {
+            SafeArray<BSTR> libs;
+            CHECK_ERROR(a->virtualBox, VRDEListLibraries(ComSafeArrayAsOutParam(libs)));
+            for (size_t i = 0; i < libs.size(); ++i)
+            {
+                Bstr bstrName(libs[i]);
+                RTPrintf("%lS\n", bstrName.raw());
+            }
+        }
+        break;
     } // end switch
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -888 +888 @@
 }
 
+int handleVRDE(HandlerArg *a)
+{
+    HRESULT rc = S_OK;
+
+    if (a->argc != 2)
+        return errorSyntax(USAGE_VRDE, "Incorrect number of parameters");
+
+    if (!strcmp(a->argv[0], "register"))
+    {
+        Bstr name = a->argv[1];
+        CHECK_ERROR(a->virtualBox, VRDERegisterLibrary(name.raw()));
+    }
+    else if (!strcmp(a->argv[0], "unregister"))
+    {
+        Bstr name = a->argv[1];
+        CHECK_ERROR(a->virtualBox, VRDEUnregisterLibrary(name.raw()));
+    }
+    else
+        return errorSyntax(USAGE_VRDE, "Invalid parameter");
+
+    return SUCCEEDED(rc) ? 0 : 1;
+}
+

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -147 +147 @@
     MODIFYVM_VRDEVIDEOCHANNEL,
     MODIFYVM_VRDEVIDEOCHANNELQUALITY,
+    MODIFYVM_VRDELIBRARY,
     MODIFYVM_VRDE,
 #endif
@@ -271 +272 @@
     { "--vrdevideochannel",         MODIFYVM_VRDEVIDEOCHANNEL,          RTGETOPT_REQ_BOOL_ONOFF },
     { "--vrdevideochannelquality",  MODIFYVM_VRDEVIDEOCHANNELQUALITY,   RTGETOPT_REQ_UINT32 },
+    { "--vrdelibrary",              MODIFYVM_VRDELIBRARY,               RTGETOPT_REQ_STRING },
     { "--vrde",                     MODIFYVM_VRDE,                      RTGETOPT_REQ_BOOL_ONOFF },
 #endif
@@ -1824 +1826 @@
 
 #ifdef VBOX_WITH_VRDP
+            case MODIFYVM_VRDELIBRARY:
+            {
+                ComPtr<IVRDEServer> vrdeServer;
+                machine->COMGETTER(VRDEServer)(vrdeServer.asOutParam());
+                ASSERT(vrdeServer);
+
+                if (vrdeServer)
+                {
+                    if (strcmp(ValueUnion.psz, "default") != 0)
+                    {
+                        Bstr bstr(ValueUnion.psz);
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDELibrary)(bstr.raw()));
+                    }
+                    else
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDELibrary)(NULL));
+                }
+                break;
+            }
+
             case MODIFYVM_VRDESETPROPERTY:
             {