wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Nikolay Sivov : ole32: Remove unused helper.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: d1b67b228caba0967086e5d61b072f435434b40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b67b228caba0967086e5d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:17 2020 +0300 ole32: Remove unused helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 37 ------------------------------------- dlls/ole32/compobj_private.h | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dfd81a8d0f..18580e9b23 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -772,43 +772,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY return S_OK; } -/* open HKCR\\AppId\\{string form of appid clsid} key */ -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) -{ - static const WCHAR szAppId[] = { 'A','p','p','I','d',0 }; - static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; - DWORD res; - WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; - DWORD size; - HKEY hkey; - DWORD type; - HRESULT hr; - - /* read the AppID value under the class's key */ - hr = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &hkey); - if (FAILED(hr)) - return hr; - - size = sizeof(buf); - res = RegQueryValueExW(hkey, szAppId, NULL, &type, (LPBYTE)buf, &size); - RegCloseKey(hkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS || type!=REG_SZ) - return REGDB_E_READREGDB; - - lstrcpyW(keyname, szAppIdKey); - lstrcatW(keyname, buf); - res = open_classes_key(HKEY_CLASSES_ROOT, keyname, access, subkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS) - return REGDB_E_READREGDB; - - return S_OK; -} - /*** * This internal method is used to scan the registered class list to * find a class object. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6e14d69e42..7a571352d3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -189,7 +189,6 @@ extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN; HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;

1 0

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

28 Aug '20

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 28 Aug '20

28 Aug '20

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 28 Aug '20

28 Aug '20

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

Ziqing Hui : windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: fa398d6ec0b2f9b7d4b6ed272b83bf2ee1c06a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa398d6ec0b2f9b7d4b6ed27… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:36:47 2020 +0800 windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks(). 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 | 42 ++++++++++++++---------------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 72c884b0ed..7e3bd44bd8 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -891,8 +891,7 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, { DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); int x, y, width, height; - UINT bytes_per_block, frame_stride, frame_size, i; - BYTE *data, *dst_buffer; + UINT bytes_per_block, frame_stride, frame_size; TRACE("(%p,%p,%u,%u,%p)\n", iface, boundsInBlocks, stride, bufferSize, buffer); @@ -901,35 +900,26 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, bytes_per_block = This->info.bytes_per_block; frame_stride = This->info.width_in_blocks * bytes_per_block; frame_size = frame_stride * This->info.height_in_blocks; + if (!boundsInBlocks) { if (stride < frame_stride) return E_INVALIDARG; if (bufferSize < frame_size) return E_INVALIDARG; - memcpy(buffer, This->block_data, frame_size); - return S_OK; - } - - x = boundsInBlocks->X; - y = boundsInBlocks->Y; - width = boundsInBlocks->Width; - height = boundsInBlocks->Height; - if (x < 0 || y < 0 || width <= 0 || height <= 0 || - x + width > This->info.width_in_blocks || - y + height > This->info.height_in_blocks) { - return E_INVALIDARG; - } - if (stride < width * bytes_per_block) return E_INVALIDARG; - if (bufferSize < stride * height) return E_INVALIDARG; - - data = This->block_data + (x + y * This->info.width_in_blocks) * bytes_per_block; - dst_buffer = buffer; - for (i = 0; i < height; i++) - { - memcpy(dst_buffer, data, (size_t)width * bytes_per_block); - data += This->info.width_in_blocks * bytes_per_block; - dst_buffer += stride; + } else { + x = boundsInBlocks->X; + y = boundsInBlocks->Y; + width = boundsInBlocks->Width; + height = boundsInBlocks->Height; + if (x < 0 || y < 0 || width <= 0 || height <= 0 || + x + width > This->info.width_in_blocks || + y + height > This->info.height_in_blocks) { + return E_INVALIDARG; + } + if (stride < width * bytes_per_block) return E_INVALIDARG; + if (bufferSize < stride * height) return E_INVALIDARG; } - return S_OK; + return copy_pixels(This->info.bytes_per_block * 8, This->block_data, This->info.width_in_blocks, + This->info.height_in_blocks, frame_stride, boundsInBlocks, stride, bufferSize, buffer); } static const IWICDdsFrameDecodeVtbl DdsFrameDecode_Dds_Vtbl = { diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1ce249c4b4..37ed17bd79 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1064,7 +1064,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(width_in_blocks > 1) ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index);

1 0

Ziqing Hui : windowscodecs/tests: Fix tests for CopyBlocks.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 87ddb4ba37422726a1e3a5b08c852ac58d55a255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ddb4ba37422726a1e3a5b0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:35:01 2020 +0800 windowscodecs/tests: Fix tests for CopyBlocks. Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. 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/tests/ddsformat.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1a7ef95ada..1ce249c4b4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -678,6 +678,19 @@ static BOOL color_buffer_match(DWORD *color_buffer_a, DWORD *color_buffer_b, UIN return TRUE; } +static void copy_pixels(void *src_buffer, UINT src_stride, void *dst_buffer, UINT dst_stride, UINT size) +{ + char *src = src_buffer, *dst = dst_buffer; + UINT i; + + for (i = 0; i < size; i++) + { + *dst = src[i]; + if (i % src_stride == src_stride - 1) dst += dst_stride - src_stride; + dst ++; + } +} + static void test_dds_decoder_initialize(void) { int i; @@ -1031,22 +1044,28 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra if (depth > 1) depth /= 2; } + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, format_info.BytesPerBlock), + ok(!memcmp(test_data[i].data + block_offset, buffer, format_info.BytesPerBlock), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + ok(!memcmp(test_data[i].data + block_offset, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); + memset(pixels, 0, sizeof(pixels)); + copy_pixels(test_data[i].data + block_offset, frame_stride, pixels, frame_stride * 2, frame_size); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + todo_wine_if(width_in_blocks > 1) + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); /* CopyPixels tests */ @@ -1104,6 +1123,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra 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); + memset(buffer, 0, sizeof(pixels)); if (is_compressed(format_info.DxgiFormat)) { decode_block(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, format_info.DxgiFormat, frame_width, frame_height, (DWORD *)pixels); @@ -1111,6 +1131,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } + 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); if (hr == S_OK) { @@ -1118,11 +1139,12 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, bpp / 8), + ok(!memcmp(pixels, buffer, bpp / 8), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } } + memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) { @@ -1130,7 +1152,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, frame_size), + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; }

1 0

Derek Lesho : shcore: Add GetScaleFactorForDevice() stub.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 7489efa03f09c6c3613668a0169abade6b390d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7489efa03f09c6c3613668a0… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Aug 27 16:16:36 2020 +0300 shcore: Add GetScaleFactorForDevice() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f..32649cccd9 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e3..368fab1954 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62..4689d83e7d 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS);

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_MODE.
by Alexandre Julliard 27 Aug '20

27 Aug '20

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 : conhost: Implement IOCTL_CONDRV_GET_MODE.
by Alexandre Julliard 27 Aug '20

27 Aug '20

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 : server: Forward screen buffer ioctls to conhost if possible.
by Alexandre Julliard 27 Aug '20

27 Aug '20

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

← Newer
1
2
3
4
5
6
7
8
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020