May 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : evr/mixer: Use hex format for message type.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 8572de607b888a4a3a590426168276d71ecda82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8572de607b888a4a3a590426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 16:11:02 2021 +0300 evr/mixer: Use hex format for message type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 03e2d166155..0d4bf8bc500 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1029,7 +1029,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, HRESULT hr = S_OK; unsigned int i; - TRACE("%p, %u, %#lx.\n", iface, message, param); + TRACE("%p, %#x, %#lx.\n", iface, message, param); switch (message) {

1 0

Francois Gouget : ucrtbase/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: d5fa1d9bfc6103780a2e323b4926e58ceb7d27d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fa1d9bfc6103780a2e323b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:14:15 2021 +0200 ucrtbase/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 512d2158b66..8fffbffb38e 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -176,7 +176,7 @@ START_TEST(thread) test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_endthreadex); ret = DeleteFileA(thread_dll); - ok(ret, "Failed to remove the test dll, err: %u", GetLastError()); + ok(ret, "Failed to remove the test dll, err: %u\n", GetLastError()); test_thread_invalid_params(); }

1 0

Nikolay Sivov : mf/evr: Pass stream start/end messages to the mixer.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 9d307bb3c2b3237c0b683658bff59ae472bb5b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d307bb3c2b3237c0b683658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 16:08:48 2021 +0300 mf/evr: Pass stream start/end messages to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 292e84ddd6b..046f5cb3ca3 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -48,6 +48,7 @@ enum video_stream_flags EVR_STREAM_PREROLLING = 0x1, EVR_STREAM_PREROLLED = 0x2, EVR_STREAM_SAMPLE_NEEDED = 0x4, + EVR_STREAM_STARTED = 0x8, }; struct video_renderer; @@ -406,6 +407,12 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS } else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING) { + if (!(stream->flags & EVR_STREAM_STARTED)) + { + IMFTransform_ProcessMessage(stream->parent->mixer, MFT_MESSAGE_NOTIFY_START_OF_STREAM, stream->id); + stream->flags |= EVR_STREAM_STARTED; + } + if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); @@ -422,12 +429,34 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS return hr; } +static void video_stream_end_of_stream(struct video_stream *stream) +{ + if (!(stream->flags & EVR_STREAM_STARTED)) + return; + + IMFTransform_ProcessMessage(stream->parent->mixer, MFT_MESSAGE_NOTIFY_END_OF_STREAM, stream->id); + stream->flags &= ~EVR_STREAM_STARTED; +} + static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, const PROPVARIANT *marker_value, const PROPVARIANT *context_value) { - FIXME("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + struct video_stream *stream = impl_from_IMFStreamSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + + EnterCriticalSection(&stream->cs); + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else + { + if (marker_type == MFSTREAMSINK_MARKER_ENDOFSEGMENT) + video_stream_end_of_stream(stream); + } + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI video_stream_sink_Flush(IMFStreamSink *iface)

1 0

Hugh McMaster : reg: Allow the 'reg_data' pointer to be NULL.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: e2dfb0aff42153f2c1a25e8c9b37ad10409aca36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2dfb0aff42153f2c1a25e8c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 6 22:47:53 2021 +1000 reg: Allow the 'reg_data' pointer to be NULL. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 9aaa3fc1acc..cb26c232de3 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -48,10 +48,10 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *size_bytes) +static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, + BYTE **data_bytes, DWORD *size_bytes) { static const WCHAR empty; - LPBYTE out_data = NULL; *size_bytes = 0; @@ -64,8 +64,8 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO case REG_EXPAND_SZ: { *size_bytes = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = malloc(*size_bytes); - lstrcpyW((LPWSTR)out_data,data); + *data_bytes = malloc(*size_bytes); + lstrcpyW((WCHAR *)*data_bytes, data); break; } case REG_DWORD: @@ -77,41 +77,46 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO val = wcstoul(data, &rest, (towlower(data[1]) == 'x') ? 16 : 10); if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { output_message(STRING_MISSING_INTEGER); - break; + return FALSE; } *size_bytes = sizeof(DWORD); - out_data = malloc(*size_bytes); - ((LPDWORD)out_data)[0] = val; + *data_bytes = malloc(*size_bytes); + *(DWORD *)*data_bytes = val; break; } case REG_BINARY: { - BYTE hex0, hex1; + BYTE hex0, hex1, *ptr; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + *size_bytes = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = malloc(*size_bytes); - if(datalen % 2) + *data_bytes = malloc(*size_bytes); + + if (datalen % 2) { hex1 = hexchar_to_byte(data[i++]); - if(hex1 == 0xFF) + if (hex1 == 0xFF) goto no_hex_data; - out_data[destByteIndex++] = hex1; + *data_bytes[destByteIndex++] = hex1; } - for(;i + 1 < datalen;i += 2) + + ptr = *data_bytes; + + for (; i + 1 < datalen; i += 2) { hex0 = hexchar_to_byte(data[i]); hex1 = hexchar_to_byte(data[i + 1]); - if(hex0 == 0xFF || hex1 == 0xFF) + if (hex0 == 0xFF || hex1 == 0xFF) goto no_hex_data; - out_data[destByteIndex++] = (hex0 << 4) | hex1; + ptr[destByteIndex++] = (hex0 << 4) | hex1; } break; + no_hex_data: - /* cleanup, print error */ - free(out_data); + free(*data_bytes); + *data_bytes = NULL; output_message(STRING_MISSING_HEXDATA); - out_data = NULL; - break; + return FALSE; } case REG_MULTI_SZ: { @@ -134,20 +139,21 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO { free(buffer); output_message(STRING_INVALID_STRING); - return NULL; + return FALSE; } } buffer[destindex] = 0; if (destindex && buffer[destindex - 1]) buffer[++destindex] = 0; *size_bytes = (destindex + 1) * sizeof(WCHAR); - return (BYTE *)buffer; + *data_bytes = (BYTE *)buffer; + break; } default: output_message(STRING_UNHANDLED_TYPE, reg_type, data); } - return out_data; + return TRUE; } static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, @@ -194,7 +200,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (!(reg_data = get_regdata(data, data_type, separator, &data_size))) + if (!get_regdata(data, data_type, separator, &reg_data, &data_size)) { RegCloseKey(hkey); return 1;

1 0

Henri Verbeet : wined3d: Reject raw blits between depth/stencil and colour resources in the GLSL blitter.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: ca289c2b39bf5cdc7cb78e4c744638ae6343abdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca289c2b39bf5cdc7cb78e4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:20 2021 +0200 wined3d: Reject raw blits between depth/stencil and colour resources in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 5 ++--- dlls/wined3d/glsl_shader.c | 11 +++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6c381f62840..cc30b439d2b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16232,7 +16232,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].dst_ds || test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) + todo_wine_if(test_data[i].dst_ds) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6dcc98e0ac4..d412f430b60 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28306,9 +28306,8 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(!test_data[i].dst_ds && test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45e7ecd4850..3876e71af58 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13000,13 +13000,20 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi const struct wined3d_resource *dst_resource = &dst_texture->t.resource; const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; + bool src_ds, dst_ds; BOOL decompress; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->depth_size || dst_format->stencil_size) + src_ds = src_format->depth_size || src_format->stencil_size; + dst_ds = dst_format->depth_size || dst_format->stencil_size; + /* We could in principle support raw depth/stencil <-> colour blits as + * well in some cases, but note that typeless formats like e.g. + * R16_TYPELESS may use a normalised GL format for depth/stencil + * resources, and a floating-point format for colour resources, */ + if (src_ds && dst_ds) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; - else + else if (!src_ds && !dst_ds) blit_op = WINED3D_BLIT_OP_COLOR_BLIT; }

