vbox的更動 38785 路徑 trunk/src/VBox/HostDrivers/VBoxUSB

時間撮記:

2011-9-16 下午09:42:20 (13 年 以前)

作者:

vboxsync

訊息:

VBoxUsbLib-win.cpp: r=bird: Marked some bogus looking string conversion code.

檔案:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp (修改) (12 筆差異)

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

@@ -51 +51 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef struct _USB_INTERFACE_DESCRIPTOR2 
+typedef struct _USB_INTERFACE_DESCRIPTOR2
 {
     UCHAR  bLength;
@@ -86 +86 @@
 } VBOXUSB_STRING_DR_ENTRY, *PVBOXUSB_STRING_DR_ENTRY;
 
-/** 
+/**
  * This represents VBoxUsb device instance
  */
@@ -344 +344 @@
         {
             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);
@@ -1249 +1256 @@
     g_VBoxUsbGlobal.hWnd = NULL;
 
-    /* 
+    /*
      * Register the Window Class and the hitten window create.
      */
@@ -1284 +1291 @@
                      SWP_NOACTIVATE | SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
 
-        /* 
+        /*
          * The message pump.
          */
@@ -1344 +1351 @@
              * Open the USB monitor device, starting if needed.
              */
-            g_VBoxUsbGlobal.hMonitor = CreateFile(USBMON_DEVICE_NAME, 
-                                                  GENERIC_READ | GENERIC_WRITE, 
-                                                  FILE_SHARE_READ | FILE_SHARE_WRITE, 
+            g_VBoxUsbGlobal.hMonitor = CreateFile(USBMON_DEVICE_NAME,
+                                                  GENERIC_READ | GENERIC_WRITE,
+                                                  FILE_SHARE_READ | FILE_SHARE_WRITE,
                                                   NULL,
-                                                  OPEN_EXISTING, 
-                                                  FILE_ATTRIBUTE_SYSTEM, 
+                                                  OPEN_EXISTING,
+                                                  FILE_ATTRIBUTE_SYSTEM,
                                                   NULL);
 
@@ -1357 +1364 @@
                 if (hr == S_OK)
                 {
-                    g_VBoxUsbGlobal.hMonitor = CreateFile(USBMON_DEVICE_NAME, 
-                                                          GENERIC_READ | GENERIC_WRITE, 
+                    g_VBoxUsbGlobal.hMonitor = CreateFile(USBMON_DEVICE_NAME,
+                                                          GENERIC_READ | GENERIC_WRITE,
                                                           FILE_SHARE_READ | FILE_SHARE_WRITE,
-                                                          NULL, 
-                                                          OPEN_EXISTING, 
-                                                          FILE_ATTRIBUTE_SYSTEM, 
+                                                          NULL,
+                                                          OPEN_EXISTING,
+                                                          FILE_ATTRIBUTE_SYSTEM,
                                                           NULL);
                     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
@@ -1376 +1383 @@
             {
                 /*
-                 * Check the USB monitor version. 
-                 *  
-                 * Drivers are backwards compatible within the same major 
-                 * number.  We consider the minor version number this library 
+                 * Check the USB monitor version.
+                 *
+                 * Drivers are backwards compatible within the same major
+                 * number.  We consider the minor version number this library
                  * is compiled with to be the minimum required by the driver.
-                 * This is by reasoning that the library uses the full feature 
-                 * set of the driver it's written for. 
+                 * This is by reasoning that the library uses the full feature
+                 * set of the driver it's written for.
                  */
                 USBSUP_VERSION  Version = {0};
                 DWORD           cbReturned = 0;
-                if (DeviceIoControl(g_VBoxUsbGlobal.hMonitor, SUPUSBFLT_IOCTL_GET_VERSION, 
-                                    NULL, 0, 
-                                    &Version, sizeof (Version), 
+                if (DeviceIoControl(g_VBoxUsbGlobal.hMonitor, SUPUSBFLT_IOCTL_GET_VERSION,
+                                    NULL, 0,
+                                    &Version, sizeof (Version),
                                     &cbReturned, NULL))
                 {
-                    if (   Version.u32Major == USBMON_MAJOR_VERSION 
+                    if (   Version.u32Major == USBMON_MAJOR_VERSION
                         && Version.u32Minor >= USBMON_MINOR_VERSION)
                     {
 #ifndef VBOX_USB_USE_DEVICE_NOTIFICATION
                         /*
-                         * Tell the monitor driver which event object to use 
+                         * Tell the monitor driver which event object to use
                          * for notifications.
                          */
@@ -1410 +1417 @@
                             if (RT_SUCCESS(rc))
                             {
-                                /* 
+                                /*
                                  * We're DONE!
-                                 */ 
+                                 */
                                 return VINF_SUCCESS;
                             }
@@ -1445 +1452 @@
                                 if (g_VBoxUsbGlobal.hWnd)
                                 {
-                                    /* 
+                                    /*
                                      * We're DONE!
-                                     *  
-                                     * Juse ensure that the event is set so the 
+                                     *
+                                     * Juse ensure that the event is set so the
                                      * first "wait change" request is processed.
                                      */
@@ -1480 +1487 @@
                     else
                     {
-                        LogRel((__FUNCTION__": USB Monitor driver version mismatch! driver=%u.%u library=%u.%u\n", 
+                        LogRel((__FUNCTION__": USB Monitor driver version mismatch! driver=%u.%u library=%u.%u\n",
                                 Version.u32Major, Version.u32Minor, USBMON_MAJOR_VERSION, USBMON_MINOR_VERSION));
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
@@ -1580 +1587 @@
     AssertMsg(bRc, ("CloseHandle for hMonitor failed winEr(%d)\n", GetLastError()));
     g_VBoxUsbGlobal.hMonitor = INVALID_HANDLE_VALUE;
-          
+
     bRc = CloseHandle(g_VBoxUsbGlobal.hInterruptEvent);
     AssertMsg(bRc, ("CloseHandle for hInterruptEvent failed lasterr=%u\n", GetLastError()));