Marc-André Moreau
5cb06ecc68
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2015-07-28 09:21:33 -04:00
Marc-André Moreau
dfa29804ad
Merge pull request #2799 from kaliway/scardlistreaders-fix
...
Smartcard Reader Connection Handling
2015-07-28 08:51:03 -04:00
Marc-André Moreau
611c194f80
Merge pull request #2801 from bmiklautz/fix/thread
...
winpr/thread: small cleanups
2015-07-28 08:47:06 -04:00
Marc-André Moreau
b33ea8aee9
Merge pull request #2804 from bmiklautz/fix/misc
...
Misc fixes
2015-07-28 08:46:27 -04:00
Marc-André Moreau
06c3f2fca4
Merge pull request #2793 from rkondratenko/pcsclite-transactions
...
Fix for transactions support for Smart Cards
2015-07-28 08:44:58 -04:00
Bernhard Miklautz
9fb6705380
rdpdr/printer: ignore unhanded packetID
...
Ignore packetIDs PRN_CACHE_DATA and PRN_USING_XPS instead of returning
an error.
2015-07-28 14:05:57 +02:00
Bernhard Miklautz
d9aca506d6
rdpsnd: include win32error.h
...
If using rdpsnd externally (for example in other projects) WIN32ERROR
needs to be defined otherwise some compilers might create a warning or
error.
2015-07-27 19:24:41 +02:00
Bernhard Miklautz
a342d40158
core/listner: fix possible problem in _free
2015-07-27 11:24:21 +02:00
Bernhard Miklautz
c3ea07f3d9
winpr/thread: don't close invalid file descriptors
...
In case the file descriptor is -1 don't call close.
2015-07-24 14:57:47 +02:00
Bernhard Miklautz
81d422588e
winrp/thread: don't call pthread_exit on return
...
As the pthread_exit man page states pthread_exit is called implicitly
when the start function returns.
2015-07-24 14:52:31 +02:00
Bernhard Miklautz
4250f3f030
winpr/event: remove critical section
...
The critical section isn't required and not used anymore since
commit 8a2220a3d9
.
2015-07-24 13:29:48 +02:00
Bernhard Miklautz
ca150f2255
winpr/thread: small cleanups
...
Also adds error checking of winpr_StartThread in winpr_StartThread.
2015-07-23 11:52:49 +02:00
Bernhard Miklautz
a637cdd9f7
Merge pull request #2789 from akallabeth/start_thread_fix
...
[Thread] Fixed mutex unlocking and return checks.
2015-07-23 11:14:39 +02:00
Petr Sumbera
903e484fed
Removes unused (big big) array. Adds ifdef for debug stuff.
2015-07-22 08:51:09 -07:00
Kirill Kotyagin
ef37487a44
channels/smartcard: fix possible mszReaders leak in smartcard_ListReaders(A/W)_Call
2015-07-22 17:25:17 +03:00
Kirill Kotyagin
76916d614b
channels/smartcard: make smartcard_ListReaders(A/W)_Call return PCSC error statuses to the server
2015-07-22 16:56:24 +03:00
Martin Haimberger
f65d15feeb
fixed audioserver
...
if no data could be read, the ERROR_NO_DATA is returend to
indicate a further read.
2015-07-22 03:16:46 -07:00
Martin Haimberger
58ada13dd9
fixed some remakes and compiler errors
2015-07-22 02:36:24 -07:00
Petr Sumbera
24ff3f256d
This array is so big that it eats whole stack for the thread and makes
...
the process dump core on some systems (e.g. Solaris).
2015-07-21 09:26:21 -07:00
Bernhard Miklautz
bfdf025e88
Merge pull request #2751 from realjiangms/shadow_fix_compile_error_win
...
server/shadow: Fix compile error on win32.
2015-07-20 17:23:23 +02:00
MartinHaimberger
08b17b5f64
Merge pull request #2 from bmiklautz/pull/2785
...
rdpsnd: restore old behavior and fixes
2015-07-20 15:10:55 +02:00
Bernhard Miklautz
f992568432
rdpsnd: restore old behavior and fixes
...
* oss: fix function signature
* autodetection - if only /sound is given all enabled
plugins are tried in order and the first successful loaded is used.
- this restores the previous behavior
* alsa/pulse fix command line parsing - no parameters shouldn't be
treated as error
2015-07-20 12:28:49 +02:00
Rostislav Kondratenko
3f81ff87a6
Removing private context on hCard so that transaction will properly unlock when context is released.
2015-07-17 18:13:41 +03:00
Rostislav Kondratenko
7248ea98d0
Fixing condition on SCardIsValidContext to be true when context is valid
2015-07-17 18:13:02 +03:00
Rostislav Kondratenko
f2863fabf5
Re-enabled PCSC-Lite transactions and fixed smartcard deinitialization so it will release all contexts to unblock calls waiting for transactions
2015-07-17 16:37:44 +03:00
MartinHaimberger
43a5680b03
Merge pull request #2791 from bmiklautz/100percent
...
transport: fix regression introduced with PR #2770
2015-07-17 12:30:20 +02:00
Bernhard Miklautz
458d3b1593
transport: fix regression introduced with PR #2770
...
When the event is reset in transport_check_fds xfreerdp doesn't work and
consumes 100% CPU (see #2790 ). On windows this is require otherwise the
CPU consumption is 100% there.
This quick fix only resets the event on windows. It's a working approach
but definitely not the final solution.
2015-07-17 12:06:41 +02:00
Armin Novak
9af2e22d51
Fixed mutex unlocking and return checks.
2015-07-16 17:07:29 +02:00
Vic Lee
042cb250f3
Merge pull request #2770 from akallabeth/bio_event_reset
...
Resetting frontBio after read now.
2015-07-16 06:57:46 -07:00
MartinHaimberger
45f9519b58
Merge pull request #2723 from akallabeth/pwd_from_stdin
...
New /from-stdin
2015-07-15 14:12:13 +02:00
MartinHaimberger
b0eccc9392
Merge pull request #2786 from mfleisz/fix_makecert
...
winpr/tools: Fixed x509_get_default_name failing with long computer names
2015-07-15 14:10:44 +02:00
Martin Haimberger
e682329eeb
fixed compiler errors
2015-07-15 03:17:38 -07:00
Martin Fleisz
1a6aba0130
winpr/tools: Fixed x509_get_default_name failing with long computer names
2015-07-15 11:47:01 +02:00
Martin Haimberger
6ab0187d84
Merge remote-tracking branch 'upstream/master' into mh-channel
...
Conflicts:
channels/audin/client/oss/audin_oss.c
channels/drive/client/drive_main.c
channels/printer/client/printer_cups.c
channels/printer/client/printer_main.c
channels/rail/client/rail_main.c
channels/rdpgfx/client/rdpgfx_main.c
channels/rdpsnd/client/oss/rdpsnd_oss.c
channels/remdesk/client/remdesk_main.c
channels/remdesk/server/remdesk_main.c
channels/tsmf/client/tsmf_media.c
2015-07-15 01:57:07 -07:00
Martin Haimberger
b8c110d19b
introduced channel error reporting system
...
The rdpContext gets an event which will
get set if an error occoured in a channel.
If a thread or a void callback has to report an
error it will get signaled by this system.
2015-07-15 00:50:35 -07:00
MartinHaimberger
b06d83ba80
Merge pull request #2766 from akallabeth/snprintf_to_sprintf_s
...
Replaced snprintf with sprintf_s
2015-07-15 09:47:43 +02:00
Bernhard Miklautz
c12bc0ec70
Merge pull request #2782 from bmiklautz/order_does_matter
...
x11: reorder xf_post_disconnect
2015-07-14 15:50:32 +02:00
Bernhard Miklautz
f589d5d6e0
x11: reorder xf_post_disconnect
...
Channels like EGFX need resources like the main window in order to
work correctly. Before the window, GDI,.. is freed it needs to be
ensured that all channels are stopped properly to prevent them to access
already freed resources. Disconnecting the channels first fixed a
possible race condition/SEGFAULT that could occur with remote initiated
disconnects.
2015-07-14 15:28:55 +02:00
MartinHaimberger
e2b4bf699e
Merge pull request #2781 from bmiklautz/fdread
...
winpr/synch: remove the dependency on winsock.h
2015-07-14 13:02:41 +02:00
Bernhard Miklautz
1a0253ef93
winpr/handle: define WINPR_FD_ on all platforms
2015-07-14 12:21:24 +02:00
Bernhard Miklautz
68e8569110
winpr/synch: remove the dependency on winsock.h
...
winsock.h pulls in a lot of defines and dependencies that are not
required and partially unwanted in winpr's core (for parts that are not
related to network). In order to get rid of this dependency and have an
independent defines for extended winpr functions the WINPR_FD_* defines
are used internally (and for exposed functions). Where required, like in
WSAEventSelect, the FD_* is mapped to WINPR_FD_*.
2015-07-14 11:39:41 +02:00
Bernhard Miklautz
920617e1bc
Merge pull request #2778 from akallabeth/cert_store_compare_fix
...
Fixed comparison bug, cleanup and error handling.
2015-07-13 17:52:18 +02:00
Armin Novak
fc929fbc7f
Using lowercase hostname for comparison now.
...
fixed argument mixup.
2015-07-13 15:52:06 +02:00
Armin Novak
ca7c34ff35
Fixed comparison bug, cleanup and error handling.
2015-07-13 14:16:04 +02:00
Armin Novak
098eda9873
Error checks for BIO_get_event
...
ResetEvent before reading data from transport BIO.
2015-07-09 12:20:22 +02:00
Martin Haimberger
d9e2834a70
channel smartcard hardend
2015-07-09 03:00:19 -07:00
Marc-André Moreau
aae86d61ce
channels/rdpgfx: fix TotalDecodedFrames counter
2015-07-08 14:16:29 -04:00
Marc-André Moreau
23f9b3bbc0
channels/rdpgfx: reset state on channel close
2015-07-08 11:17:56 -04:00
Marc-André Moreau
11f785290f
channels/drdynvc: use same status code as mstsc for DVC opening failure
2015-07-07 13:36:36 -04:00
Armin Novak
0120ee75ca
Resetting frontBio after read now.
2015-07-07 14:48:27 +02:00