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

Timestamp:

Dec 6, 2007 11:08:42 AM (17 years ago)

Author:

vboxsync

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

26562

Message:

Removed obsolete VRDP server interface that used COM.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (3 diffs)
• ConsoleVRDPServer.h (modified) (9 diffs)
• RemoteUSBBackend.h (modified) (2 diffs)

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

@@ -180 +180 @@
     AudioSniffer *getAudioSniffer () { return mAudioSniffer; }
 
-#ifdef VRDP_NO_COM
     int VRDPClientLogon (uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);
     void VRDPClientConnect (uint32_t u32ClientId);
@@ -187 +186 @@
     void VRDPInterceptUSB (uint32_t u32ClientId, void **ppvIntercept);
     void VRDPInterceptClipboard (uint32_t u32ClientId);
-#else
-    static VRDPSERVERCALLBACK *getVrdpServerCallback () { return &sVrdpServerCallback; };
-#endif /* VRDP_NO_COM */
 
     void processRemoteUSBDevices (uint32_t u32ClientId, VRDPUSBDEVICEDESC *pDevList, uint32_t cbDevList);
@@ -442 +438 @@
     volatile uint32_t mcVRDPClients;
 
-#ifdef VRDP_NO_COM
-#else
-    static DECLCALLBACK(int)    vrdp_ClientLogon (void *pvUser, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);
-    static DECLCALLBACK(void)   vrdp_ClientConnect (void *pvUser, uint32_t u32ClientId);
-    static DECLCALLBACK(void)   vrdp_ClientDisconnect (void *pvUser, uint32_t u32ClientId, uint32_t fu32Intercepted);
-    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);
-
-    static VRDPSERVERCALLBACK   sVrdpServerCallback;
-#endif /* VRDP_NO_COM */
-
     static const char *sSSMConsoleUnit;
     static uint32_t sSSMConsoleVer;

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

@@ -26 +26 @@
 #include <VBox/HostServices/VBoxClipboardExt.h>
 
-#ifdef VRDP_NO_COM
 #include "SchemaDefs.h"
-#endif /* VRDP_NO_COM */
 
 // ConsoleVRDPServer
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef VRDP_NO_COM
 typedef struct _VRDPInputSynch
 {
@@ -47 +44 @@
     bool fClientScrollLock;
 } VRDPInputSynch;
-#endif /* VRDP_NO_COM */
 
 /* Member of Console. Helper class for VRDP server management. Not a COM class. */
@@ -57 +53 @@
 
     int Launch (void);
-#ifdef VRDP_NO_COM
+
     void NotifyAbsoluteMouse (bool fGuestWantsAbsolute)
     {
@@ -88 +84 @@
     void MousePointerUpdate (const VRDPCOLORPOINTER *pPointer);
     void MousePointerHide (void);
-#else
-    void SetCallback (void);
-#endif /* VRDP_NO_COM */
+
     void Stop (void);
 
@@ -99 +93 @@
     void AuthDisconnect (const Guid &uuid, uint32_t u32ClientId);
 
-#ifdef VRDP_NO_COM
     void USBBackendCreate (uint32_t u32ClientId, void **ppvIntercept);
-#else
-    void USBBackendCreate (uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
-#endif /* VRDP_NO_COM */
     void USBBackendDelete (uint32_t u32ClientId);
     
@@ -119 +109 @@
     void waitRemoteUSBThreadEvent (unsigned cMillies);
     
-#ifdef VRDP_NO_COM
     void ClipboardCreate (uint32_t u32ClientId);
-#else
-    void ClipboardCreate (uint32_t u32ClientId, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
-#endif /* VRDP_NO_COM */
     void ClipboardDelete (uint32_t u32ClientId);
 
@@ -132 +118 @@
     void SendResize (void) const;
     void SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const;
-#ifdef VRDP_NO_COM
-#else
-    void SetFramebuffer (IFramebuffer *framebuffer, uint32_t fFlags) const;
-#endif /* VRDP_NO_COM */
 
     void SendAudioSamples (void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format) const;
@@ -157 +139 @@
     static RTLDRMOD mVRDPLibrary;
 
-#ifdef VRDP_NO_COM
     static PFNVRDPCREATESERVER mpfnVRDPCreateServer;
     
@@ -185 +166 @@
 
     VRDPInputSynch m_InputSynch;
-#else
-    // VRDP API function pointers
-    static int  (VBOXCALL *mpfnVRDPStartServer)     (IConsole *pConsole, IVRDPServer *pVRDPServer, HVRDPSERVER *phServer);
-    static int  (VBOXCALL *mpfnVRDPSetFramebuffer)  (HVRDPSERVER hServer, IFramebuffer *pFramebuffer, uint32_t fFlags);
-    static void (VBOXCALL *mpfnVRDPSetCallback)     (HVRDPSERVER hServer, VRDPSERVERCALLBACK *pcallback, void *pvUser);
-    static void (VBOXCALL *mpfnVRDPShutdownServer)  (HVRDPSERVER hServer);
-    static void (VBOXCALL *mpfnVRDPSendUpdateBitmap)(HVRDPSERVER hServer, unsigned uScreenId, unsigned x, unsigned y, unsigned w, unsigned h);
-    static void (VBOXCALL *mpfnVRDPSendResize)      (HVRDPSERVER hServer);
-    static void (VBOXCALL *mpfnVRDPSendAudioSamples)(HVRDPSERVER hserver, void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format);
-    static void (VBOXCALL *mpfnVRDPSendAudioVolume) (HVRDPSERVER hserver, uint16_t left, uint16_t right);
-    static void (VBOXCALL *mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, uint32_t u32ClientId, void *pvParms, uint32_t cbParms);
-    static void (VBOXCALL *mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, unsigned uScreenId, 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, uint32_t *pcbActualRead);
-#endif /* VRDP_NO_COM */
 #endif /* VBOX_VRDP */
 

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

@@ -34 +34 @@
 class ConsoleVRDPServer;
 
-#ifdef VRDP_NO_COM
 DECLCALLBACK(int) USBClientResponseCallback (void *pv, uint32_t u32ClientId, uint8_t code, const void *pvRet, uint32_t cbRet);
-#endif /* VRDP_NO_COM */
 
 
@@ -64 +62 @@
         void AddRef (void);
         void Release (void);
-        
-#ifdef VRDP_NO_COM
-#else
-        void QueryVRDPCallbackPointer (PFNVRDPUSBCALLBACK *ppfn, void **ppv);
-#endif /* VRDP_NO_COM */
         
         REMOTEUSBCALLBACK *GetBackendCallbackPointer (void) { return &mCallback; }