mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iOS: Compile fixes (Fixed #1069, #1086)

This commit is contained in:
Martin Fleisz 2013-03-13 15:08:45 +01:00
parent 7b07cb7094
commit 96a2717b3c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/iOS/Models/RDPKeyboard.m
View File

@ -286,14 +286,14 @@
// sends the vk code to the session
- (void)sendVirtualKey:(int)vKey up:(BOOL)up
{
RDP_SCANCODE scancode = freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(vKey);
DWORD scancode = GetVirtualScanCodeFromVirtualKeyCode(vKey, 4);
int flags = (up ? KBD_FLAGS_RELEASE : KBD_FLAGS_DOWN);
flags |= (RDP_SCANCODE_EXTENDED(scancode) ? KBD_FLAGS_EXTENDED : 0);
flags |= ((scancode & KBDEXT) ? KBD_FLAGS_EXTENDED : 0);
[_session sendInputEvent:[NSDictionary dictionaryWithObjectsAndKeys:
@"keyboard", @"type",
@"scancode", @"subtype",
[NSNumber numberWithUnsignedShort:flags], @"flags",
[NSNumber numberWithUnsignedShort:RDP_SCANCODE_CODE(scancode)], @"scancode",
[NSNumber numberWithUnsignedShort:(scancode & 0xFF)], @"scancode",
nil]];
}

8
winpr/libwinpr/utils/print.c
View File

@ -386,7 +386,7 @@ static int vsprintf_help(unsigned c, void **ptr)
return 0;
}
int vsprintf(char *buf, const char *fmt, va_list args)
int wvsprintfx(char *buf, const char *fmt, va_list args)
{
int status;
@ -401,7 +401,7 @@ static int discard(unsigned c_UNUSED, void **ptr_UNUSED)
return 0;
}
int sprintf(char *buf, const char *fmt, ...)
int wsprintfx(char *buf, const char *fmt, ...)
{
va_list args;
int status;
@ -424,7 +424,7 @@ int vprintf_help(unsigned c, void **ptr_UNUSED)
return 0;
}
int vprintf(const char *fmt, va_list args)
int wvprintfx(const char *fmt, va_list args)
{
return do_printf(fmt, args, vprintf_help, NULL);
}
@ -435,7 +435,7 @@ int wprintfx(const char *fmt, ...)
int status;
va_start(args, fmt);
status = vprintf(fmt, args);
status = wvprintfx(fmt, args);
va_end(args);
return status;