ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Properly manage UTF-8 (and any wcs) input strings.

Browse Source
This commit is contained in:
Eric Pouech 2011-01-24 22:13:32 +01:00 committed by Alexandre Julliard
parent ff057db675
commit aee674c9b8
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/kernel32/console.c
View File

@ -1101,8 +1101,9 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in
{ {
enum read_console_input_return ret; enum read_console_input_return ret;
char input[8]; char input[8];
WCHAR inputw[8];
int i; int i;
size_t idx = 0; size_t idx = 0, idxw;
unsigned numEvent; unsigned numEvent;
INPUT_RECORD ir[8]; INPUT_RECORD ir[8];
DWORD written; DWORD written;
@ -1157,12 +1158,21 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in
break; break;
case -1: case -1:
/* we haven't found the string into key-db, push full input string into server */ /* we haven't found the string into key-db, push full input string into server */
for (i = 0; i < idx; i++) idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, sizeof(inputw) / sizeof(inputw[0]));
/* we cannot translate yet... likely we need more chars (wait max 1/2s for next char) */
if (idxw == 0)
{ {
numEvent = TERM_FillSimpleChar(input[i], ir); timeout = 500;
next_char = TRUE;
break;
}
for (i = 0; i < idxw; i++)
{
numEvent = TERM_FillSimpleChar(inputw[i], ir);
WriteConsoleInputW(handle, ir, numEvent, &written); WriteConsoleInputW(handle, ir, numEvent, &written);
} }
ret = idx == 0 ? rci_timeout : rci_gotone; ret = rci_gotone;
break; break;
default: default:
/* we got a transformation from key-db... push this into server */ /* we got a transformation from key-db... push this into server */

2
dlls/kernel32/console_private.h
View File

@ -36,7 +36,7 @@ extern WCHAR* CONSOLE_Readline(HANDLE, BOOL);
/* term.c */ /* term.c */
extern BOOL TERM_Init(void); extern BOOL TERM_Init(void);
extern BOOL TERM_Exit(void); extern BOOL TERM_Exit(void);
extern unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir); extern unsigned TERM_FillSimpleChar(WCHAR real_inchar, INPUT_RECORD* ir);
extern int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir); extern int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir);
#endif /* __WINE_CONSOLE_PRIVATE_H */ #endif /* __WINE_CONSOLE_PRIVATE_H */

11
dlls/kernel32/term.c
View File

@ -87,11 +87,10 @@ static inline void init_complex_char(INPUT_RECORD* ir, BOOL down, WORD vk, WORD
* TERM_FillSimpleChar * TERM_FillSimpleChar
* *
*/ */
unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir) unsigned TERM_FillSimpleChar(WCHAR real_inchar, INPUT_RECORD* ir)
{ {
unsigned vk; unsigned vk;
unsigned inchar; WCHAR inchar;
char ch;
unsigned numEvent = 0; unsigned numEvent = 0;
DWORD cks = 0; DWORD cks = 0;
@ -110,8 +109,7 @@ unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir)
inchar = real_inchar; inchar = real_inchar;
break; break;
} }
if ((inchar & ~0xFF) != 0) FIXME("What a char (%u)\n", inchar); vk = (inchar < 256) ? vkkeyscan_table[inchar] : 0;
vk = vkkeyscan_table[inchar];
if (vk & 0x0100) if (vk & 0x0100)
init_complex_char(&ir[numEvent++], 1, 0x2a, 0x10, SHIFT_PRESSED); init_complex_char(&ir[numEvent++], 1, 0x2a, 0x10, SHIFT_PRESSED);
if ((vk & 0x0200) || (unsigned char)real_inchar <= 26) if ((vk & 0x0200) || (unsigned char)real_inchar <= 26)
@ -132,8 +130,7 @@ unsigned TERM_FillSimpleChar(unsigned real_inchar, INPUT_RECORD* ir)
ir[numEvent].Event.KeyEvent.wVirtualKeyCode = vk; ir[numEvent].Event.KeyEvent.wVirtualKeyCode = vk;
ir[numEvent].Event.KeyEvent.wVirtualScanCode = mapvkey_0[vk & 0x00ff]; /* VirtualKeyCodes to ScanCode */ ir[numEvent].Event.KeyEvent.wVirtualScanCode = mapvkey_0[vk & 0x00ff]; /* VirtualKeyCodes to ScanCode */
ch = inchar; ir[numEvent].Event.KeyEvent.uChar.UnicodeChar = inchar;
MultiByteToWideChar(CP_UNIXCP, 0, &ch, 1, &ir[numEvent].Event.KeyEvent.uChar.UnicodeChar, 1);
ir[numEvent + 1] = ir[numEvent]; ir[numEvent + 1] = ir[numEvent];
ir[numEvent + 1].Event.KeyEvent.bKeyDown = 0; ir[numEvent + 1].Event.KeyEvent.bKeyDown = 0;