Changeset 5992 in vbox

Timestamp:

Dec 6, 2007 3:05:48 PM (17 years ago)

Author:

vboxsync

Message:

VRDP cleanup: OSE fix.

File:

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

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -594 +594 @@
     ConsoleVRDPServer::VRDPCallbackVideoModeHint
 };
-#endif /* VBOX_VRDP */
 
 DECLCALLBACK(int)  ConsoleVRDPServer::VRDPCallbackQueryProperty (void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut)
@@ -847 +846 @@
 }
 
-#ifdef VBOX_VRDP
 static void fixKbdLockStatus (VRDPInputSynch *pInputSynch, IKeyboard *pKeyboard)
 {
@@ -865 +863 @@
     }
 }
-#endif /* VBOX_VRDP */
 
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackInput (void *pvCallback, int type, const void *pvInput, unsigned cbInput)
 {
-#ifdef VBOX_VRDP
     ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
     Console *pConsole = server->mConsole;
@@ -995 +991 @@
             break;
     }
-#else
-    NOREF(pvCallback);
-    NOREF(type);
-    NOREF(pvInput);
-    NOREF(cbInput);
+}
+
+DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackVideoModeHint (void *pvCallback, unsigned cWidth, unsigned cHeight, unsigned cBitsPerPixel, unsigned uScreenId)
+{
+    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+
+    server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
+}
 #endif /* VBOX_VRDP */
-}
-
-DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackVideoModeHint (void *pvCallback, unsigned cWidth, unsigned cHeight, unsigned cBitsPerPixel, unsigned uScreenId)
-{
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
-
-    server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
-}
 
 ConsoleVRDPServer::ConsoleVRDPServer (Console *console)
@@ -1068 +1059 @@
     }
 
+#ifdef VBOX_VRDP
     unsigned i;
     for (i = 0; i < ELEMENTS(maFramebuffers); i++)
@@ -1077 +1069 @@
         }
     }
+#endif /* VBOX_VRDP */
 
     if (RTCritSectIsInitialized (&mCritSect))