September 2021 - Wine-Devel

[PATCH 1/2 v5] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi Sept. 2, 2021

Sept. 2, 2021

v2-v5: Fix some corner cases. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 +-- include/wine/afd.h | 2 +- include/wine/server_protocol.h | 5 ++- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 75 ++++++++++++++++++++++++++++++++-- server/trace.c | 3 +- 7 files changed, 83 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bb4862c9669..14518f0bf6f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1761,7 +1761,8 @@ struct poll_socket_output struct poll_socket_request { struct request_header __header; - char __pad_12[4]; + char exclusive; + char __pad_13[3]; async_data_t async; timeout_t timeout; /* VARARG(sockets,poll_socket_input); */ @@ -6252,7 +6253,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 726 +#define SERVER_PROTOCOL_VERSION 727 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..8eefdaae17f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + char exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/request.h b/server/request.h index 18a6a2df3c7..f1c8f1c5432 100644 --- a/server/request.h +++ b/server/request.h @@ -1045,6 +1045,7 @@ C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct poll_socket_request, exclusive) == 12 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, timeout) == 56 ); C_ASSERT( sizeof(struct poll_socket_request) == 64 ); diff --git a/server/sock.c b/server/sock.c index 50bfc08e145..7cdbed940c6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,6 +128,7 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + char exclusive; unsigned int count; struct poll_socket_output *output; struct @@ -2853,8 +2854,8 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, - unsigned int count, const struct poll_socket_input *input ) +static int poll_socket( struct sock *poll_sock, struct async *async, char exclusive, + timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; struct poll_req *req; @@ -2893,11 +2894,79 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + if (exclusive) + { + int has_shared = FALSE; + struct poll_req *areq; + + LIST_FOR_EACH_ENTRY( areq, &poll_list, struct poll_req, entry ) + { + int skip_areq = FALSE; + + for (i = 0; i < areq->count; ++i) + { + struct sock *asock = areq->sockets[i].sock; + + for (j = 0; j < req->count; ++j) + { + if (asock == req->sockets[j].sock) + { + if (!areq->exclusive) + has_shared = TRUE; + + skip_areq = TRUE; + break; + } + } + + if (skip_areq || has_shared) + break; + } + + if (has_shared) + break; + } + + LIST_FOR_EACH_ENTRY( areq, &poll_list, struct poll_req, entry ) + { + int areq_term = FALSE; + + if (has_shared) + break; + + for (i = 0; i < areq->count; ++i) + { + struct sock *asock = areq->sockets[i].sock; + + for (j = 0; j < req->count; ++j) + { + if (asock == req->sockets[j].sock) + { + areq_term = TRUE; + break; + } + } + + if (areq_term) + break; + } + + if (areq_term) + { + areq->iosb->status = STATUS_SUCCESS; + areq->iosb->out_data = areq->output; + areq->iosb->out_size = areq->count * sizeof(*areq->output); + async_terminate( areq->async, STATUS_ALERTED ); + } + } + } + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3312,7 +3381,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - reply->wait = async_handoff( async, poll_socket( sock, async, req->timeout, count, input ), NULL, 0 ); + reply->wait = async_handoff( async, poll_socket( sock, async, req->exclusive, req->timeout, count, input ), NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); } diff --git a/server/trace.c b/server/trace.c index 4e91d933a5d..567c54c4df7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2122,7 +2122,8 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) static void dump_poll_socket_request( const struct poll_socket_request *req ) { - dump_async_data( " async=", &req->async ); + fprintf( stderr, " exclusive=%c", req->exclusive ); + dump_async_data( ", async=", &req->async ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_poll_socket_input( ", sockets=", cur_size ); } -- 2.33.0

3 8

[PATCH vkd3d 1/5] tests: Test casting to and then from bool
by Giovanni Mascellani Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-bool-cast.shader_test | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/hlsl-bool-cast.shader_test diff --git a/Makefile.am b/Makefile.am index c66f7b50..3de58991 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-invalid.shader_test \ @@ -265,6 +266,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test new file mode 100644 index 00000000..8880b2f5 --- /dev/null +++ b/tests/hlsl-bool-cast.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + return float4( + (float)(bool)0.0, + (float)(bool)0, + (float)(bool)2.0, + (float)(bool)2 + ); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0) -- 2.33.0

