August 2020 - Wine-Commits - list.winehq.org

Ziqing Hui : windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: e216385fa76aef1192c3164a9f994e2310cdede4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e216385fa76aef1192c3164a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:32 2020 +0800 windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 14 ++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 9 +++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 2a9fc5c4bc..9e6886e7ea 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -214,21 +214,31 @@ static struct dds_format { &GUID_WICPixelFormat128bppRGBAFloat, 128, DXGI_FORMAT_R32G32B32A32_FLOAT }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0xFF000000 }, &GUID_WICPixelFormat32bppRGBA, 32, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0 }, + &GUID_WICPixelFormat32bppRGB, 32, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0xFF000000 }, &GUID_WICPixelFormat32bppBGRA, 32, DXGI_FORMAT_B8G8R8A8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0 }, &GUID_WICPixelFormat32bppBGR, 32, DXGI_FORMAT_B8G8R8X8_UNORM }, /* The red and blue masks are swapped for DXGI_FORMAT_R10G10B10A2_UNORM. - * For "correct" one, the RGB masks should be 0x3FF00000,0xFFC00,0x3FF. + * For "correct" one, the RGB masks should be 0x3FF,0xFFC00,0x3FF00000. * see: https://walbourn.github.io/dds-update-and-1010102-problems */ + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF00000,0xFFC00,0x3FF,0xC0000000 }, + &GUID_WICPixelFormat32bppR10G10B10A2, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF,0xFFC00,0x3FF00000,0xC0000000 }, - &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, + &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFF,0xFFFF0000,0,0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R16G16_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFFFFFF,0,0,0 }, &GUID_WICPixelFormat32bppGrayFloat, 32, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 24, 0xFF0000,0x00FF00,0x0000FF,0 }, + &GUID_WICPixelFormat24bppBGR, 24, DXGI_FORMAT_UNKNOWN }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 24, 0x0000FF,0x00FF00,0xFF0000,0 }, + &GUID_WICPixelFormat24bppRGB, 24, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF800,0x7E0,0x1F,0 }, &GUID_WICPixelFormat16bppBGR565, 16, DXGI_FORMAT_B5G6R5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0 }, + &GUID_WICPixelFormat16bppBGR555, 16, DXGI_FORMAT_UNKNOWN }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0x8000 }, &GUID_WICPixelFormat16bppBGRA5551, 16, DXGI_FORMAT_B5G5R5A1_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF00,0xF0,0xF,0xF000 }, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index b1beebf2fb..2e7304b9d4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -941,8 +941,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format)); @@ -1077,8 +1076,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1128,8 +1126,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || - IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr);

1 0

Ziqing Hui : windowscodecs: Correctly set pixel format of uncompressed DDS images.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: abd7454ecc394e63eee1944cd64685e7c582ae81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd7454ecc394e63eee1944c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:19 2020 +0800 windowscodecs: Correctly set pixel format of uncompressed DDS images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 10 ++++++---- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 46e1074f25..2a9fc5c4bc 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -464,7 +464,6 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (header->depth) info->depth = header->depth; if (header->mipMapCount) info->mip_levels = header->mipMapCount; - format_info = get_dds_format(&header->ddspf); if (has_extended_header(header)) { if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; info->format = header_dxt10->dxgiFormat; @@ -472,20 +471,23 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); if (is_compressed(info->format)) { + info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? + &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; info->pixel_format_bpp = 32; } else { + info->pixel_format = &GUID_WICPixelFormatUndefined; info->pixel_format_bpp = 0; - FIXME("Pixel format bpp is incorrect for uncompressed DDS image with extended header\n"); + FIXME("Pixel format is incorrect for uncompressed DDS image with extended header\n"); } } else { + format_info = get_dds_format(&header->ddspf); info->format = format_info->dxgi_format; info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); + info->pixel_format = format_info->wic_format; info->pixel_format_bpp = format_info->wic_format_bpp; } - info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? - &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; if (header->ddspf.flags & (DDPF_RGB | DDPF_ALPHA | DDPF_LUMINANCE)) { info->bytes_per_block = header->ddspf.rgbBitCount / 8; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 139aaee7ed..b1beebf2fb 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -407,7 +407,7 @@ static struct test_data { { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), WINCODEC_ERR_BADHEADER, 1, 4, 32, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, 64, &GUID_WICPixelFormat64bppBGRA, + { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, 64, &GUID_WICPixelFormat64bppRGBA, { 1, 1, 1, 1, 1, DXGI_FORMAT_R16G16B16A16_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, 96, &GUID_WICPixelFormat96bppRGBFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, @@ -941,8 +941,8 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(!IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppBGRA) && - !IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppPBGRA)) + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format));

