VirtualBox

Changeset 3278 in vbox for trunk/src


Ignore:
Timestamp:
Jun 25, 2007 3:27:23 PM (18 years ago)
Author:
vboxsync
Message:

Removed some obsolete VRDP code.

Location:
trunk/src/VBox/Main
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r3191 r3278  
    302302    AssertReturn (mConsoleVRDPServer, E_FAIL);
    303303
    304 #ifdef VRDP_MC
    305304    mcAudioRefs = 0;
    306305    mcVRDPClients = 0;
    307 #endif /* VRDP_MC */
    308306
    309307    unconst (mVMMDev) = new VMMDev(this);
    … …  
    443441}
    444442
    445 #ifdef VRDP_MC
    446443DECLCALLBACK(int) Console::vrdp_ClientLogon (void *pvUser,
    447444                                             uint32_t u32ClientId,
    … …  
    449446                                             const char *pszPassword,
    450447                                             const char *pszDomain)
    451 #else
    452 DECLCALLBACK(int) Console::vrdp_ClientLogon (void *pvUser, const char *pszUser,
    453                                              const char *pszPassword,
    454                                              const char *pszDomain)
    455 #endif /* VRDP_MC */
    456448{
    457449    LogFlowFuncEnter();
    458 #ifdef VRDP_MC
    459450    LogFlowFunc (("%d, %s, %s, %s\n", u32ClientId, pszUser, pszPassword, pszDomain));
    460 #else
    461     uint32_t u32ClientId = 0;
    462     LogFlowFunc (("%s, %s, %s\n", pszUser, pszPassword, pszDomain));
    463 #endif /* VRDP_MC */
    464451
    465452    Console *console = static_cast <Console *> (pvUser);
    … …  
    630617}
    631618
    632 #ifdef VRDP_MC
    633619DECLCALLBACK(void) Console::vrdp_ClientConnect (void *pvUser,
    634620                                                uint32_t u32ClientId)
    635 #else
    636 DECLCALLBACK(void) Console::vrdp_ClientConnect (void *pvUser,
    637                                                 uint32_t fu32SupportedOrders)
    638 #endif /* VRDP_MC */
    639621{
    640622    LogFlowFuncEnter();
    … …  
    647629
    648630#ifdef VBOX_VRDP
    649 #ifdef VRDP_MC
    650631    ASMAtomicIncU32(&console->mcVRDPClients);
    651632
    652633    NOREF(u32ClientId);
    653634    console->mDisplay->VideoAccelVRDP (true);
    654 #else
    655     console->mDisplay->VideoAccelVRDP (true, fu32SupportedOrders);
    656 #endif /* VRDP_MC */
    657635#endif /* VBOX_VRDP */
    658636
    … …  
    661639}
    662640
    663 #ifdef VRDP_MC
    664641DECLCALLBACK(void) Console::vrdp_ClientDisconnect (void *pvUser,
    665642                                                   uint32_t u32ClientId,
    666643                                                   uint32_t fu32Intercepted)
    667 #else
    668 DECLCALLBACK(void) Console::vrdp_ClientDisconnect (void *pvUser)
    669 #endif /* VRDP_MC */
    670644{
    671645    LogFlowFuncEnter();
    … …  
    680654
    681655#ifdef VBOX_VRDP
    682 #ifdef VRDP_MC
    683656    ASMAtomicDecU32(&console->mcVRDPClients);
    684657
    685658    console->mDisplay->VideoAccelVRDP (false);
    686 #else
    687     u32ClientId = 0;
    688     console->mDisplay->VideoAccelVRDP (false, 0);
    689 #endif /* VRDP_MC */
    690659#endif /* VBOX_VRDP */
    691660
    692 #ifdef VRDP_MC
    693661    if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_USB)
    694662    {
    695663        console->mConsoleVRDPServer->USBBackendDelete (u32ClientId);
    696664    }
    697 #else
    698     console->mConsoleVRDPServer->DeleteUSBBackend ();
    699 #endif /* VRDP_MC */
    700665
    701666#ifdef VBOX_VRDP
    702 #ifdef VRDP_MC
    703667    if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_CLIPBOARD)
    704668    {
    … …  
    722686        }
    723687    }
    724 #else
    725     if (console->mAudioSniffer)
    726     {
    727         PPDMIAUDIOSNIFFERPORT port = console->mAudioSniffer->getAudioSnifferPort();
    728         if (port)
    729         {
    730             port->pfnSetup (port, false, false);
    731         }
    732     }
    733 #endif /* VRDP_MC */
    734688#endif /* VBOX_VRDP */
    735689
    … …  
    749703}
    750704
    751 #ifdef VRDP_MC
    752705DECLCALLBACK(void) Console::vrdp_InterceptAudio (void *pvUser,
    753706                                                 uint32_t u32ClientId)
    754 #else
    755 DECLCALLBACK(void) Console::vrdp_InterceptAudio (void *pvUser, bool fKeepHostAudio)
    756 #endif /* VRDP_MC */
    757707{
    758708    LogFlowFuncEnter();
    … …  
    764714    AssertComRCReturnVoid (autoCaller.rc());
    765715
    766 #ifdef VRDP_MC
    767716    LogFlowFunc (("mAudioSniffer %p, u32ClientId %d.\n",
    768717                  console->mAudioSniffer, u32ClientId));
    769718    NOREF(u32ClientId);
    770 #else
    771     LogFlowFunc (("mAudioSniffer %p, keepHostAudio %d.\n",
    772                   console->mAudioSniffer, fKeepHostAudio));
    773 #endif /* VRDP_MC */
    774719
    775720#ifdef VBOX_VRDP
    776 #ifdef VRDP_MC
    777721    console->mcAudioRefs++;
    778722
    … …  
    788732        }
    789733    }
    790 #else
    791     if (console->mAudioSniffer)
    792     {
    793         PPDMIAUDIOSNIFFERPORT port = console->mAudioSniffer->getAudioSnifferPort();
    794         if (port)
    795         {
    796             port->pfnSetup (port, true, !!fKeepHostAudio);
    797         }
    798     }
    799 #endif /* VRDP_MC */
    800734#endif
    801735
    … …  
    804738}
    805739
    806 #ifdef VRDP_MC
    807740DECLCALLBACK(void) Console::vrdp_InterceptUSB (void *pvUser,
    808741                                               uint32_t u32ClientId,
    809742                                               PFNVRDPUSBCALLBACK *ppfn,
    810743                                               void **ppv)
    811 #else
    812 DECLCALLBACK(void) Console::vrdp_InterceptUSB (void *pvUser, PFNVRDPUSBCALLBACK *ppfn, void **ppv)
    813 #endif /* VRDP_MC */
    814744{
    815745    LogFlowFuncEnter();
    … …  
    823753    AssertReturnVoid (console->mConsoleVRDPServer);
    824754
    825 #ifdef VRDP_MC
    826755    console->mConsoleVRDPServer->USBBackendCreate (u32ClientId, ppfn, ppv);
    827 #else
    828     console->mConsoleVRDPServer->CreateUSBBackend (ppfn, ppv);
    829 #endif /* VRDP_MC */
    830756
    831757    LogFlowFuncLeave();
    … …  
    833759}
    834760
    835 #ifdef VRDP_MC
    836761DECLCALLBACK(void) Console::vrdp_InterceptClipboard (void *pvUser,
    837762                                                     uint32_t u32ClientId,
    … …  
    856781    return;
    857782}
    858 #else
    859 DECLCALLBACK(void) Console::vrdp_InterceptClipboard (void *pvUser,
    860                                                      PFNVRDPCLIPBOARDCALLBACK *ppfn,
    861                                                      void **ppv)
    862 {
    863     /* Obsolete. */
    864     return;
    865 }
    866 #endif /* VRDP_MC */
    867783
    868784
    … …  
    42294145    ComAssertComRCRetRC (hrc);
    42304146
    4231 #ifndef VRDP_MC
    4232     if (fRemote)
    4233     {
    4234         pvRemote = mConsoleVRDPServer->GetUSBBackendPointer ();
    4235         ComAssertRet (pvRemote, E_FAIL);
    4236     }
    4237 #endif /* !VRDP_MC */
    4238 
    42394147    /* protect mpVM */
    42404148    AutoVMCaller autoVMCaller (this);
    … …  
    43064214    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
    43074215
    4308 #ifdef VRDP_MC
    43094216    if (aRemote)
    43104217    {
    … …  
    43244231        }
    43254232    }
    4326 #endif /* VRDP_MC */
    43274233
    43284234    int vrc = aConfig->pfnCreateProxyDevice (aConfig, aUuid, aRemote, aAddress,
    … …  
    44194325    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
    44204326
    4421 #ifdef VRDP_MC
    44224327    /*
    44234328     * If that was a remote device, release the backend pointer.
    … …  
    44344339        that->consoleVRDPServer ()->USBBackendReleasePointer (&guid);
    44354340    }
    4436 #endif /* VRDP_MC */
    44374341
    44384342    int vrc = aConfig->pfnDestroyProxyDevice (aConfig, aUuid);
    … …  
    63136217 *  @note Locks this object for writing.
    63146218 */
    6315 #ifdef VRDP_MC
    63166219void Console::processRemoteUSBDevices (uint32_t u32ClientId, VRDPUSBDEVICEDESC *pDevList, uint32_t cbDevList)
    6317 #else
    6318 void Console::processRemoteUSBDevices (VRDPUSBDEVICEDESC *pDevList, uint32_t cbDevList)
    6319 #endif /* VRDP_MC */
    63206220{
    63216221    LogFlowThisFuncEnter();
    6322 #ifdef VRDP_MC
    63236222    LogFlowThisFunc (("u32ClientId = %d, pDevList=%p, cbDevList = %d\n", u32ClientId, pDevList, cbDevList));
    6324 #else
    6325     LogFlowThisFunc (("pDevList=%p, cbDevList = %d\n", pDevList, cbDevList));
    6326 #endif /* VRDP_MC */
    63276223
    63286224    AutoCaller autoCaller (this);
    … …  
    63696265        while (it != mRemoteUSBDevices.end())
    63706266        {
    6371 #ifdef VRDP_MC
    63726267            if ((*it)->devId () == e->id
    63736268                && (*it)->clientId () == u32ClientId)
    6374 #else
    6375             if ((*it)->devId () == e->id)
    6376 #endif /* VRDP_MC */
    63776269            {
    63786270               /* The device is already in the list. */
    … …  
    63946286            ComObjPtr <RemoteUSBDevice> device;
    63956287            device.createObject();
    6396 #ifdef VRDP_MC
    63976288            device->init (u32ClientId, e);
    6398 #else
    6399             device->init (e);
    6400 #endif /* VRDP_MC */
    64016289
    64026290            mRemoteUSBDevices.push_back (device);

  • trunk/src/VBox/Main/ConsoleVRDPServer.cpp

    r3153 r3278  
    4545void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPSendAudioSamples)(HVRDPSERVER hserver, void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format);
    4646void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPSendAudioVolume) (HVRDPSERVER hserver, uint16_t left, uint16_t right);
    47 #ifdef VRDP_MC
    4847void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, uint32_t u32ClientId, void *pvParms, uint32_t cbParms);
    49 #else
    50 void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, void *pvParms, uint32_t cbParms);
    51 #endif /* VRDP_MC */
    5248void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate);
    5349void (VBOXCALL *ConsoleVRDPServer::mpfnVRDPQueryInfo)       (HVRDPSERVER hserver, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
    … …  
    5955    mConsole = console;
    6056
    61 #ifdef VRDP_MC
    6257    int rc = RTCritSectInit (&mCritSect);
    6358    AssertRC (rc);
    … …  
    7469    mUSBBackends.event = 0;
    7570#endif
    76 #else
    77 #ifdef VBOX_WITH_USB
    78     mRemoteUSBBackend = NULL;
    79 #endif
    80 #endif /* VRDP_MC */
    8171
    8272#ifdef VBOX_VRDP
    … …  
    8979ConsoleVRDPServer::~ConsoleVRDPServer ()
    9080{
    91 #ifdef VRDP_MC
    9281    Stop ();
    9382
    … …  
    9786        memset (&mCritSect, 0, sizeof (mCritSect));
    9887    }
    99 #else
    100 #ifdef VBOX_VRDP
    101     Stop ();
    102     /* No unloading of anything because we might still have live object around. */
    103 #endif
    104 #endif /* VRDP_MC */
    10588}
    10689
    … …  
    125108        if (VBOX_SUCCESS(rc))
    126109        {
    127 #ifndef VRDP_MC
    128             LogFlow(("VRDP server created: %p, will set mFramebuffer\n", mhServer));
    129 
    130             IFramebuffer *framebuffer = mConsole->getDisplay()->getFramebuffer();
    131 
    132             mpfnVRDPSetFramebuffer (mhServer, framebuffer,
    133                 framebuffer? VRDP_EXTERNAL_FRAMEBUFFER: VRDP_INTERNAL_FRAMEBUFFER);
    134 
    135             LogFlow(("Framebuffer %p set for the VRDP server\n", framebuffer));
    136 #endif /* !VRDP_MC */
    137110#ifdef VBOX_WITH_USB
    138 #ifdef VRDP_MC
    139111            remoteUSBThreadStart ();
    140 #endif /* VRDP_MC */
    141112#endif /* VBOX_WITH_USB */
    142113        }
    … …  
    178149
    179150#ifdef VBOX_WITH_USB
    180 #ifdef VRDP_MC
    181151    remoteUSBThreadStop ();
    182 #else
    183     /* Delete the USB backend object if it was not deleted properly. */
    184     if (mRemoteUSBBackend)
    185     {
    186         Log(("ConsoleVRDPServer::Stop: deleting USB backend\n"));
    187 
    188         mRemoteUSBBackend->ReleaseUSB ();
    189         delete mRemoteUSBBackend;
    190         mRemoteUSBBackend = NULL;
    191     }
    192 #endif /* VRDP_MC */
    193152#endif /* VBOX_WITH_USB */
    194153
    … …  
    203162}
    204163
    205 #ifdef VRDP_MC
    206164/* Worker thread for Remote USB. The thread polls the clients for
    207165 * the list of attached USB devices.
    … …  
    248206void ConsoleVRDPServer::notifyRemoteUSBThreadRunning (RTTHREAD thread)
    249207{
    250 #ifdef VBOX_WITH_USB
    251208    mUSBBackends.thread = thread;
    252209    mUSBBackends.fThreadRunning = true;
    253210    int rc = RTThreadUserSignal (thread);
    254211    AssertRC (rc);
    255 #endif
    256212}
    257213   
    … …  
    321277}
    322278#endif /* VBOX_WITH_USB */
    323 #endif /* VRDP_MC */
    324279
    325280VRDPAuthResult ConsoleVRDPServer::Authenticate (const Guid &uuid, VRDPAuthGuestJudgement guestJudgement,
    … …  
    448403}
    449404
    450 #ifdef VRDP_MC
    451405int ConsoleVRDPServer::lockConsoleVRDPServer (void)
    452406{
    … …  
    876830#endif
    877831}
    878 #else // VRDP_MC
    879 void ConsoleVRDPServer::CreateUSBBackend (PFNVRDPUSBCALLBACK *ppfn, void **ppv)
    880 {
    881 #ifdef VBOX_WITH_USB
    882     Assert(mRemoteUSBBackend == NULL);
    883 
    884     mRemoteUSBBackend = new RemoteUSBBackend (mConsole, this);
    885 
    886     if (mRemoteUSBBackend)
    887     {
    888         int rc = mRemoteUSBBackend->InterceptUSB (ppfn, ppv);
    889 
    890         if (VBOX_FAILURE (rc))
    891         {
    892             delete mRemoteUSBBackend;
    893             mRemoteUSBBackend = NULL;
    894         }
    895     }
    896 #endif /* VBOX_WITH_USB */
    897 }
    898 
    899 void ConsoleVRDPServer::DeleteUSBBackend (void)
    900 {
    901 #ifdef VBOX_WITH_USB
    902     LogFlow(("ConsoleVRDPServer::DeleteUSBBackend: %p\n", mRemoteUSBBackend));
    903 
    904     if (mRemoteUSBBackend)
    905     {
    906         mRemoteUSBBackend->ReleaseUSB ();
    907         delete mRemoteUSBBackend;
    908         mRemoteUSBBackend = NULL;
    909     }
    910 #endif /* VBOX_WITH_USB */
    911 }
    912 
    913 void *ConsoleVRDPServer::GetUSBBackendPointer (void)
    914 {
    915 #ifdef VBOX_WITH_USB
    916     Assert (mRemoteUSBBackend); /* Must be called only if the object exists. */
    917     return mRemoteUSBBackend->GetRemoteBackendCallback ();
    918 #else
    919     return NULL;
    920 #endif
    921 }
    922 #endif /* VRDP_MC */
    923 
    924832
    925833
    … …  
    972880}
    973881
    974 #ifdef VRDP_MC
    975882void ConsoleVRDPServer::SendUSBRequest (uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const
    976883{
    … …  
    980887#endif
    981888}
    982 #else
    983 void ConsoleVRDPServer::SendUSBRequest (void *pvParms, uint32_t cbParms) const
    984 {
    985 #ifdef VBOX_VRDP
    986     if (mpfnVRDPSendUSBRequest)
    987         mpfnVRDPSendUSBRequest (mhServer, pvParms, cbParms);
    988 #endif
    989 }
    990 #endif /* VRDP_MC */
    991889
    992890void ConsoleVRDPServer::QueryInfo (uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const
    … …  
    1023921            {
    1024922                DEFSYMENTRY(VRDPStartServer),
    1025 #ifndef VRDP_MC
    1026                 DEFSYMENTRY(VRDPSetFramebuffer),
    1027 #endif /* VRDP_MC */
    1028923                DEFSYMENTRY(VRDPSetCallback),
    1029924                DEFSYMENTRY(VRDPShutdownServer),

  • trunk/src/VBox/Main/DisplayImpl.cpp

    r3227 r3278  
    374374}
    375375
    376 #ifndef VRDP_MC
    377376static void checkCoordBounds (int *px, int *py, int *pw, int *ph, int cx, int cy)
    378377{
    … …  
    407406    }
    408407}
    409 #endif
    410408
    411409unsigned mapCoordsToScreen(DISPLAYFBINFO *pInfos, unsigned cInfos, int *px, int *py, int *pw, int *ph)
    … …  
    454452#endif /* DEBUG_sunlover */
    455453
    456 #ifdef VRDP_MC
    457454    unsigned uScreenId = mapCoordsToScreen(maFramebuffers, mcMonitors, &x, &y, &w, &h);
    458 #else
    459     checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
    460 #endif /* VRDP_MC */
    461455
    462456#ifdef DEBUG_sunlover
    … …  
    482476
    483477        RTSemEventMultiReset(mUpdateSem);
     478
     479        checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
    484480
    485481        pFramebuffer->NotifyUpdate(x, y, w, h, &finished);
    … …  
    770766
    771767#ifdef VBOX_VRDP
    772 #ifdef VRDP_MC
    773768/* Called always by one VRDP server thread. Can be thread-unsafe.
    774769 */
    775770void Display::VideoAccelVRDP (bool fEnable)
    776771{
    777 #if 0
    778     /* Supporting all orders. */
    779     uint32_t fu32SupportedOrders = ~0;
    780 #endif
    781    
    782772    int c = fEnable?
    783773                ASMAtomicIncS32 (&mcVideoAccelVRDPRefs):
    … …  
    823813    }
    824814}
    825 #else
    826 void Display::VideoAccelVRDP (bool fEnable, uint32_t fu32SupportedOrders)
    827 {
    828     Assert (mfVideoAccelVRDP != fEnable);
    829 
    830     mfVideoAccelVRDP = fEnable;
    831 
    832     if (fEnable)
    833     {
    834         mfu32SupportedOrders = fu32SupportedOrders;
    835     }
    836     else
    837     {
    838         mfu32SupportedOrders = 0;
    839     }
    840 
    841     vbvaSetMemoryFlags (mpVbvaMemory, mfVideoAccelEnabled, mfVideoAccelVRDP, mfu32SupportedOrders, maFramebuffers, mcMonitors);
    842 
    843     LogRel(("VBVA: VRDP acceleration has been %s.\n", fEnable? "requested": "disabled"));
    844 }
    845 #endif /* VRDP_MC */
    846815#endif /* VBOX_VRDP */
    847816
    … …  
    20742043                }
    20752044            }
    2076 #ifdef VRDP_MC
    2077             /* Inform to VRDP server that the current display update sequence is
     2045            /* Inform the VRDP server that the current display update sequence is
    20782046             * completed. At this moment the framebuffer memory contains a definite
    20792047             * image, that is synchronized with the orders already sent to VRDP client.
    … …  
    20832051            Assert (pDisplay->mParent && pDisplay->mParent->consoleVRDPServer());
    20842052            pDisplay->mParent->consoleVRDPServer()->SendUpdate (uScreenId, NULL, 0);
    2085 #endif /* VRDP_MC */
    20862053        }
    20872054    }

  • trunk/src/VBox/Main/Makefile.kmk

    r3191 r3278  
    2222DEPTH = ../../..
    2323include $(PATH_KBUILD)/header.kmk
    24 
    25 ifdef VBOX_WITH_VRDP_MC
    26 DEFS       += VRDP_MC
    27 endif
    2824
    2925SUBDIRS_AFTER    = testcase

  • trunk/src/VBox/Main/RemoteUSBDeviceImpl.cpp

    r2981 r3278  
    5252 * Initializes the remote USB device object.
    5353 */
    54 #ifdef VRDP_MC
    5554HRESULT RemoteUSBDevice::init (uint32_t u32ClientId, VRDPUSBDEVICEDESC *pDevDesc)
    56 #else
    57 HRESULT RemoteUSBDevice::init (VRDPUSBDEVICEDESC *pDevDesc)
    58 #endif /* VRDP_MC  */
    5955{
    6056    LogFlowMember (("RemoteUSBDevice::init()\n"));
    … …  
    7470
    7571    char id[64];
    76 #ifdef VRDP_MC
    7772    RTStrPrintf(id, sizeof (id), REMOTE_USB_BACKEND_PREFIX_S "0x%08X&0x%08X", pDevDesc->id, u32ClientId);
    78 #else
    79     RTStrPrintf(id, sizeof (id), REMOTE_USB_BACKEND_PREFIX_S "0x%08X", pDevDesc->id);
    80 #endif /* VRDP_MC  */
    8173    mAddress      = id;
    8274
    … …  
    8880    mDevId        = pDevDesc->id;
    8981
    90 #ifdef VRDP_MC
    9182    mClientId     = u32ClientId;
    92 #endif /* VRDP_MC  */
    9383
    9484    setReady (true);

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

    r3034 r3278  
    182182    static VRDPSERVERCALLBACK *getVrdpServerCallback () { return &sVrdpServerCallback; };
    183183
    184 #ifdef VRDP_MC
    185184    void processRemoteUSBDevices (uint32_t u32ClientId, VRDPUSBDEVICEDESC *pDevList, uint32_t cbDevList);
    186 #else
    187     void processRemoteUSBDevices (VRDPUSBDEVICEDESC *pDevList, uint32_t cbDevList);
    188 #endif /* VRDP_MC */
    189185
    190186    // callback callers
    … …  
    406402    static DECLCALLBACK(int)    drvStatus_Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle);
    407403
    408 #ifdef VRDP_MC
    409404    int mcAudioRefs;
    410405    volatile uint32_t mcVRDPClients;
    … …  
    416411    static DECLCALLBACK(void)   vrdp_InterceptUSB (void *pvUser, uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
    417412    static DECLCALLBACK(void)   vrdp_InterceptClipboard (void *pvUser, uint32_t u32ClientId, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
    418 #else
    419     static DECLCALLBACK(int)    vrdp_ClientLogon (void *pvUser, const char *pszUser, const char *pszPassword, const char *pszDomain);
    420     static DECLCALLBACK(void)   vrdp_ClientConnect (void *pvUser, uint32_t fu32SupportedOrders);
    421     static DECLCALLBACK(void)   vrdp_ClientDisconnect (void *pvUser);
    422     static DECLCALLBACK(void)   vrdp_InterceptAudio (void *pvUser, bool keepHostAudio);
    423     static DECLCALLBACK(void)   vrdp_InterceptUSB (void *pvUser, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
    424     static DECLCALLBACK(void)   vrdp_InterceptClipboard (void *pvUser, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
    425 #endif /* VRDP_MC */
    426413
    427414    static VRDPSERVERCALLBACK   sVrdpServerCallback;

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

    r3153 r3278  
    5050    void AuthDisconnect (const Guid &uuid, uint32_t u32ClientId);
    5151
    52 #ifdef VRDP_MC
    5352    void USBBackendCreate (uint32_t u32ClientId, PFNVRDPUSBCALLBACK *ppfn, void **ppv);
    5453    void USBBackendDelete (uint32_t u32ClientId);
    … …  
    6968    void ClipboardCreate (uint32_t u32ClientId, PFNVRDPCLIPBOARDCALLBACK *ppfn, void **ppv);
    7069    void ClipboardDelete (uint32_t u32ClientId);
    71 #else
    72     void CreateUSBBackend (PFNVRDPUSBCALLBACK *ppfn, void **ppv);
    73     void DeleteUSBBackend (void);
    74 
    75     void *GetUSBBackendPointer (void);
    76 #endif /* VRDP_MC */
    7770
    7871    /*
    … …  
    8679    void SendAudioSamples (void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format) const;
    8780    void SendAudioVolume (uint16_t left, uint16_t right) const;
    88 #ifdef VRDP_MC
    8981    void SendUSBRequest (uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const;
    90 #else
    91     void SendUSBRequest (void *pvParms, uint32_t cbParms) const;
    92 #endif /* VRDP_MC */
    9382
    9483    void QueryInfo (uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const;
    … …  
    117106    static void (VBOXCALL *mpfnVRDPSendAudioSamples)(HVRDPSERVER hserver, void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format);
    118107    static void (VBOXCALL *mpfnVRDPSendAudioVolume) (HVRDPSERVER hserver, uint16_t left, uint16_t right);
    119 #ifdef VRDP_MC
    120108    static void (VBOXCALL *mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, uint32_t u32ClientId, void *pvParms, uint32_t cbParms);
    121 #else
    122     static void (VBOXCALL *mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, void *pvParms, uint32_t cbParms);
    123 #endif /* VRDP_MC */
    124109    static void (VBOXCALL *mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate);
    125110    static void (VBOXCALL *mpfnVRDPQueryInfo)       (HVRDPSERVER hserver, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
    … …  
    127112#endif /* VBOX_VRDP */
    128113
    129 #ifdef VRDP_MC
    130114    RTCRITSECT mCritSect;
    131115
    … …  
    161145    void remoteUSBThreadStop (void);
    162146#endif /* VBOX_WITH_USB */
    163 #else
    164 #ifdef VBOX_WITH_USB
    165     /* The remote USB backend object is created only if the client
    166      * asks for USB channel. The object is created in the vrdp_InterceptUSB
    167      * callback.
    168      */
    169     RemoteUSBBackend *mRemoteUSBBackend;
    170 #endif /* VBOX_WITH_USB */
    171 #endif /* VRDP_MC */
    172147
    173148    /* External authentication library handle. The library is loaded in the

  • trunk/src/VBox/Main/include/DisplayImpl.h

    r3153 r3278  
    111111
    112112#ifdef VBOX_VRDP
    113 #ifdef VRDP_MC
    114113    void VideoAccelVRDP (bool fEnable);
    115 #else
    116     void VideoAccelVRDP (bool fEnable, uint32_t fu32SupportedOrders);
    117 #endif /* VRDP_MC */
    118114#endif /* VBOX_VRDP */
    119115

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

    r2981 r3278  
    3838class ConsoleVRDPServer;
    3939
    40 #ifdef VRDP_MC
    41 
    4240/* How many remote devices can be attached to a remote client.
    4341 * Normally a client computer has 2-8 physical USB ports, so 16 devices
    … …  
    5452        RemoteUSBBackendListable() : pNext (NULL), pPrev (NULL) {};
    5553};
    56 #endif /* VRDP_MC */
    5754
    58 #ifdef VRDP_MC
    5955class RemoteUSBBackend: public RemoteUSBBackendListable
    60 #else
    61 class RemoteUSBBackend
    62 #endif /* VRDP_MC */
    6356{
    6457    public:
    65 
    66 #ifdef VRDP_MC
    6758        RemoteUSBBackend(Console *console, ConsoleVRDPServer *server, uint32_t u32ClientId);
    6859        ~RemoteUSBBackend();
    … …  
    8071       
    8172        void PollRemoteDevices (void);
    82 #else
    83         RemoteUSBBackend(Console *console, ConsoleVRDPServer *server);
    84         ~RemoteUSBBackend();
    85 
    86         int InterceptUSB (PFNVRDPUSBCALLBACK *ppfn, void **ppv);
    87         void ReleaseUSB (void);
    88 
    89         REMOTEUSBCALLBACK *GetRemoteBackendCallback (void) { return &mCallback; };
    90 #endif /* VRDP_MC */
    9173
    9274    public: /* Functions for internal use. */
    93 
    9475        ConsoleVRDPServer *VRDPServer (void) { return mServer; };
    9576
    96 #ifdef VRDP_MC
    9777        bool pollingEnabledURB (void) { return mfPollURB; }
    9878
    … …  
    11494        bool findUUID (const Guid *pUuid);
    11595        void removeUUID (const Guid *pUuid);
    116 #else
    117         bool pollingEnabledURB (void) { return mfPollURB; };
    118 
    119         void notifyThreadStarted (RTTHREAD self);
    120         void notifyThreadFinished (void);
    121         bool threadEnabled (void);
    122         bool continueThread (void);
    123 
    124         bool needRDL (void);
    125         void notifyRDLSent (void);
    126 
    127         int negotiateResponse (VRDPUSBREQNEGOTIATERET *pret);
    128 
    129         int saveDeviceList (void *pvList, uint32_t cbList);
    130         bool processRDL (void);
    131 
    132         void request (void);
    133         void release (void);
    134 
    135         void waitEvent (unsigned cMillies);
    136 
    137         void addDevice (PREMOTEUSBDEVICE pDevice);
    138         void removeDevice (PREMOTEUSBDEVICE pDevice);
    139 
    140         PREMOTEUSBDEVICE deviceFromId (VRDPUSBDEVID id);
    141 
    142         int reapURB (void *pvBody, uint32_t cbBody);
    143 #endif /* VRDP_MC */
    14496
    14597    private:
    146 
    147 #ifndef VRDP_MC
    148         void initMembers (void);
    149 #endif /* !VRDP_MC */
    150 
    15198        Console *mConsole;
    15299        ConsoleVRDPServer *mServer;
    153100
    154 #ifdef VRDP_MC
    155101        int cRefs;
    156102       
    … …  
    183129       
    184130        Guid aGuids[VRDP_MAX_USB_DEVICES_PER_CLIENT];
    185 #else
    186         RTCRITSECT mCritsect;
    187         RTSEMEVENT mEvent;
    188 
    189         REMOTEUSBCALLBACK mCallback;
    190 
    191         RTTHREAD mThread;
    192 
    193         bool mfThreadActive;
    194         bool mfThreadEnabled;
    195         bool mfTerminateThread;
    196 
    197         RDLState menmRDLState;
    198 
    199         void *mpvDeviceList;
    200         uint32_t mcbDeviceList;
    201 
    202         PREMOTEUSBDEVICE mpDevices;
    203 
    204         bool mfPollURB;
    205 #endif /* VRDP_MC */
    206131};
    207132

  • trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h

    r2981 r3278  
    5454
    5555    // public initializer/uninitializer for internal purposes only
    56 #ifdef VRDP_MC
    5756    HRESULT init(uint32_t u32ClientId, VRDPUSBDEVICEDESC *pDevDesc);
    58 #else
    59     HRESULT init(VRDPUSBDEVICEDESC *pDevDesc);
    60 #endif /* VRDP_MC */
    6157    void uninit();
    6258
    … …  
    8177
    8278    uint16_t devId (void) { return mDevId; }
    83 #ifdef VRDP_MC
    8479    uint32_t clientId (void) { return mClientId; }
    85 #endif /* VRDP_MC */
    8680
    8781    bool captured (void) { return mState == USBDeviceState_USBDeviceCaptured; }
    … …  
    123117    bool mDirty;
    124118    uint16_t mDevId;
    125 #ifdef VRDP_MC
    126119    uint32_t mClientId;
    127 #endif /* VRDP_MC */
    128120};
    129121
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette