platform/upstream/freerdp.git
10 years agoMerge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Sat, 6 Sep 2014 00:17:05 +0000 (20:17 -0400)]
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx

10 years agolibfreerdp-codec: improve YUV to RGB color conversion
Marc-André Moreau [Sat, 6 Sep 2014 00:16:56 +0000 (20:16 -0400)]
libfreerdp-codec: improve YUV to RGB color conversion

10 years agolibfreerdp-codec: fix build on Windows
Marc-André Moreau [Fri, 5 Sep 2014 23:38:33 +0000 (19:38 -0400)]
libfreerdp-codec: fix build on Windows

10 years agolibfreerdp-codec: cleanup h264 decoder
Marc-André Moreau [Fri, 5 Sep 2014 23:11:03 +0000 (19:11 -0400)]
libfreerdp-codec: cleanup h264 decoder

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Fri, 5 Sep 2014 21:29:35 +0000 (17:29 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

10 years agolibfreerdp-gdi: enable altsec frame markers
Marc-André Moreau [Fri, 5 Sep 2014 20:06:19 +0000 (16:06 -0400)]
libfreerdp-gdi: enable altsec frame markers

10 years agoMerge pull request #2054 from erbth/wfreerdp
Marc-André Moreau [Fri, 5 Sep 2014 19:06:04 +0000 (15:06 -0400)]
Merge pull request #2054 from erbth/wfreerdp

(hopefully) proper window style setup in wfreerdp at startup

10 years agoMerge pull request #2057 from ptsekov/software-gdi-improvements
Marc-André Moreau [Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)]
Merge pull request #2057 from ptsekov/software-gdi-improvements

Adjust the X11 code to work with the new GDI color

10 years agoMerge pull request #2072 from nfedera/fix-2014-09-01-01
Marc-André Moreau [Fri, 5 Sep 2014 18:54:05 +0000 (14:54 -0400)]
Merge pull request #2072 from nfedera/fix-2014-09-01-01

rdpdr/drive: fixes for hung peers & info requests

10 years agoMerge pull request #2055 from dbungert/initialize
Marc-André Moreau [Fri, 5 Sep 2014 18:51:43 +0000 (14:51 -0400)]
Merge pull request #2055 from dbungert/initialize

Fix multiple cases of use of uninitialized vars

10 years agoMerge pull request #2067 from bmiklautz/fix/clog
Marc-André Moreau [Fri, 5 Sep 2014 18:51:09 +0000 (14:51 -0400)]
Merge pull request #2067 from bmiklautz/fix/clog

channels: fix possible overflow in logging

10 years agolibfreerdp-codec: improve progressive unit test
Marc-André Moreau [Thu, 4 Sep 2014 20:52:41 +0000 (16:52 -0400)]
libfreerdp-codec: improve progressive unit test

10 years agolibfreerdp-primitives: add YCbCr color converter test
Marc-André Moreau [Thu, 4 Sep 2014 20:34:29 +0000 (16:34 -0400)]
libfreerdp-primitives: add YCbCr color converter test

10 years agolibfreerdp-primitives: migrate tests to ctest
Marc-André Moreau [Thu, 4 Sep 2014 19:46:20 +0000 (15:46 -0400)]
libfreerdp-primitives: migrate tests to ctest

10 years agolibfreerdp-codec: improve YCbCr to RGB color conversion
Marc-André Moreau [Thu, 4 Sep 2014 17:09:46 +0000 (13:09 -0400)]
libfreerdp-codec: improve YCbCr to RGB color conversion

10 years agoX11: Convert GDI color to X11 color troughout.
Pavel Tsekov [Thu, 4 Sep 2014 09:44:03 +0000 (12:44 +0300)]
X11: Convert GDI color to X11 color troughout.
* client/X11/xf_client.c (xf_pre_connect): Set the field `colormap' of
`struct xfContext' to the default colormap.
* client/X11/xfreerdp.h (xf_gdi_get_color): Declare new external function.
* client/X11/xf_gdi.c (xf_gdi_get_color): Define new external function.
Use xf_gdi_get_color() to get the appropriate X color index from the GDI
color representation.
* client/X11/xf_graphics.c: Likewise.

10 years agolibfreerdp-codec: improve progressive unit tests
Marc-André Moreau [Wed, 3 Sep 2014 22:46:57 +0000 (18:46 -0400)]
libfreerdp-codec: improve progressive unit tests

