Changeset 57338 in vbox

Timestamp:

Aug 14, 2015 5:51:13 AM (9 years ago)

Author:

vboxsync

Message:

Main/HostUSBdevice: Fixed issue on Linux

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/include/USBIdDatabase.h (modified) (2 diffs)
• src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp (modified) (14 diffs)

trunk/Config.kmk

@@ -552 +552 @@
 endif
 # Whether to generate a database of USB vendor IDs and device IDs into VBoxSVC.
-#VBOX_WITH_MAIN_USB_ID_DATABASE = 1
+VBOX_WITH_MAIN_USB_ID_DATABASE = 1
 # The recompiler.
 VBOX_WITH_REM = 1

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

@@ -79 +79 @@
     {
         Product lookFor = { USBKEY(vendorId, productId) };
-        Product* it = std::lower_bound(productArray, productArray + products_size + 1, lookFor, ProductLess());
+        Product* it = std::lower_bound(productArray, productArray + products_size, lookFor, ProductLess());
         return lookFor.key == it->key ? it->product : NULL;
     }
@@ -86 +86 @@
     {
         Vendor lookFor = { vendorID };
-        Vendor* it = std::lower_bound(vendorArray, vendorArray + vendors_size + 1, lookFor, VendorLess());
+        Vendor* it = std::lower_bound(vendorArray, vendorArray + vendors_size, lookFor, VendorLess());
         return lookFor.vendorID == it->vendorID ? it->vendor : NULL;
     }

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

@@ -19 +19 @@
 
 #include <iprt/string.h>
+#include <iprt/stream.h>
 
 using namespace std;
 
 const char* header = "/*\n\
-* Copyright(C) 2005 - 2015 Oracle Corporation\n\
-*\n\
-* This file is part of VirtualBox Open Source Edition(OSE), as\n\
-* available from http ://www.virtualbox.org. This file is free software;\n\
-* you can redistribute it and / or modify it under the terms of the GNU\n\
-* General Public License(GPL) as published by the Free Software\n\
-* Foundation, in version 2 as it comes in the \"COPYING\" file of the\n\
-* VirtualBox OSE distribution.VirtualBox OSE is distributed in the\n\
-* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.\n\
-*\n\
-*/\
-\n\
-\n\
-#include \"USBIdDatabase.h\"\n\
-\n\
-/** USB devices aliases array.\n\
-*   Format: VendorId, ProductId, Vendor Name, Product Name\n\
-*   The source of the list is http://www.linux-usb.org/usb.ids\n\
-*/\n\
-Product AliasDictionary::productArray[] = { \n";
+ * Copyright(C) 2005 - 2015 Oracle Corporation\n\
+ *\n\
+ * This file is part of VirtualBox Open Source Edition(OSE), as\n\
+ * available from http ://www.virtualbox.org. This file is free software;\n\
+ * you can redistribute it and / or modify it under the terms of the GNU\n\
+ * General Public License(GPL) as published by the Free Software\n\
+ * Foundation, in version 2 as it comes in the \"COPYING\" file of the\n\
+ * VirtualBox OSE distribution.VirtualBox OSE is distributed in the\n\
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.\n\
+ *\n\
+ */\
+ \n\
+ \n\
+ #include \"USBIdDatabase.h\"\n\
+ \n\
+ /** USB devices aliases array.\n\
+ *   Format: VendorId, ProductId, Vendor Name, Product Name\n\
+ *   The source of the list is http://www.linux-usb.org/usb.ids\n\
+ */\n\
+ Product AliasDictionary::productArray[] = { \n";
 
 const char* footer = "};\n\
-\n\
-const size_t AliasDictionary::products_size = sizeof(AliasDictionary::productArray) / sizeof(Product); \n";
+ \n\
+ const size_t AliasDictionary::products_size = sizeof(AliasDictionary::productArray) / sizeof(Product); \n";
 
 const char* vendor_header = "\nVendor AliasDictionary::vendorArray[] = { \n";
@@ -53 +54 @@
 const size_t AliasDictionary::vendors_size = sizeof(AliasDictionary::vendorArray) / sizeof(Vendor);";
 
-const wchar_t* start_block = L"#                interface  interface_name               <-- two tabs";
-const wchar_t* end_block = L"# List of known device classes, subclasses and protocols";
+const char* start_block = "#            interface  interface_name               <-- two tabs";
+const char* end_block = "# List of known device classes, subclasses and protocols";
 
 #define USBKEY(vendorId, productId) (((vendorId) << 16) | (productId))
@@ -68 +69 @@
 {
     size_t vendorID;
-    wstring vendor;
+    string vendor;
 };
 
@@ -76 +77 @@
     size_t vendorID;
     size_t productID;
-    wstring product;
+    string product;
 };
 
@@ -99 +100 @@
 }
 
