VirtualBox

Changeset 44580 in vbox


Ignore:
Timestamp:
Feb 7, 2013 11:35:37 AM (12 years ago)
Author:
vboxsync
Message:

VBoxBFE: RIP.

Location:
trunk
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r44575 r44580  
    523523# Build enhanced version of rdesktop.
    524524VBOX_WITH_VRDP_RDESKTOP = 1
    525 # The basic frontend (w/o Main).
    526 VBOX_WITH_VBOXBFE = 1
    527525## The Direct Framebuffer GUI.
    528526#VBOX_WITH_VBOXFB = 1
    … …  
    835833 VBOX_WITH_MAIN =
    836834 VBOX_WITH_VBOXSDL =
    837  VBOX_WITH_VBOXBFE =
    838835 VBOX_WITH_QTGUI =
    839836 VBOX_WITH_DEBUGGER_GUI =
    … …  
    849846 # Permanent (no working SDL).
    850847 VBOX_WITH_VBOXSDL=
    851  VBOX_WITH_VBOXBFE=
    852848endif
    853849
    … …  
    864860 # Permanent (no working SDL).
    865861 VBOX_WITH_VBOXSDL=
    866  VBOX_WITH_VBOXBFE=
    867862 VBOX_WITH_DOCS=
    868863 VBOX_WITH_VBOXDRV=
    … …  
    947942 VBOX_WITH_TESTSUITE=
    948943 VBOX_WITH_USB=
    949  VBOX_WITH_VBOXBFE=
    950944 VBOX_WITH_VBOXDRV=
    951945 VBOX_WITH_VBOXSDL=
    … …  
    11311125 VBOX_WITH_QTGUI=
    11321126 VBOX_WITH_VBOXSDL=
    1133  VBOX_WITH_VBOXBFE=
    11341127 VBOX_WITH_OGL=
    11351128 VBOX_WITH_KCHMVIEWER=

  • trunk/Makefile.kmk

    r44428 r44580  
    7777# The SDL DLLs
    7878if1of ($(KBUILD_TARGET), win os2)
    79  ifneq ($(VBOX_WITH_VBOXSDL)$(VBOX_WITH_VBOXBFE),)
     79 ifdef VBOX_WITH_VBOXSDL
    8080  include $(KBUILD_PATH)/sdks/LIBSDL.kmk
    8181  InstallExternalLibs_SOURCES += \

  • trunk/configure

    r44528 r44580  
    12611261
    12621262#
    1263 # Check for the Xcursor library, needed by VBoxSDL and VBoxBFE
     1263# Check for the Xcursor library, needed by VBoxSDL.
    12641264#
    12651265check_xcursor()

  • trunk/src/VBox/Devices/Network/DrvTAP.cpp

    r44528 r44580  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    902902     */
    903903    int rc;
    904 #if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl & VBoxBFE. */
     904#if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl. */
    905905    rc = CFGMR3QueryStringAlloc(pCfg, "TAPSetupApplication", &pThis->pszSetupApplication);
    906906    if (RT_SUCCESS(rc))

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

    r44528 r44580  
    3131  include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
    3232 endif
    33 # Temporarily disables VBoxBFE as I cannot fix the bustage on a Mac.
    34 # ifdef VBOX_WITH_VBOXBFE
    35 #  include $(PATH_SUB_CURRENT)/VBoxBFE/Makefile.kmk
    36 # endif
    3733 ifdef VBOX_WITH_VBOXFB
    3834  include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk

  • trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

    r44528 r44580  
    185185    {   kSupIFT_Exe,  kSupID_AppBin,             true, "VBoxSDL" SUPLIB_EXE_SUFF },
    186186    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VBoxSDL" SUPLIB_DLL_SUFF },
    187 //#endif
    188 
    189 //#ifdef VBOX_WITH_VBOXBFE
    190     {   kSupIFT_Exe,  kSupID_AppBin,             true, "VBoxBFE" SUPLIB_EXE_SUFF },
    191     {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VBoxBFE" SUPLIB_DLL_SUFF },
    192187//#endif
    193188

  • trunk/src/VBox/Installer/freebsd/Makefile.kmk

    r44528 r44580  
    203203endif
    204204
    205 ## VBoxBFE - Follow the example set by Windows and Linux.
    206 #ifdef VBOX_WITH_VBOXBFE
    207 # VBOX_FBSD_STRIP_BIN += \
    208 #       VBoxBFE \
    209 #       $(if $(VBOX_WITH_HARDENING),VBoxBFE.so)
    210 # VBOX_FBSD_SYMLINKS += \
    211 #       VBoxBFE
    212 #endif
    213 
    214205# Webservices
    215206ifdef VBOX_WITH_WEBSERVICES
    … …  
    323314                -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
    324315                -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
    325                 -e "/VBoxBFE/d" \
    326316                --output $@ \
    327317                $<

  • trunk/src/VBox/Installer/freebsd/pkg_plist

    r43429 r44580  
    22@group wheel
    33@mode 755
    4 lib/virtualbox/VBoxBFE
    5 lib/virtualbox/VBoxBFE.so
    64lib/virtualbox/VBoxDbg.so
    75lib/virtualbox/VBoxDD.so
    … …  
    5149@mode 755
    5250bin/VirtualBox
    53 bin/VBoxBFE
    5451bin/VBoxManage
    5552bin/VBoxSVC

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r44528 r44580  
    297297endif
    298298
    299 ## VBoxBFE - Not shipped on linux due to a typo (VBOX_WITH_BFE), let's keep it that way as it doesn't get enough testing.
    300 #ifdef VBOX_WITH_VBOXBFE
    301 # VBOX_LNX_STRIP_BIN += \
    302 #       VBoxBFE \
    303 #       $(if $(VBOX_WITH_HARDENING),VBoxBFE.so)
    304 #endif
    305 
    306299# Webservices
    307300ifdef VBOX_WITH_WEBSERVICES

  • trunk/src/VBox/Installer/linux/VBox.sh

    r44528 r44580  
    113113        run_in_group "$INSTALL_DIR/vboxwebsrv" "$@"
    114114        ;;
    115     VBoxBFE|vboxbfe)
    116         run_in_group "$INSTALL_DIR/VBoxBFE" "$@"
    117         ;;
    118115    *)
    119116        echo "Unknown application - $APP"

  • trunk/src/VBox/Installer/linux/debian/VBox.sh

    r37255 r44580  
    9292        exec "$INSTALL_DIR/vboxwebsrv" "$@"
    9393        ;;
    94     VBoxBFE|vboxbfe)
    95         exec "$INSTALL_DIR/VBoxBFE" "$@"
    96         ;;
    9794    *)
    9895        echo "Unknown application - $APP"

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r44528 r44580  
    215215        VBoxXPCOMIPCD \
    216216        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
    217 ## Follow the Windows + Linux example of not shipping VBoxBFE.
    218 #SOLARIS_STRIP_EXES = \
    219 #       $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,)
    220217
    221218SOLARIS_DRIVER_BINS = \
    … …  
    274271        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
    275272        $(if $(VBOX_WITH_QTGUI),VirtualBox.so,)
    276 ## Follow the Windows + Linux example of not shipping VBoxBFE.
    277 #SOLARIS_STRIP_BINS += \
    278 #       $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so,)
    279273endif
    280274

  • trunk/src/VBox/Installer/solaris/VBox.sh

    r44528 r44580  
    4444        exec "$INSTALL_DIR/vboxwebsrv" "$@"
    4545        ;;
    46     VBoxBFE|vboxbfe)
    47         exec "$INSTALL_DIR/VBoxBFE" "$@"
    48         ;;
    4946    VBoxQtconfig)
    5047        exec "$INSTALL_DIR/VBoxQtconfig" "$@"

  • trunk/src/VBox/Installer/solaris/makepackage.sh

    r44217 r44580  
    126126    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VirtualBox
    127127fi
    128 if test -f $VBOX_INSTALLED_DIR/amd64/VBoxBFE || test -f $VBOX_INSTALLED_DIR/i386/VBoxBFE; then
    129     ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxBFE
    130 fi
    131128if test -f $VBOX_INSTALLED_DIR/amd64/VBoxHeadless || test -f $VBOX_INSTALLED_DIR/i386/VBoxHeadless; then
    132129    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxHeadless
    … …  
    194191            ||  $3 == "opt/VirtualBox/amd64/VBoxHeadless" \
    195192            ||  $3 == "opt/VirtualBox/amd64/VBoxSDL" \
    196             ||  $3 == "opt/VirtualBox/amd64/VBoxBFE" \
    197193            ||  $3 == "opt/VirtualBox/i386/VirtualBox" \
    198194            ||  $3 == "opt/VirtualBox/i386/VirtualBox3" \
    199195            ||  $3 == "opt/VirtualBox/i386/VBoxHeadless" \
    200196            ||  $3 == "opt/VirtualBox/i386/VBoxSDL" \
    201             ||  $3 == "opt/VirtualBox/i386/VBoxBFE" \
    202197            ) \
    203198       { $4 = "4755" } { print }' prototype > prototype2

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

    r44528 r44580  
    2222#include "ConsoleEvents.h"
    2323#include "ConsoleImpl.h"
    24 #ifndef VBOXBFE_WITHOUT_COM
    2524#include "EventImpl.h"
    26 #endif
    2725#include <VBox/vmm/pdmdrv.h>
    2826
    … …  
    3432class ATL_NO_VTABLE Mouse :
    3533    public VirtualBoxBase
    36 #ifndef VBOXBFE_WITHOUT_COM
    3734    , VBOX_SCRIPTABLE_IMPL(IMouse)
    38 #endif
    3935{
    4036public:
    … …  
    6965    STDMETHOD(PutMouseEventAbsolute)(LONG x, LONG y, LONG dz, LONG dw,
    7066                                     LONG buttonState);
    71 #ifndef VBOXBFE_WITHOUT_COM
    7267    STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
    73 #endif
    7468
    7569    static const PDMDRVREG  DrvReg;
    … …  
    114108    bool supportsRel(void);
    115109
    116 #ifdef VBOXBFE_WITHOUT_COM
    117     Console *mParent;
    118 #else
    119110    Console * const         mParent;
    120 #endif
    121111    /** Pointer to the associated mouse driver. */
    122112    struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];
    … …  
    127117    uint32_t mfLastButtons;
    128118
    129 #ifndef VBOXBFE_WITHOUT_COM
    130119    const ComObjPtr<EventSource> mEventSource;
    131120    VBoxEventDesc                mMouseEvent;
    132121
    133122    void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons);
    134 #else
    135     void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
    136     {}
    137 #endif
    138123};
    139 
    140 #ifdef VBOXBFE_WITHOUT_COM
    141 /** @todo make this a member of Console */
    142 extern Mouse *gMouse;
    143 
    144 /** @todo can we get these from the API somehow? */
    145 enum
    146 {
    147     MouseButtonState_LeftButton = 1,
    148     MouseButtonState_RightButton = 2,
    149     MouseButtonState_MiddleButton = 4,
    150     MouseButtonState_XButton1 = 8,
    151     MouseButtonState_XButton2 = 16
    152 };
    153 #endif
    154124
    155125#endif // !____H_MOUSEIMPL

  • trunk/src/VBox/Main/src-client/MouseImpl.cpp

    r44528 r44580  
    110110    unconst(mParent) = parent;
    111111
    112 #ifndef VBOXBFE_WITHOUT_COM
    113112    unconst(mEventSource).createObject();
    114113    HRESULT rc = mEventSource->init(static_cast<IMouse*>(this));
    … …  
    116115    mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouse,
    117116                     0, 0, 0, 0, 0);
    118 #endif
    119117
    120118    /* Confirm a successful initialization */
    … …  
    144142    }
    145143
    146 #ifdef VBOXBFE_WITHOUT_COM
    147     mParent = NULL;
    148 #else
    149144    mMouseEvent.uninit();
    150145    unconst(mEventSource).setNull();
    151146    unconst(mParent) = NULL;
    152 #endif
    153147}
    154148
    … …  
    256250}
    257251
    258 #ifndef VBOXBFE_WITHOUT_COM
    259252STDMETHODIMP Mouse::COMGETTER(EventSource)(IEventSource ** aEventSource)
    260253{
    … …  
    269262    return S_OK;
    270263}
    271 #endif
    272264
    273265/**
    … …  
    413405}
    414406
    415 #ifndef VBOXBFE_WITHOUT_COM
    416407void Mouse::fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
    417408{
    … …  
    430421    }
    431422}
    432 #endif
    433423
    434424
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