Roland Kaufmann [Wed, 16 Dec 2015 22:21:43 +0000 (23:21 +0100)]
Move UnmapButtons settings to stable ABI section
The Miscellaneous section is chosen because choosing not to map the
buttons is not a property of the input system, but rather an ad-hoc
setting to be applied to this session.
Roland Kaufmann [Mon, 13 Jul 2015 23:03:33 +0000 (01:03 +0200)]
Add option to disable pointer button mapping
In case the old behaviour of not reverse-mapping the mouse buttons is
desirable, a command-line option is added to disable the mapping. This
option is made experimental for the time being.
The default is to do the reverse mapping, as this is the intuitive
behaviour (the mouse then works as it would on the console).
Roland Kaufmann [Mon, 13 Jul 2015 22:31:12 +0000 (00:31 +0200)]
Get pointer button mapping from input system
If XInput extension is available, then find the (first) pointer device
and use the button mapping of that one. If there are more than one
pointer devices, they could have different button mappings, but it is
not clear how this should be communicated to the RDP server.
If XInput is not available, attempt to fallback to the old global
mapping. (This mapping exists, but is not correct if there actually
is an XInput extension loaded, as it is then not used).
Roland Kaufmann [Mon, 13 Jul 2015 20:59:18 +0000 (22:59 +0200)]
Map logical to physical mouse button events
RDP expects to receive an indicator of the physical mouse button that
was pressed on the client, whereas X11 deliver a value for which
logical mouse button that was pressed.
This patch introduces a (reverse) mapping from logical mouse buttons to
physical mouse buttons, so that the RDP server can do correct mapping
for the event on its end.
However, no actual mapping is done here; this patch just introduces the
framework to do so. Thus, there should be no behavioural change from
this patch alone.
There is an implicit assumption that only the first three buttons are
mapped to eachother. Enabling more a general mapping would require
extensive changes to the event handling as fourth logical button and
up is used for special functionality such as wheel.
Hardening [Tue, 15 Dec 2015 10:23:43 +0000 (11:23 +0100)]
Merge pull request #2984 from bsagal/master
remove horizontal scroll maping to forward/back
Binyamin Sagal [Mon, 14 Dec 2015 19:48:31 +0000 (21:48 +0200)]
Fix horizontal scrolling direction and capability detection
Armin Novak [Mon, 14 Dec 2015 17:29:23 +0000 (18:29 +0100)]
Implemented horizontal wheel support.
Horizontal mouse wheel input capabilities are now checked
and if available mouse buttons 6 and 7 are mapped to the
horizontal wheel for the X11 client.
Binyamin Sagal [Tue, 24 Nov 2015 13:41:46 +0000 (15:41 +0200)]
remove horizontal scroll maping to forward/back
partal fix for #2302
Bernhard Miklautz [Mon, 14 Dec 2015 16:58:25 +0000 (17:58 +0100)]
Merge pull request #2831 from akallabeth/gdi_fix
Fixed GDI_BITMAP, now using custom deallocation function.
Hardening [Mon, 14 Dec 2015 16:22:38 +0000 (17:22 +0100)]
Merge pull request #2414 from zavadovsky/opensles_fixes
opensles fixes
Hardening [Mon, 14 Dec 2015 16:21:58 +0000 (17:21 +0100)]
Merge pull request #2913 from realjiangms/shadow_fix_align
Server/Shadow: Fix invalid ALIGN in shadow_client_send_bitmap_update
Hardening [Mon, 14 Dec 2015 15:09:47 +0000 (16:09 +0100)]
Merge pull request #2980 from akallabeth/clipboard_struct_fixes
Fixed CLIPRDR_FILEDESCRIPTOR
Hardening [Mon, 14 Dec 2015 15:08:13 +0000 (16:08 +0100)]
Merge pull request #2772 from bjcollins/master
tsmf updates/fixes for gstreamer decoder on X11 platform
Hardening [Mon, 14 Dec 2015 14:10:33 +0000 (15:10 +0100)]
Merge pull request #2973 from hopToDev/master
Fixed build errors that occur when setting WITH_IOSAUDIO build option
Bernhard Miklautz [Fri, 11 Dec 2015 11:09:33 +0000 (12:09 +0100)]
Merge pull request #2928 from akallabeth/non_verbose_VerifyX509Certificate
Silenced VerifyX509Certificate logging.
Hardening [Thu, 10 Dec 2015 15:13:24 +0000 (16:13 +0100)]
Merge pull request #2941 from akallabeth/clipboard_file_fix
Clipboard file fixes
Hardening [Wed, 9 Dec 2015 13:56:56 +0000 (14:56 +0100)]
Merge pull request #2976 from akallabeth/mac_audin_support
Added audin support for mac os.
Hardening [Wed, 9 Dec 2015 13:41:53 +0000 (14:41 +0100)]
Merge pull request #2972 from akallabeth/option_fix
Fixed cmake_dependent_option use.
Hardening [Tue, 8 Dec 2015 21:46:29 +0000 (22:46 +0100)]
Merge pull request #2824 from bjcollins/nla_auth_exit_code
Return FREERDP_ERROR_AUTHENTICATION_FAILED on an authentication failure
Hardening [Thu, 3 Dec 2015 18:39:30 +0000 (19:39 +0100)]
Merge pull request #2979 from bmiklautz/bm/pre2.0_2
pkg: update version infos to 2.0
Hardening [Mon, 30 Nov 2015 09:52:40 +0000 (10:52 +0100)]
Merge pull request #2991 from xdqi/master
Fix compilation error under Visual Studio 2010
Xiaodong Qi [Sat, 28 Nov 2015 16:14:29 +0000 (00:14 +0800)]
Fix compilation error under Visual Studio 2010
Visual Studio 2010 use a compiler that supports only C89, which
only supports declaring variable at top of a local scope. Moving
scope variable to the top of function should solve this problem.
Hardening [Thu, 26 Nov 2015 08:56:19 +0000 (09:56 +0100)]
Merge pull request #2983 from nitomartinez/master
Fixes #2982. The idea is to be able to create the socket externally a…
Nito Martinez [Thu, 26 Nov 2015 08:50:03 +0000 (09:50 +0100)]
Fix formatting: else if in its own line and no brackets for single statements
Nito Martinez [Wed, 25 Nov 2015 07:36:49 +0000 (08:36 +0100)]
Disable setting socket options for preexisting socket like: keepalive and tcp_nodelay, these should be set extenally if needed. Do not close the socket if the clientaddress could not be set
Hardening [Mon, 23 Nov 2015 10:53:20 +0000 (11:53 +0100)]
Merge pull request #2981 from mfleisz/server_cliprdr_fix
cliprdr/server: Fix parsing of file contents request PDU
Nito Martinez [Fri, 20 Nov 2015 01:44:35 +0000 (02:44 +0100)]
Fixes #2982. The idea is to be able to create the socket externally and pass that socket FD to FreeRDP so that it can be used there.
The idea suggested is to use the following interface:
settings->ServerHostname = "|"
settings->ServerPort = SocketFD
Martin Fleisz [Thu, 19 Nov 2015 15:29:57 +0000 (16:29 +0100)]
cliprdr/server: Fix incorrect message flags
Martin Fleisz [Thu, 19 Nov 2015 15:17:36 +0000 (16:17 +0100)]
cliprdr/server: Fix incorrect message header
Martin Fleisz [Thu, 19 Nov 2015 13:12:26 +0000 (14:12 +0100)]
cliprdr/server: Fix parsing of file contents request PDU
Armin Novak [Wed, 18 Nov 2015 08:49:40 +0000 (09:49 +0100)]
Fixed CLIPRDR_FILEDESCRIPTOR
Bernhard Miklautz [Tue, 17 Nov 2015 22:29:07 +0000 (23:29 +0100)]
pkg: update version infos to 2.0
Armin Novak [Fri, 13 Nov 2015 10:47:58 +0000 (11:47 +0100)]
Added mac implementation.
Armin Novak [Thu, 12 Nov 2015 15:04:31 +0000 (16:04 +0100)]
Added audin support for mac os.
Hardening [Wed, 11 Nov 2015 11:54:34 +0000 (12:54 +0100)]
Merge pull request #2970 from bmiklautz/prep_2.0
2.0 preparations
Bernhard Miklautz [Wed, 11 Nov 2015 02:20:37 +0000 (03:20 +0100)]
Merge pull request #2971 from woutershep/cmake-manual-path
cmake: tweak manpage install location
Mehul Dhorda [Tue, 10 Nov 2015 19:39:37 +0000 (11:39 -0800)]
Fixed build errors that occur when setting WITH_IOSAUDIO build option.
- Replaced } with ) in CMakeLists.txt
- Included header in TPCircularBuffer.c which is required for the TAG define
Mehul Dhorda [Tue, 10 Nov 2015 19:34:05 +0000 (11:34 -0800)]
bjcollins [Tue, 10 Nov 2015 16:59:13 +0000 (10:59 -0600)]
Fix issue with previous commit, Xext is not required for tsmf but the
definition for it still needs to be added when found.
Bernhard Miklautz [Tue, 10 Nov 2015 15:29:09 +0000 (16:29 +0100)]
wlog: cleanup API includes
Only include necessary header files.
Armin Novak [Tue, 10 Nov 2015 13:18:51 +0000 (14:18 +0100)]
Fixed cmake_dependent_option use.
Bernhard Miklautz [Tue, 10 Nov 2015 12:40:52 +0000 (13:40 +0100)]
wlog/journald: don't set a default identifier
Don't set the identifier to "winpr" as default value because journald
will use the programs name as default if no identifier is set.
This way a program using WLog doesn't need to set an identifier (except
it want something different then it's name).
Bernhard Miklautz [Tue, 10 Nov 2015 11:05:23 +0000 (12:05 +0100)]
wlog: change variable naming and fix documentation
* change State to active and make it BOOL since it's only got two
used values
* fix some typos in the documentation
Hardening [Tue, 10 Nov 2015 09:13:47 +0000 (10:13 +0100)]
Merge pull request #2917 from binglinoioij/master
add values-zh/string.xml,that was profiles for chinese
Hardening [Tue, 10 Nov 2015 09:12:21 +0000 (10:12 +0100)]
Merge pull request #2930 from dbungert/glyph
Clamp ultra-wide glyph opRight vals to desktop width
Hardening [Tue, 10 Nov 2015 08:59:45 +0000 (09:59 +0100)]
Merge pull request #2962 from akallabeth/client_build_fixes
Allow client build to be disabled
Wouter van Kesteren [Mon, 9 Nov 2015 20:57:41 +0000 (21:57 +0100)]
cmake: tweak manpage install location
This patch is needed when wanting to install binaries/libraries to other
locations than data. The linux distro Exherbo installs binaries and
libraries to /usr/<chost>/bin, /usr/<chost>/lib respectively but
manpages should still go in /usr/share/man/ because they are
architecture independent, without this patch they go in
/usr/<chost>/share/man unconditionally.
cmake documentation states:
DATAROOTDIR - read-only architecture-independent data root (share)
So this patch makes it use that so that its configurable.
Bernhard Miklautz [Mon, 9 Nov 2015 19:30:23 +0000 (20:30 +0100)]
wlog: add some rudimentary documentation
Bernhard Miklautz [Mon, 9 Nov 2015 18:47:51 +0000 (19:47 +0100)]
wlog: fix build on windows
Bernhard Miklautz [Mon, 9 Nov 2015 18:37:02 +0000 (19:37 +0100)]
wlog: fix android build
Bernhard Miklautz [Mon, 9 Nov 2015 18:26:34 +0000 (19:26 +0100)]
Fix compiler warnings
gcc (Debian 4.9.2-10) 4.9.2
winpr/libwinpr/thread/argv.c: In function ‘CommandLineToArgvA’:
winpr/libwinpr/thread/argv.c:94:6: warning: unused variable ‘index’ [-Wunused-variable]
int index;
winpr/libwinpr/file/test/TestFileGetStdHandle.c: In function ‘TestFileGetStdHandle’:
winpr/libwinpr/file/test/TestFileGetStdHandle.c:44:2: warning: implicit
declaration of function ‘CloseHandle’ [-Wimplicit-function-declaration]
CloseHandle(stdout);
^
libfreerdp/codec/test/TestFreeRDPRegion.c: In function ‘test_norbert2_case’:
libfreerdp/codec/test/TestFreeRDPRegion.c:697:6: warning: unused variable ‘i’ [-Wunused-variable]
int i;
channels/cliprdr/server/cliprdr_main.c: In function ‘cliprdr_server_receive_format_list’:
channels/cliprdr/server/cliprdr_main.c:636:24: warning: unused variable ‘cliprdr’ [-Wunused-variable]
CliprdrServerPrivate* cliprdr = (CliprdrServerPrivate*) context->handle;
^
channels/cliprdr/server/cliprdr_main.c: In function ‘cliprdr_server_init’:
channels/cliprdr/server/cliprdr_main.c:1097:24: warning: unused variable ‘cliprdr’ [-Wunused-variable]
CliprdrServerPrivate* cliprdr = (CliprdrServerPrivate*) context->handle;
Bernhard Miklautz [Mon, 9 Nov 2015 17:27:38 +0000 (18:27 +0100)]
Adapt error level for debug messages
When using xfreerdp a regular invocation should really only report grave
problems as error. "Regular" messages should be either info or even
debug.
Bernhard Miklautz [Mon, 9 Nov 2015 16:56:44 +0000 (17:56 +0100)]
wlog: rework, cleanup and stabilize API
* only expose necessary functions and types in header
* don't expose appender internals
* add generic function WLog_ConfigureAppender to have the possibility
to configure appender specific settings
* detect appender availability if WLog_SetLogAppenderType or
WLog_Appender_New return FALSE or NULL respectively the appender isn't
available or the initialization failed. This is very useful for the
use with optional appenders.
* add Free to the appender interface. At the time of the Free the
appender is known and available so it can be called directly (instead
of calling the right function according to the type)
* make all appender internal function static
* all appenders return the generic wLogAppender type now. Typecasts
are internally done where necessary this abstracts the appenders more
cleanly
Bernhard Miklautz [Thu, 5 Nov 2015 13:02:07 +0000 (14:02 +0100)]
Add build-config.h
build-config.h should contain configure/compile time settings that are
relevant for projects that use FreeRDP.
For example the compiled in plugin search paths.
Bernhard Miklautz [Thu, 5 Nov 2015 11:29:41 +0000 (12:29 +0100)]
Pump version to 2.0.0
Norbert Federa [Mon, 9 Nov 2015 12:42:02 +0000 (13:42 +0100)]
Merge pull request #2964 from hardening/udp_appender
Add an UDP appender to wLog
David FORT [Fri, 6 Nov 2015 22:17:11 +0000 (23:17 +0100)]
Take in account @nfedera's remarks
Norbert Federa [Fri, 6 Nov 2015 12:43:44 +0000 (13:43 +0100)]
Merge pull request #2954 from mfleisz/cliprdr_fix
cliprdr/server: Server-side file content receiving used wrong callback
Norbert Federa [Fri, 6 Nov 2015 12:34:42 +0000 (13:34 +0100)]
Merge pull request #2926 from bjcollins/rail_fixes
Rail fixes
Hardening [Fri, 6 Nov 2015 09:21:47 +0000 (10:21 +0100)]
Merge pull request #2963 from nfedera/fix-fullscreen-multimon
client/X11: multimon/fullscreen fixes
Hardening [Fri, 6 Nov 2015 09:19:40 +0000 (10:19 +0100)]
Merge pull request #2968 from nfedera/fix-commandlinetoargv
winpr/argv: fix CommandLineToArgvA memory access
Norbert Federa [Thu, 5 Nov 2015 17:10:05 +0000 (18:10 +0100)]
winpr/argv: fix CommandLineToArgvA memory access
- fixed access of unitialized memory beyond terminating null
- minor simplifications
David FORT [Wed, 4 Nov 2015 17:11:19 +0000 (18:11 +0100)]
Add an UDP appender to wLog
This appender allows to receive the logs over a network connection using UDP packets.
You can see the logs using a listening netcat, for example: nc -ul 127.0.0.1 20000.
Norbert Federa [Wed, 4 Nov 2015 16:58:21 +0000 (17:58 +0100)]
client/X11: fix post fullscreen repositioning
Norbert Federa [Wed, 4 Nov 2015 14:01:31 +0000 (15:01 +0100)]
client/X11: multimon/fullscreen fixes
- fixed wrong calculation of xfc->fullscreenMonitors.[right|bottom]
- only use _NET_WM_FULLSCREEN_MONITORS if at least 2 monitors are involved
- call XMoveWindow before setting the _NET_WM_STATE_FULLSCREEN property
Armin Novak [Wed, 4 Nov 2015 12:15:37 +0000 (13:15 +0100)]
Fixed WITH_CLIENT_CHANNELS dependencies.
Armin Novak [Wed, 4 Nov 2015 08:53:13 +0000 (09:53 +0100)]
Added WITH_CLIENT_COMMON option.
Armin Novak [Tue, 3 Nov 2015 15:16:49 +0000 (16:16 +0100)]
Disabled client builds if WITH_CLIENT is not set.
Armin Novak [Tue, 3 Nov 2015 15:18:09 +0000 (16:18 +0100)]
Fixed return values.
Bernhard Miklautz [Tue, 3 Nov 2015 11:22:22 +0000 (12:22 +0100)]
Merge pull request #2961 from nfedera/nf-fix-image-copy-segfault
codec/color: fix segfault in freerdp_image32_copy
Norbert Federa [Tue, 3 Nov 2015 11:05:47 +0000 (12:05 +0100)]
codec/color: fix segfault in freerdp_image32_copy
Code path for dstBytesPerPixel == 3 moved src and dst pointers
beyond their respective buffers.
Hardening [Mon, 2 Nov 2015 09:50:16 +0000 (10:50 +0100)]
Merge pull request #2951 from bmiklautz/friday
Misc fixes
Bernhard Miklautz [Mon, 2 Nov 2015 09:45:35 +0000 (10:45 +0100)]
Merge pull request #2957 from hardening/journald
Adds a systemd journal appender
David FORT [Sun, 1 Nov 2015 20:34:03 +0000 (21:34 +0100)]
Take in account @bmiklautz remarks
* I have added a function to set the journal identifier
* the appender name has been changed from SYSTEMD to JOURNALD
David FORT [Fri, 30 Oct 2015 19:22:25 +0000 (20:22 +0100)]
Fix the env var leak
David FORT [Fri, 30 Oct 2015 19:20:42 +0000 (20:20 +0100)]
Use unbuffered output
David FORT [Fri, 30 Oct 2015 13:50:14 +0000 (14:50 +0100)]
Adds a systemd journal appender
Bernhard Miklautz [Thu, 29 Oct 2015 17:44:14 +0000 (18:44 +0100)]
Merge pull request #2940 from hardening/syslog_appender
Add a wLog syslog appender
David FORT [Thu, 29 Oct 2015 17:33:42 +0000 (18:33 +0100)]
Fixed a warning
David FORT [Thu, 29 Oct 2015 17:31:22 +0000 (18:31 +0100)]
Support syslog type for the WLOG_APPENDER env var
Martin Fleisz [Thu, 29 Oct 2015 11:45:12 +0000 (12:45 +0100)]
cliprdr/server: Server-side file content receiving used wrong callback
David FORT [Thu, 29 Oct 2015 09:32:58 +0000 (10:32 +0100)]
Don't include config.h in public headers
In fact we don't need the ifdefery in public headers, so don't include unneeded
config.h file.
Bernhard Miklautz [Wed, 28 Oct 2015 14:55:17 +0000 (15:55 +0100)]
Merge pull request #2952 from mfleisz/server_cliprdr_config
cliprdr/server: Provide the server with a possibility to configure capabilities
Martin Fleisz [Wed, 28 Oct 2015 11:28:14 +0000 (12:28 +0100)]
cliprdr/server: Add comment
David FORT [Tue, 27 Oct 2015 20:45:26 +0000 (21:45 +0100)]
Include config.h file when needed
Martin Fleisz [Tue, 27 Oct 2015 16:12:33 +0000 (17:12 +0100)]
cliprdr/server: Provide the server with a possibility to configure capabilities
Armin Novak [Tue, 27 Oct 2015 08:57:15 +0000 (09:57 +0100)]
Fixed mixed declaration.
Armin Novak [Fri, 23 Oct 2015 10:07:36 +0000 (12:07 +0200)]
Fixed clipboard format for directory copy.
Armin Novak [Fri, 23 Oct 2015 09:31:54 +0000 (11:31 +0200)]
Fixed directory copy from remote to local.
Armin Novak [Thu, 22 Oct 2015 08:01:12 +0000 (10:01 +0200)]
Disabled file locking, added response checks.
Armin Novak [Thu, 22 Oct 2015 07:31:47 +0000 (09:31 +0200)]
Fixed clipboard file transfer.
Armin Novak [Thu, 22 Oct 2015 07:01:30 +0000 (09:01 +0200)]
Fixed clipboard file contents response and message to string.
Bernhard Miklautz [Fri, 23 Oct 2015 16:17:14 +0000 (18:17 +0200)]
winpr API: add EnvironmentBlockToEnvpA
* expose EnvironmentBlockToEnvpA
* cleanup includes in process.c
* removed unused "flag" variable in _CreateProcessExA
* make ProcessHandleCloseHandle static
Bernhard Miklautz [Fri, 23 Oct 2015 16:06:17 +0000 (18:06 +0200)]
winpr/stream: don't allow 0-size streams
Bernhard Miklautz [Fri, 23 Oct 2015 15:18:53 +0000 (17:18 +0200)]
winpr: fix compiler warning
winpr/libwinpr/utils/wlog/wlog.c: In function ‘WLog_PrintMessageVA’:
winpr/libwinpr/utils/wlog/wlog.c:234:7: warning: ‘status’ may be
used uninitialized in this function [-Wmaybe-uninitialized]
BOOL status;
^
gcc 4.9.2
Bernhard Miklautz [Fri, 23 Oct 2015 10:38:13 +0000 (12:38 +0200)]
Merge pull request #2945 from mfleisz/wlog_compile_fix
wlog: Fix variable definitions
Martin Fleisz [Fri, 23 Oct 2015 10:08:20 +0000 (12:08 +0200)]
wlog: Fix variable definitions
Vic Lee [Fri, 23 Oct 2015 07:59:07 +0000 (15:59 +0800)]
Merge pull request #2929 from mfleisz/cliprdr_fix
cliprdr/server: Don't call CloseHandle on ChannelEvent
Martin Fleisz [Fri, 23 Oct 2015 06:49:24 +0000 (08:49 +0200)]
cliprdr/server: Fix memory leak
David FORT [Thu, 22 Oct 2015 08:54:21 +0000 (10:54 +0200)]
Adapt to last wLog changes