kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run indentation script

Browse Source
This commit is contained in:
Henrik Andersson 2017-08-15 10:50:08 +02:00
parent c07bfffabf
commit b25f93c0e6
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto.h
View File

@ -244,7 +244,7 @@ RD_BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, R
key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state);
void xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
RD_BOOL pressed, uint8 nesting);
uint16 xkeymap_translate_button(unsigned int button, uint16* input_type);
uint16 xkeymap_translate_button(unsigned int button, uint16 * input_type);
char *get_ksname(uint32 keysym);
void save_remote_modifiers(uint8 scancode);
void restore_remote_modifiers(uint32 ev_time, uint8 scancode);

6
ssl.c
View File

@ -205,7 +205,8 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), 0, NULL, NULL, 0);
#else
if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, NULL, key)) {
if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, NULL, key))
{
logger(Protocol, Error,
"rdssl_cert_to_key(), failed to get algorithm used for public key");
rdssl_log_ssl_errors("rdssl_cert_to_key()");
@ -213,7 +214,8 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
return NULL;
}
if (!(rsa = d2i_RSAPublicKey(NULL, &p, pklen))) {
if (!(rsa = d2i_RSAPublicKey(NULL, &p, pklen)))
{
logger(Protocol, Error,
"rdssl_cert_to_key(), failed to extract public key from certificate");
rdssl_log_ssl_errors("rdssl_cert_to_key()");

17
xkeymap.c
View File

@ -672,14 +672,13 @@ handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, RD_BOOL p
*/
if (pressed)
{
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS | KBD_FLAG_EXT1,
0x1d, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
0x45, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE | KBD_FLAG_EXT1,
0x1d, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE,
0x45, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
RDP_KEYPRESS | KBD_FLAG_EXT1, 0x1d, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x45, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE,
RDP_KEYRELEASE | KBD_FLAG_EXT1, 0x1d, 0);
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE, 0x45,
0);
}
return True;
break;
@ -874,7 +873,7 @@ xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint3
}
uint16
xkeymap_translate_button(unsigned int button, uint16* input_type)
xkeymap_translate_button(unsigned int button, uint16 * input_type)
{
*input_type = RDP_INPUT_MOUSE;