Changeset 59122 in vbox

Timestamp:

Dec 14, 2015 2:50:28 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104693

Message:

Main/USB: More fixes

Location:

trunk/src/VBox/Main

Files:

• src-client/RemoteUSBDeviceImpl.cpp (modified) (1 diff)
• src-server/darwin/iokit.cpp (modified) (1 diff)
• src-server/freebsd/USBProxyBackendFreeBSD.cpp (modified) (1 diff)
• src-server/solaris/USBProxyBackendSolaris.cpp (modified) (1 diff)

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

@@ -76 +76 @@
     RTStrPrintf(id, sizeof(id), REMOTE_USB_BACKEND_PREFIX_S "0x%08X&0x%08X", pDevDesc->id, u32ClientId);
     unconst(mData.address)      = id;
-    RTStrPrintf(id, sizeof(id), "vrdp");
-    unconst(mData.backend)      = id;
+    unconst(mData.backend)      = "vrdp";
 
     unconst(mData.port)         = pDevDesc->idPort;

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -1004 +1004 @@
                     pCur->pszProduct = RTStrDup("Bluetooth");
                 darwinDictDupString(PropsRef, CFSTR("USB Serial Number"),   (char **)&pCur->pszSerialNumber);
+
+                pCur->pszBackend = RTStrDup("host");
+                AssertBreak(pCur->pszBackend);
 
 #if 0           /* leave the remainder as zero for now. */

trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

@@ -334 +334 @@
 
             pDevice->pszAddress = RTStrDup(pszDevicePath);
+            pDevice->pszBackend = RTStrDup("host");
             pDevice->enmState   = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
 

trunk/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp

@@ -263 +263 @@
             RTStrPrintf(szBuf, sizeof(szBuf), "%#x:%#x:%d:%s", pCur->idVendor, pCur->idProduct, pCur->bcdDevice, pszDevicePath);
             pCur->pszAddress = RTStrDup(szBuf);
+            AssertBreak(pCur->pszAddress);
 
             pCur->pszDevicePath = RTStrDup(pszDevicePath);
             AssertBreak(pCur->pszDevicePath);
+
+            pCur->pszBackend = RTStrDup("host");
+            AssertBreak(pCur->pszBackend);
 
             /*