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

Timestamp:

Mar 9, 2009 9:34:22 AM (16 years ago)

Author:

vboxsync

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Replaced IUSBDeviceCollection. Reviewed by Christian.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -591 +591 @@
                 else
                 {
-                    ComPtr <IUSBDeviceCollection> coll;
-                    CHECK_ERROR_BREAK (console, COMGETTER(USBDevices)(coll.asOutParam()));
+                    SafeIfaceArray <IUSBDevice> coll;
+                    CHECK_ERROR_BREAK (console, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll)));
                     ComPtr <IUSBDevice> dev;
-                    CHECK_ERROR_BREAK (coll, FindByAddress (Bstr (a->argv [2]), dev.asOutParam()));
+                    CHECK_ERROR_BREAK (console, FindUSBDeviceByAddress (Bstr (a->argv [2]),
+                                                       dev.asOutParam()));
                     CHECK_ERROR_BREAK (dev, COMGETTER(Id) (usbId.asOutParam()));
                 }

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

@@ -1313 +1313 @@
                     RTPrintf ("Currently Attached USB Devices:\n\n");
 
-                ComPtr <IUSBDeviceCollection> coll;
-                CHECK_ERROR_RET (console, COMGETTER(USBDevices) (coll.asOutParam()), rc);
-
-                ComPtr <IUSBDeviceEnumerator> en;
-                CHECK_ERROR_RET (coll, Enumerate (en.asOutParam()), rc);
-
-                BOOL more = FALSE;
-                ASSERT(SUCCEEDED(rc = en->HasMore (&more)));
-                if (FAILED(rc))
-                    return rc;
-
-                if (!more)
+                SafeIfaceArray <IUSBDevice> coll;
+                CHECK_ERROR_RET (console, COMGETTER(USBDevices) (ComSafeArrayAsOutParam(coll)), rc);
+
+                if (coll.size() == 0)
                 {
                     if (details != VMINFO_MACHINEREADABLE)
@@ -1330 +1322 @@
                 }
                 else
-                while (more)
                 {
-                    ComPtr <IUSBDevice> dev;
-                    ASSERT(SUCCEEDED(rc = en->GetNext (dev.asOutParam())));
-                    if (FAILED(rc))
-                        return rc;
-
-                    /* Query info. */
-                    Guid id;
-                    CHECK_ERROR_RET (dev, COMGETTER(Id)(id.asOutParam()), rc);
-                    USHORT usVendorId;
-                    CHECK_ERROR_RET (dev, COMGETTER(VendorId)(&usVendorId), rc);
-                    USHORT usProductId;
-                    CHECK_ERROR_RET (dev, COMGETTER(ProductId)(&usProductId), rc);
-                    USHORT bcdRevision;
-                    CHECK_ERROR_RET (dev, COMGETTER(Revision)(&bcdRevision), rc);
-
-                    if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBAttachedUUID%d=\"%S\"\n"
-                                 "USBAttachedVendorId%d=\"%#06x\"\n"
-                                 "USBAttachedProductId%d=\"%#06x\"\n"
-                                 "USBAttachedRevision%d=\"%#04x%02x\"\n",
-                                 index + 1, id.toString().raw(),
-                                 index + 1, usVendorId,
-                                 index + 1, usProductId,
-                                 index + 1, bcdRevision >> 8, bcdRevision & 0xff);
-                    else
-                        RTPrintf("UUID:               %S\n"
-                                 "VendorId:           0x%04x (%04X)\n"
-                                 "ProductId:          0x%04x (%04X)\n"
-                                 "Revision:           %u.%u (%02u%02u)\n",
-                                 id.toString().raw(),
-                                 usVendorId, usVendorId, usProductId, usProductId,
-                                 bcdRevision >> 8, bcdRevision & 0xff,
-                                 bcdRevision >> 8, bcdRevision & 0xff);
-
-                    /* optional stuff. */
-                    Bstr bstr;
-                    CHECK_ERROR_RET (dev, COMGETTER(Manufacturer)(bstr.asOutParam()), rc);
-                    if (!bstr.isEmpty())
+                    for (index = 0; index < coll.size(); ++index)
                     {
+                        ComPtr <IUSBDevice> dev = coll[index];
+
+                        /* Query info. */
+                        Guid id;
+                        CHECK_ERROR_RET (dev, COMGETTER(Id)(id.asOutParam()), rc);
+                        USHORT usVendorId;
+                        CHECK_ERROR_RET (dev, COMGETTER(VendorId)(&usVendorId), rc);
+                        USHORT usProductId;
+                        CHECK_ERROR_RET (dev, COMGETTER(ProductId)(&usProductId), rc);
+                        USHORT bcdRevision;
+                        CHECK_ERROR_RET (dev, COMGETTER(Revision)(&bcdRevision), rc);
+
                         if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("USBAttachedManufacturer%d=\"%lS\"\n", index + 1, bstr.raw());
+                            RTPrintf("USBAttachedUUID%zu=\"%S\"\n"
+                                     "USBAttachedVendorId%zu=\"%#06x\"\n"
+                                     "USBAttachedProductId%zu=\"%#06x\"\n"
+                                     "USBAttachedRevision%zu=\"%#04x%02x\"\n",
+                                     index + 1, id.toString().raw(),
+                                     index + 1, usVendorId,
+                                     index + 1, usProductId,
+                                     index + 1, bcdRevision >> 8, bcdRevision & 0xff);
                         else
-                            RTPrintf("Manufacturer:       %lS\n", bstr.raw());
+                            RTPrintf("UUID:               %S\n"
+                                     "VendorId:           0x%04x (%04X)\n"
+                                     "ProductId:          0x%04x (%04X)\n"
+                                     "Revision:           %u.%u (%02u%02u)\n",
+                                     id.toString().raw(),
+                                     usVendorId, usVendorId, usProductId, usProductId,
+                                     bcdRevision >> 8, bcdRevision & 0xff,
+                                     bcdRevision >> 8, bcdRevision & 0xff);
+
+                        /* optional stuff. */
+                        Bstr bstr;
+                        CHECK_ERROR_RET (dev, COMGETTER(Manufacturer)(bstr.asOutParam()), rc);
+                        if (!bstr.isEmpty())
+                        {
+                            if (details == VMINFO_MACHINEREADABLE)
+                                RTPrintf("USBAttachedManufacturer%zu=\"%lS\"\n", index + 1, bstr.raw());
+                            else
+                                RTPrintf("Manufacturer:       %lS\n", bstr.raw());
+                        }
+                        CHECK_ERROR_RET (dev, COMGETTER(Product)(bstr.asOutParam()), rc);
+                        if (!bstr.isEmpty())
+                        {
+                            if (details == VMINFO_MACHINEREADABLE)
+                                RTPrintf("USBAttachedProduct%zu=\"%lS\"\n", index + 1, bstr.raw());
+                            else
+                                RTPrintf("Product:            %lS\n", bstr.raw());
+                        }
+                        CHECK_ERROR_RET (dev, COMGETTER(SerialNumber)(bstr.asOutParam()), rc);
+                        if (!bstr.isEmpty())
+                        {
+                            if (details == VMINFO_MACHINEREADABLE)
+                                RTPrintf("USBAttachedSerialNumber%zu=\"%lS\"\n", index + 1, bstr.raw());
+                            else
+                                RTPrintf("SerialNumber:       %lS\n", bstr.raw());
+                        }
+                        CHECK_ERROR_RET (dev, COMGETTER(Address)(bstr.asOutParam()), rc);
+                        if (!bstr.isEmpty())
+                        {
+                            if (details == VMINFO_MACHINEREADABLE)
+                                RTPrintf("USBAttachedAddress%zu=\"%lS\"\n", index + 1, bstr.raw());
+                            else
+                                RTPrintf("Address:            %lS\n", bstr.raw());
+                        }
+
+                        if (details != VMINFO_MACHINEREADABLE)
+                            RTPrintf("\n");
                     }