1 0

Ziqing Hui : windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: e7abfd6f3001b30dd846448c3d36f9a27853540a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abfd6f3001b30dd846448c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:37:06 2020 +0800 windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7e3bd44bd8..46e1074f25 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -687,7 +687,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pixel_data); + if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data); HeapFree(GetProcessHeap(), 0, This->block_data); HeapFree(GetProcessHeap(), 0, This); } @@ -746,7 +746,7 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); UINT bpp, frame_stride, frame_size; INT x, y, width, height; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -777,13 +777,17 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, EnterCriticalSection(&This->lock); if (!This->pixel_data) { - This->pixel_data = HeapAlloc(GetProcessHeap(), 0, frame_size); - if (!This->pixel_data) { - hr = E_OUTOFMEMORY; - goto end; + if (is_compressed(This->info.format)) { + This->pixel_data = HeapAlloc(GetProcessHeap(), 0, frame_size); + if (!This->pixel_data) { + hr = E_OUTOFMEMORY; + goto end; + } + decode_block(This->block_data, This->info.width_in_blocks * This->info.height_in_blocks, This->info.format, + This->info.width, This->info.height, (DWORD *)This->pixel_data); + } else { + This->pixel_data = This->block_data; } - decode_block(This->block_data, This->info.width_in_blocks * This->info.height_in_blocks, This->info.format, - This->info.width, This->info.height, (DWORD *)This->pixel_data); } hr = copy_pixels(bpp, This->pixel_data, This->info.width, This->info.height, frame_stride, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 37ed17bd79..139aaee7ed 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1069,11 +1069,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra /* CopyPixels tests */ - if (!is_compressed(format_info.DxgiFormat)) { - skip("Skip CopyPixels tests for uncompressed image\n"); - return; - } - bpp = test_data[i].pixel_format_bpp; stride = rect.Width * bpp / 8; frame_stride = frame_width * bpp / 8; @@ -1082,6 +1077,8 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1118,6 +1115,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + } hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); @@ -1130,6 +1128,8 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } + todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat24bppBGR) || + IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); @@ -1155,6 +1155,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; } + } } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i)

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 151b42953b49bc0417c53656b0040ef765a8cbef URL: https://source.winehq.org/git/wine.git/?a=commit;h=151b42953b49bc0417c53656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:24 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=151b42953b49bc0417c5…

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: df8578da8ef4f6e9e480e1c49cd82ebdf8281d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8578da8ef4f6e9e480e1c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:13 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7c20cd4eb3..f20d8c29ec 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -42,6 +42,16 @@ struct history_line WCHAR text[1]; }; +struct font_info +{ + short int width; + short int height; + short int weight; + short int pitch_family; + WCHAR *face_name; + size_t face_len; +}; + struct console { HANDLE server; /* console server handle */ @@ -70,6 +80,17 @@ struct screen_buffer unsigned int mode; /* output mode */ unsigned int width; /* size (w-h) of the screen buffer */ unsigned int height; + unsigned int cursor_size; /* size of cursor (percentage filled) */ + unsigned int cursor_visible;/* cursor visibility flag */ + unsigned int cursor_x; /* position of cursor */ + unsigned int cursor_y; /* position of cursor */ + unsigned short attr; /* default fill attributes (screen colors) */ + unsigned short popup_attr; /* pop-up color attributes */ + unsigned int max_width; /* size (w-h) of the window given font size */ + unsigned int max_height; + unsigned int color_map[16]; /* color table */ + RECT win; /* current visible window on the screen buffer */ + struct font_info font; /* console font information */ struct wine_rb_entry entry; /* map entry */ }; @@ -104,8 +125,27 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->cursor_size = 100; + screen_buffer->cursor_visible = 1; + screen_buffer->cursor_x = 0; + screen_buffer->cursor_y = 0; screen_buffer->width = width; screen_buffer->height = height; + screen_buffer->attr = 0x07; + screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = 80; + screen_buffer->max_height = 25; + screen_buffer->win.left = 0; + screen_buffer->win.right = screen_buffer->max_width - 1; + screen_buffer->win.top = 0; + screen_buffer->win.bottom = screen_buffer->max_height - 1; + screen_buffer->font.width = 0; + screen_buffer->font.height = 0; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + screen_buffer->font.face_name = NULL; + screen_buffer->font.face_len = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) { @@ -202,6 +242,38 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD return STATUS_SUCCESS; } +static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *out_size ) +{ + struct condrv_output_info *info; + + TRACE( "%p\n", screen_buffer ); + + *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); + if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + + info->cursor_size = screen_buffer->cursor_size; + info->cursor_visible = screen_buffer->cursor_visible; + info->cursor_x = screen_buffer->cursor_x; + info->cursor_y = screen_buffer->cursor_y; + info->width = screen_buffer->width; + info->height = screen_buffer->height; + info->attr = screen_buffer->attr; + info->popup_attr = screen_buffer->popup_attr; + info->win_left = screen_buffer->win.left; + info->win_top = screen_buffer->win.top; + info->win_right = screen_buffer->win.right; + info->win_bottom = screen_buffer->win.bottom; + info->max_width = screen_buffer->max_width; + info->max_height = screen_buffer->max_height; + info->font_width = screen_buffer->font.width; + info->font_height = screen_buffer->font.height; + info->font_weight = screen_buffer->font.weight; + info->font_pitch_family = screen_buffer->font.pitch_family; + memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); + if (*out_size > sizeof(*info)) memcpy( info + 1, screen_buffer->font.face_name, *out_size - sizeof(*info) ); + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -250,6 +322,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_OUTPUT_INFO: + if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; + return get_output_info( screen_buffer, out_size ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 01c05387ce56ad99bd0b629a41317d7058a82462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c05387ce56ad99bd0b629a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:37 2020 +0200 conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a8fd9abf28..4fbfc19a08 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -469,6 +469,82 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, return STATUS_SUCCESS; } +static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, + size_t in_size, size_t *out_size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + entry_cnt = (in_size - sizeof(*params)) / entry_size; + + TRACE( "(%u,%u) cnt %u\n", params->x, params->y, entry_cnt ); + + if (params->x >= screen_buffer->width) + { + *out_size = 0; + return STATUS_SUCCESS; + } + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + return STATUS_INVALID_PARAMETER; + } + } + + if (*out_size == sizeof(SMALL_RECT)) + { + SMALL_RECT *region; + unsigned int width = params->width; + x = params->x; + y = params->y; + if (!(region = alloc_ioctl_buffer( sizeof(*region )))) return STATUS_NO_MEMORY; + region->Left = x; + region->Top = y; + region->Right = min( x + width, screen_buffer->width ) - 1; + region->Bottom = min( y + entry_cnt / width, screen_buffer->height ) - 1; + } + else + { + DWORD *result; + if (!(result = alloc_ioctl_buffer( sizeof(*result )))) return STATUS_NO_MEMORY; + *result = i; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -517,6 +593,12 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_OUTPUT: + if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || + in_size < sizeof(struct condrv_output_params)) + return STATUS_INVALID_PARAMETER; + return write_output( screen_buffer, in_data, in_size, out_size ); + case IOCTL_CONDRV_GET_OUTPUT_INFO: if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; return get_output_info( screen_buffer, out_size );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_MODE.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: e5bd1ba4ad4802c3f589fc91b8953205af52a978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bd1ba4ad4802c3f589fc91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:25 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 8 ++++++-- programs/conhost/conhost.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 09c48ee705..5efe4ee38c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3945,7 +3945,7 @@ static void test_AllocConsole(void) CloseHandle(pipe_write); } -static void test_pseudo_console_child(HANDLE input) +static void test_pseudo_console_child(HANDLE input, HANDLE output) { DWORD mode; BOOL ret; @@ -3967,6 +3967,10 @@ static void test_pseudo_console_child(HANDLE input) ret = SetConsoleMode(input, mode | ENABLE_AUTO_POSITION); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + ret = GetConsoleMode(output, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT), "mode = %x\n", mode); + test_console_title(); test_WriteConsoleInputW(input); } @@ -4144,7 +4148,7 @@ START_TEST(console) if (using_pseudo_console) { - test_pseudo_console_child(hConIn); + test_pseudo_console_child(hConIn, hConOut); return; } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a5d9a8feeb..06d2b15d2a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -67,6 +67,7 @@ struct screen_buffer { struct console *console; /* console reference */ unsigned int id; /* screen buffer id */ + unsigned int mode; /* output mode */ unsigned int width; /* size (w-h) of the screen buffer */ unsigned int height; struct wine_rb_entry entry; /* map entry */ @@ -102,6 +103,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = malloc( sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; screen_buffer->width = width; screen_buffer->height = height; @@ -232,6 +234,16 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign screen_buffer->console->active = screen_buffer; return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_MODE: + { + DWORD *mode; + TRACE( "returning mode %x\n", screen_buffer->mode ); + if (in_size || *out_size != sizeof(*mode)) return STATUS_INVALID_PARAMETER; + if (!(mode = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + *mode = screen_buffer->mode; + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_MODE.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 21c99970f3c423e2b8b1f92b2b44c5dce7cc28bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c99970f3c423e2b8b1f92b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:36 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 10 ++++++++++ programs/conhost/conhost.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5efe4ee38c..a8c07dcae7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3971,6 +3971,16 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); ok(mode == (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT), "mode = %x\n", mode); + ret = SetConsoleMode(output, mode & ~ENABLE_WRAP_AT_EOL_OUTPUT); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + + ret = GetConsoleMode(output, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == ENABLE_PROCESSED_OUTPUT, "mode = %x\n", mode); + + ret = SetConsoleMode(output, mode | ENABLE_WRAP_AT_EOL_OUTPUT); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + test_console_title(); test_WriteConsoleInputW(input); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 06d2b15d2a..7c20cd4eb3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -244,6 +244,12 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_MODE: + if (in_size != sizeof(unsigned int) || *out_size) return STATUS_INVALID_PARAMETER; + screen_buffer->mode = *(unsigned int *)in_data; + TRACE( "set %x mode\n", screen_buffer->mode ); + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : server: Forward screen buffer ioctls to conhost if possible.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: eb293d7645eddbac8e94086a58d460b4407f4b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb293d7645eddbac8e94086a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:09 2020 +0200 server: Forward screen buffer ioctls to conhost if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/server/console.c b/server/console.c index 7a2ebc1b71..93ea509ae4 100644 --- a/server/console.c +++ b/server/console.c @@ -261,6 +261,7 @@ struct screen_buffer * as seen in wineconsole */ struct font_info font; /* console font information */ struct fd *fd; /* for bare console, attached output fd */ + struct async_queue ioctl_q; /* ioctl queue */ }; static void screen_buffer_dump( struct object *obj, int verbose ); @@ -679,6 +680,7 @@ static struct object *create_console_output( struct console_input *console_input screen_buffer->font.face_name = NULL; screen_buffer->font.face_len = 0; memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); + init_async_queue( &screen_buffer->ioctl_q ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd != -1) @@ -1290,6 +1292,7 @@ static void screen_buffer_destroy( struct object *obj ) queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_CLOSE_OUTPUT, screen_buffer->id, NULL, NULL ); if (screen_buffer->fd) release_object( screen_buffer->fd ); + free_async_queue( &screen_buffer->ioctl_q ); free( screen_buffer->data ); free( screen_buffer->font.face_name ); } @@ -1854,6 +1857,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { case IOCTL_CONDRV_GET_MODE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_reply_max_size() != sizeof(screen_buffer->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1862,6 +1868,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; case IOCTL_CONDRV_SET_MODE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(screen_buffer->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1873,6 +1882,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_READ_OUTPUT: { const struct condrv_output_params *params = get_req_data(); + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1888,6 +1900,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_WRITE_OUTPUT: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() < sizeof(struct condrv_output_params) || (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) { @@ -1907,6 +1922,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * struct condrv_output_info *info; data_size_t size; + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); size = min( sizeof(*info) + screen_buffer->font.face_len, get_reply_max_size() ); if (size < sizeof(*info)) { @@ -1942,6 +1960,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_SET_OUTPUT_INFO: { const struct condrv_output_info_params *params = get_req_data(); + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1956,6 +1977,10 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_ACTIVATE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); + if (!screen_buffer->input) { set_error( STATUS_INVALID_HANDLE ); @@ -1970,6 +1995,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * const struct condrv_fill_output_params *params = get_req_data(); char_info_t data; DWORD written; + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(*params) || (get_reply_max_size() && get_reply_max_size() != sizeof(written))) { @@ -1989,6 +2017,11 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * { const struct condrv_scroll_params *params = get_req_data(); rectangle_t clip; + + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); + if (get_req_data_size() != sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER );

1 0

Jacek Caban : conhost: Initial support for screen buffers.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 029843176b11404a77384b40ca3e9a99226477fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=029843176b11404a77384b40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:04:48 2020 +0200 conhost: Initial support for screen buffers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 100 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05a160f9cc..a5d9a8feeb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -31,6 +31,7 @@ #include "wine/condrv.h" #include "wine/server.h" +#include "wine/rbtree.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(conhost); @@ -45,6 +46,7 @@ struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ + struct screen_buffer *active; /* active screen buffer */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */ @@ -61,6 +63,15 @@ struct console unsigned int win; /* window handle if backend supports it */ }; +struct screen_buffer +{ + struct console *console; /* console reference */ + unsigned int id; /* screen buffer id */ + unsigned int width; /* size (w-h) of the screen buffer */ + unsigned int height; + struct wine_rb_entry entry; /* map entry */ +}; + static void *ioctl_buffer; static size_t ioctl_buffer_size; @@ -76,6 +87,41 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry *entry ) +{ + struct screen_buffer *screen_buffer = WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ); + return (unsigned int)key - screen_buffer->id; +} + +static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id }; + +static struct screen_buffer *create_screen_buffer( struct console *console, int id, int width, int height ) +{ + struct screen_buffer *screen_buffer; + + if (!(screen_buffer = malloc( sizeof(*screen_buffer) ))) return NULL; + screen_buffer->console = console; + screen_buffer->id = id; + screen_buffer->width = width; + screen_buffer->height = height; + + if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) + { + ERR( "id %x already exists\n", id ); + return NULL; + } + + return screen_buffer; +} + +static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) +{ + if (screen_buffer->console->active == screen_buffer) + screen_buffer->console->active = NULL; + wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer ); +} + static NTSTATUS read_console_input( struct console *console, size_t out_size ) { size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); @@ -158,7 +204,7 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl { WCHAR *title = NULL; - TRACE( "%s\n", debugstr_wn(in_title, size) ); + TRACE( "%s\n", debugstr_wn(in_title, size / sizeof(WCHAR)) ); if (size) { @@ -171,6 +217,27 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl return STATUS_SUCCESS; } +static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsigned int code, + const void *in_data, size_t in_size, size_t *out_size ) +{ + switch (code) + { + case IOCTL_CONDRV_CLOSE_OUTPUT: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + destroy_screen_buffer( screen_buffer ); + return STATUS_SUCCESS; + + case IOCTL_CONDRV_ACTIVATE: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + screen_buffer->console->active = screen_buffer; + return STATUS_SUCCESS; + + default: + FIXME( "unsupported ioctl %x\n", code ); + return STATUS_NOT_SUPPORTED; + } +} + static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { @@ -324,6 +391,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) { size_t out_size = 0, in_size; unsigned int code; + int output; NTSTATUS status = STATUS_SUCCESS; for (;;) @@ -339,6 +407,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); status = wine_server_call( req ); code = reply->code; + output = reply->output; out_size = reply->out_size; in_size = wine_server_reply_size( reply ); } @@ -357,7 +426,32 @@ static NTSTATUS process_console_ioctls( struct console *console ) return status; } - status = console_input_ioctl( console, code, ioctl_buffer, in_size, &out_size ); + if (code == IOCTL_CONDRV_INIT_OUTPUT) + { + TRACE( "initializing output %x\n", output ); + if (console->active) + create_screen_buffer( console, output, console->active->width, console->active->height ); + else + create_screen_buffer( console, output, 80, 150 ); + } + else if (!output) + { + status = console_input_ioctl( console, code, ioctl_buffer, in_size, &out_size ); + } + else + { + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &screen_buffer_map, (const void *)output ))) + { + ERR( "invalid screen buffer id %x\n", output ); + status = STATUS_INVALID_HANDLE; + } + else + { + status = screen_buffer_ioctl( WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ), code, + ioctl_buffer, in_size, &out_size ); + } + } } } @@ -484,5 +578,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) return 1; } + if (!(console.active = create_screen_buffer( &console, 1, width, height ))) return 1; + return main_loop( &console, signal ); }

1 0