November 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani 16 Nov '21

16 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

3 11

[PATCH 0/6] Improvements around module handling in dbghelp
by Eric Pouech 16 Nov '21

16 Nov '21

The following series implements: - a couple of bug fixes related to module management - a change in collision detection while loading modules: + logic based on module base address (rather than name) + allow loading several modules with same module names (either multiple times the same module, or different modules with same module name) A+ --- Eric Pouech (6): dbghelp: fix module name construction dbghelp: always search current directory when loading PE modules dbghelp: allow 32bit dbghelp to handle 64 addresses dbghelp: move debug info loading out of image backends into SymLoadModuleEx() dbghelp: detect collision by looking at module's base address in SymLoadModuleEx() dbghelp: improve collision handling in SymLoadModuleEx() dlls/dbghelp/elf_module.c | 7 +- dlls/dbghelp/macho_module.c | 4 - dlls/dbghelp/module.c | 169 +++++++++++++++++++----------------- dlls/dbghelp/pe_module.c | 12 +-- 4 files changed, 95 insertions(+), 97 deletions(-)

1 6

[PATCH v2] winedbg: Use heap allocation for module filenames in handle_debug_event.
by Jinoh Kang 16 Nov '21

16 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - Capitalise subject - Fix passing incorrect length to dbg_W2A() - Remove a gratuitous blank line programs/winedbg/gdbproxy.c | 40 ++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..605da512a27 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -396,10 +396,8 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load DEBUG_EVENT *de = &gdbctx->de; struct dbg_thread *thread; - union { - char bufferA[256]; - WCHAR buffer[256]; - } u; + char bufferA[512]; + LPWSTR name; DWORD size; gdbctx->exec_tid = de->dwThreadId; @@ -414,44 +412,54 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load if (!gdbctx->process) return TRUE; - size = ARRAY_SIZE(u.buffer); - QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); - dbg_set_process_name(gdbctx->process, u.buffer); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + if (!QueryFullProcessImageNameW( gdbctx->process->handle, 0, name, &size )) + { + size = 0; + name[size] = L'\0'; + } + + dbg_set_process_name(gdbctx->process, name); fprintf(stderr, "%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, -1), de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpStartAddress, de->u.CreateProcessInfo.dwDebugInfoFileOffset, de->u.CreateProcessInfo.nDebugInfoSize); /* de->u.CreateProcessInfo.lpStartAddress; */ - if (!dbg_init(gdbctx->process->handle, u.buffer, TRUE)) + if (!dbg_init(gdbctx->process->handle, name, TRUE)) ERR("Couldn't initiate DbgHelp\n"); fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); - dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, name, (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); + + HeapFree(GetProcessHeap(), 0, name); return TRUE; case LOAD_DLL_DEBUG_EVENT: - fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, - u.buffer, ARRAY_SIZE(u.buffer) ); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, name, size ); fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, -1), de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, name, (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); + HeapFree(GetProcessHeap(), 0, name); if (stop_on_dll_load_unload) break; return TRUE; @@ -501,9 +509,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load case OUTPUT_DEBUG_STRING_EVENT: memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, - de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); + de->u.DebugString.fUnicode, bufferA, sizeof(bufferA)); fprintf(stderr, "%08x:%08x: output debug string (%s)\n", - de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); + de->dwProcessId, de->dwThreadId, debugstr_a(bufferA)); return TRUE; case RIP_EVENT: -- 2.31.1

1 0

[PATCH v2] winedbg: Set reuseaddr flag for gdb remote socket.
by Jinoh Kang 16 Nov '21

16 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - Capitalise subject - Fix type of SO_REUSEADDR argument variable programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..b8a450d70db 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2146,6 +2146,7 @@ static BOOL gdb_exec(unsigned port, unsigned flags) static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned port) { SOCKET sock; + BOOL reuseaddr = TRUE; struct sockaddr_in s_addrs = {0}; int s_len = sizeof(s_addrs); fd_set read_fds; @@ -2161,6 +2162,8 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por return FALSE; } + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&reuseaddr, sizeof(reuseaddr)); + s_addrs.sin_family = AF_INET; s_addrs.sin_addr.S_un.S_addr = INADDR_ANY; s_addrs.sin_port = htons(port); -- 2.31.1

1 0

[PATCH v2] winedbg: Report current thread ID to GDB for all stop replies.
by Jinoh Kang 16 Nov '21