-string conv(const wstring& src)
-{
-    string res;
-    char* buf = NULL;
-    
-    if (RTUtf16ToLatin1((PRTUTF16)src.c_str(), &buf) == VINF_SUCCESS)
-    {
-        size_t len = strlen(buf);
-        for (size_t i = 0; i < len; i++)
-        {
-            if (buf[i] == '"')
-                buf[i] = '\'';
-        }
-        res = buf;
-        RTStrFree(buf);
+string conv(const string& src)
+{
+    string res = src;
+    for (size_t i = 0; i < res.length(); i++)
+    {
+        switch (res[i])
+        {
+        case '"':
+        case '\\': res.insert(i++, "\\");
+        }
     }
     return res;
@@ -126 +122 @@
 }
 
-wostream& operator <<(wostream& stream, const ProductRecord product)
-{
-    stream << L"{USBKEY(0x" << hex << product.vendorID
-        << L", 0x" << product.productID << L"), "
-        << L"\"" << product.product.c_str() << L"\" }," << endl;
-    return stream;
-}
-
 ostream& operator <<(ostream& stream, const VendorRecord vendor)
 {
     stream << "{0x" << hex << vendor.vendorID
         << ", \"" << conv(vendor.vendor).c_str() << "\" }," << endl;
-    return stream;
-}
-
-wostream& operator <<(wostream& stream, const VendorRecord vendor)
-{
-    stream << L"{0x" << hex << vendor.vendorID
-        << L", \"" << vendor.vendor.c_str() << L"\" }," << endl;
     return stream;
 }
@@ -165 +146 @@
 
 
-int ParseAlias(const wstring& src, size_t& id, wstring& desc)
-{
-    int i = 0;
+int ParseAlias(const string& src, size_t& id, string& desc)
+{
+    unsigned int i = 0;
     int idx = 0;
-    wstring sin;
-
-    if (swscanf(src.c_str(), L"%x", &i) != 1)
+    string sin;
+
+    if (sscanf(src.c_str(), "%x", &i) != 1)
         return ERROR_IN_PARSE_LINE;
 
-    size_t index = src.find_first_of(L" \t", 1);
-    index = src.find_first_not_of(L" \t", index);
+    size_t index = src.find_first_of(" \t", 1);
+    index = src.find_first_not_of(" \t", index);
 
     if (index == string::npos)
@@ -187 +168 @@
 }
 
-bool IsCommentOrEmptyLine(const wstring& str)
-{
-    size_t index = str.find_first_not_of(L" \t");// skip left spaces
-    return index == string::npos || str[index] == L'#';
-}
-
-int ParseUsbIds(wifstream& instream)
+bool IsCommentOrEmptyLine(const string& str)
+{
+    size_t index = str.find_first_not_of(" \t");// skip left spaces
+    return index == string::npos || str[index] == '#';
+}
+
+bool getline(PRTSTREAM instream, string& resString)
+{
+    const size_t szBuf = 4096;
+    char buf[szBuf] = { 0 };
+
+    int rc = RTStrmGetLine(instream, buf, szBuf);
+    if (RT_SUCCESS(rc))
+    {
+        resString = buf;
+        return true;
+    }
+    else if (rc != VERR_EOF)
+    {
+        cerr << "Warning: Invalid line in file. Error: " << hex << rc << endl;
+    }
+    return false;
+}
+
+int ParseUsbIds(PRTSTREAM instream)
 {
     State::Value state = State::lookForStartBlock;
-    wstring line;
+    string line;
     int res = 0;
-    VendorRecord vendor = { 0, L"" };
+    VendorRecord vendor = { 0, "" };
 
     while (state != State::finished && getline(instream, line))
@@ -228 +227 @@
                             return ERROR_WRONG_FILE_FORMAT;
                         }
-                        ProductRecord product = { 0, vendor.vendorID, 0, L"" };
+                        ProductRecord product = { 0, vendor.vendorID, 0, "" };
                         if (ParseAlias(line.substr(1), product.productID, product.product) != 0)
                         {
@@ -274 +273 @@
     }
     ofstream fout;
-    wifstream fin;
+    PRTSTREAM fin;
     g_products.reserve(20000);
     g_vendors.reserve(3500);
 
     char* outName = NULL;
+    int rc = 0;
     for (int i = 1; i < argc; i++)
     {
@@ -287 +287 @@
         }
 
-        fin.open(argv[i]);
-        if (!fin.is_open())
+        if (RT_FAILURE(rc = RTStrmOpen(argv[i], "r", &fin)))
         {
             cerr << "Format: " << argv[0] <<
                 " [linux.org usb list file] [custom usb list file] [-o output file]" << endl;
-            cerr << "Error: Can not open file '" << argv[i] << "'." << endl;
+            cerr << "Error: Can not open file '" << argv[i] << "'. Error: " << hex << rc << endl;
             return ERROR_OPEN_FILE;
         }
@@ -301 +300 @@
             cerr << "Error in parsing USB devices file '" <<
                 argv[i] << "'" << endl;
-            fin.close();
+            RTStrmClose(fin);
             return res;
         }
-        fin.close();
+        RTStrmClose(fin);
     }
 
@@ -311 +310 @@
 
     // validate that all records are unique
-    ProductsSet::iterator it = adjacent_find(g_products.begin(), g_products.end());
-    if (it != g_products.end())
-    {
-        cerr << "Error: Duplicate alias detected. " << *it << endl;
-        return ERROR_DUPLICATE_ENTRY;
+    ProductsSet::iterator ita = adjacent_find(g_products.begin(), g_products.end());
+    if (ita != g_products.end())
+    {
+        cerr << "Warning: Duplicate alias detected. " << *ita << endl;
+        return 0;
     }
 
@@ -336 +335 @@
 
     fout << header;
-    for (ProductsSet::iterator it = g_products.begin(); it != g_products.end(); ++it)
-    {
-        fout << *it;
+    for (ProductsSet::iterator itp = g_products.begin(); itp != g_products.end(); ++itp)
+    {
+        fout << *itp;
     }
     fout << footer;
 
     fout << vendor_header;
-    for (VendorsSet::iterator it = g_vendors.begin(); it != g_vendors.end(); ++it)
-    {
-        fout << *it;
+    for (VendorsSet::iterator itv = g_vendors.begin(); itv != g_vendors.end(); ++itv)
+    {
+        fout << *itv;
     }
     fout << vendor_footer;