January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 4/9] winhttp: Use send_socket_shutdown() in WinHttpWebSocketClose().

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 25, 2022

Re: [PATCH 3/9] winhttp: Factor out send_socket_shutdown() function.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 25, 2022

Re: [PATCH 2/9] winhttp: Set socket state to shutdown right away in WinHttpWebSocketShutdown().

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 25, 2022

Re: [PATCH 1/9] winhttp: Return ERROR_INVALID_OPERATION when websocket is in the wrong state.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 25, 2022

[PATCH v6] ntdll: Use case insensitive comparison in is_import_dll_system().

by Paul Gofman

From: Ben Shefte <shefben(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52446 Fixes a regression introduced by commit 250c113169217933b1fffa8024fa958f71b8aee7. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 224209. v6: - make patch compile; - change subject; - use _stricmp() instead of stricmp(). changelog: v1-v4 -> 5 removed unicode code referemces Fixes Regression from: Wine 6.21 dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..b50b9e61bbc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -628,7 +628,7 @@ static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_ { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /********************************************************************** -- 2.34.1

Jan. 25, 2022

[PATCH] server: Release correct sockets in poll_socket().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Watch Dogs 2 hang on start (due to wineserver crash). server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 650e67a2e0a..40fb0cac535 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3046,7 +3046,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus req->sockets[i].sock = (struct sock *)get_handle_obj( current->process, sockets[i].socket, 0, &sock_ops ); if (!req->sockets[i].sock) { - for (j = 0; j < i; ++j) release_object( req->sockets[i].sock ); + for (j = 0; j < i; ++j) release_object( req->sockets[j].sock ); if (req->timeout) remove_timeout_user( req->timeout ); free( req ); return; -- 2.34.1

Jan. 25, 2022

Re: [PATCH 2/2] server: Strip terminating '\0' from the registry key name. (Resend)

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Alexandre Julliard <julliard(a)winehq.org> wrote: > >> > @@ -477,6 +477,8 @@ static inline void get_req_path( struct unicode_str *str ) >> > { >> > str->str = get_req_data(); >> > str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); >> > + >> > + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); >> >> I don't see a test that would justify that while() loop. You should also >> test embedded nulls. > > Is that acceptable to test embedded nulls in a separate patch? I'm not sure I see why, you need the test to know how to implement it. -- Alexandre Julliard julliard(a)winehq.org

Jan. 25, 2022

Re: [PATCH 07/11] d3d11/tests: Add some tests for ID3DUserDefinedAnnotation.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105935 Your paranoid android. === debian11 (32 bit Arabic:Morocco report) === d3d11: d3d11.c:28261: Test failed: Got texcoord {8.71093690e-001, 1.28906310e-001}, expected {8.71093750e-001, 1.28906250e-001} at (3, 3), offset 1.56250000e-002. === debian11 (32 bit French report) === d3d11: d3d11.c:16710: Test failed: Dim 2, Test 15: Got unexpected result {-1.00000000e+000, 1.00000000e+000, 0.00000000e+000, 1.00000000e+000} at 18. === debian11 (32 bit Japanese:Japan report) === d3d11: d3d11.c:9827: Test failed: d3d11.c:15303: Test marked todo: Got hr 0 for WRITE_NO_OVERWRITE. d3d11.c:28315: Test failed: Got 0xffffffff, expected 0xff00ff00 at (639, 479, 0), sub-resource 0.

Jan. 25, 2022

[PATCH v2 6/6] d3d10/effect: Fix index access in GetBlendState().

by Matteo Bruni

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add a GetBlendState(..., 1, ...) test. dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96fd994fe77..e3c261d0270 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8531,17 +8531,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D1 TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_state); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_BLEND) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a blend state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->blend_states))) + return E_FAIL; + if ((*blend_state = v->u.state.object.blend)) ID3D10BlendState_AddRef(*blend_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5c2e7766767..b4ea4402a05 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4530,8 +4530,22 @@ static void test_effect_state_groups(void) blend_desc.RenderTargetWriteMask[0]); ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); + hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + /* We can't check the SrcBlend value from the ID3D10BlendState object + * descriptor because BlendEnable[0] is effectively false, which forces + * normalization of all the other descriptor values. We can at least + * confirm that we got blend_state2 by checking BlendEnable[0] itself. */ + ok(!blend_desc.BlendEnable[0], "Got unexpected BlendEnable[0] %#x.\n", blend_desc.BlendEnable[0]); + ID3D10BlendState_Release(blend_state); v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); -- 2.34.1

Jan. 25, 2022

Re: [PATCH 5/6] d3d10/effect: Fix index access in GetDepthStencilState().

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Jan. 25, 2022