10 years agolibwinpr-utils: centralize bitmap utils
Marc-André Moreau [Wed, 3 Sep 2014 20:20:50 +0000 (16:20 -0400)]
libwinpr-utils: centralize bitmap utils

10 years agolibfreerdp-codec: initial partial upgrade tile support
Marc-André Moreau [Tue, 2 Sep 2014 23:25:01 +0000 (19:25 -0400)]
libfreerdp-codec: initial partial upgrade tile support

10 years agolibfreerdp-codec: fix and improve SRL decoder
Marc-André Moreau [Tue, 2 Sep 2014 22:15:36 +0000 (18:15 -0400)]
libfreerdp-codec: fix and improve SRL decoder

10 years agolibfreerdp-codec: add more progressive test functions
Marc-André Moreau [Tue, 2 Sep 2014 17:31:40 +0000 (13:31 -0400)]
libfreerdp-codec: add more progressive test functions

10 years agordpdr/drive: fixes for hung peers & info requests
Norbert Federa [Tue, 2 Sep 2014 13:42:44 +0000 (15:42 +0200)]
rdpdr/drive: fixes for hung peers & info requests

drive_file_init: only allow directories and regular files
This is fixes issue #2071

Even if the server is only interested in getting a file's or directory's
attributes FreeRDP still tries to open the object with read permissions.
If the FreeRDP client has no read permissions for this object the call will
fail which forces the server to perform some expensive workarounds (e.g.
getting to the stat buffers via a directory enumeration request).

On Linux we can try to open the file or directory with the O_PATH flag in
order to obtain a file descriptor who's only purpose is to perform operations
that act purely at the file descriptor level.

10 years agochannels: fix possible overflow in logging
Bernhard Miklautz [Fri, 29 Aug 2014 14:37:14 +0000 (16:37 +0200)]
channels: fix possible overflow in logging

Fixes clang compiler warning:

"warning: the value of the size argument in 'strncat' is too large,
might lead to a buffer overflow [-Wstrncat-size]"

strncat requires an extra byte for '\0' so dest needs to have a size of
n+1

10 years agoMerge pull request #2066 from llyzs/llyzs
Martin Fleisz [Fri, 29 Aug 2014 09:14:50 +0000 (11:14 +0200)]
Merge pull request #2066 from llyzs/llyzs

channels: fix memory leak in stream pools.

10 years agolibfreerdp-codec: add separate sign array
Marc-André Moreau [Thu, 28 Aug 2014 19:14:01 +0000 (15:14 -0400)]
libfreerdp-codec: add separate sign array

10 years agolibfreerdp-codec: add code for SRL parsing
Marc-André Moreau [Thu, 28 Aug 2014 16:14:28 +0000 (12:14 -0400)]
libfreerdp-codec: add code for SRL parsing

10 years agochannels: fix memory leak in stream pools.
Vic Lee [Thu, 28 Aug 2014 15:16:32 +0000 (23:16 +0800)]
channels: fix memory leak in stream pools.

10 years agolibfreerdp-codec: start reading progressive RAW bytes
Marc-André Moreau [Wed, 27 Aug 2014 22:34:37 +0000 (18:34 -0400)]
libfreerdp-codec: start reading progressive RAW bytes

10 years agolibfreerdp-codec: start computing BitPos
Marc-André Moreau [Wed, 27 Aug 2014 21:02:15 +0000 (17:02 -0400)]
libfreerdp-codec: start computing BitPos

10 years agolibfreerdp-codec: fix progressive tile diffing
Marc-André Moreau [Wed, 27 Aug 2014 19:15:37 +0000 (15:15 -0400)]
libfreerdp-codec: fix progressive tile diffing

10 years agolibfreerdp-codec: fix sub-band diffing
Marc-André Moreau [Tue, 26 Aug 2014 20:15:22 +0000 (16:15 -0400)]
libfreerdp-codec: fix sub-band diffing

10 years agolibfreerdp-codec: partial YCbCr diffing support
Marc-André Moreau [Tue, 26 Aug 2014 18:36:33 +0000 (14:36 -0400)]
libfreerdp-codec: partial YCbCr diffing support

10 years agolibfreerdp-codec: fix progressive codec tile drawing offset, fix dequantization
Marc-André Moreau [Mon, 25 Aug 2014 23:50:42 +0000 (19:50 -0400)]
libfreerdp-codec: fix progressive codec tile drawing offset, fix dequantization

