Changeset 11820 in vbox for trunk/src/VBox/Main/ConsoleVRDPServer.cpp

Timestamp:

Aug 29, 2008 2:09:39 PM (16 years ago)

Author:

vboxsync

Message:

made Qt4 the default GUI; VBOX_VRDP => VBOX_WITH_VRDP; VBOX_HGCM => VBOX_WITH_HGCM; Makefile cleanup

File:

• trunk/src/VBox/Main/ConsoleVRDPServer.cpp (modified) (23 diffs)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -35 +35 @@
 
 #include <VBox/err.h>
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
 #include <VBox/VRDPOrders.h>
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
 class VRDPConsoleCallback : public IConsoleCallback
@@ -579 +579 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
 RTLDRMOD ConsoleVRDPServer::mVRDPLibrary;
 
@@ -1007 +1007 @@
     server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
 }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
 ConsoleVRDPServer::ConsoleVRDPServer (Console *console)
@@ -1028 +1028 @@
 #endif
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     mhServer = 0;
 
@@ -1051 +1051 @@
     mConsoleCallback->AddRef();
     console->RegisterCallback(mConsoleCallback);
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     mAuthLibrary = 0;
@@ -1060 +1060 @@
     Stop ();
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mConsoleCallback)
     {
@@ -1077 +1077 @@
         }
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     if (RTCritSectIsInitialized (&mCritSect))
@@ -1089 +1089 @@
 {
     LogFlowMember(("ConsoleVRDPServer::Launch\n"));
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     int rc = VINF_SUCCESS;
     IVRDPServer *vrdpserver = mConsole->getVRDPServer ();
@@ -1122 +1122 @@
     int rc = VERR_NOT_SUPPORTED;
     LogRel(("VRDP: this version does not include the VRDP server.\n"));
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
     return rc;
 }
@@ -1128 +1128 @@
 void ConsoleVRDPServer::EnableConnections (void)
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPEnableConnections (mhServer, true);
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 }
 
 void ConsoleVRDPServer::MousePointerUpdate (const VRDPCOLORPOINTER *pPointer)
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPColorPointer (mhServer, pPointer);
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 }
 
 void ConsoleVRDPServer::MousePointerHide (void)
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPHidePointer (mhServer);
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 }
 
@@ -1160 +1160 @@
     Assert(VALID_PTR(this)); /** @todo r=bird: there are(/was) some odd cases where this buster was invalid on
                               * linux. Just remove this when it's 100% sure that problem has been fixed. */
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mhServer)
     {
@@ -1173 +1173 @@
         }
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
 #ifdef VBOX_WITH_USB
@@ -1499 +1499 @@
     int rc = VINF_SUCCESS;
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     ConsoleVRDPServer *pServer = static_cast <ConsoleVRDPServer *>(pvExtension);
 
@@ -1558 +1558 @@
             rc = VERR_NOT_SUPPORTED;
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     return rc;
@@ -1858 +1858 @@
 void ConsoleVRDPServer::SendUpdate (unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1868 +1868 @@
 void ConsoleVRDPServer::SendResize (void) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1878 +1878 @@
 void ConsoleVRDPServer::SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     VRDPORDERHDR update;
     update.x = x;
@@ -1893 +1893 @@
 void ConsoleVRDPServer::SendAudioSamples (void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1903 +1903 @@
 void ConsoleVRDPServer::SendAudioVolume (uint16_t left, uint16_t right) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1913 +1913 @@
 void ConsoleVRDPServer::SendUSBRequest (uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1923 +1923 @@
 void ConsoleVRDPServer::QueryInfo (uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
@@ -1931 +1931 @@
 }
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
 /* note: static function now! */
 bool ConsoleVRDPServer::loadVRDPLibrary (void)
@@ -1991 +1991 @@
     return (mVRDPLibrary != NULL);
 }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
 /*