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

conhost: Fix wrapping search in edit_line_find_in_history. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-01-04 21:13:50 +01:00 committed by Alexandre Julliard
parent 849e521dba
commit 105db4c538
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
programs/conhost/conhost.c
View File

@ -691,6 +691,7 @@ static void edit_line_find_in_history( struct console *console )
unsigned int len, oldoffset; unsigned int len, oldoffset;
WCHAR *line; WCHAR *line;
if (!console->history_index) return;
if (ctx->history_index && ctx->history_index == console->history_index) if (ctx->history_index && ctx->history_index == console->history_index)
{ {
start_pos--; start_pos--;
@ -699,28 +700,28 @@ static void edit_line_find_in_history( struct console *console )
do do
{ {
line = edit_line_history(console, ctx->history_index); line = edit_line_history(console, ctx->history_index);
if (ctx->history_index) ctx->history_index--; if (ctx->history_index) ctx->history_index--;
else ctx->history_index = console->history_index; else ctx->history_index = console->history_index - 1;
len = lstrlenW(line) + 1; len = lstrlenW(line) + 1;
if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) ))
{ {
/* need to clean also the screen if new string is shorter than old one */ /* need to clean also the screen if new string is shorter than old one */
edit_line_delete(console, 0, ctx->len); edit_line_delete(console, 0, ctx->len);
if (edit_line_grow(console, len)) if (edit_line_grow(console, len))
{ {
oldoffset = ctx->cursor; oldoffset = ctx->cursor;
ctx->cursor = 0; ctx->cursor = 0;
edit_line_insert( console, line, len - 1 ); edit_line_insert( console, line, len - 1 );
ctx->cursor = oldoffset; ctx->cursor = oldoffset;
free(line); free(line);
return; return;
} }
} }
free(line); free(line);
} }
while (ctx->history_index != start_pos); while (ctx->history_index != start_pos);
} }