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

Timestamp:

Mar 16, 2016 7:43:56 PM (9 years ago)

Author:

vboxsync

Message:

Revert r106058, incomplete conversion of USBProxyBackend to a COM class failing to build on Windows

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageUSB.cpp (modified) (1 diff)

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

@@ -159 +159 @@
     { "convertfromraw",     USAGE_CONVERTFROMRAW,   VBMG_CMD_TODO, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
     { "convertdd",          USAGE_CONVERTFROMRAW,   VBMG_CMD_TODO, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
-    { "usbdevsource",       USAGE_USBDEVSOURCE,     VBMG_CMD_TODO, handleUSBDevSource,         0 }
 };
 

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

@@ -112 +112 @@
 #define USAGE_ENCRYPTMEDIUM         RT_BIT_64(61)
 #define USAGE_MEDIUMENCCHKPWD       RT_BIT_64(62)
-#define USAGE_USBDEVSOURCE          RT_BIT_64(63)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -309 +308 @@
 /* VBoxManageUSB.cpp */
 RTEXITCODE handleUSBFilter(HandlerArg *a);
-RTEXITCODE handleUSBDevSource(HandlerArg *a);
 
 /* VBoxManageHostonly.cpp */

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

@@ -1380 +1380 @@
     }
 
-    if (fCategory & USAGE_USBDEVSOURCE)
-    {
-        RTStrmPrintf(pStrm,
-                           "%s usbdevsource %s    add <source name>\n"
-                     "                            --backend <backend>\n"
-                     "                            --address <address>\n"
-                           "%s usbdevsource %s    remove <source name>\n"
-                     "\n", SEP, SEP);
-    }
-
 #ifndef VBOX_ONLY_DOCS /* Converted to man page, not needed. */
     if (fCategory == USAGE_ALL)

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

@@ -547 +547 @@
     return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
-
-RTEXITCODE handleUSBDevSource(HandlerArg *a)
-{
-    HRESULT rc = S_OK;
-
-    /* at least: 0: command, 1: source id */
-    if (a->argc < 2)
-        return errorSyntax(USAGE_USBDEVSOURCE, "Not enough parameters");
-
-    ComPtr<IHost> host;
-    if (!strcmp(a->argv[0], "add"))
-    {
-        Bstr strBackend;
-        Bstr strAddress;
-        if (a->argc != 6)
-            return errorSyntax(USAGE_USBDEVSOURCE, "Invalid number of parameters");
-
-        for (int i = 2; i < a->argc; i++)
-        {
-            if (!strcmp(a->argv[i], "--backend"))
-            {
-                i++;
-                strBackend = a->argv[i];
-            }
-            else if (!strcmp(a->argv[i], "--address"))
-            {
-                i++;
-                strAddress = a->argv[i];
-            }
-            else
-                return errorSyntax(USAGE_USBDEVSOURCE, "Parameter \"%s\" is invalid", a->argv[i]);
-        }
-
-        SafeArray<BSTR> usbSourcePropNames;
-        SafeArray<BSTR> usbSourcePropValues;
-
-        CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), RTEXITCODE_FAILURE);
-        CHECK_ERROR_RET(host, AddUSBDeviceSource(strBackend.raw(), Bstr(a->argv[1]).raw(), strAddress.raw(),
-                                                 ComSafeArrayAsInParam(usbSourcePropNames), ComSafeArrayAsInParam(usbSourcePropValues)),
-                        RTEXITCODE_FAILURE);
-    }
-    else if (!strcmp(a->argv[0], "remove"))
-    {
-        CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), RTEXITCODE_FAILURE);
-        CHECK_ERROR_RET(host, RemoveUSBDeviceSource(Bstr(a->argv[1]).raw()), RTEXITCODE_FAILURE);
-    }
-
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
-}
-
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */