VirtualBox

Changeset 55123 in vbox


Ignore:
Timestamp:
Apr 8, 2015 9:40:02 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
99420
Message:

rdesktop 1.8.3 modified for VBox

Location:
trunk/src/VBox
Files:
55 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/RDP/client-1.8.3/Makefile.in

    r55121 r55123  
    1717CC          = @CC@
    1818INSTALL     = @INSTALL@
    19 CFLAGS      = @CFLAGS@ @X_CFLAGS@ @DEFS@ -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
    20 LDFLAGS     = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
     19CFLAGS      = @CFLAGS@ @X_CFLAGS@ @DEFS@ -Iinclude -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -DWITH_RDPUSB=1 -DRDESKTOP -DVBOX -DIN_RING3 -DRT_OS_LINUX -DLOG_DISABLED -DRTLOG_REL_DISABLED -DVBOX_USB_WITH_SYSFS
     20CXXFLAGS    = @CXXFLAGS@ @DEFS@ -Iinclude -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -DWITH_RDPUSB=1 -DRDESKTOP -DVBOX -DIN_RING3 -DRT_OS_LINUX -DLOG_DISABLED -DRTLOG_REL_DISABLED -DVBOX_USB_WITH_SYSFS
     21LDFLAGS     = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lpthread -ldl
    2122STRIP       = @STRIP@
    2223
    … …  
    2930CREDSSPOBJ  = @CREDSSPOBJ@
    3031
    31 RDPOBJ   = tcp.o asn.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpdr.o serial.o printer.o disk.o parallel.o printercache.o mppc.o pstcache.o lspci.o seamless.o ssl.o utils.o
     32RDPOBJ   = tcp.o asn.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpdr.o serial.o printer.o disk.o parallel.o printercache.o mppc.o pstcache.o lspci.o seamless.o ssl.o utils.o Runtime/common/alloc/alloc.o Runtime/common/err/errmsg.o Runtime/common/err/errmsgxpcom.o Runtime/common/err/RTErrConvertFromErrno.o Runtime/common/err/RTErrConvertToErrno.o Runtime/common/misc/sg.o Runtime/common/path/RTPathAppend.o Runtime/common/path/RTPathAppendEx.o Runtime/common/path/RTPathCountComponents.o Runtime/common/path/RTPathFilename.o Runtime/common/path/rtPathRootSpecLen.o Runtime/common/path/RTPathStripFilename.o Runtime/common/path/RTPathStripTrailingSlash.o Runtime/common/path/rtPathVolumeSpecLen.o Runtime/common/string/RTStrCmp.o Runtime/common/string/RTStrNCmp.o Runtime/common/string/RTStrCopy.o Runtime/common/string/RTStrNLen.o Runtime/common/string/straprintf.o Runtime/common/string/stringalloc.o Runtime/common/string/strformat.o Runtime/common/string/strformatrt.o Runtime/common/string/strformattype.o Runtime/common/string/strprintf.o Runtime/common/string/strstrip.o Runtime/common/string/strtonum.o Runtime/common/string/unidata-flags.o Runtime/common/string/unidata-upper.o Runtime/common/string/unidata-lower.o Runtime/common/string/utf-16.o Runtime/common/string/utf-8.o Runtime/common/string/utf-8-case.o Runtime/common/time/timesysalias.o Runtime/generic/pathhost-generic.o Runtime/generic/RTPathAbs-generic.o Runtime/r3/alloc.o Runtime/r3/dir.o Runtime/r3/fileio.o Runtime/r3/fs.o Runtime/r3/linux/sysfs.o Runtime/r3/linux/time-linux.o Runtime/r3/posix/dir-posix.o Runtime/r3/posix/env-posix.o Runtime/r3/posix/fileio-posix.o Runtime/r3/posix/fs2-posix.o Runtime/r3/posix/fs3-posix.o Runtime/r3/posix/path-posix.o Runtime/r3/posix/path2-posix.o Runtime/r3/posix/pipe-posix.o Runtime/r3/posix/thread2-posix.o Runtime/r3/posix/utf8-posix.o Runtime/r3/stream.o vrdp/rdpusb.o vrdp/USBGetDevices.o vrdp/USBLib.o vrdp/linux/USBProxyDevice-linux.o
    3233X11OBJ   = rdesktop.o xwin.o xkeymap.o ewmhints.o xclip.o cliprdr.o ctrl.o
    3334VNCOBJ   = vnc/rdp2vnc.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o
    … …  
    3738
    3839rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ)
    39         $(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ) $(LDFLAGS) -lX11
     40        $(CXX) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ) $(LDFLAGS) -lX11
    4041
    4142rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ)
    … …  
    9293.PHONY: clean
    9394clean:
    94         rm -f *.o *~ vnc/*.o vnc/*~ rdesktop rdp2vnc
     95        rm -f *.o *~ vnc/*.o vnc/*~ vrdp/*.o vrdp/*~ vrdp/linux/*.o vrdp/linux/*~ Runtime/common/*/*.o Runtime/common/*/*~ Runtime/generic/*.o Runtime/generic/*~ Runtime/r3/*.o Runtime/r3/*~ Runtime/r3/*/*.o Runtime/r3/*/*~ rdesktop rdp2vnc
    9596
    9697.PHONY: distclean
    … …  
    156157
    157158.SUFFIXES:
    158 .SUFFIXES: .c .o
     159.SUFFIXES: .c .cpp .o
    159160
    160161.c.o:

  • trunk/src/VBox/RDP/client-1.8.3/Makefile.kmk

    r55120 r55123  
    2525VBOX_PATH_MAIN_LINUX   := $(PATH_ROOT)/src/VBox/Main/src-server/linux
    2626VBOX_PATH_MAIN_INCLUDE := $(PATH_ROOT)/src/VBox/Main/include
    27 VBOX_RDESKTOP_SRC_SUBDIR = rdesktop-1.7.0-vrdp
     27VBOX_RDESKTOP_SRC_SUBDIR = rdesktop-1.8.3-vrdp
    2828
    2929#
    … …  
    3434rdesktop-vrdp_SDKS = VBOX_OPENSSL2
    3535rdesktop-vrdp_DEFS = \
    36         PACKAGE_NAME=\"rdesktop-vrdp\" PACKAGE_TARNAME=\"rdesktop-vrdp\" PACKAGE_VERSION=\"1.7.0\" \
    37         PACKAGE_STRING=\"rdesktop\ 1.7.0\" PACKAGE_BUGREPORT=\"\" STDC_HEADERS=1 L_ENDIAN=1 \
     36        PACKAGE_NAME=\"rdesktop-vrdp\" PACKAGE_TARNAME=\"rdesktop-vrdp\" PACKAGE_VERSION=\"1.8.3\" \
     37        PACKAGE_STRING=\"rdesktop\ 1.8.3\" PACKAGE_BUGREPORT=\"\" STDC_HEADERS=1 L_ENDIAN=1 \
    3838        HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 \
    3939        HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_SYS_SELECT_H=1 \
    … …  
    6868rdesktop-vrdp_SOURCES = \
    6969        tcp.c \
     70        asn.c \
    7071        iso.c \
    7172        mcs.c \
    … …  
    8990        seamless.c \
    9091        ssl.c \
     92        utils.c \
    9193        rdesktop.c \
    9294        xwin.c \
    … …  
    9597        xclip.c \
    9698        cliprdr.c \
     99        ctrl.c \
    97100        rdpsnd.c \
    98101        rdpsnd_dsp.c
    … …  
    151154        keymaps/convert-map=>keymaps/convert-map
    152155rdesktop-src_SOURCES = \
     156        asn.c=>asn.c \
    153157        bitmap.c=>bitmap.c \
    154158        cache.c=>cache.c \
    … …  
    158162        constants.h=>constants.h \
    159163        COPYING=>COPYING \
     164        cssp.c=>cssp.c \
    160165        disk.c=>disk.c \
    161166        disk.h=>disk.h \
    … …  
    233238        rdp.c=>rdp.c \
    234239        rdpdr.c=>rdpdr.c \
    235         rdpsnd_alsa.c=>rdpsnd_alsa.c \
    236240        rdpsnd.c=>rdpsnd.c \
    237241        rdpsnd_dsp.c=>rdpsnd_dsp.c \
    … …  
    239243        rdpsnd.h=>rdpsnd.h \
    240244        rdpsnd_libao.c=>rdpsnd_libao.c \
     245        rdpsnd_alsa.c=>rdpsnd_alsa.c \
    241246        rdpsnd_oss.c=>rdpsnd_oss.c \
    242247        rdpsnd_sgi.c=>rdpsnd_sgi.c \
    … …  
    254259        tcp.c=>tcp.c \
    255260        types.h=>types.h \
     261        utils.c=>utils.c \
    256262        vrdp/vrdpusb.h=>vrdp/vrdpusb.h \
    257263        vrdp/rdpusb.c=>vrdp/rdpusb.c \
    258264        xclip.c=>xclip.c \
     265        ctrl.c=>ctrl.c \
    259266        xkeymap.c=>xkeymap.c \
    260267        xproto.h=>xproto.h \

  • trunk/src/VBox/RDP/client-1.8.3/asn.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/bitmap.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029/* three seperate function for speed when decompressing the bitmaps

  • trunk/src/VBox/RDP/client-1.8.3/cache.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/channels.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/cliprdr.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/configure

    r55121 r55123  
    658658INSTALL_SCRIPT
    659659INSTALL_PROGRAM
     660ac_ct_CXX
     661CXXFLAGS
     662CXX
    660663OBJEXT
    661664EXEEXT
    … …  
    746749LIBS
    747750CPPFLAGS
     751CXX
     752CXXFLAGS
     753CCC
    748754CPP
    749755XMKMF
    … …  
    14161422  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    14171423              you have headers in a nonstandard directory <include dir>
     1424  CXX         C++ compiler command
     1425  CXXFLAGS    C++ compiler flags
    14181426  CPP         C preprocessor
    14191427  XMKMF       Path to xmkmf, Makefile generator for X Window System
    … …  
    15611569
    15621570} # ac_fn_c_try_compile
     1571
     1572# ac_fn_cxx_try_compile LINENO
     1573# ----------------------------
     1574# Try to compile conftest.$ac_ext, and return whether this succeeded.
     1575ac_fn_cxx_try_compile ()
     1576{
     1577  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1578  rm -f conftest.$ac_objext
     1579  if { { ac_try="$ac_compile"
     1580case "(($ac_try" in
     1581  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1582  *) ac_try_echo=$ac_try;;
     1583esac
     1584eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1585$as_echo "$ac_try_echo"; } >&5
     1586  (eval "$ac_compile") 2>conftest.err
     1587  ac_status=$?
     1588  if test -s conftest.err; then
     1589    grep -v '^ *+' conftest.err >conftest.er1
     1590    cat conftest.er1 >&5
     1591    mv -f conftest.er1 conftest.err
     1592  fi
     1593  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1594  test $ac_status = 0; } && {
     1595         test -z "$ac_cxx_werror_flag" ||
     1596         test ! -s conftest.err
     1597       } && test -s conftest.$ac_objext; then :
     1598  ac_retval=0
     1599else
     1600  $as_echo "$as_me: failed program was:" >&5
     1601sed 's/^/| /' conftest.$ac_ext >&5
     1602
     1603        ac_retval=1
     1604fi
     1605  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1606  as_fn_set_status $ac_retval
     1607
     1608} # ac_fn_cxx_try_compile
    15631609
    15641610# ac_fn_c_try_cpp LINENO
    … …  
    32763322    CFLAGS="$CFLAGS -Wall"
    32773323fi
     3324ac_ext=cpp
     3325ac_cpp='$CXXCPP $CPPFLAGS'
     3326ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     3327ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     3328ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     3329if test -z "$CXX"; then
     3330  if test -n "$CCC"; then
     3331    CXX=$CCC
     3332  else
     3333    if test -n "$ac_tool_prefix"; then
     3334  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
     3335  do
     3336    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     3337set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     3338{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3339$as_echo_n "checking for $ac_word... " >&6; }
     3340if ${ac_cv_prog_CXX+:} false; then :
     3341  $as_echo_n "(cached) " >&6
     3342else
     3343  if test -n "$CXX"; then
     3344  ac_cv_prog_CXX="$CXX" # Let the user override the test.
     3345else
     3346as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3347for as_dir in $PATH
     3348do
     3349  IFS=$as_save_IFS
     3350  test -z "$as_dir" && as_dir=.
     3351    for ac_exec_ext in '' $ac_executable_extensions; do
     3352  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3353    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     3354    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3355    break 2
     3356  fi
     3357done
     3358  done
     3359IFS=$as_save_IFS
     3360
     3361fi
     3362fi
     3363CXX=$ac_cv_prog_CXX
     3364if test -n "$CXX"; then
     3365  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
     3366$as_echo "$CXX" >&6; }
     3367else
     3368  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3369$as_echo "no" >&6; }
     3370fi
     3371
     3372
     3373    test -n "$CXX" && break
     3374  done
     3375fi
     3376if test -z "$CXX"; then
     3377  ac_ct_CXX=$CXX
     3378  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
     3379do
     3380  # Extract the first word of "$ac_prog", so it can be a program name with args.
     3381set dummy $ac_prog; ac_word=$2
     3382{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3383$as_echo_n "checking for $ac_word... " >&6; }
     3384if ${ac_cv_prog_ac_ct_CXX+:} false; then :
     3385  $as_echo_n "(cached) " >&6
     3386else
     3387  if test -n "$ac_ct_CXX"; then
     3388  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
     3389else
     3390as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3391for as_dir in $PATH
     3392do
     3393  IFS=$as_save_IFS
     3394  test -z "$as_dir" && as_dir=.
     3395    for ac_exec_ext in '' $ac_executable_extensions; do
     3396  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3397    ac_cv_prog_ac_ct_CXX="$ac_prog"
     3398    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3399    break 2
     3400  fi
     3401done
     3402  done
     3403IFS=$as_save_IFS
     3404
     3405fi
     3406fi
     3407ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
     3408if test -n "$ac_ct_CXX"; then
     3409  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
     3410$as_echo "$ac_ct_CXX" >&6; }
     3411else
     3412  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3413$as_echo "no" >&6; }
     3414fi
     3415
     3416
     3417  test -n "$ac_ct_CXX" && break
     3418done
     3419
     3420  if test "x$ac_ct_CXX" = x; then
     3421    CXX="g++"
     3422  else
     3423    case $cross_compiling:$ac_tool_warned in
     3424yes:)
     3425{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     3426$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     3427ac_tool_warned=yes ;;
     3428esac
     3429    CXX=$ac_ct_CXX
     3430  fi
     3431fi
     3432
     3433  fi
     3434fi
     3435# Provide some information about the compiler.
     3436$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
     3437set X $ac_compile
     3438ac_compiler=$2
     3439for ac_option in --version -v -V -qversion; do
     3440  { { ac_try="$ac_compiler $ac_option >&5"
     3441case "(($ac_try" in
     3442  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3443  *) ac_try_echo=$ac_try;;
     3444esac
     3445eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3446$as_echo "$ac_try_echo"; } >&5
     3447  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     3448  ac_status=$?
     3449  if test -s conftest.err; then
     3450    sed '10a\
     3451... rest of stderr output deleted ...
     3452         10q' conftest.err >conftest.er1
     3453    cat conftest.er1 >&5
     3454  fi
     3455  rm -f conftest.er1 conftest.err
     3456  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3457  test $ac_status = 0; }
     3458done
     3459
     3460{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
     3461$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
     3462if ${ac_cv_cxx_compiler_gnu+:} false; then :
     3463  $as_echo_n "(cached) " >&6
     3464else
     3465  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3466/* end confdefs.h.  */
     3467
     3468int
     3469main ()
     3470{
     3471#ifndef __GNUC__
     3472       choke me
     3473#endif
     3474
     3475  ;
     3476  return 0;
     3477}
     3478_ACEOF
     3479if ac_fn_cxx_try_compile "$LINENO"; then :
     3480  ac_compiler_gnu=yes
     3481else
     3482  ac_compiler_gnu=no
     3483fi
     3484rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3485ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
     3486
     3487fi
     3488{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
     3489$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
     3490if test $ac_compiler_gnu = yes; then
     3491  GXX=yes
     3492else
     3493  GXX=
     3494fi
     3495ac_test_CXXFLAGS=${CXXFLAGS+set}
     3496ac_save_CXXFLAGS=$CXXFLAGS
     3497{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
     3498$as_echo_n "checking whether $CXX accepts -g... " >&6; }
     3499if ${ac_cv_prog_cxx_g+:} false; then :
     3500  $as_echo_n "(cached) " >&6
     3501else
     3502  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
     3503   ac_cxx_werror_flag=yes
     3504   ac_cv_prog_cxx_g=no
     3505   CXXFLAGS="-g"
     3506   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3507/* end confdefs.h.  */
     3508
     3509int
     3510main ()
     3511{
     3512
     3513  ;
     3514  return 0;
     3515}
     3516_ACEOF
     3517if ac_fn_cxx_try_compile "$LINENO"; then :
     3518  ac_cv_prog_cxx_g=yes
     3519else
     3520  CXXFLAGS=""
     3521      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3522/* end confdefs.h.  */
     3523
     3524int
     3525main ()
     3526{
     3527
     3528  ;
     3529  return 0;
     3530}
     3531_ACEOF
     3532if ac_fn_cxx_try_compile "$LINENO"; then :
     3533
     3534else
     3535  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
     3536         CXXFLAGS="-g"
     3537         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3538/* end confdefs.h.  */
     3539
     3540int
     3541main ()
     3542{
     3543
     3544  ;
     3545  return 0;
     3546}
     3547_ACEOF
     3548if ac_fn_cxx_try_compile "$LINENO"; then :
     3549  ac_cv_prog_cxx_g=yes
     3550fi
     3551rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3552fi
     3553rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3554fi
     3555rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3556   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
     3557fi
     3558{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
     3559$as_echo "$ac_cv_prog_cxx_g" >&6; }
     3560if test "$ac_test_CXXFLAGS" = set; then
     3561  CXXFLAGS=$ac_save_CXXFLAGS
     3562elif test $ac_cv_prog_cxx_g = yes; then
     3563  if test "$GXX" = yes; then
     3564    CXXFLAGS="-g -O2"
     3565  else
     3566    CXXFLAGS="-g"
     3567  fi
     3568else
     3569  if test "$GXX" = yes; then
     3570    CXXFLAGS="-O2"
     3571  else
     3572    CXXFLAGS=
     3573  fi
     3574fi
     3575ac_ext=c
     3576ac_cpp='$CPP $CPPFLAGS'
     3577ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     3578ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     3579ac_compiler_gnu=$ac_cv_c_compiler_gnu
     3580
    32783581
    32793582# Find a good install program.  We prefer a C program (faster),
    … …  
    49065209fi
    49075210
     5211{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
     5212$as_echo_n "checking for library containing clock_gettime... " >&6; }
     5213if ${ac_cv_search_clock_gettime+:} false; then :
     5214  $as_echo_n "(cached) " >&6
     5215else
     5216  ac_func_search_save_LIBS=$LIBS
     5217cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5218/* end confdefs.h.  */
     5219
     5220/* Override any GCC internal prototype to avoid an error.
     5221   Use char because int might match the return type of a GCC
     5222   builtin and then its argument prototype would still apply.  */
     5223#ifdef __cplusplus
     5224extern "C"
     5225#endif
     5226char clock_gettime ();
     5227int
     5228main ()
     5229{
     5230return clock_gettime ();
     5231  ;
     5232  return 0;
     5233}
     5234_ACEOF
     5235for ac_lib in '' rt; do
     5236  if test -z "$ac_lib"; then
     5237    ac_res="none required"
     5238  else
     5239    ac_res=-l$ac_lib
     5240    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     5241  fi
     5242  if ac_fn_c_try_link "$LINENO"; then :
     5243  ac_cv_search_clock_gettime=$ac_res
     5244fi
     5245rm -f core conftest.err conftest.$ac_objext \
     5246    conftest$ac_exeext
     5247  if ${ac_cv_search_clock_gettime+:} false; then :
     5248  break
     5249fi
     5250done
     5251if ${ac_cv_search_clock_gettime+:} false; then :
     5252
     5253else
     5254  ac_cv_search_clock_gettime=no
     5255fi
     5256rm conftest.$ac_ext
     5257LIBS=$ac_func_search_save_LIBS
     5258fi
     5259{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
     5260$as_echo "$ac_cv_search_clock_gettime" >&6; }
     5261ac_res=$ac_cv_search_clock_gettime
     5262if test "$ac_res" != no; then :
     5263  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
     5264
     5265fi
     5266
    49085267
    49095268ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
    … …  
    56906049fi
    56916050
     6051
     6052#
     6053# linux/compiler.h
     6054#
     6055{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if linux/compiler.h is required" >&5
     6056$as_echo_n "checking if linux/compiler.h is required... " >&6; }
     6057cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6058/* end confdefs.h.  */
     6059
     6060#include <linux/compiler.h>
     6061
     6062int
     6063main ()
     6064{
     6065
     6066  ;
     6067  return 0;
     6068}
     6069_ACEOF
     6070if ac_fn_c_try_compile "$LINENO"; then :
     6071  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     6072$as_echo "yes" >&6; }
     6073 $as_echo "#define VBOX_WITH_LINUX_COMPILER_H 1" >>confdefs.h
     6074
     6075else
     6076  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     6077$as_echo "no" >&6; }
     6078fi
     6079rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    56926080
    56936081
    … …  
    71347522    since some C++ compilers masquerading as C compilers
    71357523    incorrectly reject 9223372036854775807.  */
    7136 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
     7524#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
    71377525  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    71387526                       && LARGE_OFF_T % 2147483647 == 1)
    … …  
    71807568    since some C++ compilers masquerading as C compilers
    71817569    incorrectly reject 9223372036854775807.  */
    7182 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
     7570#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
    71837571  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    71847572                       && LARGE_OFF_T % 2147483647 == 1)
    … …  
    72047592    since some C++ compilers masquerading as C compilers
    72057593    incorrectly reject 9223372036854775807.  */
    7206 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
     7594#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
    72077595  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    72087596                       && LARGE_OFF_T % 2147483647 == 1)
    … …  
    72497637    since some C++ compilers masquerading as C compilers
    72507638    incorrectly reject 9223372036854775807.  */
    7251 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
     7639#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
    72527640  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    72537641                       && LARGE_OFF_T % 2147483647 == 1)
    … …  
    72737661    since some C++ compilers masquerading as C compilers
    72747662    incorrectly reject 9223372036854775807.  */
    7275 #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
     7663#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
    72767664  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
    72777665                       && LARGE_OFF_T % 2147483647 == 1)

  • trunk/src/VBox/RDP/client-1.8.3/configure.ac

    r55121 r55123  
    99    CFLAGS="$CFLAGS -Wall"
    1010fi
     11AC_PROG_CXX
    1112
    1213AC_PROG_INSTALL
    … …  
    3233AC_SEARCH_LIBS(socket, socket)
    3334AC_SEARCH_LIBS(inet_aton, resolv)
     35AC_SEARCH_LIBS(clock_gettime, rt)
    3436
    3537AC_CHECK_HEADER(sys/select.h, AC_DEFINE(HAVE_SYS_SELECT_H))
    … …  
    223225        }
    224226        return 0;
    225 }], 
    226  [AC_MSG_RESULT(no)], 
    227  [AC_MSG_RESULT(yes) 
    228   AC_DEFINE(NEED_ALIGN)], 
    229  [AC_MSG_RESULT(assuming yes) 
     227}],
     228 [AC_MSG_RESULT(no)],
     229 [AC_MSG_RESULT(yes)
     230  AC_DEFINE(NEED_ALIGN)],
     231 [AC_MSG_RESULT(assuming yes)
    230232  AC_DEFINE(NEED_ALIGN)])
     233
     234#
     235# linux/compiler.h
     236#
     237AC_MSG_CHECKING([if linux/compiler.h is required])
     238AC_TRY_COMPILE([
     239#include <linux/compiler.h>
     240],[],
     241[AC_MSG_RESULT(yes)
     242 AC_DEFINE(VBOX_WITH_LINUX_COMPILER_H)],
     243[AC_MSG_RESULT(no)])
    231244
    232245
    … …  
    252265AC_ARG_WITH(libvncserver,
    253266    [  --with-libvncserver     make rdp2vnc],
    254     [ 
     267    [
    255268    VNCINC=`$vncserverconfig --cflags`
    256269    AC_SUBST(VNCINC)
    … …  
    271284AC_ARG_WITH(sound,
    272285    [  --with-sound            select sound system ("oss", "sgi", "sun", "alsa" or "libao") ],
    273     [ 
    274     sound="$withval" 
     286    [
     287    sound="$withval"
    275288    ])
    276289
    … …  
    279292AC_CHECK_HEADER(sys/audioio.h, [HAVE_SUN=1], [HAVE_SUN=0])
    280293
    281 AC_ARG_ENABLE(static-libsamplerate, 
    282     [  --enable-static-libsamplerate link libsamplerate statically], 
    283     [static_libsamplerate=yes], 
     294AC_ARG_ENABLE(static-libsamplerate,
     295    [  --enable-static-libsamplerate link libsamplerate statically],
     296    [static_libsamplerate=yes],
    284297    [static_libsamplerate=no])
    285298
    … …  
    854867AC_ARG_WITH(ipv6,
    855868    [  --with-ipv6             enable IPv6-support],
    856     [ 
     869    [
    857870        if test $withval != "no";
    858871        then
    … …  
    869882    [
    870883        if test $withval != "no";
    871         then 
     884        then
    872885            AC_DEFINE(WITH_DEBUG,1)
    873886        fi
    … …  
    878891    [
    879892        if test $withval != "no";
    880         then 
     893        then
    881894            AC_DEFINE(WITH_DEBUG_KBD,1)
    882895        fi
    … …  
    887900    [
    888901        if test $withval != "no";
    889         then 
     902        then
    890903            AC_DEFINE(WITH_DEBUG_RDP5,1)
    891904        fi
    … …  
    896909    [
    897910        if test $withval != "no";
    898         then 
     911        then
    899912            AC_DEFINE(WITH_DEBUG_CLIPBOARD,1)
    900913        fi
    … …  
    905918    [
    906919        if test $withval != "no";
    907         then 
     920        then
    908921            AC_DEFINE(WITH_DEBUG_SOUND,1)
    909922        fi
    … …  
    914927    [
    915928        if test $withval != "no";
    916         then 
     929        then
    917930            AC_DEFINE(WITH_DEBUG_CHANNEL,1)
    918931        fi
    … …  
    923936    [
    924937        if test $withval != "no";
    925         then 
     938        then
    926939            AC_DEFINE(WITH_DEBUG_SEAMLESS,1)
    927940        fi

  • trunk/src/VBox/RDP/client-1.8.3/constants.h

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029/* TCP port for Remote Desktop Protocol */
    … …  
    227236#define KBD_FLAG_RIGHT          0x0001
    228237#define KBD_FLAG_EXT            0x0100
     238#define KBD_FLAG_EXT2           0x0200
    229239#define KBD_FLAG_QUIET          0x1000
    230240#define KBD_FLAG_DOWN           0x4000

  • trunk/src/VBox/RDP/client-1.8.3/cssp.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <gssapi/gssapi.h>

  • trunk/src/VBox/RDP/client-1.8.3/ctrl.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
     28
    1929#include "rdesktop.h"
    2030#include "ssl.h"

  • trunk/src/VBox/RDP/client-1.8.3/disk.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "disk.h"
    … …  
    358367                filename[strlen(filename) - 1] = 0;
    359368
     369#ifdef VBOX
     370        snprintf(path, sizeof(path),  "%s%s", g_rdpdr_device[device_id].local_path, filename);
     371#else
    360372        sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename ? filename : "");
     373#endif
    361374
    362375        /* Protect against mailicous servers:
    … …  
    827840                        convert_to_unix_filename(newname);
    828841
     842#ifdef VBOX
     843                        snprintf(fullpath, sizeof(fullpath), "%s%s", g_rdpdr_device[pfinfo->device_id].local_path,
     844                                newname);
     845#else
    829846                        sprintf(fullpath, "%s%s", g_rdpdr_device[pfinfo->device_id].local_path,
    830847                                newname);
     848#endif
    831849
    832850                        free(newname);
    … …  
    12131231
    12141232                        /* Get information for directory entry */
     1233#ifdef VBOX
     1234                        snprintf(fullpath, sizeof(fullpath), "%s/%s", dirname, pdirent->d_name);
     1235#else
    12151236                        sprintf(fullpath, "%s/%s", dirname, pdirent->d_name);
     1237#endif
    12161238
    12171239                        if (stat(fullpath, &filestat))
    … …  
    13701392disk_device_control(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
    13711393{
     1394#ifdef VBOX
     1395        if (((request >> 16) != 20) && ((request >> 16) != 9))
     1396                return RD_STATUS_INVALID_PARAMETER;
     1397#else
    13721398        if (((request >> 16) != 20) || ((request >> 16) != 9))
    13731399                return RD_STATUS_INVALID_PARAMETER;
     1400#endif
    13741401
    13751402        /* extract operation */

  • trunk/src/VBox/RDP/client-1.8.3/disk.h

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#define FILE_ATTRIBUTE_READONLY                 0x00000001

  • trunk/src/VBox/RDP/client-1.8.3/ewmhints.c

    r55121 r55123  
    2121   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2222*/
     23
     24/*
     25 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     26 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     27 * the General Public License version 2 (GPLv2) at this time for any software where
     28 * a choice of GPL license versions is made available with the language indicating
     29 * that GPLv2 or any later version may be used, or where a choice of which version
     30 * of the GPL is applied is otherwise unspecified.
     31 */
    2332
    2433#include <X11/Xlib.h>

  • trunk/src/VBox/RDP/client-1.8.3/iso.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/licence.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/lspci.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/mcs.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/mppc.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <stdio.h>

  • trunk/src/VBox/RDP/client-1.8.3/orders.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/orders.h

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#define RDP_ORDER_STANDARD   0x01

  • trunk/src/VBox/RDP/client-1.8.3/parallel.c

    r55121 r55123  
    1616   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
     18
     19/*
     20 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     21 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     22 * the General Public License version 2 (GPLv2) at this time for any software where
     23 * a choice of GPL license versions is made available with the language indicating
     24 * that GPLv2 or any later version may be used, or where a choice of which version
     25 * of the GPL is applied is otherwise unspecified.
     26 */
     27
    1828#define MAX_PARALLEL_DEVICES            1
    1929

  • trunk/src/VBox/RDP/client-1.8.3/parse.h

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130/* Parser state */

  • trunk/src/VBox/RDP/client-1.8.3/printer.c

    r55121 r55123  
    1616   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
     18
     19/*
     20 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     21 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     22 * the General Public License version 2 (GPLv2) at this time for any software where
     23 * a choice of GPL license versions is made available with the language indicating
     24 * that GPLv2 or any later version may be used, or where a choice of which version
     25 * of the GPL is applied is otherwise unspecified.
     26 */
    1827
    1928#include "rdesktop.h"
    … …  
    116125        else
    117126        {
     127#ifdef VBOX
     128                snprintf(cmd, sizeof(cmd), "lpr -P %s", pprinter_data->printer);
     129#else
    118130                sprintf(cmd, "lpr -P %s", pprinter_data->printer);
     131#endif
    119132                pprinter_data->printer_fp = popen(cmd, "w");
    120133        }

  • trunk/src/VBox/RDP/client-1.8.3/printercache.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332/* According to the W2K RDP Printer Redirection WhitePaper, a data

  • trunk/src/VBox/RDP/client-1.8.3/proto.h

    r55121 r55123  
    1616   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
     18
     19/*
     20 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     21 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     22 * the General Public License version 2 (GPLv2) at this time for any software where
     23 * a choice of GPL license versions is made available with the language indicating
     24 * that GPLv2 or any later version may be used, or where a choice of which version
     25 * of the GPL is applied is otherwise unspecified.
     26 */
    1827
    1928#ifndef RDESKTOP_PROTO_H
    … …  
    355364void scardSetInfo(uint32 epoch, uint32 device, uint32 id, uint32 bytes_out);
    356365void scard_reset_state();
     366/* vrdp/rdpusb.c */
     367RD_BOOL rdpusb_init(void);
     368void rdpusb_close (void);
     369void rdpusb_add_fds(int *n, fd_set * rfds, fd_set * wfds);
     370void rdpusb_check_fds(fd_set * rfds, fd_set * wfds);
    357371
    358372/* *INDENT-OFF* */

  • trunk/src/VBox/RDP/client-1.8.3/pstcache.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/rdesktop.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include <stdarg.h>             /* va_list va_start va_end */
    … …  
    3342#include <signal.h>
    3443#include "rdesktop.h"
     44
     45#ifdef VBOX
     46# include <VBox/version.h>
     47# include <iprt/log.h>
     48#endif
    3549
    3650#ifdef HAVE_LOCALE_H
    … …  
    102116RD_BOOL g_rdpclip = True;
    103117RD_BOOL g_console_session = False;
     118#ifndef VBOX
    104119RD_BOOL g_numlock_sync = False;
     120#else /* VBOX */
     121/* Always use numlock synchronization with VRDP. */
     122RD_BOOL g_numlock_sync = True;
     123#endif /* VBOX */
    105124RD_BOOL g_lspci_enabled = False;
    106125RD_BOOL g_owncolmap = False;
    … …  
    142161#endif
    143162
     163#ifdef WITH_RDPUSB
     164RD_BOOL g_rdpusb = False;
     165#endif
     166
     167#ifdef WITH_BIRD_VD_HACKS
     168RD_BOOL g_keep_virtual_desktop_shortcuts = False;
     169#endif
     170
    144171#ifdef HAVE_ICONV
    145172char g_codepage[16] = "";
    … …  
    169196        fprintf(stderr,
    170197                "Version " PACKAGE_VERSION ". Copyright (C) 1999-2011 Matthew Chapman et al.\n");
     198#ifdef VBOX
     199        fprintf(stderr, "Modified for VirtualBox by " VBOX_VENDOR "\n");
     200#endif
    171201        fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
    172202
    … …  
    231261        rdpsnd_show_help();
    232262#endif
     263#ifdef WITH_RDPUSB
     264        fprintf(stderr,
     265                "         '-r usb': enable USB redirection\n");
     266#endif
    233267        fprintf(stderr,
    234268                "         '-r clipboard:[off|PRIMARYCLIPBOARD|CLIPBOARD]': enable clipboard\n");
    … …  
    256290        fprintf(stderr, "   -4: use RDP version 4\n");
    257291        fprintf(stderr, "   -5: use RDP version 5 (default)\n");
     292#ifdef WITH_BIRD_VD_HACKS
     293    fprintf(stderr, "   -H keep-virtual-desktop-shortcuts: Keep keyboard shortcuts typical\n"
     294                    "      for switching virtual desktops (C-A-Left/Right). \n");
     295#endif
    258296#ifdef WITH_SCARD
    259297        fprintf(stderr, "   -o: name=value: Adds an additional option to rdesktop.\n");
    … …  
    516554
    517555}
     556
     557#ifdef VBOX
     558/* This disables iprt logging */
     559DECLEXPORT(PRTLOGGER) RTLogDefaultInit(void)
     560{
     561    return NULL;
     562}
     563#endif
    518564
    519565/* Client program */
    … …  
    571617#define VNCOPT
    572618#endif
     619#ifdef WITH_BIRD_VD_HACKS
     620#define VDHOPT "H:"
     621#else
     622#define VDHOPT
     623#endif
     624
    573625        while ((c = getopt(argc, argv,
    574                            VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
     626                           VNCOPT VDHOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
    575627        {
    576628                switch (c)
    … …  
    853905#endif
    854906                                        }
     907                                }
     908                                else if (str_startswith(optarg, "usb"))
     909                                {
     910#ifdef WITH_RDPUSB
     911                                        g_rdpusb = True;
     912#else
     913                                        warning("Not compiled with USB support\n");
     914#endif
    855915                                }
    856916                                else if (str_startswith(optarg, "disk"))
    … …  
    9501010                                break;
    9511011#endif
     1012
     1013#ifdef WITH_BIRD_VD_HACKS
     1014                        case 'H': /* hacks */
     1015                                if (!strcmp(optarg, "keep-virtual-desktop-shortcuts"))
     1016                                        g_keep_virtual_desktop_shortcuts = True;
     1017                                else
     1018                                        error("Unknown -H argument\n\n\tPossible argument is: keep-virtual-desktop-shortcuts\n");
     1019                                break;
     1020#endif
     1021
    9521022                        case 'h':
    9531023                        case '?':
    … …  
    11111181#endif
    11121182
    1113         if (g_lspci_enabled)
     1183#ifdef WITH_RDPUSB
     1184        if (g_rdpusb)
     1185                rdpusb_init();
     1186#endif
     1187
     1188        if (g_lspci_enabled)
    11141189                lspci_init();
    11151190
    … …  
    12151290        cache_save_state();
    12161291        ui_deinit();
     1292
     1293#ifdef WITH_RDPUSB
     1294        if (g_rdpusb)
     1295                rdpusb_close();
     1296#endif
    12171297
    12181298        if (g_user_quit)
    … …  
    17941874                return False;
    17951875
     1876#ifdef VBOX
     1877        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop");
     1878#else
    17961879        sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop");
     1880#endif
    17971881
    17981882        if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
    … …  
    18021886        }
    18031887
     1888#ifdef VBOX
     1889        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop/cache");
     1890#else
    18041891        sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop/cache");
     1892#endif
    18051893
    18061894        if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
    … …  
    18241912        if (home == NULL)
    18251913                return -1;
     1914#ifdef VBOX
     1915        snprintf(fn, sizeof(fn), "%s/.rdesktop/%s", home, filename);
     1916#else
    18261917        sprintf(fn, "%s/.rdesktop/%s", home, filename);
     1918#endif
    18271919        fd = open(fn, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
    18281920        if (fd == -1)

  • trunk/src/VBox/RDP/client-1.8.3/rdesktop.h

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <stdlib.h>
    … …  
    121130#define EXRD_UNKNOWN 63
    122131
     132#ifdef VBOX
     133#undef DEBUG
     134#endif
     135
    123136#ifdef WITH_DEBUG
    124137#define DEBUG(args)     printf args;

  • trunk/src/VBox/RDP/client-1.8.3/rdp.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include <time.h>
    … …  
    3039#ifdef HAVE_ICONV
    3140#ifdef HAVE_ICONV_H
     41
     42#if defined(RT_OS_SOLARIS) && !defined(_XPG6)
     43# define VBOX_XPG6_TMP_DEF
     44# define _XPG6
     45#endif
     46#if defined(RT_OS_SOLARIS) && defined(__USE_LEGACY_PROTOTYPES__)
     47# define VBOX_LEGACY_PROTO_TMP_DEF
     48# undef __USE_LEGACY_PROTOTYPES__
     49#endif
    3250#include <iconv.h>
     51#if defined(VBOX_XPG6_TMP_DEF)
     52# undef _XPG6
     53# undef VBOX_XPG6_TMP_DEF
     54#endif
     55#if defined(VBOX_LEGACY_PROTO_TMP_DEF)
     56# define  __USE_LEGACY_PROTOTYPES__
     57# undef VBOX_LEGACY_PROTO_TMP_DEF
    3358#endif
    3459
    3560#ifndef ICONV_CONST
    3661#define ICONV_CONST ""
     62#endif
    3763#endif
    3864#endif
    … …  
    845871}
    846872
     873#ifndef VBOX
    847874/* Output new pointer capability set */
    848875static void
    … …  
    856883        out_uint16_le(s, 20);   /* Cache size for new pointers */
    857884}
     885#endif
    858886
    859887/* Output share capability set */
    … …  
    943971        {
    944972                caplen += RDP_CAPLEN_BMPCACHE2;
     973#ifdef VBOX
     974                caplen += RDP_CAPLEN_POINTER;
     975#else
    945976                caplen += RDP_CAPLEN_NEWPOINTER;
     977#endif
    946978        }
    947979        else
    … …  
    9721004        {
    9731005                rdp_out_bmpcache2_caps(s);
     1006#ifdef VBOX
     1007                rdp_out_pointer_caps(s);
     1008#else
    9741009                rdp_out_newpointer_caps(s);
     1010#endif
    9751011        }
    9761012        else

  • trunk/src/VBox/RDP/client-1.8.3/rdp5.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/rdpdr.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130/*

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#include <assert.h>

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd.h

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029struct audio_packet

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_alsa.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_dsp.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <strings.h>

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_dsp.h

    r55121 r55123  
    1818*/
    1919
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
     28
    2029/* Software volume control */
    2130void rdpsnd_dsp_softvol_set(uint16 left, uint16 right);

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_libao.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_oss.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332/*

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_sgi.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/rdpsnd_sun.c

    r55121 r55123  
    2222*/
    2323
     24/*
     25 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     26 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     27 * the General Public License version 2 (GPLv2) at this time for any software where
     28 * a choice of GPL license versions is made available with the language indicating
     29 * that GPLv2 or any later version may be used, or where a choice of which version
     30 * of the GPL is applied is otherwise unspecified.
     31 */
     32
    2433#include "rdesktop.h"
    2534#include "rdpsnd.h"

  • trunk/src/VBox/RDP/client-1.8.3/scard.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include <stdio.h>

  • trunk/src/VBox/RDP/client-1.8.3/scard.h

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <pthread.h>

  • trunk/src/VBox/RDP/client-1.8.3/seamless.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/secure.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/serial.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
     28
    1929#include <unistd.h>
    2030#include <fcntl.h>
    … …  
    3848#define DEBUG_SERIAL(args) printf args;
    3949#else
    40 #define DEBUG_SERIAL(args)
     50#define DEBUG_SERIAL(args) do {} while (0)
    4151#endif
    4252

  • trunk/src/VBox/RDP/client-1.8.3/ssl.c

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#include "rdesktop.h"

  • trunk/src/VBox/RDP/client-1.8.3/ssl.h

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130#ifndef _RDSSL_H

  • trunk/src/VBox/RDP/client-1.8.3/tcp.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#ifndef _WIN32

  • trunk/src/VBox/RDP/client-1.8.3/types.h

    r55121 r55123  
    1818   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919*/
     20
     21/*
     22 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     23 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     24 * the General Public License version 2 (GPLv2) at this time for any software where
     25 * a choice of GPL license versions is made available with the language indicating
     26 * that GPLv2 or any later version may be used, or where a choice of which version
     27 * of the GPL is applied is otherwise unspecified.
     28 */
    2029
    2130typedef int RD_BOOL;

  • trunk/src/VBox/RDP/client-1.8.3/utils.c

    r55121 r55123  
    1717   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818*/
     19
     20/*
     21 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     22 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     23 * the General Public License version 2 (GPLv2) at this time for any software where
     24 * a choice of GPL license versions is made available with the language indicating
     25 * that GPLv2 or any later version may be used, or where a choice of which version
     26 * of the GPL is applied is otherwise unspecified.
     27 */
    1928
    2029#include <stdio.h>

  • trunk/src/VBox/RDP/client-1.8.3/xclip.c

    r55121 r55123  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
     21
     22/*
     23 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     24 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     25 * the General Public License version 2 (GPLv2) at this time for any software where
     26 * a choice of GPL license versions is made available with the language indicating
     27 * that GPLv2 or any later version may be used, or where a choice of which version
     28 * of the GPL is applied is otherwise unspecified.
     29 */
    2130
    2231#include <X11/Xlib.h>
    … …  
    3746#ifdef HAVE_ICONV_H
    3847#include <langinfo.h>
     48
     49#if defined(RT_OS_SOLARIS) && !defined(_XPG6)
     50# define VBOX_XPG6_TMP_DEF
     51# define _XPG6
     52#endif
     53#if defined(RT_OS_SOLARIS) && defined(__USE_LEGACY_PROTOTYPES__)
     54# define VBOX_LEGACY_PROTO_TMP_DEF
     55# undef __USE_LEGACY_PROTOTYPES__
     56# endif
    3957#include <iconv.h>
     58#if defined(VBOX_XPG6_TMP_DEF)
     59# undef _XPG6
     60# undef VBOX_XPG6_TMP_DEF
     61#endif
     62#if defined(VBOX_LEGACY_PROTO_TMP_DEF)
     63# define  __USE_LEGACY_PROTOTYPES__
     64# undef VBOX_LEGACY_PROTO_TMP_DEF
     65#endif
     66
    4067#define USE_UNICODE_CLIPBOARD
    4168#endif

  • trunk/src/VBox/RDP/client-1.8.3/xkeymap.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#ifdef RDP2VNC
    … …  
    650659
    651660                case XK_Break:
     661#ifdef RDESKTOP_KBD_CODE
    652662                        /* Send Break sequence E0 46 E0 C6 */
    653663                        if (pressed)
    … …  
    660670                        /* No release sequence */
    661671                        return True;
     672#else
     673                        /* Send Break sequence E0 46 E0 C6 */
     674                        if (pressed)
     675                        {
     676                                /* VirtualBox code begin */
     677                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_EXT, 0x46, 0);
     678                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_EXT | KBD_FLAG_UP, 0x46, 0);
     679                                /* VirtualBox code end */
     680                        }
     681                        /* No release sequence */
     682                        return True;
     683#endif /* RDESKTOP_KBD_CODE */
    662684                        break;
    663685
    664686                case XK_Pause:
     687#ifdef RDESKTOP_KBD_CODE
    665688                        /* According to MS Keyboard Scan Code
    666689                           Specification, pressing Pause should result
    … …  
    687710                        }
    688711                        return True;
     712#else
     713                        /* Send Break sequence E1 1D 45 E1 9D C5 */
     714                        if (pressed)
     715                        {
     716                                /* VirtualBox code begin */
     717                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_EXT2, 0x1d, 0);
     718                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,  0x45, 0);
     719                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_EXT2 | KBD_FLAG_UP, 0x1d, 0);
     720                                rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP,  0x45, 0);
     721                                /* VirtualBox code end */
     722                        }
     723                        /* No release sequence */
     724                        return True;
     725#endif /* RDESKTOP_KBD_CODE */
    689726                        break;
    690727
    … …  
    724761                                ui_seamless_toggle();
    725762                        break;
    726 
     763#ifdef WITH_BIRD_VD_HACKS
     764                case XK_Left:
     765                case XK_Right:
     766                {
     767                        /* Check for typical virtual desktop switching hotkeys:
     768                               Ctrl-Alt-Left and Ctrl-Alt-Right.
     769                           Needs to be pressed twice to have any effect... */
     770                        extern RD_BOOL g_keep_virtual_desktop_shortcuts;
     771                        extern RD_BOOL g_fullscreen;
     772                        if (   g_keep_virtual_desktop_shortcuts
     773                            && (   (   get_key_state(state, XK_Alt_L)
     774                                    || get_key_state(state, XK_Alt_R))
     775                                && (   get_key_state(state, XK_Control_L)
     776                                    || get_key_state(state, XK_Control_R))
     777                               )
     778                           )
     779                        {
     780                                if (g_fullscreen)
     781                                        xwin_toggle_fullscreen();
     782                                XUngrabKeyboard(g_display, CurrentTime);
     783                                return True;
     784                        }
     785                        break;
     786                }
     787#endif
    727788        }
    728789        return False;

  • trunk/src/VBox/RDP/client-1.8.3/xwin.c

    r55121 r55123  
    2020   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121*/
     22
     23/*
     24 * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
     25 * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
     26 * the General Public License version 2 (GPLv2) at this time for any software where
     27 * a choice of GPL license versions is made available with the language indicating
     28 * that GPLv2 or any later version may be used, or where a choice of which version
     29 * of the GPL is applied is otherwise unspecified.
     30 */
    2231
    2332#include <X11/Xlib.h>
    … …  
    647656                   &num_children);
    648657
    649         for (i = num_children - 1; i >= 0; i--)
    650         {
    651                 if (child_list[i] == behind)
     658        for (i = num_children; i > 0; i--)
     659        {
     660                if (child_list[i-1] == behind)
    652661                {
    653662                        found_behind = True;
    654663                }
    655                 else if (child_list[i] == wnd)
     664                else if (child_list[i-1] == wnd)
    656665                {
    657666                        found_wnd = True;
    … …  
    25152524                                g_mouse_in_wnd = False;
    25162525                                XUngrabKeyboard(g_display, CurrentTime);
     2526                                /* VirtualBox code begin */
     2527                                if (g_fullscreen)
     2528                                {
     2529                                        /* If mouse pointer is outside the fullscreen client window,
     2530                                         * release it to let the client on the other screen to continue
     2531                                         * with the mouse processing.
     2532                                         */
     2533                                        XUngrabPointer(g_display, CurrentTime);
     2534                                }
     2535                                /* VirtualBox code end */
    25172536                                break;
    25182537
    … …  
    26832702#endif
    26842703
     2704#ifdef WITH_RDPUSB
     2705                rdpusb_add_fds (&n, &rfds, &wfds);
     2706#endif
     2707
    26852708                /* add redirection handles */
    26862709                rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout);
    … …  
    27072730                                continue;
    27082731                }
     2732
     2733#ifdef WITH_RDPUSB
     2734                rdpusb_check_fds (&rfds, &wfds);
     2735#endif
    27092736
    27102737#ifdef WITH_RDPSND

  • trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

    r54308 r55123  
    7070    (PFNRT)i2d_X509,
    7171    (PFNRT)i2d_X509,
     72    (PFNRT)i2d_PublicKey,
    7273    (PFNRT)RSA_generate_key,
    7374    (PFNRT)RSA_generate_key_ex,
Note: See TracChangeset for help on using the changeset viewer.

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