Changeset 4404 in vbox

Timestamp:

Aug 28, 2007 3:58:08 PM (18 years ago)

Author:

vboxsync

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

23972

Message:

Fixed the initialization of the remote USB channel.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleVRDPServer.cpp (modified) (7 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/ConsoleVRDPServer.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -788 +788 @@
 
 #ifdef VRDP_NO_COM
-void Console::VRDPInterceptUSB (uint32_t u32ClientId)
+void Console::VRDPInterceptUSB (uint32_t u32ClientId, void **ppvIntercept)
 #else
 DECLCALLBACK(void) Console::vrdp_InterceptUSB (void *pvUser,
@@ -811 +811 @@
 
 #ifdef VRDP_NO_COM
-    mConsoleVRDPServer->USBBackendCreate (u32ClientId);
+    mConsoleVRDPServer->USBBackendCreate (u32ClientId, ppvIntercept);
 #else
     console->mConsoleVRDPServer->USBBackendCreate (u32ClientId, ppfn, ppv);

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -708 +708 @@
 {
     ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    
+    LogFlowFunc(("%x\n", fu32Intercept));
 
     int rc = VERR_NOT_SUPPORTED;
@@ -716 +718 @@
         {
             server->mConsole->VRDPInterceptAudio (u32ClientId);
+            if (ppvIntercept)
+            {
+                *ppvIntercept = server;
+            }
             rc = VINF_SUCCESS;
         } break;
@@ -721 +727 @@
         case VRDP_CLIENT_INTERCEPT_USB:
         {
-            server->mConsole->VRDPInterceptUSB (u32ClientId);
+            server->mConsole->VRDPInterceptUSB (u32ClientId, ppvIntercept);
             rc = VINF_SUCCESS;
         } break;
@@ -728 +734 @@
         {
             server->mConsole->VRDPInterceptClipboard (u32ClientId);
+            if (ppvIntercept)
+            {
+                *ppvIntercept = server;
+            }
             rc = VINF_SUCCESS;
         } break;
@@ -733 +743 @@
         default:
             break;
-    }
-
-    if (VBOX_SUCCESS (rc))
-    {
-        if (ppvIntercept)
-        {
-            *ppvIntercept = server;
-        }
     }
 
@@ -1564 +1566 @@
  */
 #ifdef VRDP_NO_COM
-void ConsoleVRDPServer::USBBackendCreate (uint32_t u32ClientId)
+void ConsoleVRDPServer::USBBackendCreate (uint32_t u32ClientId, void **ppvIntercept)
 #else
 void ConsoleVRDPServer::USBBackendCreate (uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv)
@@ -1599 +1601 @@
             
 #ifdef VRDP_NO_COM
+            if (ppvIntercept)
+            {
+                *ppvIntercept = pRemoteUSBBackend;
+            }
 #else
             pRemoteUSBBackend->QueryVRDPCallbackPointer (ppfn, ppv);

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

@@ -184 +184 @@
     void VRDPClientDisconnect (uint32_t u32ClientId, uint32_t fu32Intercepted);
     void VRDPInterceptAudio (uint32_t u32ClientId);
-    void VRDPInterceptUSB (uint32_t u32ClientId);
+    void VRDPInterceptUSB (uint32_t u32ClientId, void **ppvIntercept);
     void VRDPInterceptClipboard (uint32_t u32ClientId);
 #else

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

@@ -62 +62 @@
 
 #ifdef VRDP_NO_COM
-    void USBBackendCreate (uint32_t u32ClientId);
+    void USBBackendCreate (uint32_t u32ClientId, void **ppvIntercept);
 #else
     void USBBackendCreate (uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv);