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

kernelbase: Avoid unneeded GetConsoleOutputCP calls. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-07-17 13:55:20 +02:00 committed by Alexandre Julliard
parent f16a631c2a
commit 6039b78594
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/kernelbase/console.c
View File

@ -133,9 +133,8 @@ static void input_records_AtoW( INPUT_RECORD *buffer, int count )
}
/* map char infos to ASCII */
static void char_info_WtoA( CHAR_INFO *buffer, int count )
static void char_info_WtoA( UINT cp, CHAR_INFO *buffer, int count )
{
UINT cp = GetConsoleOutputCP();
char ch;
while (count-- > 0)
@ -889,8 +888,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputA( HANDLE handle, CHAR_INFO *buff
ret = ReadConsoleOutputW( handle, buffer, size, coord, region );
if (ret && region->Right >= region->Left)
{
UINT cp = GetConsoleOutputCP();
for (y = 0; y <= region->Bottom - region->Top; y++)
char_info_WtoA( &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 );
char_info_WtoA( cp, &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 );
}
return ret;
}
@ -1583,19 +1583,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST
if (length > 0)
{
UINT cp = GetConsoleOutputCP();
if (!str)
{
SetLastError( ERROR_INVALID_ACCESS );
return FALSE;
}
lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 );
lenW = MultiByteToWideChar( cp, 0, str, length, NULL, 0 );
if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) )))
{
SetLastError( ERROR_NOT_ENOUGH_MEMORY );
return FALSE;
}
MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, strW, lenW );
MultiByteToWideChar( cp, 0, str, length, strW, lenW );
}
ret = WriteConsoleOutputCharacterW( handle, strW, lenW, coord, written );
HeapFree( GetProcessHeap(), 0, strW );