Commit Graph

177 Commits

Author SHA1 Message Date
Jay Sorg
c1b7cbd657 merges from authentic8 2013-09-26 11:28:07 -07:00
Laxmikant Rashinkar
5e005bf26c Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-09-25 18:54:16 -07:00
Laxmikant Rashinkar
52fb1f9854 scard: added more messages 2013-09-25 18:54:05 -07:00
Laxmikant Rashinkar
06f01f6c37 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-09-24 17:19:43 -07:00
Laxmikant Rashinkar
379685bfca FUSE: we now process only one opendir command at a time 2013-09-24 17:19:10 -07:00
Jay Sorg
675e1b86c4 chansrv: work on smartcard 2013-09-24 11:17:50 -07:00
Jay Sorg
3b743f64eb chansrv: deadlock, add trans copy func 2013-09-23 18:08:22 -07:00
Jay Sorg
dfd78c722b chansrv: fix for deadlock 2013-09-23 12:16:52 -07:00
Laxmikant Rashinkar
db71bc5d8b smartcard: added more messages 2013-09-20 19:00:14 -07:00
Jay Sorg
9263b22cb2 chansrv: work on smartcard 2013-09-19 01:03:20 -07:00
Jay Sorg
d926a5becd chansrv: work on smartcard 2013-09-16 00:16:21 -07:00
Jay Sorg
b206de3314 pcsc: work on pcsclite lib 2013-09-16 00:10:04 -07:00
Laxmikant Rashinkar
0ef89c02ab scard: changed the way we store and pass context 2013-09-15 15:20:16 -07:00
Laxmikant Rashinkar
a1352b62e3 scard: added more messages 2013-09-15 13:52:07 -07:00
Jay Sorg
68371ed361 chansrv: work on smartcard 2013-09-14 12:59:42 -07:00
Jay Sorg
edf483ecb6 chansrv: work on smartcard 2013-09-14 12:57:34 -07:00
Laxmikant Rashinkar
215956353f scard: added support for connect call 2013-09-13 10:20:35 -07:00
Laxmikant Rashinkar
188ca68adb scard: added GetStatusChange() msg 2013-09-11 19:42:42 -07:00
Jay Sorg
2d112bac8f chansrv: work on smart card 2013-09-09 12:30:58 -07:00
Jay Sorg
a9f37229ac chansrv: work on smartcard 2013-09-08 14:22:53 -07:00
Jay Sorg
d22b8b5ed0 chansrv: added timeout callback 2013-09-07 23:54:36 -07:00
Laxmikant Rashinkar
ece8f1fb47 gracefully handle segfaults in chansrv code 2013-09-03 19:44:20 -07:00
Jim Grandy
b3ee3cbd4b Another merge error in sesman/chansrv/clipboar.c 2013-08-22 13:58:43 -07:00
Jim Grandy
72ec05d37e fix merge error in sesman/chansrv/clipboard.c 2013-08-22 13:50:04 -07:00
Jim Grandy
a308d2e25c Fix errors cause by previous merge (2361914) 2013-08-22 12:57:00 -07:00
Jim Grandy
b7b3d9ef28 Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce 2013-08-22 12:56:51 -07:00
Jim Grandy
81d206ba68 Hand-apply patch (rail: send ShowState when window order changes) from Authentic8: c36a2d7 2013-08-22 12:52:32 -07:00
Jim Grandy
142a93829b Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99 2013-08-22 12:52:32 -07:00
Jim Grandy
9d4205ba7a Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07 2013-08-22 12:52:31 -07:00
Jim Grandy
bd8083d7e2 Fix merge errors introduced in 3ae1b415 and 20ec9ee3 2013-08-22 12:52:31 -07:00
Jim Grandy
a32669f3ef Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61 2013-08-22 12:49:41 -07:00
Jim Grandy
173ed7056f Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c aef2dce 2013-08-22 12:49:41 -07:00
Jim Grandy
af4e42a08d Hand-apply patches (rail) from Authentic8: bc68076 2013-08-22 12:49:40 -07:00
Jim Grandy
2036010e0c Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878 2013-08-22 12:49:40 -07:00
Jim Grandy
53311f2b25 Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a 2013-08-22 12:49:40 -07:00
Jim Grandy
dfe5911b55 Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f 2013-08-22 12:49:40 -07:00
Jay Sorg
e602a28d5c common: transport aware when app is terminating 2013-08-17 13:32:53 -07:00
Laxmikant Rashinkar
09dd58c5e1 clipboard: enabled module logging 2013-08-14 20:00:52 -07:00
Laxmikant Rashinkar
6381941c78 FUSE: changed architecture to use opendir/readdir instead of just readdir 2013-08-11 18:06:39 -07:00
Laxmikant Rashinkar
d2de1b703b Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-08-09 19:44:05 -07:00
Laxmikant Rashinkar
23433c9c7e fuse: added support for detecting files/directories deleted locally 2013-08-09 19:43:45 -07:00
Jay Sorg
8b48e2274e chansrv: work on smartcard 2013-08-05 20:16:18 -07:00
Jay Sorg
e427113fa8 chansrv: work on smartcard redir 2013-08-05 01:10:57 -07:00
Jay Sorg
17bf2abe30 xorg driver, include cleanup 2013-07-23 20:57:38 -07:00
Jay Sorg
45492057c5 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-07-02 00:45:54 -07:00
Jay Sorg
29420b3134 chansrv: no logic change, work on warning 2013-07-02 00:45:40 -07:00
speidy
aab0176867 chansrv: fix for pulse simple method, to get it work again. 2013-06-25 00:00:32 +03:00
Jay Sorg
0aa3dbe738 chansrv: no logic change, EOL and coding style cleanup 2013-06-23 14:17:59 -07:00
Lukas Vacek
e7fe39a65b Fix sound and clipboard crashes
- In case clipboard is not initialized, clipboard_data_in returns
    (fixes a segfault)
- If less than 4 bytes are sent to sound_send_wave_data_chunk, it
  returns
    (fixes a segfault)
- When sending sound initiliazation messages set g_chan in chansrv to 0,
  so the server waits for client to reply (this makes sound work afte
  reconnecting)
- In process_message_channel_setup, clear any leftover data in
  chan_items
2013-06-22 21:57:16 +01:00
Laxmikant Rashinkar
78498f6682 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-06-08 18:44:34 -07:00