Changeset 298 in vbox for trunk/src

Timestamp:

Jan 25, 2007 1:09:58 PM (18 years ago)

Author:

vboxsync

Message:

Main: Fixed: [Host]USBDeviceFilter::manufaturer/product/serialNumber setters mistakenly used USHORT filters instead of Bstr ones (not allowing to assign anything but 4 digits).

File:

• trunk/src/VBox/Main/USBDeviceFilterImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/USBDeviceFilterImpl.cpp

@@ -495 +495 @@
     if (mData->mManufacturer.string() != aManufacturer)
     {
-        Data::USHORTFilter flt = aManufacturer;
+        Data::BstrFilter flt = aManufacturer;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())
@@ -533 +533 @@
     if (mData->mProduct.string() != aProduct)
     {
-        Data::USHORTFilter flt = aProduct;
+        Data::BstrFilter flt = aProduct;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())
@@ -571 +571 @@
     if (mData->mSerialNumber.string() != aSerialNumber)
     {
-        Data::USHORTFilter flt = aSerialNumber;
+        Data::BstrFilter flt = aSerialNumber;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())
@@ -1078 +1078 @@
     if (mData->mManufacturer.string() != aManufacturer)
     {
-        Data::USHORTFilter flt = aManufacturer;
+        Data::BstrFilter flt = aManufacturer;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())
@@ -1114 +1114 @@
     if (mData->mProduct.string() != aProduct)
     {
-        Data::USHORTFilter flt = aProduct;
+        Data::BstrFilter flt = aProduct;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())
@@ -1150 +1150 @@
     if (mData->mSerialNumber.string() != aSerialNumber)
     {
-        Data::USHORTFilter flt = aSerialNumber;
+        Data::BstrFilter flt = aSerialNumber;
         ComAssertRet (!flt.isNull(), E_FAIL);
         if (!flt.isValid())