Changeset 34244 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Nov 22, 2010 2:31:02 PM (14 years ago)

Author:

vboxsync

Message:

Main,Config.kmk,VBoxManage,ExtPacks: Moved the VRDE bits from IVirtualBox to the extension packs; changed ISystemProperties and IVRDEServer to talk about VRDE extension packs instead of VRDE libraries.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -431 +431 @@
 #endif
             { "dhcpserver",       USAGE_DHCPSERVER,        handleDHCPServer},
-            { "vrde",             USAGE_VRDE,              handleVRDE},
             { "extpack",          USAGE_EXTPACK,           handleExtPack},
             { 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_EXTPACK               RT_BIT_64(56)
+#define USAGE_EXTPACK               RT_BIT_64(55)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -211 +210 @@
 int handleSharedFolder(HandlerArg *a);
 int handleVMStatistics(HandlerArg *a);
-int handleVRDE(HandlerArg *a);
 int handleExtPack(HandlerArg *a);
 

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

@@ -115 +115 @@
                      "                            hostcpuids|hddbackends|hdds|dvds|floppies|\n"
                      "                            usbhost|usbfilters|systemproperties|\n"
-                     "                            vrdelibraries|extpacks\n"
+                     "                            extpacks\n"
                      "\n");
     }
@@ -306 +306 @@
         RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"
-                     "                            [--vrdelibrary default|<name>\n"
+                     "                            [--vrdeextpack default|<name>\n"
                      "                            [--vrdeproperty <name=[value]>]\n"
                      "                            [--vrdeauthtype null|external|guest]\n"
@@ -579 +579 @@
                      "                            vrdeauthlibrary default|<library> |\n"
                      "                            websrvauthlibrary default|null|<library> |\n"
-                     "                            vrdelibrary null|<library> |\n"
+                     "                            vrdeextpack null|<library> |\n"
                      "                            loghistorycount <value>\n"
                      "\n");
@@ -724 +724 @@
                      "\n");
     }
-    if (u64Cmd & USAGE_VRDE)
-    {
-        RTStrmPrintf(pStrm,
-                     "VBoxManage vrde             register <name>\n"
-                     "VBoxManage vrde             unregister <name>\n"
-                     "\n");
-    }
     if (u64Cmd & USAGE_EXTPACK)
     {
@@ -736 +729 @@
                      "VBoxManage extpack          install <tarball>\n"
                      "VBoxManage extpack          uninstall [--force] <name>\n"
+                     "VBoxManage extpack          cleanup\n"
                      "\n");
     }

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

@@ -214 +214 @@
         ULONG   uRevision;
         CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Revision)(&uRevision),                 hrc = hrcCheck; uRevision = 0);
+        Bstr    bstrVrdeModule;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(VRDEModule)(bstrVrdeModule.asOutParam()),hrc=hrcCheck; bstrVrdeModule.setNull());
         BOOL    fUsable;
         CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Usable)(&fUsable),                     hrc = hrcCheck; fUsable = FALSE);
@@ -226 +228 @@
                  "Revision:     %u\n"
                  "Description:  %lS\n"
+                 "VRDE Module:  %lS\n"
                  "Usable:       %RTbool\n"
                  "Why unusable: %lS\n",
@@ -232 +235 @@
                  uRevision,
                  bstrDesc.raw(),
+                 bstrVrdeModule.raw(),
                  fUsable != FALSE,
                  bstrWhy.raw());
+
+        /* Query plugins and display them. */
     }
     return hrc;
@@ -264 +270 @@
     kListSystemProperties,
     kListDhcpServers,
-    kListVrdeLibraries,
     kListExtPacks
 };
@@ -893 +898 @@
             systemProperties->COMGETTER(WebServiceAuthLibrary)(str.asOutParam());
             RTPrintf("Webservice auth. library:        %lS\n", str.raw());
-            systemProperties->COMGETTER(DefaultVRDELibrary)(str.asOutParam());
-            RTPrintf("Remote desktop library:          %lS\n", str.raw());
+            systemProperties->COMGETTER(DefaultVRDEExtPack)(str.asOutParam());
+            RTPrintf("Remote desktop ExtPack:          %lS\n", str.raw());
             systemProperties->COMGETTER(LogHistoryCount)(&ulValue);
             RTPrintf("Log history count:               %u\n", ulValue);
@@ -926 +931 @@
                 RTPrintf("Enabled:        %s\n", fEnabled ? "Yes" : "No");
                 RTPrintf("\n");