4 13

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by Aurélien Inacio Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..a1017def5b6 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -323,6 +323,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case OPENTYPE_PLATFORM_MAC: switch (encoding) { + case TT_NAME_MAC_ENCODING_KHMER: + return 0; case TT_NAME_MAC_ENCODING_ROMAN: return 10000; case TT_NAME_MAC_ENCODING_JAPANESE: -- 2.30.2

1 0

[PATCH 1/7] ntoskrnl.exe/tests: Reduce todo_wine test verbosity.
by Rémi Bernon Sept. 2, 2021

Sept. 2, 2021

Reducing the failure message and mute driver todos after first failure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 38 ++++++++++------------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1d5f7563e3f..1a2971a8956 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -388,7 +388,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) #undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" - static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; @@ -479,12 +478,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { ULONG expected_size = 23; ok(!in_size, "got input size %u\n", in_size); - if (!test_failed) - { - todo_wine_if(!report_id) - ok(out_size == expected_size, "got output size %u\n", out_size); - } - if (out_size != expected_size) test_failed = TRUE; + todo_wine_if(!report_id) + ok(out_size == expected_size, "got output size %u\n", out_size); if (polled) { @@ -537,12 +532,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || (polled && report_id && packet->reportId == 0)) - ok(packet->reportId == report_id, "report %d, polled %d got packet report id %u\n", - report_id, polled, packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -559,11 +552,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 1) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; @@ -578,11 +570,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -599,11 +590,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 1eab88311ab..148de3b1a6c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2714,7 +2714,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) HDEVINFO set; HANDLE file; - winetest_push_context("report %d, polled %d", report_id, polled); + winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f73f6f938ca..aa84890f6af 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -51,7 +51,7 @@ static int winetest_debug; static int winetest_report_success; /* silence todos and skips above this threshold */ -static int winetest_mute_threshold = 42; +static int winetest_mute_threshold = 1; /* counts how many times a given line printed a message */ static LONG line_counters[16384]; -- 2.32.0

3 8

[PATCH 1/5] d3d10/effect: Set IsInline in GetShaderDesc().
by Nikolay Sivov Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 4 +++- dlls/d3d10/tests/effect.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 64c445ec07a..4d73121d6ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -118,6 +118,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; char *stream_output_declaration; + unsigned int isinline : 1; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81745f7f239..d521684f788 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1409,6 +1409,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ v->type = t; v->effect = e; + v->u.shader.isinline = 1; set_variable_vtbl(v); if (!copy_name("$Anonymous", &v->name)) @@ -7008,7 +7009,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( D3D10_SHADER_DESC shader_desc; HRESULT hr; - FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) return hr; @@ -7017,6 +7018,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( if (s->input_signature) desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); desc->SODecl = s->stream_output_declaration; + desc->IsInline = s->isinline; if (s->bytecode) { desc->pBytecode = ID3D10Blob_GetBufferPointer(s->bytecode); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 70bcf1ea72b..f59686c26a3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3671,8 +3671,8 @@ if (0) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine { ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); +todo_wine { ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); } -- 2.33.0

3 11

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by aurelien.ina Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Aurélien Inacio <aurelien.ina(a)protonmail.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 01/10] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Looks like my attempt to move driver tests around will need some thought so I'm sending the HID tests changes in ntoskrnl.exe/tests instead, as there'll be exhibiting a few things that need fixing. Also sending a few ntoskrnl.exe tests improvements to fix a few potential spurious failures, especially when running the tests several times, where there's sometimes stale devices laying around. I'll probably then duplicate the code for DInput driver-based tests. The first patch may just be skipped, otherwise Marvin was going to complain on every other patch. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..e3afd46181c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -979,12 +979,15 @@ static void test_return_status(void) params.ret_status = status_tests[i]; params.iosb_status = status_tests[j]; - winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u", - params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n", + params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; do_return_status(method_tests[k], &params); - winetest_pop_context(); + winetest_mute_threshold = old_threshold; + trace("done\n"); } } } -- 2.33.0

3 19

[PATCH v3 1/2] wined3d: Fix the odd line condition in gen_yv12_read().
by Anton Baskanov Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. v2: Added a comment. v3: Split condition simplification into a separate patch. --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..c760d519b30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */ -- 2.25.1

3 5

[PATCH] mf: Remove WINAPI on static functions where not needed.
by Francois Gouget Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5730a6e769f..a5545c157de 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -638,7 +638,7 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) +static HRESULT video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { HRESULT hr = S_OK; -- 2.30.2

2 1

[PATCH 0/2] Better handling of WoW in winedbg
by Eric Pouech Sept. 2, 2021

Sept. 2, 2021

a couple of fixes for winedbg (64bit) debugging a Wow64 32bit debuggee A+ --- Eric Pouech (2): winedbg: allow debugging a 32bit target from a 64bit winedbg dbghelp: handle the case where loader isn't what WINELOADER reports dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 28 +++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-)

2 3