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

conhost: Store title as zero terminated string. 

To make it usable for Windows functions.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-10-12 18:26:43 +02:00 committed by Alexandre Julliard
parent 1333aebe0b
commit b2487c17eb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/conhost/conhost.c
View File

@ -2271,12 +2271,12 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl
if (size) if (size)
{ {
if (!(title = malloc( size ))) return STATUS_NO_MEMORY; if (!(title = malloc( size + sizeof(WCHAR) ))) return STATUS_NO_MEMORY;
memcpy( title, in_title, size ); memcpy( title, in_title, size );
title[size / sizeof(WCHAR)] = 0;
} }
free( console->title ); free( console->title );
console->title = title; console->title = title;
console->title_len = size;
if (console->tty_output) if (console->tty_output)
{ {
@ -2284,9 +2284,11 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl
char *vt; char *vt;
tty_write( console, "\x1b]0;", 4 ); tty_write( console, "\x1b]0;", 4 );
len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR),
NULL, 0, NULL, NULL);
if ((vt = tty_alloc_buffer( console, len ))) if ((vt = tty_alloc_buffer( console, len )))
WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR),
vt, len, NULL, NULL );
tty_write( console, "\x07", 1 ); tty_write( console, "\x07", 1 );
tty_sync( console ); tty_sync( console );
} }
@ -2503,10 +2505,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code,
{ {
WCHAR *result; WCHAR *result;
if (in_size) return STATUS_INVALID_PARAMETER; if (in_size) return STATUS_INVALID_PARAMETER;
TRACE( "returning title %s\n", debugstr_wn(console->title, TRACE( "returning title %s\n", debugstr_w(console->title) );
console->title_len / sizeof(WCHAR)) ); *out_size = min( *out_size, console->title ? wcslen( console->title ) * sizeof(WCHAR) : 0 );
if (!(result = alloc_ioctl_buffer( *out_size = min( *out_size, console->title_len )))) if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY;
return STATUS_NO_MEMORY;
if (*out_size) memcpy( result, console->title, *out_size ); if (*out_size) memcpy( result, console->title, *out_size );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

1
programs/conhost/conhost.h
View File

@ -88,7 +88,6 @@ struct console
struct edit_line edit_line; /* edit line context */ struct edit_line edit_line; /* edit line context */
struct console_window *window; struct console_window *window;
WCHAR *title; /* console title */ WCHAR *title; /* console title */
size_t title_len; /* length of console title */
struct history_line **history; /* lines history */ struct history_line **history; /* lines history */
unsigned int history_size; /* number of entries in history array */ unsigned int history_size; /* number of entries in history array */
unsigned int history_index; /* number of used entries in history array */ unsigned int history_index; /* number of used entries in history array */