-                    CHECK_ERROR_RET (dev, COMGETTER(Product)(bstr.asOutParam()), rc);
-                    if (!bstr.isEmpty())
-                    {
-                        if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("USBAttachedProduct%d=\"%lS\"\n", index + 1, bstr.raw());
-                        else
-                            RTPrintf("Product:            %lS\n", bstr.raw());
-                    }
-                    CHECK_ERROR_RET (dev, COMGETTER(SerialNumber)(bstr.asOutParam()), rc);
-                    if (!bstr.isEmpty())
-                    {
-                        if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("USBAttachedSerialNumber%d=\"%lS\"\n", index + 1, bstr.raw());
-                        else
-                            RTPrintf("SerialNumber:       %lS\n", bstr.raw());
-                    }
-                    CHECK_ERROR_RET (dev, COMGETTER(Address)(bstr.asOutParam()), rc);
-                    if (!bstr.isEmpty())
-                    {
-                        if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("USBAttachedAddress%d=\"%lS\"\n", index + 1, bstr.raw());
-                        else
-                            RTPrintf("Address:            %lS\n", bstr.raw());
-                    }
-
-                    if (details != VMINFO_MACHINEREADABLE)
-                        RTPrintf("\n");
-
-                    ASSERT(SUCCEEDED(rc = en->HasMore (&more)));
-                    if (FAILED(rc))
-                        return rc;
-
-                    index ++;
                 }
             }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1976 +1976 @@
                 mDevicesUSBMenu->setEnabled (isRunningOrPaused);
 
-                CUSBDeviceEnumerator en = cconsole.GetUSBDevices().Enumerate();
-                while (en.HasMore())
+                CUSBDeviceVector devsvec = cconsole.GetUSBDevices();
+                for (int i = 0; i < devsvec.size(); ++i)
                 {
-                    CUSBDevice usb = en.GetNext();
+                    CUSBDevice usb = devsvec[i];
                     info += QString ("<br><b><nobr>%1</nobr></b>")
                                      .arg (vboxGlobal().details (usb));

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -5544 +5544 @@
             {
                 CUSBDevice attachedUSB =
-                    mConsole.GetUSBDevices().FindById (usb.GetId());
+                    mConsole.FindUSBDeviceById (usb.GetId());
                 action->setChecked (!attachedUSB.isNull());
                 action->setEnabled (dev.GetState() !=