Changeset 39189 in vbox

Timestamp:

Nov 3, 2011 2:23:26 PM (13 years ago)

Author:

vboxsync

Message:

usb/win: get rid of utf8->ansi string conversion

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -327 +327 @@
     for (; pDrList; pDrList = pDrList->pNext)
     {
-        LPSTR *lppszString = NULL;
+        char ** lppszString = NULL;
         if (pConInfo->DeviceDescriptor.iManufacturer && pDrList->iDr == pConInfo->DeviceDescriptor.iManufacturer)
         {
-            lppszString = (LPSTR*)&pDev->pszManufacturer;
+            lppszString = (char**)&pDev->pszManufacturer;
         }
         else if (pConInfo->DeviceDescriptor.iProduct && pDrList->iDr == pConInfo->DeviceDescriptor.iProduct)
         {
-            lppszString = (LPSTR*)&pDev->pszProduct;
+            lppszString = (char**)&pDev->pszProduct;
         }
         else if (pConInfo->DeviceDescriptor.iSerialNumber && pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
         {
-            lppszString = (LPSTR*)&pDev->pszSerialNumber;
+            lppszString = (char**)&pDev->pszSerialNumber;
         }
 
         if (lppszString)
         {
-            char *pStringUTF8 = NULL;
 /** @todo r=bird: This code is making bad asumptions that strings are sane and
  *  that stuff succeeds:
  *  http://vbox.innotek.de/pipermail/vbox-dev/2011-August/004516.html
  *
- *  Also, why is this code converting stuff to the ANSI code page?!?  If
- *  That's somehow required, the reason must be documented since all strings in
- *  VBox are UTF-8 unless explicitly stated otherwise! */
-            RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, &pStringUTF8);
-            RTStrUtf8ToCurrentCP(lppszString, pStringUTF8);
-            RTStrFree(pStringUTF8);
+ *  */
+            RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, lppszString);
             if (pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
             {