10 years agolibfreerdp-codec: make use of progressive quantization factors
Marc-André Moreau [Mon, 25 Aug 2014 21:58:38 +0000 (17:58 -0400)]
libfreerdp-codec: make use of progressive quantization factors

10 years agowfreerdp: WM_SIZE: only update canvas diff if window size is bigger than 0
erbth [Mon, 25 Aug 2014 13:24:04 +0000 (15:24 +0200)]
wfreerdp: WM_SIZE: only update canvas diff if window size is bigger than 0

10 years agoWM_GETMINMAXINFO: use latest determined canvas diff
erbth [Mon, 25 Aug 2014 13:12:44 +0000 (15:12 +0200)]
WM_GETMINMAXINFO: use latest determined canvas diff

10 years agolibfreerdp-codec: fix progressive quantization shifts
Marc-André Moreau [Thu, 21 Aug 2014 23:43:37 +0000 (19:43 -0400)]
libfreerdp-codec: fix progressive quantization shifts

10 years agolibfreerdp-codec: partially working progressive iDWT
Marc-André Moreau [Thu, 21 Aug 2014 23:02:26 +0000 (19:02 -0400)]
libfreerdp-codec: partially working progressive iDWT

10 years agolibfreerdp-codec: fix crashes
Marc-André Moreau [Thu, 21 Aug 2014 21:14:10 +0000 (17:14 -0400)]
libfreerdp-codec: fix crashes

10 years agolibfreerdp-codec: improve progressive iDWT
Marc-André Moreau [Thu, 21 Aug 2014 20:05:39 +0000 (16:05 -0400)]
libfreerdp-codec: improve progressive iDWT

10 years agoAdjust the code to work with the new GDI color
Pavel Tsekov [Thu, 21 Aug 2014 00:35:34 +0000 (03:35 +0300)]
Adjust the code to work with the new GDI color
representation.
* client/X11/xf_gdi.c:
Use freerdp_color_convert_drawing_order_color_to_gdi_color() to convert
from drawing order color representation to GDI color representation
troughout.
* client/X11/xf_graphics.c: Likewise.

10 years agolibfreerdp-codec: start new progressive rfx iDWT functions
Marc-André Moreau [Wed, 20 Aug 2014 23:12:08 +0000 (19:12 -0400)]
libfreerdp-codec: start new progressive rfx iDWT functions

10 years agolibfreerdp-codec: intermediate progressive rfx iDWT
Marc-André Moreau [Wed, 20 Aug 2014 21:16:34 +0000 (17:16 -0400)]
libfreerdp-codec: intermediate progressive rfx iDWT

10 years agoFix multiple cases of use of uninitialized vars
Daniel Bungert [Wed, 20 Aug 2014 09:54:05 +0000 (03:54 -0600)]
Fix multiple cases of use of uninitialized vars

* Zeroing xevent helped address some erratic behavior.
* valgrind complained about using xfBitmap uninitialized
  during shutdown, traced it back to the initialization.
  Bitmap_Prototype->size > sizeof(rdpBitmap).
* Early exit from recv_tpkt_pdu is necessary to address
  a shutdown crash - the channelId value was being used
  without being set in the disconnect case.

10 years ago(hopefully) proper window style setup in wfreerdp at startup
erbth [Tue, 19 Aug 2014 20:59:22 +0000 (22:59 +0200)]
(hopefully) proper window style setup in wfreerdp at startup

10 years agolibfreerdp-codec: start work on progressive inverse DWT
Marc-André Moreau [Tue, 19 Aug 2014 18:48:09 +0000 (14:48 -0400)]
libfreerdp-codec: start work on progressive inverse DWT

10 years agoMerge pull request #2050 from bmiklautz/fix/winpr_monolithic
Marc-André Moreau [Tue, 19 Aug 2014 18:06:48 +0000 (14:06 -0400)]
Merge pull request #2050 from bmiklautz/fix/winpr_monolithic

build: fix compilation for non monolithic builds

10 years agoMerge pull request #2051 from bmiklautz/feat/atusername
Martin Fleisz [Tue, 19 Aug 2014 13:39:52 +0000 (15:39 +0200)]
Merge pull request #2051 from bmiklautz/feat/atusername

handle user@corp.net username correctly

