Skip to content

W
wine-cw
Commit b17eb271 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard
Browse files
Options

conhost: Copy Character Attributes (colors) to the new screen buffer.

CreateConsoleScreenBuffer() copies the Character Attributes (colors) to the new screen buffer when called. Signed-off-by: 's avatarHugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5ee5d7bb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/kernel32/tests/console.c
View file @ b17eb271
......@@ -1047,7 +1047,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut)
ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError());
CloseHandle(hConOut2);
todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: "
ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: "
"got %#x, expected %#x\n", csbi2.wAttributes, orig_attr);
todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n");
todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n");
......@@ -1068,7 +1068,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut)
ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError());
CloseHandle(hConOut2);
todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: "
ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: "
"got %#x, expected %#x\n", csbi2.wAttributes, attr);
todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n");
todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n");
......@@ -1092,7 +1092,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut)
ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError());
CloseHandle(hConOut2);
todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: "
ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: "
"got %#x, expected %#x\n", csbi2.wAttributes, orig_attr);
todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n");
todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n");
......
programs/conhost/conhost.c
View file @ b17eb271
......@@ -85,7 +85,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
screen_buffer->cursor_visible = 1;
screen_buffer->width = width;
screen_buffer->height = height;
screen_buffer->attr = 0x07;
screen_buffer->popup_attr = 0xf5;
screen_buffer->font.weight = FW_NORMAL;
screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE;
......@@ -96,6 +95,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
screen_buffer->max_height = console->active->max_height;
screen_buffer->win.right = console->active->win.right - console->active->win.left;
screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top;
screen_buffer->attr = console->active->attr;
}
else
{
......@@ -103,6 +103,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
screen_buffer->max_height = height;
screen_buffer->win.right = width - 1;
screen_buffer->win.bottom = height - 1;
screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED;
}
if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment