Commit Graph

7031 Commits

Author SHA1 Message Date
Marc-André Moreau
e4a4aa4d3a Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
Conflicts:
	channels/encomsp/client/encomsp_main.c
	libfreerdp/core/tcp.c
	libfreerdp/crypto/certificate.c
	server/Windows/CMakeLists.txt
	server/X11/xf_cursor.c
	server/X11/xf_input.c
	server/X11/xf_interface.c
	server/X11/xf_monitors.c
	server/X11/xf_peer.c
2014-08-11 19:22:33 -04:00
Marc-André Moreau
ff05c69c8e Merge branch 'shadow' of github.com:awakecoding/FreeRDP into shadow 2014-08-11 19:09:00 -04:00
Marc-André Moreau
31ac35698f Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-08-11 19:01:15 -04:00
Marc-André Moreau
2ea151e136 Merge pull request #1983 from ntwerdochlib/fileclip-updates
clipboard: File clipping updates
2014-08-11 19:00:00 -04:00
Marc-André Moreau
422336b8b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	include/freerdp/channels/log.h
2014-08-11 18:56:07 -04:00
Marc-André Moreau
fe833f06f9 Merge pull request #2032 from ntwerdochlib/master
Minor tweak to CLOG_PRINT macro.  Initialalize tag buffer to NULL.  Use ...
2014-08-11 18:54:43 -04:00
Marc-André Moreau
b713bc1a98 freerdp: fix possible clog memory corruption 2014-08-11 18:51:22 -04:00
Marc-André Moreau
87fd839a35 libfreerdp-codec: cleanup and fix __lzcnt on Windows 2014-08-11 18:48:42 -04:00
Nicholas Twerdochlib
c41c6589e1 Minor tweak to CLOG_PRINT macro. Initialalize tag buffer to NULL. Use strncat as a fail safe. 2014-08-11 18:48:11 -04:00
Marc-André Moreau
dc7f89dbd5 Merge branch 'egfx' of github.com:awakecoding/FreeRDP 2014-08-11 17:25:38 -04:00
Marc-André Moreau
7171a0b5c1 libfreerdp-core: fix reconnection using client random 2014-08-11 11:23:23 -04:00
Marc-André Moreau
067da290dd Merge pull request #2027 from akallabeth/winpr-log
Replace stdout and logging defines with WLog, add logcat support
2014-08-11 10:38:28 -04:00
Marc-André Moreau
cff9c16c1e Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	channels/disp/client/disp_main.c
2014-08-11 10:36:07 -04:00
Marc-André Moreau
51ac7fffbd Merge pull request #1993 from bmiklautz/merge/from-stable-1.1
Pick changes from stable-1.1 that are not yet on master
2014-08-11 10:28:10 -04:00
Armin Novak
d0c5d9bb9e Fixed missing include. 2014-08-11 09:49:57 +02:00
Armin Novak
784696c1cd Fixed missing includes and invalid replacement. 2014-08-11 09:38:08 +02:00
Armin Novak
8d8719e101 Replaced fprintf with DEBUG_WARN 2014-08-11 09:19:47 +02:00
Armin Novak
bcb5f90ee6 Replaced perror with DEBUG_WARN 2014-08-11 09:19:23 +02:00
Armin Novak
2436e41e63 Fixed warnings for comm tests. 2014-08-11 09:17:56 +02:00
Armin Novak
66b8905ac6 Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
Marc-André Moreau
6c85505ecc libwinpr-synch: replace pthreads-based barrier implementation by interlocked operations + event and avoid deadlocks 2014-08-08 21:02:15 -04:00
Marc-André Moreau
54264936d1 shadow: improve synchronization barrier usage 2014-08-08 20:51:26 -04:00
Marc-André Moreau
8b4cf07c8a shadow: make use of synchronization barrier 2014-08-08 18:47:46 -04:00
Marc-André Moreau
edde16e9d5 libwinpr-synch: add initial synchronization barrier implementation 2014-08-08 17:34:30 -04:00
Benoit LeBlanc
b990c2002a Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-08-08 11:42:53 -04:00
Bernhard Miklautz
cd974e874a Merge pull request #2028 from v00d00/update-codecid
tmsf: CODEC_ID_* -> AV_CODEC_ID_*
2014-08-08 15:06:48 +02:00
Ian Whyman
8eb7f69a12 Backwards compat defines 2014-08-08 13:05:06 +01:00
Ian Whyman
f73e40d188 CODEC_ID_* -> AV_CODEC_ID_* 2014-08-08 09:05:03 +01:00
Armin Novak
0780c0993e Replaced fprintf(stderr with DEBUG_WARN 2014-08-07 22:21:07 +02:00
Armin Novak
084da200cf Replaced fprintf(stderr with DEBUG_WARN 2014-08-07 22:20:53 +02:00
Armin Novak
b897c6a433 Replaced fprintf(stderr with DEBUG_WARN 2014-08-07 22:20:35 +02:00
Armin Novak
b97099e815 Replaced fprintf(stderr with DEBUG_WARN 2014-08-07 22:20:13 +02:00
Armin Novak
e6ed76977a DEBUG_PRINT now a define, resolves linking issues.
Using log name as logcat tag now.
Removed log name from default android log formatting.
2014-08-07 21:51:52 +02:00
Armin Novak
eecc8e2333 Removed debug.c 2014-08-07 21:38:11 +02:00
Armin Novak
158e1323de Fixed compiler warnings. 2014-08-07 19:05:48 +02:00
Armin Novak
f00cb3d25c Reverted previous replacements, not to be done for tests. 2014-08-07 19:05:22 +02:00
Marc-André Moreau
fdab87cba0 shadow: improve invalid region detection 2014-08-07 12:36:45 -04:00
Armin Novak
a27706d129 Fixed missing includes. 2014-08-07 18:25:43 +02:00
Armin Novak
1a37435a26 Added redirection of ConsoleAppender to logcat, if used on android.
Using custom default format for log messages on android.
2014-08-07 17:47:59 +02:00
Armin Novak
219a760bad Fixed logging, now using log functions. 2014-08-07 17:31:42 +02:00
Armin Novak
b252009d36 Replaced custom logging mechanism with WLog wrapper. 2014-08-07 16:51:49 +02:00
Armin Novak
f4c133eaf8 Replaced custom logging mechanism with WLog wrapper. 2014-08-07 16:51:24 +02:00
Marc-André Moreau
d9d9bf3609 shadow: start detecting invalid regions manually 2014-08-06 17:51:38 -04:00
Benoît LeBlanc
1f2f9dfbdc fix gdi_resize: set primary_buffer to NULL to avoid use after free 2014-08-06 17:02:21 -04:00
Marc-André Moreau
4f41f03ad7 shadow: fix X11 non-XShm support 2014-08-06 14:18:34 -04:00
Marc-André Moreau
9838200068 libfreerdp-core: fix unix domain socket support 2014-08-06 12:08:00 -04:00
Marc-André Moreau
2653c5420f libfreerdp-codec: start processing tiles in progressive rfx 2014-08-06 10:23:14 -04:00
Marc-André Moreau
22d3b6c74b libfreerdp-codec: remove old RemoteFX RLGR implementation in favour of faster one 2014-08-05 21:41:58 -04:00
Marc-André Moreau
b7ca13f19d libfreerdp-codec: add RLGR3 support in new RLGR function 2014-08-05 21:26:47 -04:00
Marc-André Moreau
db5b947852 libfreerdp-codec: optimize RLGR1 2014-08-05 17:22:20 -04:00