1 0

Henri Verbeet : wined3d: Reject blits between depth/stencil and colour attachments in the FBO blitter.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 850f465c67994f2f54101eeff991ace5d6cb8fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850f465c67994f2f54101eef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:19 2021 +0200 wined3d: Reject blits between depth/stencil and colour attachments in the FBO blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 24ff5874841..2caad29d369 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -269,6 +269,7 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win { const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; + bool src_ds, dst_ds; if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return false; @@ -280,6 +281,16 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return false; + /* We can't copy between depth/stencil and colour attachments. One notable + * way we can end up here is when copying between typeless resources with + * formats like R16_TYPELESS, which can end up using either a + * depth/stencil or a colour format on the OpenGL side, depending on the + * resource's bind flags. */ + src_ds = src_format->depth_size || src_format->stencil_size; + dst_ds = dst_format->depth_size || dst_format->stencil_size; + if (src_ds != dst_ds) + return false; + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT:

1 0

Henri Verbeet : wined3d: Reject blits between depth/stencil and colour resources in the raw blitter.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 769e2be52ff7893b0dd97a3eaf6bb4582b327080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769e2be52ff7893b0dd97a3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:18 2021 +0200 wined3d: Reject blits between depth/stencil and colour resources in the raw blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 7 ++++--- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/texture.c | 11 +++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index def80870fd5..6c381f62840 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16217,8 +16217,9 @@ static void test_format_compatibility(void) colour = get_readback_color(&rb, x, y); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].dst_ds && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -16231,7 +16232,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds) + todo_wine_if(test_data[i].dst_ds || test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 989347ccac5..6dcc98e0ac4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28306,7 +28306,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + todo_wine_if(!test_data[i].dst_ds && test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1d1b64ad60d..24ff5874841 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6082,12 +6082,19 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; + bool src_ds, dst_ds; DWORD location; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it - * to copy the resource contents to the texture anyway. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT + * to copy the resource contents to the texture anyway. + * + * We also can't copy between depth/stencil and colour resources, since + * the formats are considered incompatible in OpenGL. */ + if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)))))

1 0

Henri Verbeet : d3d10core/tests: Add some tests for copying between depth/stencil and colour formats.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: dfb6c307541efb6144b720775728cd980023bbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb6c307541efb6144b72077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:17 2021 +0200 d3d10core/tests: Add some tests for copying between depth/stencil and colour formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d23857a14bf..def80870fd5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16112,6 +16112,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -16140,6 +16142,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, FALSE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, FALSE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -16161,7 +16167,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -16172,7 +16177,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D10_USAGE_DEFAULT : D3D10_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -16183,6 +16189,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -16201,7 +16208,9 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + /* While partial depth/stencil <-> colour copies are unsupported in + * d3d11, they're just broken in d3d10. */ + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !test_data[i].src_ds; ++j) { x = j % 4; y = j / 4; @@ -16222,8 +16231,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0

Francois Gouget : msxml3: Refcount the domdoc/xmldoc properties.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 0e87427500b1564ebdaa0a7ad7f627dce2762be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e87427500b1564ebdaa0a7a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 6 18:08:06 2021 +0300 msxml3: Refcount the domdoc/xmldoc properties. Multiple domdoc and xmlDoc objects may need to share a common properties object but may be released independently. So add a reference count on the properties object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43377 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cf4f0433218..c67e570a8ea 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -80,6 +80,7 @@ static const WCHAR PropertyNormalizeAttributeValuesW[] = {'N','o','r','m','a','l * We need to preserve this when reloading a document, * and also need access to it from the libxml backend. */ typedef struct { + LONG refs; MSXML_VERSION version; VARIANT_BOOL preserving; IXMLDOMSchemaCollection2* schemaCache; @@ -290,6 +291,7 @@ static domdoc_properties *create_properties(MSXML_VERSION version) { domdoc_properties *properties = heap_alloc(sizeof(domdoc_properties)); + properties->refs = 1; list_init(&properties->selectNsList); properties->preserving = VARIANT_FALSE; properties->schemaCache = NULL; @@ -316,6 +318,7 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) if (pcopy) { + pcopy->refs = 1; pcopy->version = properties->version; pcopy->preserving = properties->preserving; pcopy->schemaCache = properties->schemaCache; @@ -345,9 +348,31 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) return pcopy; } -static void free_properties(domdoc_properties* properties) +static domdoc_properties * properties_add_ref(domdoc_properties *properties) +{ + LONG ref; + + if (!properties) return NULL; + + ref = InterlockedIncrement(&properties->refs); + TRACE("%p, %d.\n", properties, ref); + return properties; +} + +static void properties_release(domdoc_properties *properties) { - if (properties) + LONG ref; + + if (!properties) return; + + ref = InterlockedDecrement(&properties->refs); + + TRACE("%p, %d.\n", properties, ref); + + if (ref < 0) + WARN("negative refcount, expect troubles\n"); + + if (ref == 0) { if (properties->schemaCache) IXMLDOMSchemaCollection2_Release(properties->schemaCache); @@ -622,7 +647,7 @@ LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs) xmlFreeNode( orphan->node ); heap_free( orphan ); } - free_properties(priv->properties); + properties_release(priv->properties); heap_free(doc->_private); xmlFreeDoc(doc); @@ -679,10 +704,16 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { + properties_release(properties_from_xmlDocPtr(get_doc(This))); priv_from_xmlDocPtr(get_doc(This))->properties = NULL; if (xmldoc_release(get_doc(This)) != 0) + { + /* The xmlDocPtr object can no longer use the properties of this + * domdoc object. So give it its own copy. + */ priv_from_xmlDocPtr(get_doc(This))->properties = copy_properties(This->properties); + } } This->node.node = (xmlNodePtr) xml; @@ -690,7 +721,10 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { xmldoc_add_ref(get_doc(This)); - priv_from_xmlDocPtr(get_doc(This))->properties = This->properties; + /* Only attach new xmlDocPtr objects, i.e. ones for which properties + * is still NULL. + */ + priv_from_xmlDocPtr(get_doc(This))->properties = properties_add_ref(This->properties); } return S_OK; @@ -975,6 +1009,7 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); + properties_release(This->properties); release_namespaces(This); heap_free(This); } @@ -3675,7 +3710,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->async = VARIANT_TRUE; doc->validating = 0; doc->resolving = 0; - doc->properties = properties_from_xmlDocPtr(xmldoc); + doc->properties = properties_add_ref(properties_from_xmlDocPtr(xmldoc)); doc->error = S_OK; doc->site = NULL; doc->base_uri = NULL; @@ -3714,7 +3749,7 @@ HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) hr = get_domdoc_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) { - free_properties(properties_from_xmlDocPtr(xmldoc)); + properties_release(properties_from_xmlDocPtr(xmldoc)); heap_free(xmldoc->_private); xmlFreeDoc(xmldoc); return hr;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 54459e593f7ec3f905f17301cd5cfb2cfdc42270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54459e593f7ec3f905f17301… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 6 23:06:45 2021 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 268 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 174 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54459e593f7ec3f905f1…

1 0