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

[PATCH vkd3d 7/8] vkd3d-shader/hlsl: Support negation for all numeric types in fold_constants().
by Francisco Casas 07 Jan '22

07 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 41 +++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 54c63691..2f34a730 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -103,6 +103,39 @@ static int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, return 1; } +static int constant_op1_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + + assert(type == src->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = -src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = -src->value[k].d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = -src->value[k].i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = -src->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP1_NEG), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) { @@ -171,6 +204,9 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont case HLSL_OP1_CAST: success = constant_op1_cast(ctx, res, arg1); break; + case HLSL_OP1_NEG: + success = constant_op1_neg(ctx, res, arg1); + break; case HLSL_OP2_ADD: success = constant_op2_add(ctx, res, arg1, arg2); break; @@ -198,11 +234,6 @@ fallback: { switch (expr->op) { - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - case HLSL_OP2_MUL: for (i = 0; i < instr->data_type->dimx; ++i) res->value[i].u = arg1->value[i].u * arg2->value[i].u; -- 2.25.1

2 2

[PATCH] d3dx9_36/tests: Add missing call to ID3DXSprite_End
by Alex Henrie 07 Jan '22

07 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I think this will help prevent the testbot from crashing intermittently in check_release(sprite, 0). --- dlls/d3dx9_36/tests/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index a8477591e87..ea2d1e4465b 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -319,6 +319,8 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) ok (hr == D3D_OK, "Begin returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXSprite_Draw(sprite, tex2, &rect, &center, &pos, D3DCOLOR_XRGB(255, 255, 255)); ok (hr == D3D_OK, "Draw returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_End(sprite); + ok (hr == D3D_OK, "End returned %#x, expected %#x\n", hr, D3D_OK); IDirect3DDevice9_EndScene(device); check_release((IUnknown*)sprite, 0); -- 2.34.1

2 1

[PATCH] d3d10/tests: Increase size of array expected_i_a in test_scalar_array_methods (cppcheck)
by Alex Henrie 07 Jan '22

07 Jan '22

This array is accessed at index 5 on line 5138. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/d3d10/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ddc24d66e20..51675bcdab3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4974,7 +4974,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA const char *name) { float set_f[2], ret_f[2], expected_f; - int set_i[6], ret_i[6], expected_i, expected_i_a[2]; + int set_i[6], ret_i[6], expected_i, expected_i_a[6]; BOOL set_b[2], ret_b[2], expected_b, expected_b_a[6]; unsigned int i; HRESULT hr; -- 2.34.1

2 1

[PATCH] user32: Set WM_CONTEXTMENU's wparam to the child window's handle
by Huw Davies 07 Jan '22

07 Jan '22

DefWindowProc() does not propagate the wparam; it updates it instead. Spotted by YAL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52327 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/msg.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8cd9047f02b..44675c7b8e7 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -322,7 +322,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_CONTEXTMENU: if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - SendMessageW( GetParent(hwnd), msg, wParam, lParam ); + SendMessageW( GetParent(hwnd), msg, (WPARAM)hwnd, lParam ); else { LONG hitcode; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c054a145112..870c38b106c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -106,6 +106,7 @@ typedef struct } MEASURE_ITEM_STRUCT; static BOOL test_DestroyWindow_flag; +static BOOL test_context_menu; static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; static HHOOK hCBT_hook; @@ -9984,7 +9985,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, return 0; } - if (message == WM_CONTEXTMENU) + if (!test_context_menu && message == WM_CONTEXTMENU) { /* don't create context menu */ return 0; @@ -16148,6 +16149,13 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { 0 } }; +static struct message WmContextMenuSeq[] = { + { WM_CONTEXTMENU, sent|wparam, 0 }, /* wparams set in the code */ + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -16169,7 +16177,7 @@ static DWORD CALLBACK post_rbuttonup_msg( void *arg ) static void test_defwinproc(void) { - HWND hwnd; + HWND hwnd, child[3]; MSG msg; BOOL gotwmquit = FALSE; POINT pos; @@ -16219,6 +16227,23 @@ static void test_defwinproc(void) flush_events(); ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); + child[0] = CreateWindowExA(0, "TestWindowClass", "1st child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, hwnd, 0, 0, NULL); + child[1] = CreateWindowExA(0, "TestWindowClass", "2nd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[0], 0, 0, NULL); + child[2] = CreateWindowExA(0, "TestWindowClass", "3rd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[1], 0, 0, NULL); + flush_events(); + flush_sequence(); + test_context_menu = TRUE; + DefWindowProcA(child[2], WM_CONTEXTMENU, 0xcafe, 0); + test_context_menu = FALSE; + WmContextMenuSeq[0].wParam = (WPARAM)child[2]; + WmContextMenuSeq[1].wParam = (WPARAM)child[1]; + WmContextMenuSeq[2].wParam = (WPARAM)child[0]; + ok_sequence(WmContextMenuSeq, "DefWindowProcA(WM_CONTEXTMENU)", FALSE); + DestroyWindow(child[0]); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2; -- 2.23.0

1 0

[PATCH] cryptnet: Open the revocation cache file in binary mode.
by Zebediah Figura 07 Jan '22

07 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2f4e2d895f7..e1b32216353 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1578,7 +1578,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1626,7 +1626,7 @@ static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file); -- 2.34.1

1 0

[PATCH] taskschd: Set count to zero in regtasks_get_Count stub.
by Olivier F. R. Dierick 06 Jan '22

06 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52349 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> --- dlls/taskschd/regtask.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 0b4b571..094f34d 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -465,6 +465,7 @@ static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID d static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) { FIXME("%p,%p: stub\n", iface, count); + if (count) *count = 0; return E_NOTIMPL; } -- 2.1.4

1 0

[PATCH] amstream: Trace some format fields in IDirectDrawMediaStream::SetFormat().
by Zebediah Figura 06 Jan '22

06 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/ddrawstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index b1b79756ff9..af4492fe3e8 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -549,6 +549,10 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (format->dwSize != sizeof(DDSURFACEDESC)) return E_INVALIDARG; + TRACE("flags %#x, pixel format flags %#x, bit count %u, size %ux%u.\n", + format->dwFlags, format->ddpfPixelFormat.dwFlags, + format->ddpfPixelFormat.u1.dwRGBBitCount, format->dwWidth, format->dwHeight); + if (format->dwFlags & DDSD_PIXELFORMAT) { if (format->ddpfPixelFormat.dwSize != sizeof(DDPIXELFORMAT)) -- 2.34.1

1 0

[PATCH] server: Avoid reporting POLLOUT on connection failure in poll_single_socket().
by Zebediah Figura 06 Jan '22

06 Jan '22

Ideally we should be using sock_get_poll_events() and sock_poll_event() instead, but that seems like an overly risky change for this late in code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51442 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c00d25fec3e..042c743f95e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6883,7 +6883,7 @@ static void test_WSAPoll(void) fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - todo_wine ok(ret == 1, "got %d\n", ret); + ok(ret == 1, "got %d\n", ret); todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); diff --git a/server/sock.c b/server/sock.c index c7378306511..650e67a2e0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2979,6 +2979,9 @@ static int poll_single_socket( struct sock *sock, int mask ) if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) return 0; + if (sock->state == SOCK_CONNECTING && (pollfd.revents & (POLLERR | POLLHUP))) + pollfd.revents &= ~POLLOUT; + if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) { char dummy; -- 2.34.1

1 0

[PATCH] urlmon: Don't allow direct sink callbacks when reporting data.
by Jacek Caban 06 Jan '22

06 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52286 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 222914, 222932, 222998, 222999. dlls/urlmon/bindprot.c | 49 +++++++++++++++++++++------------- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++--------- 2 files changed, 70 insertions(+), 30 deletions(-)

2 1

[PATCH] mshtml: Fix nsnode leak when cloning.
by Gabriel Ivăncescu 06 Jan '22

06 Jan '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 996c28c..23ab719 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -800,6 +800,7 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD } hres = This->vtbl->clone(This, nsnode, &new_node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres; -- 2.34.1

2 1