10 years agohandle user@corp.net username correctly
Daryl Poe [Fri, 15 Aug 2014 21:45:06 +0000 (15:45 -0600)]
handle user@corp.net username correctly

(cherry picked from commit 248c9185084e99121ea5e99610384bb3a2c0f803)

10 years agobuild: fix compilation for non monolithic builds
Bernhard Miklautz [Tue, 19 Aug 2014 09:59:47 +0000 (11:59 +0200)]
build: fix compilation for non monolithic builds

set_complex_link_libraries isn't required anymore for winpr
since it's always build monolithic.

10 years agolibfreerdp-codec: optimize RemoteFX dequantization and differentiation
Marc-André Moreau [Tue, 19 Aug 2014 01:10:56 +0000 (21:10 -0400)]
libfreerdp-codec: optimize RemoteFX dequantization and differentiation

10 years agolibfreerdp-codec: start working on progressive dequantization
Marc-André Moreau [Mon, 18 Aug 2014 23:12:08 +0000 (19:12 -0400)]
libfreerdp-codec: start working on progressive dequantization

10 years agoMerge pull request #2049 from awakecoding/master
Marc-André Moreau [Mon, 18 Aug 2014 21:52:24 +0000 (17:52 -0400)]
Merge pull request #2049 from awakecoding/master

Shadow Server

10 years agofreerdp: fix build warnings
Marc-André Moreau [Mon, 18 Aug 2014 21:25:48 +0000 (17:25 -0400)]
freerdp: fix build warnings

