mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marc-André Moreau 2012-07-04 18:34:37 -04:00
commit f3d480bba2
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -133,6 +133,9 @@ set(FREERDP_KEYMAP_PATH "${FREERDP_DATA_PATH}/keymaps")
# Path to put plugins
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp")
# Path to put extensions
set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp/extensions")
# Include directories
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)

2
include/freerdp/utils/stream.h
View File

@ -65,7 +65,7 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
#define stream_read_uint8(_s, _v) do { _v = *_s->p++; } while (0)
#define stream_read_uint16(_s, _v) do { _v = \
(uint16)(*_s->p) + \
(((uint16)(*(_s->p + 1))) << 8); \
(uint16)(((uint16)(*(_s->p + 1))) << 8); \
_s->p += 2; } while (0)
#define stream_read_uint32(_s, _v) do { _v = \
(uint32)(*_s->p) + \

2
libfreerdp-core/CMakeLists.txt
View File

@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
add_definitions(-DEXT_PATH="/usr/lib/freerdp/extensions")
add_definitions(-DEXT_PATH="${FREERDP_EXTENSION_PATH}")
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${ZLIB_INCLUDE_DIRS})

8
libfreerdp-crypto/tls.c
View File

@ -76,8 +76,10 @@ boolean tls_connect(rdpTls* tls)
* and the FreeRDP client, and caused major performance issues,
* which is why we're disabling it.
*/
#ifdef SSL_OP_NO_COMPRESSION
options |= SSL_OP_NO_COMPRESSION;
#endif
/**
* SSL_OP_TLS_BLOCK_PADDING_BUG:
*
@ -179,8 +181,10 @@ boolean tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_fi
* and the FreeRDP client, and caused major performance issues,
* which is why we're disabling it.
*/
#ifdef SSL_OP_NO_COMPRESSION
options |= SSL_OP_NO_COMPRESSION;
#endif
/**
* SSL_OP_TLS_BLOCK_PADDING_BUG:
*

6
winpr/crt/string.c
View File

@ -50,11 +50,11 @@ WCHAR* _wcsdup(const WCHAR* strSource)
#if sun
strDestination = wsdup(strSource);
#elif defined(__APPLE__) && defined(__MACH__)
strDestination = malloc(wcslen(strSource));
#elif defined(__APPLE__) && defined(__MACH__) || defined(ANDROID)
strDestination = malloc(wcslen((wchar_t*)strSource));
if (strDestination != NULL)
wcscpy(strDestination, strSource);
wcscpy((wchar_t*)strDestination, (const wchar_t*)strSource);
#else
strDestination = (WCHAR*) wcsdup((wchar_t*) strSource);
#endif