platform/upstream/freerdp.git
10 years agoMerge pull request #1823 from akallabeth/cmake-library-noversion
Bernhard Miklautz [Fri, 11 Jul 2014 11:21:12 +0000 (13:21 +0200)]
Merge pull request #1823 from akallabeth/cmake-library-noversion

Build library without SOVERSION

10 years agoNow usin ON/OFF to set library versioning.
Armin Novak [Fri, 11 Jul 2014 11:07:36 +0000 (13:07 +0200)]
Now usin ON/OFF to set library versioning.

10 years agoAdded WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
Armin Novak [Tue, 29 Apr 2014 07:42:18 +0000 (09:42 +0200)]
Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
SOVERSION information. (required by Android)

10 years agoMerge pull request #1957 from hardening/ssl_deco_fix
Marc-André Moreau [Thu, 10 Jul 2014 21:45:43 +0000 (17:45 -0400)]
Merge pull request #1957 from hardening/ssl_deco_fix

Fix unclean SSL disconnection

10 years agoFix unclean SSL disconnection
Hardening [Thu, 10 Jul 2014 21:35:11 +0000 (23:35 +0200)]
Fix unclean SSL disconnection

This patch prevent an infinite loop when the remote peer disconnect
the socket without cleanly closing the SSL connection.

10 years agoMerge pull request #1956 from bmiklautz/feat/monolithic
Marc-André Moreau [Thu, 10 Jul 2014 21:02:43 +0000 (17:02 -0400)]
Merge pull request #1956 from bmiklautz/feat/monolithic

monolithic winpr

10 years agowinpr: fix handling of absolute include paths
Bernhard Miklautz [Thu, 10 Jul 2014 15:40:27 +0000 (17:40 +0200)]
winpr: fix handling of absolute include paths

Don't prefix include paths if it is absolute

10 years agowinpr: always build "monolitic"
Bernhard Miklautz [Wed, 9 Jul 2014 22:03:20 +0000 (00:03 +0200)]
winpr: always build "monolitic"

winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.

The only exception is winpr-makecert-tool which is still build as extra
library.

This obsoletes complex_libraries for winpr.

10 years agoMerge pull request #1953 from awakecoding/master
Marc-André Moreau [Thu, 10 Jul 2014 00:26:03 +0000 (20:26 -0400)]
Merge pull request #1953 from awakecoding/master

Fix _aligned_realloc() when resizing to smaller size

10 years agolibwinpr-crt: fix realloc to smaller size
Marc-André Moreau [Thu, 10 Jul 2014 00:10:33 +0000 (20:10 -0400)]
libwinpr-crt: fix realloc to smaller size

10 years agoMerge pull request #1947 from awakecoding/egfx
Marc-André Moreau [Tue, 8 Jul 2014 20:12:03 +0000 (16:12 -0400)]
Merge pull request #1947 from awakecoding/egfx

[MS-RDPEGFX] ClearCodec, H264, YCbCr

10 years agolibfreerdp-codec: fix strict aliasing warnings in ncrush code
Marc-André Moreau [Tue, 8 Jul 2014 19:59:23 +0000 (15:59 -0400)]
libfreerdp-codec: fix strict aliasing warnings in ncrush code

10 years agolibfreerdp-codec: fix build bot warnings
Marc-André Moreau [Tue, 8 Jul 2014 19:48:29 +0000 (15:48 -0400)]
libfreerdp-codec: fix build bot warnings