10 years agoMerge branch 'shadow' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Mon, 18 Aug 2014 21:06:13 +0000 (17:06 -0400)]
Merge branch 'shadow' of github.com:awakecoding/FreeRDP

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Mon, 18 Aug 2014 20:23:45 +0000 (16:23 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP

10 years agoMerge pull request #2023 from ptsekov/software-gdi-improvements
Marc-André Moreau [Mon, 18 Aug 2014 20:22:23 +0000 (16:22 -0400)]
Merge pull request #2023 from ptsekov/software-gdi-improvements

Software GDI improvements

10 years agoMerge pull request #2022 from dbungert/percent
Marc-André Moreau [Mon, 18 Aug 2014 20:20:15 +0000 (16:20 -0400)]
Merge pull request #2022 from dbungert/percent

Restore window size by percent

10 years agoMerge pull request #2024 from repzilon/master
Marc-André Moreau [Mon, 18 Aug 2014 17:08:52 +0000 (13:08 -0400)]
Merge pull request #2024 from repzilon/master

uclibc build fixes and recompressed images

10 years agoMerge pull request #2045 from zhangzl2013/fix-cut-fold
Marc-André Moreau [Mon, 18 Aug 2014 17:06:58 +0000 (13:06 -0400)]
Merge pull request #2045 from zhangzl2013/fix-cut-fold

drive: fix contents lost when cut-paste a folder.

10 years agoMerge pull request #2044 from RonYaari/master
Marc-André Moreau [Mon, 18 Aug 2014 17:06:10 +0000 (13:06 -0400)]
Merge pull request #2044 from RonYaari/master

X11: fix toggle-fullscreen option functionality

10 years agoMerge pull request #2010 from hardening/list_return_value
Marc-André Moreau [Mon, 18 Aug 2014 17:05:18 +0000 (13:05 -0400)]
Merge pull request #2010 from hardening/list_return_value

Make LinkedList return errors when something fails

10 years agoMerge pull request #2038 from akallabeth/winpr-stacktrace
Marc-André Moreau [Mon, 18 Aug 2014 17:04:51 +0000 (13:04 -0400)]
Merge pull request #2038 from akallabeth/winpr-stacktrace

Winpr add stacktrace

10 years agodrive: fix contents lost when cut-paste a folder.
Zhang Zhaolong [Mon, 18 Aug 2014 08:00:34 +0000 (16:00 +0800)]
drive: fix contents lost when cut-paste a folder.

10 years agoX11: fix toggle-fullscreen option functionality
Ron Yaari [Mon, 18 Aug 2014 07:41:40 +0000 (10:41 +0300)]
X11: fix toggle-fullscreen option functionality

10 years agoRevert "X11: fix toggle-fullscreen option functionality"
Idan Freiberg [Mon, 18 Aug 2014 07:39:47 +0000 (10:39 +0300)]
Revert "X11: fix toggle-fullscreen option functionality"

This reverts commit 0c84c81401c041a249834c07b8f953d5b4dcabc5.

10 years agoX11: fix toggle-fullscreen option functionality
Ron Yaari [Mon, 18 Aug 2014 07:19:47 +0000 (10:19 +0300)]
X11: fix toggle-fullscreen option functionality

10 years agoshadow: fix race conditions
Marc-André Moreau [Fri, 15 Aug 2014 22:12:53 +0000 (18:12 -0400)]
shadow: fix race conditions

10 years agoshadow: fix build for Windows XP
Marc-André Moreau [Fri, 15 Aug 2014 20:06:08 +0000 (16:06 -0400)]
shadow: fix build for Windows XP

10 years agoshadow: initial working support for WDS+RDP backend
Marc-André Moreau [Fri, 15 Aug 2014 18:57:09 +0000 (14:57 -0400)]
shadow: initial working support for WDS+RDP backend

10 years agoshadow: fix WDS connectivity
Marc-André Moreau [Fri, 15 Aug 2014 18:15:53 +0000 (14:15 -0400)]
shadow: fix WDS connectivity

10 years agoshadow: fix RDP security
Marc-André Moreau [Fri, 15 Aug 2014 17:50:22 +0000 (13:50 -0400)]
shadow: fix RDP security

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP into shadow
Marc-André Moreau [Fri, 15 Aug 2014 15:44:07 +0000 (11:44 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow

10 years agoMerge branch 'awakecoding' of github.com:vworkspace/FreeRDP
Marc-André Moreau [Fri, 15 Aug 2014 15:43:50 +0000 (11:43 -0400)]
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP

Conflicts:
libfreerdp/core/nego.c
libfreerdp/core/peer.c
winpr/libwinpr/synch/wait.c

10 years agoMerge pull request #2017 from ptsekov/Issue_2016
Hardening [Fri, 15 Aug 2014 07:21:12 +0000 (09:21 +0200)]
Merge pull request #2017 from ptsekov/Issue_2016

Honour user performance preferences.

10 years agoshadow: add more virtual channels to RDP backend like WDS API
Marc-André Moreau [Thu, 14 Aug 2014 23:23:48 +0000 (19:23 -0400)]
shadow: add more virtual channels to RDP backend like WDS API

10 years agoshadow: start RDP client backend for WDS
Marc-André Moreau [Thu, 14 Aug 2014 22:41:22 +0000 (18:41 -0400)]
shadow: start RDP client backend for WDS

10 years agoFix erronous use of colors in gdi_patblt().
Pavel Tsekov [Thu, 14 Aug 2014 17:21:49 +0000 (20:21 +0300)]
Fix erronous use of colors in gdi_patblt().
* libfreerdp/gdi/gdi.c:
(gdi_patblt): Fix a call to freerdp_mono_image_convert() which was
still passed colors in drawing order representation instead of GDI
representation.

10 years agoshadow: initial WDS working setup
Marc-André Moreau [Thu, 14 Aug 2014 17:10:43 +0000 (13:10 -0400)]
shadow: initial WDS working setup

10 years agoFix 1bpp -> 16bpp image conversion.
Pavel Tsekov [Thu, 14 Aug 2014 17:09:12 +0000 (20:09 +0300)]
Fix 1bpp -> 16bpp image conversion.
* libfreerdp/codec/color.c (freerdp_mono_image_convert): Update the
1bpp -> 16bpp conversion code to reflect the fact that the foreground
and the background colors are in GDI representation now.

10 years agoMerge pull request #1963 from akallabeth/async-update-to-lib
Norbert Federa [Thu, 14 Aug 2014 15:46:43 +0000 (17:46 +0200)]
Merge pull request #1963 from akallabeth/async-update-to-lib

Moved update thread from client to library.

10 years agoFixed license header, added correct copyright.
Armin Novak [Thu, 14 Aug 2014 08:42:10 +0000 (10:42 +0200)]
Fixed license header, added correct copyright.

10 years agoFixed missing argument checks in logger, fixed crashes if file not created.
Armin Novak [Thu, 14 Aug 2014 08:38:02 +0000 (10:38 +0200)]
Fixed missing argument checks in logger, fixed crashes if file not created.

10 years agoWinpr stacktrace header.
Armin Novak [Thu, 14 Aug 2014 08:37:48 +0000 (10:37 +0200)]
Winpr stacktrace header.

10 years agoAdded winpr functions to generate a stacktrace.
Armin Novak [Thu, 14 Aug 2014 08:36:50 +0000 (10:36 +0200)]
Added winpr functions to generate a stacktrace.
Added libcorkscrew headers for stacktrace on android.
Added execinfo.h detection for stacktrace on linux.

10 years agoshadow: improve WDS subsystem
Marc-André Moreau [Thu, 14 Aug 2014 00:12:09 +0000 (20:12 -0400)]
shadow: improve WDS subsystem

10 years agoshadow: start Windows Desktop Sharing API support
Marc-André Moreau [Wed, 13 Aug 2014 21:48:57 +0000 (17:48 -0400)]
shadow: start Windows Desktop Sharing API support

10 years agoFix conversion of 24bpp bitmaps to 32bpp fb when
Pavel Tsekov [Wed, 13 Aug 2014 21:31:15 +0000 (00:31 +0300)]
Fix conversion of 24bpp bitmaps to 32bpp fb when
CLRCONV_INVERT and/or CLRCONV_ALPHA is set.
* include/freerdp/codec/color.h (RGB32_to_BGR32): New inline function.
* libfreerdp/codec/color.c:
(freerdp_image_convert_24bpp): Fix CLRCONV_ALPHA and CLRCONV_INVERT
processing for 32bpp destination.
Unroll the conversion loop to process four pixels in one go using
32-bit load and store operations.

10 years agoFixed a FreeRDP server problem which prevented RDP security from being negotiated.
Mike McDonald [Wed, 13 Aug 2014 15:01:43 +0000 (11:01 -0400)]
Fixed a FreeRDP server problem which prevented RDP security from being negotiated.

10 years agoFixed typo in message
Mike McDonald [Wed, 13 Aug 2014 14:14:56 +0000 (10:14 -0400)]
Fixed typo in message

10 years agoMerge pull request #2037 from akallabeth/array-list-compare
Martin Fleisz [Wed, 13 Aug 2014 12:44:48 +0000 (14:44 +0200)]
Merge pull request #2037 from akallabeth/array-list-compare

Implemented comparison functions for ArrayList

10 years agoImplemented default fnObjectEquals function.
Armin Novak [Wed, 13 Aug 2014 12:15:17 +0000 (14:15 +0200)]
Implemented default fnObjectEquals function.
Implemented ArrayList_Contains.
ArrayList_IndexOf and ArrayList_LastIndexOf now use comparison function.

10 years agoshadow: move DXGI 1.2 code to separate file
Marc-André Moreau [Tue, 12 Aug 2014 23:22:42 +0000 (19:22 -0400)]
shadow: move DXGI 1.2 code to separate file

10 years agoshadow: improve DXGI support
Marc-André Moreau [Tue, 12 Aug 2014 20:57:58 +0000 (16:57 -0400)]
shadow: improve DXGI support

10 years agoMerge pull request #2035 from bmiklautz/fix/fingerprint
Bernhard Miklautz [Tue, 12 Aug 2014 13:54:44 +0000 (15:54 +0200)]
Merge pull request #2035 from bmiklautz/fix/fingerprint

crypto: fix fingerprint

10 years agocrypto: fix fingerprint
Bernhard Miklautz [Tue, 12 Aug 2014 13:40:53 +0000 (15:40 +0200)]
crypto: fix fingerprint

Latest logging changes introduced a problem with fingerprint generation.
The last byte wasn't added.

10 years agoserver: fix build on Windows
Marc-André Moreau [Mon, 11 Aug 2014 23:31:38 +0000 (19:31 -0400)]
server: fix build on Windows

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP into shadow
Marc-André Moreau [Mon, 11 Aug 2014 23:22:33 +0000 (19:22 -0400)]
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

10 years agoMerge branch 'shadow' of github.com:awakecoding/FreeRDP into shadow
Marc-André Moreau [Mon, 11 Aug 2014 23:09:00 +0000 (19:09 -0400)]
Merge branch 'shadow' of github.com:awakecoding/FreeRDP into shadow

10 years agoMerge pull request #2033 from awakecoding/master
Marc-André Moreau [Mon, 11 Aug 2014 23:08:08 +0000 (19:08 -0400)]
Merge pull request #2033 from awakecoding/master

RLGR, Progressive, RDP8.1 H264, MS-RDPEDISP