Merge branch 'master' of github.com:FreeRDP/FreeRDP

diff --cc CMakeLists.txt
Simple merge

diff --cc channels/audin/client/mac/audin_mac.c
Simple merge

diff --cc channels/rdpsnd/client/mac/rdpsnd_mac.c
Simple merge

diff --cc winpr/include/winpr/nt.h
Simple merge

diff --cc winpr/include/winpr/string.h
Simple merge

diff --cc winpr/include/winpr/user.h
Simple merge

diff --cc winpr/libwinpr/crt/string.c
Simple merge

diff --cc winpr/libwinpr/crt/unicode.c
Simple merge

diff --cc winpr/libwinpr/crypto/cipher.c
index c7cdb52,f7dd835..f85ab65
--- 1/winpr/libwinpr/crypto/cipher.c
--- 2/winpr/libwinpr/crypto/cipher.c
+++ b/winpr/libwinpr/crypto/cipher.c
@@@ -49,11 -58,12 +58,12 @@@ WINPR_RC4_CTX* winpr_RC4_New(const BYTE
        RC4_set_key((RC4_KEY*) ctx, keylen, key);
  #elif defined(WITH_MBEDTLS) && defined(MBEDTLS_ARC4_C)
        mbedtls_arc4_init((mbedtls_arc4_context*) ctx);
 -      mbedtls_arc4_setup((mbedtls_arc4_context*) ctx, key, keylen);
 +      mbedtls_arc4_setup((mbedtls_arc4_context*) ctx, key, (unsigned int) keylen);
  #endif
+       return ctx;
  }
  
- int winpr_RC4_Update(WINPR_RC4_CTX* ctx, size_t length, const BYTE* input, BYTE* output)
+ BOOL winpr_RC4_Update(WINPR_RC4_CTX* ctx, size_t length, const BYTE* input, BYTE* output)
  {
  #if defined(WITH_OPENSSL)
        RC4((RC4_KEY*) ctx, length, input, output);

diff --cc winpr/libwinpr/file/file.c
Simple merge