Commit Graph

8881 Commits

Author SHA1 Message Date
zihao.jiang
457413727f server/shadow: Fix alpha pointer message so that it allows pixel with both 'xor' and 'and'.
Original pointer alpha update message is too specific for x11 implementation.
It doesn't allow pointer alpha mask with both 'xor' color and 'and' mask, e.g.: the 'edit' pointer in windows text box.

1. Move shadow_client_convert_alpha_pointer_data to x11 implementation as it is specific for x11.
2. Update message definition to be more generic: to accept 'xor/and' mask directly.
Implementation of subsystem can implement its own way to convert pointer mask data.
3. Fixed fault handling to free the resource allocated.
2015-06-28 22:16:29 +08:00
Norbert Federa
20878e50fe Merge pull request #2724 from bmiklautz/leak_fix
Fix leaks in certificate and identity handling
2015-06-26 15:30:00 +02:00
Marc-André Moreau
cf2f4bf9cf Merge pull request #2737 from nfedera/nf-fix-gdi-return-value-weirdness
libfreerdp/gdi: fixed gdi return value madness
2015-06-26 09:24:08 -04:00
Bernhard Miklautz
77ef5a80de nla: clear identity memory before releasing 2015-06-26 15:12:33 +02:00
Norbert Federa
ac95b7274e Merge pull request #2727 from akallabeth/leak_fixes_reformat
Fixed leaks, NULL dereferences and broken init.
2015-06-26 15:01:08 +02:00
Norbert Federa
bb9536b867 libfreerdp/gdi: fixed gdi return value madness
Mostly booleanization to comply with the MS API
2015-06-26 14:32:38 +02:00
Marc-André Moreau
ddf2519f1e Merge pull request #2719 from bmiklautz/pull/2481
OSS, tsmf, usb and BSD fixes and improvements
2015-06-26 08:27:22 -04:00
Bernhard Miklautz
da021fe1a8 Merge pull request #2736 from akallabeth/windows_client_fix
Fixed windows client pre_connect return.
2015-06-26 14:20:37 +02:00
Norbert Federa
5281070045 Merge pull request #2734 from giox069/master
Fixes for software GDI issues #2732 and #2137
2015-06-26 13:15:56 +02:00
Armin Novak
8165031eb4 Fixed windows client pre_connect return. 2015-06-26 13:13:32 +02:00
Bernhard Miklautz
54c4dd6264 Merge pull request #2735 from akallabeth/clipboard_temp_file_name_conversion_fix
[Clipboard] Fixed out of bound array access.
2015-06-26 12:49:42 +02:00
Hardening
b411c11f6e Merge pull request #2729 from akallabeth/win_reg_key_by_vendor_product_define
Replaced hard coded registry keys with cmake defines.
2015-06-26 11:15:09 +02:00
Armin Novak
015754633d Fixed out of bound array access. 2015-06-26 09:50:21 +02:00
Giovanni Panozzo
8a45b567fc Returing OK when there is nothing to draw after clipping, fixes #2732 2015-06-25 16:54:08 +02:00
Giovanni Panozzo
85b5c5f890 Signed glyph offset calculation, fixes #2137 2015-06-25 16:49:29 +02:00
Norbert Federa
91353f00a8 Merge pull request #2731 from akallabeth/mutex_cleanup_fix
Fixed mutex trylock in MutexCloseHandle.
2015-06-25 12:39:12 +02:00
Armin Novak
b81aaa9cc2 Fixed mutex trylock in MutexCloseHandle. 2015-06-25 12:24:28 +02:00
Norbert Federa
a4c9a7f604 Merge pull request #2728 from bmiklautz/unsigned
Fix possible endless loops on cleanup.
2015-06-25 12:11:50 +02:00
Bernhard Miklautz
cbbc680131 clipboard: fix of by one error on cleanup 2015-06-25 11:53:03 +02:00
Bernhard Miklautz
28e63786cd Integrate pull request feedback
Use while instead of for with additional variable where appropriate.
2015-06-25 10:33:54 +02:00
Armin Novak
80ba4643dc Fixed cleanup of resources, only in error case now. 2015-06-24 14:59:59 +02:00
Armin Novak
e8bfa29bd2 Replaced registry keys with cmake defines. 2015-06-24 14:02:48 +02:00
Bernhard Miklautz
9f6fa7ef4c Fix possible endless loops on cleanup.
Some cleanup code possibly create endless loops because an unsigned
type was used as run variable but the check was >= 0 in the for loop.
2015-06-24 12:26:13 +02:00
Armin Novak
c78b6f38ab Fixed cleanup of MachineAddresses and MachinePorts. 2015-06-24 12:14:06 +02:00
Armin Novak
ee221315db Fixed loop condition. 2015-06-24 10:08:04 +02:00
Armin Novak
a809b87362 Fixed memory leak. 2015-06-24 10:02:42 +02:00
Armin Novak
4c9ee07eb6 Fixed sizeof misuse. 2015-06-24 10:02:30 +02:00
Armin Novak
2ff1205dde Fixed a resource leak. 2015-06-24 09:45:40 +02:00
Armin Novak
2e762c881c Fixed a resource leak. 2015-06-24 09:33:20 +02:00
Armin Novak
6ed7b7b4b3 Fixed a resource leak. 2015-06-24 09:29:52 +02:00
Armin Novak
f177430acc Fixed a resource leak. 2015-06-24 09:29:13 +02:00
Martin Fleisz
ccf5ba3194 Merge pull request #2717 from realjiangms/shadow_encoder_fps
server/shadow: shadow encoder related enhancement/fix.
2015-06-24 09:22:55 +02:00
Armin Novak
6698e24228 Fixed leaks, NULL dereferences and broken init. 2015-06-23 21:29:21 +02:00
Hardening
e5008d4b1b Merge pull request #2725 from akallabeth/warning_fixes_more_more_more
Warning fixes more more more
2015-06-23 19:32:26 +02:00
Armin Novak
e969049aa3 Removed unused variable and incorrect comment. 2015-06-23 16:20:59 +02:00
Armin Novak
fbbc1affd0 ifdef variables used with specific build options. 2015-06-23 16:20:59 +02:00
Bernhard Miklautz
2e87d0ee52 Fix leaks in certificate and identity handling 2015-06-23 15:40:37 +02:00
Bernhard Miklautz
5f7ebd493b Merge pull request #2721 from akallabeth/warning_fixes_some_more
Some warnings fixed
2015-06-23 14:30:23 +02:00
Armin Novak
063b10e8e4 Fixed memory leak. 2015-06-23 12:30:19 +02:00
Armin Novak
2f81d99327 Added missing argument checks. 2015-06-23 12:17:37 +02:00
Armin Novak
30ea9f5056 Fixed malloc with 0 size. 2015-06-23 12:12:59 +02:00
Armin Novak
d83af81295 Fixed uninitialized value. 2015-06-23 12:12:16 +02:00
Armin Novak
89eac97d0e Fixed uninitialized value. 2015-06-23 12:09:42 +02:00
Armin Novak
24fed46cda Fixed grabage return value. 2015-06-23 12:08:47 +02:00
Armin Novak
212db120e0 Fixed NULL pointer dereference. 2015-06-23 12:07:38 +02:00
Bernhard Miklautz
72fde88a8f tsmf_oss: fix compiler warning 2015-06-23 11:40:04 +02:00
Norbert Federa
e8d194c743 Merge pull request #2708 from bmiklautz/dupdup
alloc and strdup checks
2015-06-23 11:18:19 +02:00
Bernhard Miklautz
ff8d172a12 core: use error instead of debug
When the function would return with an error print an error message
instead of a debug message
2015-06-23 11:15:13 +02:00
Bernhard Miklautz
09445c2b0e nla and cmdline: integrated feedback
* fix possible problems with 0 size lengths
* add return value checks
2015-06-23 10:14:11 +02:00
zihao.jiang
e00655c3c2 server/shadow: shadow encoder related enhancement/fix.
1. Export fps related API so that subsystem implementation no longer need to know about details in encoder structure.
2. Discard frameList dictionary.
The 'value' in this dictionary is never used and not properly free'ed when client is disconnected.
The dictionary was used to calculate 'inflight' frame count. Once an ACK is received from client, an item in the dictionary is removed.
We then calculate 'inflight' frame by the count of the items in the dictionary.
However, some rdp clients (win7 mstsc) skips frame ACK if it is inactive, ACK of some frame would actually never arrive.
We actually don't need the dictionary. We only need to record the latest acknowledged frame id, and the difference between last sent frame id is the inflight frame count.
3. Minor fix in default fps calculation. encoder->frameAck is wrongly used as integer while it's actually bool flag.
2015-06-23 14:36:53 +08:00