May 2022 - Wine-devel - list.winehq.org

[PATCH v2 0/2] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 27 May '22

27 May '22

-- v2: d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalSize(). d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalTransparency(). https://gitlab.winehq.org/wine/wine/-/merge_requests/130

2 2

[PATCH v2 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- v2: d3d11: Always initialize out shader pointer in CreateComputeShader(). d3d11: Always initialize out shader pointer in CreateDomainShader(). d3d11: Always initialize out shader pointer in CreateHullShader(). d3d11: Always initialize out shader pointer in CreatePixelShader(). d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput(). d3d11: Always initialize out shader pointer in CreateGeometryShader(). d3d11: Always initialize out shader pointer in CreateVertexShader(). https://gitlab.winehq.org/wine/wine/-/merge_requests/141

4 11

[PATCH 1/4] mshtml: Handle empty strings in heap_strndupWtoU.
by Gabriel Ivăncescu 27 May '22

27 May '22

The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca0..0a7c3a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae..bc1b829 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n" -- 2.34.1

3 8

[PATCH 0/5] MR142: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/142

3 6

[PATCH v2 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v2: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 3

Re: [PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Hans Leidekker 27 May '22

27 May '22

On Fri, 2022-05-27 at 16:43 +0800, Zhao Yi wrote: > These profiles belong to a specific printer driver and are required for > data conversion during printing. However, these profiles are not available in > the default wine prefix of the Linux system, resulting in the failure of my > test program. Here's a test using the standard RGB color profile which shows our mapping is wrong. I think this is sufficient to show the general problem and we can assume that the CMYK case should be fixed accordingly.

1 0

[PATCH 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/141

3 12

[PATCH v2 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon 27 May '22

27 May '22

-- v2: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

1 4

[PATCH v3 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

2 1

[PATCH v3 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

v3: Don't Unmap on Release. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index a75a9be62be..9d9d980b4c9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -285,9 +285,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 1