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

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

Browse Source
This commit is contained in:
Marc-André Moreau 2013-02-28 10:42:13 -05:00
commit 62e686f62a
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -24,6 +24,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#include <signal.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -848,7 +849,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints)
_p->plugin.event_callback = rdpsnd_process_event; _p->plugin.event_callback = rdpsnd_process_event;
_p->plugin.terminate_callback = rdpsnd_process_terminate; _p->plugin.terminate_callback = rdpsnd_process_terminate;
#ifndef _WIN32 #if !defined(_WIN32) && !defined(ANDROID)
{ {
sigset_t mask; sigset_t mask;
sigemptyset(&mask); sigemptyset(&mask);

6
libfreerdp/core/fastpath.c
View File

@ -340,7 +340,11 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s)
stream_check_size(fastpath->updateData, size); stream_check_size(fastpath->updateData, size);
stream_copy(fastpath->updateData, comp_stream, size); stream_copy(fastpath->updateData, comp_stream, size);
/* TODO: add a limit on the fragmentation buffer size */ if (stream_get_size(fastpath->updateData) > rdp->settings->MultifragMaxRequestSize)
{
printf("fastpath PDU is bigger than MultifragMaxRequestSize\n");
return -1;
}
if (fragmentation == FASTPATH_FRAGMENT_LAST) if (fragmentation == FASTPATH_FRAGMENT_LAST)
{ {

1
libfreerdp/primitives/prim_andor_opt.c
View File

@ -43,6 +43,7 @@ SSE3_SCD_PRE_ROUTINE(sse3_orC_32u, UINT32, general_orC_32u,
# endif /* !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS) */ # endif /* !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS) */
#endif #endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
void primitives_init_andor_opt(const primitives_hints_t *hints, primitives_t *prims) void primitives_init_andor_opt(const primitives_hints_t *hints, primitives_t *prims)
{ {

11
libfreerdp/primitives/test/CMakeLists.txt
View File

@ -39,6 +39,13 @@ set(PRIMITIVE_TEST_CFILES
../prim_set.c ../prim_set.c
../prim_shift.c ../prim_shift.c
../prim_sign.c ../prim_sign.c
../prim_add_opt.c
../prim_alphaComp_opt.c
../prim_andor_opt.c
../prim_colors_opt.c
../prim_set_opt.c
../prim_shift_opt.c
../prim_sign_opt.c
../primitives.c ../primitives.c
) )
@ -46,7 +53,7 @@ set(PRIMITIVE_TEST_HEADERS
measure.h measure.h
prim_test.h prim_test.h
../prim_internal.h ../prim_internal.h
) )
set(PRIMITIVE_TEST_SRCS set(PRIMITIVE_TEST_SRCS
${PRIMITIVE_TEST_CFILES} ${PRIMITIVE_TEST_CFILES}
@ -85,7 +92,7 @@ if(WITH_SSE2)
endif() endif()
elseif(WITH_NEON) elseif(WITH_NEON)
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
set(OPTIMZATION "${OPTFLAGS} -mfpu=neon -mfloat-abi=${ARM_FP_ABI} -O2") set(OPTFLAGS "${OPTFLAGS} -mfpu=neon -mfloat-abi=${ARM_FP_ABI} -O2")
endif() endif()
# TODO: Add MSVC equivalent # TODO: Add MSVC equivalent
endif() endif()

2
winpr/libwinpr/sysinfo/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib") set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
if((NOT WIN32) AND (NOT APPLE)) if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID))
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rt) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rt)
endif() endif()