Changeset 51770 in vbox for trunk/src/VBox/RDP

Timestamp:

Jul 1, 2014 6:14:02 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94611

Message:

Merged in iprt++ dev branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/RDP/client/Makefile.in (modified) (1 diff)
• src/VBox/RDP/client/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/RDP/client/Makefile.in

@@ -29 +29 @@
 SCARDOBJ    = @SCARDOBJ@
 
-RDPOBJ   = tcp.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 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/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.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/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/utf8-posix.o Runtime/r3/stream.o vrdp/rdpusb.o vrdp/USBGetDevices.o vrdp/USBLib.o vrdp/linux/USBProxyDevice-linux.o
+RDPOBJ   = tcp.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 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/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
 X11OBJ   = rdesktop.o xwin.o xkeymap.o ewmhints.o xclip.o cliprdr.o
 VNCOBJ   = vnc/rdp2vnc.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o

trunk/src/VBox/RDP/client/Makefile.kmk

@@ -271 +271 @@
         $(PATH_ROOT)/include/iprt/cdefs.h=>include/iprt/cdefs.h \
         $(PATH_ROOT)/include/iprt/cpp/autores.h=>include/iprt/cpp/autores.h \
+        $(PATH_ROOT)/include/iprt/critsect.h=>include/iprt/critsect.h \
         $(PATH_ROOT)/include/iprt/ctype.h=>include/iprt/ctype.h \
         $(PATH_ROOT)/include/iprt/dir.h=>include/iprt/dir.h \
         $(PATH_ROOT)/include/iprt/env.h=>include/iprt/env.h \
         $(PATH_ROOT)/include/iprt/err.h=>include/iprt/err.h \
+        $(PATH_ROOT)/include/iprt/errno.h=>include/iprt/errno.h \
         $(PATH_ROOT)/include/iprt/file.h=>include/iprt/file.h \
         $(PATH_ROOT)/include/iprt/fs.h=>include/iprt/fs.h \
@@ -280 +282 @@
         $(PATH_ROOT)/include/iprt/list.h=>include/iprt/list.h \
         $(PATH_ROOT)/include/iprt/log.h=>include/iprt/log.h \
+        $(PATH_ROOT)/include/iprt/lockvalidator.h=>include/iprt/lockvalidator.h \
         $(PATH_ROOT)/include/iprt/mem.h=>include/iprt/mem.h \
         $(PATH_ROOT)/include/iprt/net.h=>include/iprt/net.h \
         $(PATH_ROOT)/include/iprt/param.h=>include/iprt/param.h \
         $(PATH_ROOT)/include/iprt/path.h=>include/iprt/path.h \
+        $(PATH_ROOT)/include/iprt/pipe.h=>include/iprt/pipe.h \
+        $(PATH_ROOT)/include/iprt/poll.h=>include/iprt/poll.h \
         $(PATH_ROOT)/include/iprt/process.h=>include/iprt/process.h \
+        $(PATH_ROOT)/include/iprt/queueatomic.h=>include/iprt/queueatomic.h \
+        $(PATH_ROOT)/include/iprt/sg.h=>include/iprt/sg.h \
         $(PATH_ROOT)/include/iprt/stdarg.h=>include/iprt/stdarg.h \
         $(PATH_ROOT)/include/iprt/stdint.h=>include/iprt/stdint.h \
@@ -315 +322 @@
         $(PATH_ROOT)/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp=>Runtime/common/err/RTErrConvertFromErrno.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp=>Runtime/common/err/RTErrConvertToErrno.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/misc/sg.cpp=>Runtime/common/misc/sg.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathAppend.cpp=>Runtime/common/path/RTPathAppend.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathAppendEx.cpp=>Runtime/common/path/RTPathAppendEx.cpp \
@@ -335 +343 @@
         $(PATH_ROOT)/src/VBox/Runtime/common/string/strstrip.cpp=>Runtime/common/string/strstrip.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/string/strtonum.cpp=>Runtime/common/string/strtonum.cpp \
-        $(PATH_ROOT)/src/VBox/Runtime/common/string/unidata.cpp=>Runtime/common/string/unidata.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/string/unidata-flags.cpp=>Runtime/common/string/unidata-flags.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/string/unidata-upper.cpp=>Runtime/common/string/unidata-upper.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/string/unidata-lower.cpp=>Runtime/common/string/unidata-lower.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/string/utf-16.cpp=>Runtime/common/string/utf-16.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/string/utf-8.cpp=>Runtime/common/string/utf-8.cpp \
@@ -346 +356 @@
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/fs.h=>include/internal/fs.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \
+        $(PATH_ROOT)/src/VBox/Runtime/include/internal/lockvalidator.h=>include/internal/lockvalidator.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/mem.h=>include/internal/mem.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/path.h=>include/internal/path.h \
+        $(PATH_ROOT)/src/VBox/Runtime/include/internal/pipe.h=>include/internal/pipe.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/process.h=>include/internal/process.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
+        $(PATH_ROOT)/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \
         $(PATH_ROOT)/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \
         $(PATH_ROOT)/src/VBox/Runtime/r3/alloc.cpp=>Runtime/r3/alloc.cpp \
@@ -366 +379 @@
         $(PATH_ROOT)/src/VBox/Runtime/r3/posix/path-posix.cpp=>Runtime/r3/posix/path-posix.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/r3/posix/path2-posix.cpp=>Runtime/r3/posix/path2-posix.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/r3/posix/pipe-posix.cpp=>Runtime/r3/posix/pipe-posix.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/r3/posix/thread2-posix.cpp=>Runtime/r3/posix/thread2-posix.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/r3/posix/utf8-posix.cpp=>Runtime/r3/posix/utf8-posix.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/r3/stream.cpp=>Runtime/r3/stream.cpp