16 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: Capitalise subject programs/winedbg/gdbproxy.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..a4f5bd1387e 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -867,6 +867,22 @@ static void packet_reply_status_xpoints(struct gdb_context* gdbctx, struct dbg_t } } +static void packet_reply_begin_stop_reply(struct gdb_context* gdbctx, unsigned char signal) +{ + packet_reply_add(gdbctx, "T"); + packet_reply_val(gdbctx, signal, 1); + + /* We should always report the current thread ID for all stop replies. + * Otherwise, GDB complains with the following message: + * + * Warning: multi-threaded target stopped without sending a thread-id, + * using first non-exited thread + */ + packet_reply_add(gdbctx, "thread:"); + packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); + packet_reply_add(gdbctx, ";"); +} + static enum packet_return packet_reply_status(struct gdb_context* gdbctx) { struct dbg_process *process = gdbctx->process; @@ -885,11 +901,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) return packet_error; packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, signal_from_debug_event(&gdbctx->de), 1); - packet_reply_add(gdbctx, "thread:"); - packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); - packet_reply_add(gdbctx, ";"); + packet_reply_begin_stop_reply(gdbctx, signal_from_debug_event(&gdbctx->de)); packet_reply_status_xpoints(gdbctx, thread, &ctx); for (i = 0; i < backend->gdb_num_regs; i++) @@ -913,8 +925,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) case LOAD_DLL_DEBUG_EVENT: case UNLOAD_DLL_DEBUG_EVENT: packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, HOST_SIGTRAP, 1); + packet_reply_begin_stop_reply(gdbctx, HOST_SIGTRAP); packet_reply_add(gdbctx, "library:;"); packet_reply_close(gdbctx); return packet_done; -- 2.31.1

1 0

[PATCH vkd3d] vkd3d-shader/hlsl: Add cross() intrinsic function and test.
by Francisco Casas 16 Nov '21

16 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 54 ++++++++++++++++++++++++++++++++++++++++ tests/cross.shader_test | 11 ++++++++ 3 files changed, 66 insertions(+) create mode 100644 tests/cross.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..3cfd90f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..3bb5cd70 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,59 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_cross(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *v0 = params->args[0], *v1 = params->args[1]; + struct hlsl_ir_swizzle *v0_swzl1, *v0_swzl2, *v1_swzl1, *v1_swzl2; + struct hlsl_ir_node *mul1_neg; + struct hlsl_ir_expr *mul1, *mul2; + int wrong_arg = -1; + + if (v1->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 1; + if (v0->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 0; + if (wrong_arg != -1) + { + struct vkd3d_string_buffer *string; + if ((string = hlsl_type_to_string(ctx, params->args[wrong_arg]->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %d of 'cross': expected 'vector' but got '%s'.", + wrong_arg, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (!(v0_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, v0, &loc))) + return false; + list_add_tail(params->instrs, &v0_swzl1->node.entry); + + if (!(v1_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, v1, &loc))) + return false; + list_add_tail(params->instrs, &v1_swzl1->node.entry); + + if (!(mul1 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &v0_swzl1->node, &v1_swzl1->node, &loc))) + return false; + + if (!(mul1_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &mul1->node, loc))) + return false; + list_add_tail(params->instrs, &mul1_neg->entry); + + if (!(v0_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, v0, &loc))) + return false; + list_add_tail(params->instrs, &v0_swzl2->node.entry); + + if (!(v1_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, v1, &loc))) + return false; + list_add_tail(params->instrs, &v1_swzl2->node.entry); + + if (!(mul2 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &v0_swzl2->node, &v1_swzl2->node, &loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1628,6 +1681,7 @@ intrinsic_functions[] = { {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, + {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/cross.shader_test b/tests/cross.shader_test new file mode 100644 index 00000000..c49f5248 --- /dev/null +++ b/tests/cross.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main(uniform float4 u, uniform float4 v) : sv_target +{ + return float4(cross(u,v),0); +} + +[test] +uniform 0 float4 1 -2 3 4 +uniform 4 float4 10 100 1000 10000 +draw quad +probe all rgba (-2300, -970, 120, 0) -- 2.25.1

2 1

[PATCH] winevulkan: Update to VK spec version 1.2.199.
by Georg Lehmann 16 Nov '21

16 Nov '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f88f15b49dd..92dc71ab9d8 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.197" +VK_XML_VERSION = "1.2.199" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.1

1 0

[PATCH 7/9] win32u: Move NtUserGetKeyboardLayout implementation from user32.
by Jacek Caban 16 Nov '21

16 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This exposes user_thread_info in ntuser.h. I think that we will ultimately want to expose only parts of that, but it's convenient for now for the transition. dlls/user32/input.c | 35 ++++++----------------- dlls/user32/message.c | 4 +-- dlls/user32/misc.c | 4 +-- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 30 -------------------- dlls/win32u/input.c | 54 ++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 ++++ include/ntuser.h | 30 ++++++++++++++++++++ 11 files changed, 106 insertions(+), 63 deletions(-)

3 2

[PATCH 9/9] win32u: Move NtUserGetOpenClipboardWindow implementation from user32.
by Jacek Caban 16 Nov '21

16 Nov '21

2 1

[PATCH 8/9] win32u: Move NtUserGetKeyNameText implementation from user32.
by Jacek Caban 16 Nov '21

16 Nov '21

2 1