zihao.jiang [Mon, 15 Jun 2015 11:37:26 +0000 (19:37 +0800)]
server/shadow: integrate comment from @hardening
Return directly at subsystem->ClientConnect
Also change to argument to accept shadow_client instead of freerdp_peer
zihao.jiang [Wed, 8 Apr 2015 17:37:41 +0000 (01:37 +0800)]
server/shadow: add connect/disconnect anchor in subsystem callback
Other implementation of subsystem may want to track connect/disconnect of each client
Norbert Federa [Mon, 8 Jun 2015 15:57:24 +0000 (17:57 +0200)]
Merge pull request #2683 from nfedera/fix-shadow-server
server/shadow: resuscitate shadow server
Norbert Federa [Mon, 8 Jun 2015 14:34:45 +0000 (16:34 +0200)]
server/shadow: prevent memcopy of NULL area
Norbert Federa [Mon, 8 Jun 2015 13:55:11 +0000 (15:55 +0200)]
server/shadow: resuscitate shadow server
shadow_client_refresh_rect returned FALSE if the areas parameter
was NULL. It may only do so if the count parameter is > 0.
Bernhard Miklautz [Mon, 8 Jun 2015 12:17:50 +0000 (14:17 +0200)]
Merge pull request #2676 from nfedera/fix-hresult-xxx
winpr: fixed some misuses of S_FALSE
Norbert Federa [Wed, 3 Jun 2015 14:05:19 +0000 (16:05 +0200)]
winpr: fix PathCchAppend
Fix incorrect usage of S_FALSE which was used to indicate errors
although it is a HRESULT success code.
Make this function behave like the Windows 8 implementation and
the according MSDN specification.
- return E_INVALIDARG instead of S_FALSE if pszPath is NULL
- return E_INVALIDARG instead of S_FALSE if pszMore is NULL
- return E_INVALIDARG if cchPath is zero
- return E_INVALIDARG if cchPath is greater than PATHCCH_MAX_CCH
- return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) if the combined
path size exceeds cchPath (this is the same HRESULT which the Windows
implementation returns in this case and which is referred to as
PATHCCH_E_FILENAME_TOO_LONG on msdn)
Also extended/fixed the TestPathCchAppend ctest
Norbert Federa [Wed, 3 Jun 2015 11:53:39 +0000 (13:53 +0200)]
winpr: fix PathCchStripPrefix
And again S_FALSE was incorrectly used to indicate an error.
Fix this and be more compatible to the Windows 8 implementation of
this function:
- return E_INVALIDARG instead of S_FALSE if pszPath is NULL
- return E_INVALIDARG instead of S_FALSE if cchPath < 4
- return E_INVALIDARG if cchPath > PATHCCH_MAX_CCH
- allow stripping of "\\?\c:" and don't require "\\?\c:\"
- verify that the character at the drive letter position is
actually an alphabetic character
- since the passed pszPath must not necessarily be null terminated
and we always have enough space after the memmove we can always
ensure the null termination of the stripped result
Also extended/fixed the TestPathCchStripPrefixctest
Norbert Federa [Tue, 2 Jun 2015 20:21:57 +0000 (22:21 +0200)]
winpr: fix PathCchAddExtension
The HRESULT S_FALSE does not indicate an error:
- return E_INVALIDARG instead of S_FALSE
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) instead of S_FALSE
Also extended/fixed the corresponding ctest
Norbert Federa [Tue, 2 Jun 2015 19:38:49 +0000 (21:38 +0200)]
winpr: fix PathCchAddBackslashEx
The HRESULT S_FALSE does not indicate an error:
- return E_INVALIDARG instead of S_FALSE
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) instead of S_FALSE
Also extended/fixed the corresponding ctest
Norbert Federa [Tue, 2 Jun 2015 19:36:31 +0000 (21:36 +0200)]
winpr: fix PathCchAddBackslash
The HRESULT S_FALSE does not indicate an error:
- return E_INVALIDARG instead of S_FALSE
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) instead of S_FALSE
Also extended/fixed the corresponding ctest
Norbert Federa [Tue, 2 Jun 2015 19:15:46 +0000 (21:15 +0200)]
client/windows: invalid usage of S_FALSE HRESULT
S_FALSE is a success code and not an error (note the S_)
Bernhard Miklautz [Wed, 3 Jun 2015 08:05:09 +0000 (10:05 +0200)]
Merge pull request #2673 from nfedera/fix-hresult
winpr: fixed HRESULT & SCODE types, added a ctest
Norbert Federa [Tue, 2 Jun 2015 17:52:52 +0000 (19:52 +0200)]
winpr: fixed HRESULT & SCODE types, added a ctest
- HRESULT was unsigned which means that until now all usages of the
SUCCEDED(hr) and FAILED(hr) macros never detected any errors
- Also fixed the (unused) SCODE typedef
- Added new ctest TestTypes
Hardening [Tue, 2 Jun 2015 17:22:29 +0000 (19:22 +0200)]
Merge pull request #2672 from akallabeth/img_test_fix
Fixed for TestImage unit test
Armin Novak [Tue, 2 Jun 2015 15:54:27 +0000 (17:54 +0200)]
Writing failure to stderr.
Armin Novak [Tue, 2 Jun 2015 15:53:16 +0000 (17:53 +0200)]
Fixed image test.
Armin Novak [Tue, 2 Jun 2015 13:17:54 +0000 (15:17 +0200)]
Fixed image test.
Marc-André Moreau [Tue, 2 Jun 2015 13:15:29 +0000 (09:15 -0400)]
Merge pull request #2649 from xhaakon/cross-monitor-subrect
shadow_screen: allow sub-rectangle to span multiple monitors
MartinHaimberger [Tue, 2 Jun 2015 10:38:21 +0000 (12:38 +0200)]
Merge pull request #2669 from llyzs/h264
h264: add encoder constant QP rate control.
Vic Lee [Tue, 2 Jun 2015 07:28:36 +0000 (15:28 +0800)]
h264: add encoder constant QP rate control.
Hardening [Fri, 29 May 2015 15:58:30 +0000 (17:58 +0200)]
Merge pull request #2658 from hardening/fix_2657
Fix for #2657
Hardening [Fri, 29 May 2015 12:38:58 +0000 (14:38 +0200)]
Merge pull request #2647 from hardening/fix_message_queue
Fixed MessageQueue and callers
David FORT [Wed, 27 May 2015 15:35:25 +0000 (17:35 +0200)]
Take in account nfedera's remarks
David FORT [Tue, 26 May 2015 13:49:38 +0000 (15:49 +0200)]
Check some return values
David FORT [Tue, 26 May 2015 12:50:13 +0000 (14:50 +0200)]
Added misc checks in rdg.c
David FORT [Mon, 25 May 2015 20:55:37 +0000 (22:55 +0200)]
Fixed nfedera's remarks
David FORT [Sat, 23 May 2015 20:47:18 +0000 (22:47 +0200)]
Fixed MessageQueue and callers
Hardening [Fri, 29 May 2015 12:12:59 +0000 (14:12 +0200)]
Merge pull request #2661 from MartinHaimberger/mh-stream-fix
stream: check stream_new in winpr and libfreerdp
Martin Haimberger [Fri, 29 May 2015 11:46:50 +0000 (04:46 -0700)]
stream: check stream_new in winpr and libfreerdp
also fixed a few things
Hardening [Fri, 29 May 2015 08:49:42 +0000 (10:49 +0200)]
Merge pull request #2608 from oshogbo/master
Add check to protect memcpy(3) from using NULL pointer.
Hardening [Thu, 28 May 2015 20:58:15 +0000 (22:58 +0200)]
Merge pull request #2642 from hardening/shadow_fix
Specify to skip compression with remoteFx frames
Hardening [Thu, 28 May 2015 20:57:17 +0000 (22:57 +0200)]
Merge pull request #2659 from oshogbo/unused
Remove unused variable.
Hardening [Thu, 28 May 2015 09:09:07 +0000 (11:09 +0200)]
Merge pull request #2660 from nfedera/fix-tsmf-channel
tsmf: fix invalid check and a potential segfault
Hardening [Thu, 28 May 2015 08:51:53 +0000 (10:51 +0200)]
Merge pull request #2646 from eledoux/thread_list
fixed a synchronization issue on thread_list
Norbert Federa [Thu, 28 May 2015 08:49:38 +0000 (10:49 +0200)]
tsmf: fix invalid check and a potential segfault
This resuscitates tsmf which was accidently broken in commit
f8120919
Emmanuel Ledoux [Wed, 27 May 2015 16:24:56 +0000 (18:24 +0200)]
winpr-thread: added HP's copyright
Emmanuel Ledoux [Wed, 27 May 2015 16:15:17 +0000 (18:15 +0200)]
winpr-thread: thread_list's synchronization based on a pthread_cond_t
Mariusz Zaborski [Wed, 27 May 2015 14:04:06 +0000 (16:04 +0200)]
Remove unused variable.
David FORT [Wed, 27 May 2015 13:13:43 +0000 (15:13 +0200)]
Fix for #2657
Marc-André Moreau [Wed, 27 May 2015 13:00:22 +0000 (09:00 -0400)]
Merge pull request #2653 from bmiklautz/lzcnt
winpr: add intrin.h
Bernhard Miklautz [Wed, 27 May 2015 08:32:08 +0000 (10:32 +0200)]
winpr/test: incorporate comments from pull request
* Fix TestIntrinsics - always returned 0
* rename TestWinpr to TestWinPR for consistency
* update gitignores accordingly
Emmanuel Ledoux [Tue, 26 May 2015 16:15:57 +0000 (18:15 +0200)]
winpr-thread: a better error message and comments about thread_list
Emmanuel Ledoux [Tue, 26 May 2015 15:55:27 +0000 (17:55 +0200)]
winpr-thread: added an assertion to enforce that thread_list is correctly set
Emmanuel Ledoux [Tue, 26 May 2015 15:40:34 +0000 (17:40 +0200)]
winpr-thread: thread_list's synchronization based on an Event
Bernhard Miklautz [Tue, 26 May 2015 14:41:29 +0000 (16:41 +0200)]
winpr: add intrin.h
Exposing lzcnt in crt.h might causes compiler errors (redefinition) with
recent versions of gcc (>=4.9) when winpr is included in other projects.
As lzcnt isn't part of crt according to MSDN and also shouldn't be
exported by default it was moved to intrin.h.
The related test was also moved to the top level directory of winpr.
Mariusz Zaborski [Tue, 26 May 2015 13:33:12 +0000 (15:33 +0200)]
In c file the name is channelId.
Hardening [Tue, 26 May 2015 14:10:41 +0000 (16:10 +0200)]
Merge pull request #2654 from oshogbo/typos
Typo
Hardening [Tue, 26 May 2015 06:39:08 +0000 (08:39 +0200)]
Merge pull request #2652 from nfedera/fix-ios-context-new
client/iOS: fix ios_context_new
Norbert Federa [Mon, 25 May 2015 20:21:53 +0000 (22:21 +0200)]
client/iOS: fix ios_context_new
- fixed wrong signature since ContextNew is BOOL now
- added error checking
Jakub Adam [Mon, 25 May 2015 11:44:51 +0000 (13:44 +0200)]
shadow_screen: allow sub-rectangle to span multiple monitors
When we share a sub-rectangle of our desktop, allow it to span over
multiple monitors. Previously it was possible to export an area larger
than one display, however the contents were always cropped to
the boundaries of the selected monitor and the rest was visible for
the client only as a black area .
Mariusz Zaborski [Mon, 11 May 2015 14:21:02 +0000 (16:21 +0200)]
Add check to protect memcpy(3) from using NULL pointer.
The ntlm_construct_challenge_target_info function can potentially pass NULL as
argument to the ntlm_av_pair_add function (for example DnsDomainName.Buffer).
This NULL finally lands in the CopyMemory (which is macro to the memcpy(3)
function) which can't handle NULL.
Marc-André Moreau [Fri, 22 May 2015 18:30:11 +0000 (14:30 -0400)]
Merge pull request #2639 from awakecoding/master
WLog, server-side rdpdr, remote assistance, byteswap, etc
Marc-André Moreau [Fri, 22 May 2015 18:15:31 +0000 (14:15 -0400)]
Merge pull request #2644 from xhaakon/shadow-server-disposal
shadow_client: dispose encomsp and remdesk
Marc-André Moreau [Fri, 22 May 2015 18:15:09 +0000 (14:15 -0400)]
Merge pull request #2643 from xhaakon/shadow-server-client-disconnect
Don't dispose shadow server before all clients have disconnected
Marc-André Moreau [Fri, 22 May 2015 18:14:57 +0000 (14:14 -0400)]
freerdp: patch multiple leaks and OOM errors
Emmanuel Ledoux [Fri, 22 May 2015 17:17:30 +0000 (19:17 +0200)]
winpr-thread: better error message upon a failure of TestThreadExitThread
Emmanuel Ledoux [Fri, 22 May 2015 16:28:10 +0000 (18:28 +0200)]
winpr-thread:
- added the unit test: TestThreadExitThread
- fix: ensure thread_list to be up to date before to call ExitThread()
- possibly resolved: Problems with serial redirection #2389
Marc-André Moreau [Fri, 22 May 2015 14:03:21 +0000 (10:03 -0400)]
libwinpr-shell: use getpwnam_r
Jakub Adam [Fri, 22 May 2015 07:29:16 +0000 (09:29 +0200)]
shadow_client: dispose encomsp and remdesk
Their threads were kept running after the client's exit.
Jakub Adam [Thu, 21 May 2015 12:32:10 +0000 (14:32 +0200)]
Don't dispose shadow server before all clients have disconnected
Ensure all client threads are disconnected before we stop the server
thread and thus make it available for deletion. We do this because
shadow_client_context_free() accesses rdpShadowServer structure, which
we have to keep alive as long as it is needed.
Calling shadow_client_context_free() after shadow_server_stop() and
shadow_server_free() were called may have caused an application crash.
Bernhard Miklautz [Fri, 22 May 2015 11:36:00 +0000 (13:36 +0200)]
Merge pull request #2638 from kwitaszczyk/master
Assign peer to settings when a new RDP module is being initialized.
David FORT [Fri, 22 May 2015 09:12:41 +0000 (11:12 +0200)]
Specify to skip compression with remoteFx frames
Hardening [Fri, 22 May 2015 07:56:59 +0000 (09:56 +0200)]
Merge pull request #2640 from xsumbe00/master
winsock.c Solaris build fixes
Marc-André Moreau [Thu, 21 May 2015 20:50:29 +0000 (16:50 -0400)]
channels/rdpdr: add more server-side error checking
Petr Sumbera [Thu, 21 May 2015 20:24:03 +0000 (13:24 -0700)]
winsock.c Solaris build fixes
Marc-André Moreau [Thu, 21 May 2015 20:08:46 +0000 (16:08 -0400)]
channels/rdpdr: treat OOM and status failures in server-side code
Marc-André Moreau [Thu, 21 May 2015 18:33:38 +0000 (14:33 -0400)]
channels/rdpdr: cleanup server-side rdpdr code
Marc-André Moreau [Thu, 21 May 2015 17:29:59 +0000 (13:29 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Thu, 21 May 2015 17:25:35 +0000 (13:25 -0400)]
libwinpr-utils: update backtrace utils
Konrad Witaszczyk [Thu, 21 May 2015 14:54:19 +0000 (16:54 +0200)]
Assign peer to settings when a new RDP module is being initialized.
Bernhard Miklautz [Thu, 21 May 2015 14:21:09 +0000 (16:21 +0200)]
Merge pull request #2637 from nfedera/fix-shadow_client_context_cleanup
shadow/client context cleanup and unused vars fix
Marc-André Moreau [Thu, 21 May 2015 14:17:54 +0000 (10:17 -0400)]
Merge pull request #2583 from bceverly/OpenBSD-cleanup
Two minor source code changes to remove warnings
Norbert Federa [Thu, 21 May 2015 08:56:56 +0000 (10:56 +0200)]
shadow/client context cleanup and unused vars fix
Norbert Federa [Thu, 21 May 2015 14:04:26 +0000 (16:04 +0200)]
Merge pull request #2630 from hardening/new_2616
Add checks for some XXX_New and XXX_Add functions
Marc-André Moreau [Wed, 20 May 2015 20:26:31 +0000 (16:26 -0400)]
Merge pull request #2557 from realjiangms/shadow_fix_hang2395
shadow fix multi-client hang
Hardening [Wed, 20 May 2015 19:19:20 +0000 (21:19 +0200)]
Merge pull request #2632 from akallabeth/client_bandwidth_measurement_callback
Added client bandwidth measurement result callback.
David FORT [Wed, 20 May 2015 19:01:46 +0000 (21:01 +0200)]
Fixed declaration of xf_event_action_script_init()
David FORT [Wed, 20 May 2015 17:19:50 +0000 (19:19 +0200)]
Take in account nfedera's review
Bryan Everly [Wed, 20 May 2015 16:17:05 +0000 (12:17 -0400)]
Fixed mistake with bitwise operator in previous two commits
Marc-André Moreau [Wed, 20 May 2015 15:40:48 +0000 (11:40 -0400)]
Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP
Conflicts:
channels/rdpdr/server/rdpdr_main.c
Marc-André Moreau [Wed, 20 May 2015 15:27:36 +0000 (11:27 -0400)]
cmake: add PULSE_FOUND variable to FindPulse.cmake
Bryan Everly [Wed, 20 May 2015 14:52:24 +0000 (10:52 -0400)]
Moved thread code to OpenBSD only
Armin Novak [Wed, 20 May 2015 08:47:24 +0000 (10:47 +0200)]
Added client bandwidth measurement result callback.
Marc-André Moreau [Wed, 20 May 2015 14:12:24 +0000 (10:12 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
client/Windows/wf_client.c
libfreerdp/common/assistance.c
Marc-André Moreau [Wed, 20 May 2015 13:41:18 +0000 (09:41 -0400)]
Merge pull request #2633 from clivest/progressive_codec_new_surface_fix
Fix rounding error in progressive codec surface new
Marc-André Moreau [Wed, 20 May 2015 13:40:24 +0000 (09:40 -0400)]
Merge pull request #2635 from clivest/gdi_gfx_leaked_regions_fix
Fix two memory leaks in gdi/gfx
Clive Stevens [Wed, 20 May 2015 11:35:24 +0000 (12:35 +0100)]
Fix two cases of leaked regions in gdi/gfx
Clive Stevens [Wed, 20 May 2015 11:26:58 +0000 (12:26 +0100)]
Fix rounding error in progressive codec
The grid is composed of 64x64 blocks and should not be smaller
than the surface. If width or height were not a multiple of 64
the previous rounding resulted in a grid smaller than the surface.
David FORT [Tue, 19 May 2015 11:54:43 +0000 (13:54 +0200)]
Fixed last VirtualChannelEntry
David FORT [Tue, 19 May 2015 11:48:57 +0000 (13:48 +0200)]
Fixed functions that return BOOLs
Bernhard Miklautz [Tue, 19 May 2015 09:07:42 +0000 (11:07 +0200)]
Merge pull request #2627 from nfedera/fix-x11-polyregion
client/x11: fix + simplify invalidate_poly_region
Norbert Federa [Mon, 18 May 2015 23:07:51 +0000 (01:07 +0200)]
client/x11: fix + simplify invalidate_poly_region
Marc-André Moreau [Mon, 18 May 2015 12:55:48 +0000 (08:55 -0400)]
Merge pull request #2624 from kwitaszczyk/master
QueryContextAttributes shouldn't return an error when a user or a domain is empty.
Bernhard Miklautz [Mon, 18 May 2015 09:36:31 +0000 (11:36 +0200)]
smartcard: fix compiler warnings
gcc 4.7.2:
warning: passing argument 1 of ‘free’ discards ‘const’ qualifier from
pointer target type
Hardening [Mon, 18 May 2015 09:28:00 +0000 (11:28 +0200)]
Add checks for some XXX_New and XXX_Add functions
Based on PR #2616
Konrad Witaszczyk [Mon, 18 May 2015 07:42:17 +0000 (09:42 +0200)]
QueryContextAttributes shouldn't return an error when a user or a domain
is empty.
Hardening [Sun, 17 May 2015 19:40:38 +0000 (21:40 +0200)]
Merge pull request #2623 from nfedera/fix-xfclient-if-semicolons
client/x11: fixed if statements with empty body
Norbert Federa [Sun, 17 May 2015 16:24:11 +0000 (18:24 +0200)]
client/x11: fixed if statements with empty body
Marc-André Moreau [Fri, 15 May 2015 12:37:10 +0000 (08:37 -0400)]
Merge pull request #2622 from kwitaszczyk/master
Pass valid context to CompleteAuthToken function in Negotiate Security Package.