-            }
-            break;
-        }
-
-        case kListVrdeLibraries:
-        {
-            SafeArray<BSTR> libs;
-            CHECK_ERROR(rptrVirtualBox, VRDEListLibraries(ComSafeArrayAsOutParam(libs)));
-            if (SUCCEEDED(rc))
-            {
-                for (size_t i = 0; i < libs.size(); ++i)
-                {
-                    Bstr bstrName(libs[i]);
-                    RTPrintf("%lS\n", bstrName.raw());
-                }
             }
             break;
@@ -992 +982 @@
         { "systemproperties",   kListSystemProperties,   RTGETOPT_REQ_NOTHING },
         { "dhcpservers",        kListDhcpServers,        RTGETOPT_REQ_NOTHING },
-        { "vrdelibraries",      kListVrdeLibraries,      RTGETOPT_REQ_NOTHING },
         { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
     };
@@ -1035 +1024 @@
             case kListSystemProperties:
             case kListDhcpServers:
-            case kListVrdeLibraries:
             case kListExtPacks:
                 enmOptCommand = (enum enmListType)ch;

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

@@ -606 +606 @@
             CHECK_ERROR(systemProperties, COMSETTER(WebServiceAuthLibrary)(Bstr(a->argv[1]).raw()));
     }
-    else if (!strcmp(a->argv[0], "vrdelibrary"))
+    else if (!strcmp(a->argv[0], "vrdeextpack"))
     {
         /* disable? */
         if (!strcmp(a->argv[1], "null"))
-            CHECK_ERROR(systemProperties, COMSETTER(DefaultVRDELibrary)(NULL));
-        else
-            CHECK_ERROR(systemProperties, COMSETTER(DefaultVRDELibrary)(Bstr(a->argv[1]).raw()));
+            CHECK_ERROR(systemProperties, COMSETTER(DefaultVRDEExtPack)(NULL));
+        else
+            CHECK_ERROR(systemProperties, COMSETTER(DefaultVRDEExtPack)(Bstr(a->argv[1]).raw()));
     }
     else if (!strcmp(a->argv[0], "loghistorycount"))
@@ -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;
-}
-
 int handleExtPack(HandlerArg *a)
 {
@@ -976 +953 @@
         RTPrintf("Successfully uninstalled \"%s\".\n", pszName);
     }
+    else if (!strcmp(a->argv[0], "cleanup"))
+    {
+        if (a->argc > 1)
+            return errorSyntax(USAGE_EXTPACK, "Too many parameters given to \"extpack cleanup\"");
+
+        CHECK_ERROR2_RET(ptrExtPackMgr, Cleanup(), RTEXITCODE_FAILURE);
+        RTPrintf("Successfully performed extension pack cleanup\n");
+    }
     else
         return errorSyntax(USAGE_EXTPACK, "Unknown command \"%s\"", a->argv[0]);

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

@@ -146 +146 @@
     MODIFYVM_VRDEVIDEOCHANNEL,
     MODIFYVM_VRDEVIDEOCHANNELQUALITY,
-    MODIFYVM_VRDELIBRARY,
+    MODIFYVM_VRDE_EXTPACK,
     MODIFYVM_VRDE,
     MODIFYVM_RTCUSEUTC,
@@ -269 +269 @@
     { "--vrdevideochannel",         MODIFYVM_VRDEVIDEOCHANNEL,          RTGETOPT_REQ_BOOL_ONOFF },
     { "--vrdevideochannelquality",  MODIFYVM_VRDEVIDEOCHANNELQUALITY,   RTGETOPT_REQ_UINT32 },
-    { "--vrdelibrary",              MODIFYVM_VRDELIBRARY,               RTGETOPT_REQ_STRING },
+    { "--vrdeextpack",              MODIFYVM_VRDE_EXTPACK,              RTGETOPT_REQ_STRING },
     { "--vrde",                     MODIFYVM_VRDE,                      RTGETOPT_REQ_BOOL_ONOFF },
     { "--usbehci",                  MODIFYVM_USBEHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
@@ -1821 +1821 @@
             }
 
-            case MODIFYVM_VRDELIBRARY:
+            case MODIFYVM_VRDE_EXTPACK:
             {
                 ComPtr<IVRDEServer> vrdeServer;
@@ -1832 +1832 @@
                     {
                         Bstr bstr(ValueUnion.psz);
-                        CHECK_ERROR(vrdeServer, COMSETTER(VRDELibrary)(bstr.raw()));
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)(bstr.raw()));
                     }
                     else
-                        CHECK_ERROR(vrdeServer, COMSETTER(VRDELibrary)(NULL));
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)(NULL));
                 }
                 break;