Changeset 59381 in vbox

Timestamp:

Jan 18, 2016 5:17:24 PM (9 years ago)

Author:

vboxsync

Message:

Main,FE/Qt: Don't access the USB ID database for IHostUSBDevice::getManufacturer() and IHostUSBDevice::getProduct() because these attrtibutes might be used to initialize a filter. Ther filter won't work if the device doesn't expose a manufacturer or product and we pick one from the database and initialize the filter with bugref:7868

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/HostUSBDeviceImpl.h (modified) (1 diff)
• Main/include/RemoteUSBDeviceImpl.h (modified) (1 diff)
• Main/include/USBDeviceImpl.h (modified) (1 diff)
• Main/src-client/RemoteUSBDeviceImpl.cpp (modified) (1 diff)
• Main/src-client/USBDeviceImpl.cpp (modified) (1 diff)
• Main/src-server/HostUSBDeviceImpl.cpp (modified) (4 diffs)

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

@@ -884 +884 @@
     else
     {
-        QString m = aDevice.GetManufacturer().trimmed();
-        QString p = aDevice.GetProduct().trimmed();
+        QVector<QString> devInfoVector = aDevice.GetDeviceInfo();
+        QString m;
+        QString p;
+
+        if (devInfoVector.size() >= 1)
+            m = devInfoVector[0].trimmed();
+        if (devInfoVector.size() >= 2)
+            p = devInfoVector[1].trimmed();
 
         if (m.isEmpty() && p.isEmpty())

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -18021 +18021 @@
     uuid="5915d179-83c7-4f2b-a323-9a97f46f4e29"
     wsmap="managed"
-    reservedAttributes="3"
+    reservedAttributes="2"
     >
     <desc>
@@ -18108 +18108 @@
       <desc>
         The backend which will be used to communicate with this device.
+      </desc>
+    </attribute>
+
+    <attribute name="deviceInfo" type="wstring" readonly="yes" safearray="yes">
+      <desc>
+        Array of device attributes as single strings.
+
+        So far the following are used:
+          0: The manufacturer string, if the device doesn't expose the ID one is taken
+             from an internal database or an empty string if none is found.
+          1: The product string, if the device doesn't expose the ID one is taken
+             from an internal database or an empty string if none is found.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/HostUSBDeviceImpl.h

@@ -261 +261 @@
     HRESULT getSpeed(USBConnectionSpeed_T *aSpeed);
     HRESULT getRemote(BOOL *aRemote);
-    HRESULT getName(com::Utf8Str &aName);
     HRESULT getState(USBDeviceState_T *aState);
     HRESULT getBackend(com::Utf8Str &aBackend);
+    HRESULT getDeviceInfo(std::vector<com::Utf8Str> &aInfo);
 
 

trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h

@@ -80 +80 @@
     HRESULT getRemote(BOOL *aRemote);
     HRESULT getBackend(com::Utf8Str &aBackend);
+    HRESULT getDeviceInfo(std::vector<com::Utf8Str> &aInfo);
 
     // wrapped IHostUSBDevice properties

trunk/src/VBox/Main/include/USBDeviceImpl.h

@@ -60 +60 @@
     HRESULT getRemote(BOOL *aRemote);
     HRESULT getBackend(com::Utf8Str &aBackend);
+    HRESULT getDeviceInfo(std::vector<com::Utf8Str> &aInfo);
 
     struct Data

trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp

@@ -279 +279 @@
 }
 
+HRESULT RemoteUSBDevice::getDeviceInfo(std::vector<com::Utf8Str> &aInfo)
+{
+    /* this is const, no need to lock */
+    aInfo.resize(2);
+    aInfo[0] = mData.manufacturer;
+    aInfo[1] = mData.product;
+
+    return S_OK;
+}
+
 // IHostUSBDevice properties
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

@@ -325 +325 @@
 }
 
+HRESULT OUSBDevice::getDeviceInfo(std::vector<com::Utf8Str> &aInfo)
+{
+    /* this is const, no need to lock */
+    aInfo.resize(2);
+    aInfo[0] = mData.manufacturer;
+    aInfo[1] = mData.product;
+
+    return S_OK;
+}
+
 // private methods
 /////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -168 +168 @@
 
     aManufacturer = mUsb->pszManufacturer;
-    if (mUsb->pszManufacturer == NULL || mUsb->pszManufacturer[0] == 0)
-        aManufacturer = USBIdDatabase::findVendor(mUsb->idVendor);
     return S_OK;
 }
@@ -179 +177 @@
 
     aProduct = mUsb->pszProduct;
-    if (mUsb->pszProduct == NULL || mUsb->pszProduct[0] == 0)
-        aProduct = USBIdDatabase::findProduct(mUsb->idVendor, mUsb->idProduct);
     return S_OK;
 }
@@ -316 +312 @@
 }
 
+
+HRESULT HostUSBDevice::getDeviceInfo(std::vector<com::Utf8Str> &aInfo)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    com::Utf8Str strManufacturer;
+    com::Utf8Str strProduct;
+
+    if (mUsb->pszManufacturer && *mUsb->pszManufacturer)
+        strManufacturer = mUsb->pszManufacturer;
+    else
+        strManufacturer = USBIdDatabase::findVendor(mUsb->idVendor);
+
+    if (mUsb->pszProduct && *mUsb->pszProduct)
+        strProduct = mUsb->pszProduct;
+    else
+        strProduct = USBIdDatabase::findProduct(mUsb->idVendor, mUsb->idProduct);
+
+    aInfo.resize(2);
+    aInfo[0] = strManufacturer;
+    aInfo[1] = strProduct;
+
+    return S_OK;
+}
+
 // public methods only for internal purposes
 ////////////////////////////////////////////////////////////////////////////////
@@ -335 +356 @@
     if (haveManufacturer && haveProduct)
         name = Utf8StrFmt("%s %s", mUsb->pszManufacturer, mUsb->pszProduct);
-    else if (haveManufacturer)
-        name = mUsb->pszManufacturer;
-    else if (haveProduct)
-        name = mUsb->pszProduct;
     else
     {
         Utf8Str strProduct;
         Utf8Str strVendor = USBIdDatabase::findVendorAndProduct(mUsb->idVendor, mUsb->idProduct, &strProduct);
-        if (strVendor.isNotEmpty() && strProduct.isNotEmpty())
-            name = Utf8StrFmt("%s %s", strVendor.c_str(), strProduct.c_str());
+        if (   (strVendor.isNotEmpty() || haveManufacturer)
+            && (strProduct.isNotEmpty() || haveProduct))
+            name = Utf8StrFmt("%s %s", haveManufacturer ? mUsb->pszManufacturer
+                                                        : strVendor.c_str(),
+                                       haveProduct ? mUsb->pszProduct
+                                                   : strProduct.c_str());
         else
         {