10 years agolibfreerdp-gdi: migrate to _aligned_malloc/_aligned_free
Marc-André Moreau [Tue, 8 Jul 2014 19:07:19 +0000 (15:07 -0400)]
libfreerdp-gdi: migrate to _aligned_malloc/_aligned_free

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
Marc-André Moreau [Tue, 8 Jul 2014 16:29:30 +0000 (12:29 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx

10 years agolibfreerdp-client: cleanup gfx options
Marc-André Moreau [Tue, 8 Jul 2014 16:29:08 +0000 (12:29 -0400)]
libfreerdp-client: cleanup gfx options

10 years agoMerge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Marc-André Moreau [Tue, 8 Jul 2014 16:20:30 +0000 (12:20 -0400)]
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx

10 years agolibfreerdp-codec: don't use posix_memalign
Marc-André Moreau [Tue, 8 Jul 2014 16:18:41 +0000 (12:18 -0400)]
libfreerdp-codec: don't use posix_memalign

10 years agoMerge branch 'master' of https://github.com/dpoe/FreeRDP into egfx
Marc-André Moreau [Tue, 8 Jul 2014 16:13:11 +0000 (12:13 -0400)]
Merge branch 'master' of https://github.com/dpoe/FreeRDP into egfx

10 years agolibfreerdp-codec: reduce ClearCodec memory usage
Marc-André Moreau [Tue, 8 Jul 2014 15:37:27 +0000 (11:37 -0400)]
libfreerdp-codec: reduce ClearCodec memory usage

10 years agoMerge pull request #1944 from nfedera/fix-2014-07-07-01
Bernhard Miklautz [Tue, 8 Jul 2014 14:36:54 +0000 (16:36 +0200)]
Merge pull request #1944 from nfedera/fix-2014-07-07-01

xfreerdp: xfixes selection ownership notification

10 years agoMerge pull request #1942 from hardening/kill_select
Bernhard Miklautz [Tue, 8 Jul 2014 14:36:04 +0000 (16:36 +0200)]
Merge pull request #1942 from hardening/kill_select

Use poll() instead of select() when available

10 years agoMerge pull request #1946 from akallabeth/android-openssl-build-tag
Bernhard Miklautz [Tue, 8 Jul 2014 10:54:16 +0000 (12:54 +0200)]
Merge pull request #1946 from akallabeth/android-openssl-build-tag

Openssl makefile repo now checked out with specific TAG.

10 years agoUpdated OpenSSL tag to 1.0.1h-fips-2.0.7
Armin Novak [Tue, 8 Jul 2014 10:44:35 +0000 (12:44 +0200)]
Updated OpenSSL tag to 1.0.1h-fips-2.0.7
Using ndk-build from ANDROID_NDK now if available, fallback to path.

10 years agoOpenssl makefile repo now checked out with specific TAG.
Armin Novak [Tue, 8 Jul 2014 08:20:13 +0000 (10:20 +0200)]
Openssl makefile repo now checked out with specific TAG.

10 years agolibfreerdp-codec: fix C++ headers
Marc-André Moreau [Tue, 8 Jul 2014 02:24:17 +0000 (22:24 -0400)]
libfreerdp-codec: fix C++ headers

10 years agolibfreerdp-codec: fix ClearCodec short vbar cache hit
Marc-André Moreau [Mon, 7 Jul 2014 20:50:19 +0000 (16:50 -0400)]
libfreerdp-codec: fix ClearCodec short vbar cache hit

10 years agolibfreerdp-codec: improve ClearCodec error checking
Marc-André Moreau [Mon, 7 Jul 2014 19:48:56 +0000 (15:48 -0400)]
libfreerdp-codec: improve ClearCodec error checking

10 years agoxfreerdp: xfixes selection ownership notification
Norbert Federa [Mon, 7 Jul 2014 18:26:41 +0000 (20:26 +0200)]
xfreerdp: xfixes selection ownership notification

The X11 core protocol does not have support for selection ownership
notifications. Until now xfreerdp worked around this issue by always sending
a format list pdu to the server after sending the format data response pdu
which makes the server side think that the clients clipboard data has changed.

This workaround has some severe drawbacks:
* it causes unnecessary data transfers because even without local clipboard
  data changes the same data is always re-transferred over the channel
* with some clipboard managers (in the server sessions) you will get massive
  endless data transfer loops because these managers immediately request the
  data on clipboard changes.

The correct (core X11) way would be polling for selection ownership changes
which must include the ability to detect changes to the TIMESTAMP target if
the selection owner did not change.
The alternative to the poll based approach is using the X Fixes extension in
order to get selection ownership notifications.

This commit adds support for the XFIXES solution and also moves the complete
clipboard related event handling from xf_event.c to xf_cliprdr.c

10 years agolibfreerdp-codec: fix ClearCodec RLEX decoding
Marc-André Moreau [Mon, 7 Jul 2014 18:16:05 +0000 (14:16 -0400)]
libfreerdp-codec: fix ClearCodec RLEX decoding

10 years agolibfreerdp-codec: ClearCodec fix error codes and wrapping around of cursors
Marc-André Moreau [Mon, 7 Jul 2014 16:17:37 +0000 (12:17 -0400)]
libfreerdp-codec: ClearCodec fix error codes and wrapping around of cursors

10 years agoAdd a guard on nCount with MAXIMUM_WAIT_OBJECTS + cosmetic fixes
Hardening [Mon, 7 Jul 2014 12:50:05 +0000 (14:50 +0200)]
Add a guard on nCount with MAXIMUM_WAIT_OBJECTS + cosmetic fixes

10 years agoFix invalid timeout
Hardening [Mon, 7 Jul 2014 08:44:57 +0000 (10:44 +0200)]
Fix invalid timeout

timeout was set to 1000ms while in the old code it was 1000us. As 1ms
seems too small set it to 10ms.

10 years agoMerge pull request #1933 from akallabeth/android-localized-assets
Martin Fleisz [Mon, 7 Jul 2014 07:46:00 +0000 (09:46 +0200)]
Merge pull request #1933 from akallabeth/android-localized-assets

Android localized assets

10 years agolibfreerdp-codec: fix some ClearCodec flag checking
Marc-André Moreau [Sat, 5 Jul 2014 20:29:28 +0000 (16:29 -0400)]
libfreerdp-codec: fix some ClearCodec flag checking

10 years agoMerge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Marc-André Moreau [Sat, 5 Jul 2014 19:35:37 +0000 (15:35 -0400)]
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx

10 years agoMerge pull request #1941 from eledoux/master
Marc-André Moreau [Sat, 5 Jul 2014 19:33:13 +0000 (15:33 -0400)]
Merge pull request #1941 from eledoux/master

Serial ports redirection based on winpr-comm

10 years agoMerge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx
Mike McDonald [Sat, 5 Jul 2014 10:52:27 +0000 (06:52 -0400)]
Merge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx

10 years agoUpdated coefficients for YUV to RGB conversion to match Microsoft, updated clip funct...
Mike McDonald [Sat, 5 Jul 2014 10:51:57 +0000 (06:51 -0400)]
Updated coefficients for YUV to RGB conversion to match Microsoft, updated clip function, and added an initial implementation for upconverting 4:2:0 to 4:4:4.

10 years agoFixed a typo
Hardening [Fri, 4 Jul 2014 20:14:04 +0000 (22:14 +0200)]
Fixed a typo

10 years agowinpr-comm: UGLY: attempt to resolve the linking issue below specific to debian-squee...
Emmanuel Ledoux [Fri, 4 Jul 2014 16:02:35 +0000 (18:02 +0200)]
winpr-comm: UGLY: attempt to resolve the linking issue below specific to debian-squeeze. This might end up in some circular dependencies...

Linking C executable ../../../../Testing/TestInterlocked
../../handle/libwinpr-handle.so.1.1.0: undefined reference to `LeaveCriticalSection'

10 years agowinpr-comm, serial: excluded Android platforms as well
Emmanuel Ledoux [Fri, 4 Jul 2014 15:40:06 +0000 (17:40 +0200)]
winpr-comm, serial: excluded Android platforms as well

10 years agoserial: implementation still __linux__ specific (even though not much remains to...
Emmanuel Ledoux [Fri, 4 Jul 2014 14:57:25 +0000 (16:57 +0200)]
serial: implementation still __linux__ specific (even though not much remains to do to be platform agnostic at this stage)

10 years agowinpr-comm: made its current implementation verific specific to __linux__ since it...
Emmanuel Ledoux [Fri, 4 Jul 2014 14:16:26 +0000 (16:16 +0200)]
winpr-comm: made its current implementation verific specific to __linux__ since it was done on top of NTTY.

10 years agoFix header inclusion
Hardening [Fri, 4 Jul 2014 14:11:19 +0000 (16:11 +0200)]
Fix header inclusion

10 years agoFix missing include for macOS
Hardening [Fri, 4 Jul 2014 13:29:21 +0000 (15:29 +0200)]
Fix missing include for macOS

10 years agoFix missing include
Hardening [Fri, 4 Jul 2014 13:18:50 +0000 (15:18 +0200)]
Fix missing include

10 years agowinpr-utils: WLog_PrintMessageVA, include stdarg.h from wlog.h instead of wlog.c
Emmanuel Ledoux [Fri, 4 Jul 2014 12:52:13 +0000 (14:52 +0200)]
winpr-utils: WLog_PrintMessageVA, include stdarg.h from wlog.h instead of wlog.c

10 years agoRemoved unused welcome screen.
Armin Novak [Fri, 4 Jul 2014 12:43:32 +0000 (14:43 +0200)]
Removed unused welcome screen.

10 years agoMoved common resources to top asset folder, adjusted html references.
Armin Novak [Fri, 4 Jul 2014 12:32:59 +0000 (14:32 +0200)]
Moved common resources to top asset folder, adjusted html references.
Removed unused asset folder.

10 years agowinpr-comm: fixed QueryCommDevice() when used with some wide characters
Emmanuel Ledoux [Fri, 4 Jul 2014 10:24:41 +0000 (12:24 +0200)]
winpr-comm: fixed QueryCommDevice() when used with some wide characters

10 years agoFixed issue with last merge.
Mike McDonald [Fri, 4 Jul 2014 07:52:05 +0000 (03:52 -0400)]
Fixed issue with last merge.

10 years agoMerged branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
Mike McDonald [Fri, 4 Jul 2014 07:16:55 +0000 (03:16 -0400)]
Merged branch 'egfx' of github.com:awakecoding/FreeRDP into egfx

10 years agoAdded #ifdef WITH_OPENH264 ... #endif to appropriate places in the code.
Mike McDonald [Fri, 4 Jul 2014 07:06:50 +0000 (03:06 -0400)]
Added #ifdef WITH_OPENH264 ... #endif to appropriate places in the code.

10 years agolibfreerdp-codec: handle long vbar length mismatch
Marc-André Moreau [Thu, 3 Jul 2014 20:09:53 +0000 (16:09 -0400)]
libfreerdp-codec: handle long vbar length mismatch

10 years agochannels/rdpgfx: add egfx command line options and settings
Marc-André Moreau [Thu, 3 Jul 2014 18:35:03 +0000 (14:35 -0400)]
channels/rdpgfx: add egfx command line options and settings

10 years agowinpr-comm: made the unit tests to succeed when /dev/ttyS0 is not available
Emmanuel Ledoux [Thu, 3 Jul 2014 17:01:45 +0000 (19:01 +0200)]
winpr-comm: made the unit tests to succeed when /dev/ttyS0 is not available

10 years agoserial: attempt to avoid a couple compilation warnings: Warning:int-to-pointer-cast
Emmanuel Ledoux [Thu, 3 Jul 2014 16:13:25 +0000 (18:13 +0200)]
serial: attempt to avoid a couple compilation warnings: Warning:int-to-pointer-cast

10 years agoMerge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Marc-André Moreau [Thu, 3 Jul 2014 16:03:39 +0000 (12:03 -0400)]
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx

Conflicts:
client/X11/xf_gfx.c

10 years agoLink utils against winsocks
Hardening [Thu, 3 Jul 2014 15:53:02 +0000 (17:53 +0200)]
Link utils against winsocks

10 years agolibfreerdp-codec: reduce number of variables
Marc-André Moreau [Thu, 3 Jul 2014 15:49:06 +0000 (11:49 -0400)]
libfreerdp-codec: reduce number of variables

10 years agoUse poll() instead of select() when available
Hardening [Wed, 2 Jul 2014 13:15:46 +0000 (15:15 +0200)]
Use poll() instead of select() when available

select() has the major drawback that it cannot handle file descriptor
that are bigger than 1024. This patch makes use of poll() instead of
select() when poll() support is available.

10 years agoMerge remote-tracking branch 'upstream/master'
Emmanuel Ledoux [Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)]
Merge remote-tracking branch 'upstream/master'

10 years agowinpr-comm: added _HandleCloseCbsLock to protect accesses to _HandleCloseCbs
Emmanuel Ledoux [Thu, 3 Jul 2014 09:24:37 +0000 (11:24 +0200)]
winpr-comm: added _HandleCloseCbsLock to protect accesses to _HandleCloseCbs

10 years agowinpr-comm: added _HandleCreatorsLock to protect accesses to _HandleCreators
Emmanuel Ledoux [Thu, 3 Jul 2014 09:20:46 +0000 (11:20 +0200)]
winpr-comm: added _HandleCreatorsLock to protect accesses to _HandleCreators

10 years agowinpr-comm: added _CommDevicesLock to protect accesses to _CommDevices
Emmanuel Ledoux [Thu, 3 Jul 2014 09:07:48 +0000 (11:07 +0200)]
winpr-comm: added _CommDevicesLock to protect accesses to _CommDevices

10 years agoadd YCoCg->RGB and 16-to-32bit SSE
Daryl Poe [Wed, 2 Jul 2014 20:30:04 +0000 (14:30 -0600)]
add YCoCg->RGB and 16-to-32bit SSE

10 years agolibfreerdp-codec: improve ClearCodec robustness
Marc-André Moreau [Wed, 2 Jul 2014 18:51:46 +0000 (14:51 -0400)]
libfreerdp-codec: improve ClearCodec robustness

10 years agolibfreerdp-codec: simplify ClearCodec code
Marc-André Moreau [Wed, 2 Jul 2014 17:45:19 +0000 (13:45 -0400)]
libfreerdp-codec: simplify ClearCodec code

10 years agoRevert "winpr-handle: removed RegisterHandleCloseCb() which would require a better...
Emmanuel Ledoux [Wed, 2 Jul 2014 14:57:20 +0000 (16:57 +0200)]
Revert "winpr-handle: removed RegisterHandleCloseCb() which would require a better synchronization"
       RegisterHandleCloseCb() is also useful to don't get a circular dependency, a better synchronization must be find out...

This reverts commit 8f3b3fa57371cabe63fc1b23375bede3f0814927.

10 years agowinpr-handle: removed RegisterHandleCloseCb() which would require a better synchroniz...
Emmanuel Ledoux [Wed, 2 Jul 2014 14:19:28 +0000 (16:19 +0200)]
winpr-handle: removed RegisterHandleCloseCb() which would require a better synchronization
winpr-comm: don't use anymore RegisterHandleCloseCb()

10 years agowinpr-comm: introduced CommLog_Print(...). Don't use anymore DEBUG_WARN() and DEBUG_M...
Emmanuel Ledoux [Wed, 2 Jul 2014 13:59:16 +0000 (15:59 +0200)]
winpr-comm: introduced CommLog_Print(...). Don't use anymore DEBUG_WARN() and DEBUG_MSG() macros

10 years agoMerge pull request #1901 from erbth/master_new
Marc-André Moreau [Wed, 2 Jul 2014 13:47:59 +0000 (09:47 -0400)]
Merge pull request #1901 from erbth/master_new

small SmartCard fix and drive redirection hotplug mechanism change

10 years agoMerge pull request #1937 from hardening/sound_optionnal_thread
Marc-André Moreau [Wed, 2 Jul 2014 13:47:09 +0000 (09:47 -0400)]
Merge pull request #1937 from hardening/sound_optionnal_thread

Make server sound thread optional

10 years agoserial: restored wlog messages using com.freerdp.channel.serial.client. Don't use...
Emmanuel Ledoux [Wed, 2 Jul 2014 13:44:29 +0000 (15:44 +0200)]
serial: restored wlog messages using com.freerdp.channel.serial.client. Don't use anymore DEBUG_MSG(), DEBUG_WARN() and DEBUG_SVC() macros

10 years agowinpr-utils: exported WLog_PrintMessageVA() and defined WLog_PrintVA() in order to...
Emmanuel Ledoux [Wed, 2 Jul 2014 13:37:13 +0000 (15:37 +0200)]
winpr-utils: exported WLog_PrintMessageVA() and defined WLog_PrintVA() in order to be then able to wrap wlog messages in another variadic function.

10 years agoMake server sound thread optionnal
Hardening [Wed, 2 Jul 2014 08:31:45 +0000 (10:31 +0200)]
Make server sound thread optionnal

This patch makes the server-side sound channel thread optionnal, and
exposes functions to handle channel traffic from the outside.

10 years agoInitial implementation of H.264 decoder for MS-RDPEGFX
Mike McDonald [Wed, 2 Jul 2014 03:28:09 +0000 (23:28 -0400)]
Initial implementation of H.264 decoder for MS-RDPEGFX

10 years agolibfreerdp-codec: improve ClearCodec subcodec xStart, yStart handling
Marc-André Moreau [Tue, 1 Jul 2014 22:56:10 +0000 (18:56 -0400)]
libfreerdp-codec: improve ClearCodec subcodec xStart, yStart handling

10 years agolibfreerdp-codec: improve ClearCodec subcodec support
Marc-André Moreau [Tue, 1 Jul 2014 22:21:51 +0000 (18:21 -0400)]
libfreerdp-codec: improve ClearCodec subcodec support

10 years agolibfreerdp-codec: improve ClearCodec error checking
Marc-André Moreau [Tue, 1 Jul 2014 20:32:36 +0000 (16:32 -0400)]
libfreerdp-codec: improve ClearCodec error checking

10 years agolibfreerdp-codec: more ClearCodec vBar caching
Marc-André Moreau [Tue, 1 Jul 2014 18:38:54 +0000 (14:38 -0400)]
libfreerdp-codec: more ClearCodec vBar caching

10 years agochannels/rdpgfx: harden parsing code
Marc-André Moreau [Tue, 1 Jul 2014 15:33:35 +0000 (11:33 -0400)]
channels/rdpgfx: harden parsing code

10 years agolibfreerdp-codec: add ClearCodec glyph cache
Marc-André Moreau [Tue, 1 Jul 2014 13:55:52 +0000 (09:55 -0400)]
libfreerdp-codec: add ClearCodec glyph cache

10 years agoMerge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Tue, 1 Jul 2014 13:11:50 +0000 (09:11 -0400)]
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx

Conflicts:
libfreerdp/codec/test/TestFreeRDPCodecClear.c

10 years agolibfreerdp-codec: fix ClearCodec unit tests
Marc-André Moreau [Tue, 1 Jul 2014 13:10:32 +0000 (09:10 -0400)]
libfreerdp-codec: fix ClearCodec unit tests

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
Marc-André Moreau [Tue, 1 Jul 2014 13:01:52 +0000 (09:01 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Tue, 1 Jul 2014 13:01:35 +0000 (09:01 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

10 years agoMerge pull request #1934 from awakecoding/lync
Marc-André Moreau [Mon, 30 Jun 2014 22:10:31 +0000 (18:10 -0400)]
Merge pull request #1934 from awakecoding/lync

Initial Remote Assistance Support

10 years agoMerge pull request #1931 from bjcollins/master
Marc-André Moreau [Mon, 30 Jun 2014 21:34:03 +0000 (17:34 -0400)]
Merge pull request #1931 from bjcollins/master

Fix glib cmake script and only call OnOpen callback if set

10 years agoMerge pull request #1928 from hardening/wts_fix
Marc-André Moreau [Mon, 30 Jun 2014 21:25:17 +0000 (17:25 -0400)]
Merge pull request #1928 from hardening/wts_fix

Fix conflicting define

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP into lync
Marc-André Moreau [Mon, 30 Jun 2014 21:22:50 +0000 (17:22 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into lync

10 years agoxfreerdp: initial remote assistance controls (ctrl+alt+c to request/release control)
Marc-André Moreau [Mon, 30 Jun 2014 21:17:06 +0000 (17:17 -0400)]
xfreerdp: initial remote assistance controls (ctrl+alt+c to request/release control)

10 years agoMerge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx
Mike McDonald [Mon, 30 Jun 2014 20:43:15 +0000 (16:43 -0400)]
Merge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx

10 years agoMerge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding
Mike McDonald [Mon, 30 Jun 2014 20:42:04 +0000 (16:42 -0400)]
Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding

10 years agoMerge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding
Mike McDonald [Mon, 30 Jun 2014 20:38:58 +0000 (16:38 -0400)]
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding

10 years agochannels/remdesk: initial working Remote Assistance
Marc-André Moreau [Mon, 30 Jun 2014 17:26:11 +0000 (13:26 -0400)]
channels/remdesk: initial working Remote Assistance

10 years agochannels/remdesk: start sending authentication data
Marc-André Moreau [Mon, 30 Jun 2014 16:51:27 +0000 (12:51 -0400)]
channels/remdesk: start sending authentication data

10 years agoMerge branch 'ports'
Emmanuel Ledoux [Mon, 30 Jun 2014 15:22:15 +0000 (17:22 +0200)]
Merge branch 'ports'

Conflicts:
channels/serial/client/serial_tty.c

10 years agolibfreerdp-common: move assistance code
Marc-André Moreau [Mon, 30 Jun 2014 13:40:24 +0000 (09:40 -0400)]
libfreerdp-common: move assistance code