Changeset 2386 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 27, 2007 9:59:46 AM (18 years ago)

Author:

vboxsync

Message:

Clipboard RDP channel

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (2 diffs)
• ConsoleVRDPServer.h (modified) (4 diffs)
• hgcm/HGCM.h (modified) (2 diffs)

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

@@ -410 +410 @@
     static DECLCALLBACK(void)   vrdp_InterceptAudio (void *pvUser, uint32_t u32ClientId);
     static DECLCALLBACK(void)   vrdp_InterceptUSB (void *pvUser, uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
+    static DECLCALLBACK(void)   vrdp_InterceptClipboard (void *pvUser, uint32_t u32ClientId, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
 #else
     static DECLCALLBACK(int)    vrdp_ClientLogon (void *pvUser, const char *pszUser, const char *pszPassword, const char *pszDomain);
@@ -416 +417 @@
     static DECLCALLBACK(void)   vrdp_InterceptAudio (void *pvUser, bool keepHostAudio);
     static DECLCALLBACK(void)   vrdp_InterceptUSB (void *pvUser, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
+    static DECLCALLBACK(void)   vrdp_InterceptClipboard (void *pvUser, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
 #endif /* VRDP_MC */
 

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

@@ -24 +24 @@
 
 #include "RemoteUSBBackend.h"
+#include "hgcm/hgcm.h"
 
 #include <VBox/VRDPAuth.h>
+
+#include <VBox/HostServices/VBoxClipboardExt.h>
 
 // ConsoleVRDPServer
@@ -61 +64 @@
     void waitRemoteUSBThreadEvent (unsigned cMillies);
     
+    void ClipboardCreate (uint32_t u32ClientId, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
+    void ClipboardDelete (uint32_t u32ClientId);
 #else
     void CreateUSBBackend (PFNVRDPUSBCALLBACK *ppfn, void **ppv);
@@ -116 +121 @@
     static void (VBOXCALL *mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, void *pvUpdate, uint32_t cbUpdate);
     static void (VBOXCALL *mpfnVRDPQueryInfo)       (HVRDPSERVER hserver, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
+    static void (VBOXCALL *mpfnVRDPClipboard)       (HVRDPSERVER hserver, uint32_t u32Function, uint32_t u32Format, const void *pvData, uint32_t cbData);
 #endif
 
@@ -123 +129 @@
     int lockConsoleVRDPServer (void);
     void unlockConsoleVRDPServer (void);
-
+    
+    int mcClipboardRefs;
+    HGCMSVCEXTHANDLE mhClipboard;
+    PFNVRDPCLIPBOARDEXTCALLBACK mpfnClipboardCallback;
+
+    RTSEMEVENTMULTI   mEventClipboardData;
+    void             *mpvClipboardData;
+    uint32_t          mcbClipboardData;
+    volatile uint32_t mfu32ClipboardWaitData;
+
+    static DECLCALLBACK(int) ClipboardCallback (void *pvCallback, uint32_t u32ClientId, uint32_t u32Function, uint32_t u32Format, const void *pvData, uint32_t cbData);
+    static DECLCALLBACK(int) ClipboardServiceExtension (void *pvExtension, uint32_t u32Function, void *pvParm, uint32_t cbParms);
+    
 #ifdef VBOX_WITH_USB
     RemoteUSBBackend *usbBackendFindByUUID (const Guid *pGuid);

trunk/src/VBox/Main/include/hgcm/HGCM.h

@@ -33 +33 @@
 #define HGCM_SSM_VERSION    2
 
+/* Handle of a HGCM service extension. */
+struct _HGCMSVCEXTHANDLEDATA;
+typedef struct _HGCMSVCEXTHANDLEDATA *HGCMSVCEXTHANDLE;
+
 __BEGIN_DECLS
 int HGCMHostInit (void);
@@ -40 +44 @@
 
 int HGCMHostLoad (const char *pszServiceName, const char *pszServiceLibrary);
+
+int HGCMHostRegisterServiceExtension (HGCMSVCEXTHANDLE *pHandle, const char *pszServiceName, PFNHGCMSVCEXT pfnExtension, void *pvExtension);
+void HGCMHostUnregisterServiceExtension (HGCMSVCEXTHANDLE handle);
 
 int HGCMGuestConnect (PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, const char *pszServiceName, uint32_t *pClientID);