March 2022 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-shader: Add missing version information for some enum elements.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 969dc1e899ae0728a0f28f5697882a0a60c98143 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=969dc1e899ae0728a0f28f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:22 2022 +0100 vkd3d-shader: Add missing version information for some enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 406f3af..05d235f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,11 +566,11 @@ enum vkd3d_shader_source_type * the format used for Direct3D shader model 4 and 5 shaders. */ VKD3D_SHADER_SOURCE_DXBC_TPF, - /** High-Level Shader Language source code. */ + /** High-Level Shader Language source code. \since 1.3 */ VKD3D_SHADER_SOURCE_HLSL, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_SOURCE_D3D_BYTECODE, @@ -597,16 +597,16 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is - * the format used for Direct3D shader model 4 and 5 shaders. + * the format used for Direct3D shader model 4 and 5 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_DXBC_TPF, /** - * An 'OpenGL Shading Language' shader. + * An 'OpenGL Shading Language' shader. \since 1.3 */ VKD3D_SHADER_TARGET_GLSL, @@ -691,7 +691,9 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION),

1 0

Henri Verbeet : vkd3d-shader/glsl: Disable support for the GLSL target.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: f0479f08bdb9bbc4175e697e7d4f706368a64e4c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0479f08bdb9bbc4175e697… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:23 2022 +0100 vkd3d-shader/glsl: Disable support for the GLSL target. Regrettably, support for the GLSL target is not mature enough for the upcoming 1.3 release. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bc3402a..62baf17 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1456,7 +1456,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif VKD3D_SHADER_TARGET_D3D_ASM, +#if 0 VKD3D_SHADER_TARGET_GLSL, +#endif }; static const enum vkd3d_shader_target_type hlsl_types[] =

1 0

Henri Verbeet : Release 1.3.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: d1d9e713f2a2c0ce439f7c3a44fcc5cd7dcaba76 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1d9e713f2a2c0ce439f7c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:24 2022 +0100 Release 1.3. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 248 ++++++++++++++++++++-------------------------- AUTHORS | 11 ++ COPYING | 2 +- Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- 8 files changed, 125 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d1d9e713f2a2c0ce439…

1 0

Tag vkd3d-1.3 : Alexandre Julliard : Release 1.3
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: refs/tags/vkd3d-1.3 Tag: 82c4dce99d2a99a535fc1ad15486e37a99cb61b5 URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=82c4dce99d2a99a535fc1ad154… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 21:32:57 2022 +0100 Release 1.3

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a helper to validate that an instruction has integer type.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 5548d5fe6daeeb208f519ddead795b6149c40628 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5548d5fe6daeeb208f519dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 24 12:45:15 2022 -0600 vkd3d-shader/hlsl: Introduce a helper to validate that an instruction has integer type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03..01e6b3d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1014,6 +1014,27 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return expr; } +static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr) +{ + const struct hlsl_type *type = instr->data_type; + struct vkd3d_string_buffer *string; + + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + break; + + default: + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression type '%s' is not integer.", string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } +} + static struct hlsl_ir_expr *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) { @@ -1061,29 +1082,8 @@ static struct hlsl_ir_expr *add_binary_bitwise_expr(struct hlsl_ctx *ctx, struct enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - if (arg1->data_type->base_type != HLSL_TYPE_INT && arg1->data_type->base_type != HLSL_TYPE_UINT - && arg1->data_type->base_type != HLSL_TYPE_BOOL) - { - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg1->data_type); - - if (type_str) - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "The first argument has type '%s', which is not integer.", type_str->buffer); - hlsl_release_string_buffer(ctx, type_str); - return NULL; - } - - if (arg2->data_type->base_type != HLSL_TYPE_INT && arg2->data_type->base_type != HLSL_TYPE_UINT - && arg2->data_type->base_type != HLSL_TYPE_BOOL) - { - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg2->data_type); - - if (type_str) - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "The second argument has type '%s', which is not integer.", type_str->buffer); - hlsl_release_string_buffer(ctx, type_str); - return NULL; - } + check_integer_type(ctx, arg1); + check_integer_type(ctx, arg2); return add_binary_arithmetic_expr(ctx, instrs, op, arg1, arg2, loc); }

1 0

Brendan Shanks : winedbg: Sanity check the dwType field of MSVC thread naming exceptions.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: ce07be1a791420ab1ed2dda7474452626a35016b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce07be1a791420ab1ed2dda7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:02 2022 -0800 winedbg: Sanity check the dwType field of MSVC thread naming exceptions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ programs/winedbg/tgt_active.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e7f9ddaf226..89985c06666 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -485,6 +485,8 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e char name[9]; SIZE_T read; + if (threadname->dwType != 0x1000) + return FALSE; if (threadname->dwThreadID == -1) thread = dbg_get_thread(gdbctx->process, gdbctx->de.dwThreadId); else diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8c365a1e55d..50f48e8d1b8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -245,6 +245,9 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance break; case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); + + if (pThreadName->dwType != 0x1000) + return DBG_EXCEPTION_NOT_HANDLED; if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; else

1 0

Brendan Shanks : winedbg: Ensure thread->name is null-terminated.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 3c2c4437969a27f5c0755c4a053702d38abd8d5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2c4437969a27f5c0755c4a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:03 2022 -0800 winedbg: Ensure thread->name is null-terminated. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 50f48e8d1b8..2caa62206d6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -257,9 +257,12 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf("Thread ID=%04lx not in our list of threads -> can't rename\n", pThreadName->dwThreadID); return DBG_CONTINUE; } - if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) - dbg_printf("Thread ID=%04lx renamed using MS VC6 extension (name==\"%.9s\")\n", + if (dbg_read_memory(pThreadName->szName, pThread->name, sizeof(pThread->name))) + { + pThread->name[sizeof(pThread->name) - 1] = '\0'; + dbg_printf("Thread ID=%04lx renamed using MSVC extension (name==\"%s\")\n", pThread->tid, pThread->name); + } return DBG_CONTINUE; case EXCEPTION_INVALID_HANDLE: return DBG_CONTINUE;

1 0

Brendan Shanks : winedbg: Don't set initial thread->name to the tid.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 88457bf68e9ef0a38bae622c97833f202181f767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88457bf68e9ef0a38bae622c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:04 2022 -0800 winedbg: Don't set initial thread->name to the tid. Currently the name is only used by GDB, send the tid there. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 11 ++++++++++- programs/winedbg/winedbg.c | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 89985c06666..0268a288481 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1790,7 +1790,16 @@ static enum packet_return packet_query_threads(struct gdb_context* gdbctx) reply_buffer_append_str(reply, "id=\""); reply_buffer_append_uinthex(reply, thread->tid, 4); reply_buffer_append_str(reply, "\" name=\""); - reply_buffer_append_str(reply, thread->name); + if (strlen(thread->name)) + { + reply_buffer_append_str(reply, thread->name); + } + else + { + char tid[5]; + snprintf(tid, sizeof(tid), "%04lx", thread->tid); + reply_buffer_append_str(reply, tid); + } reply_buffer_append_str(reply, "\"/>"); } reply_buffer_append_str(reply, "</threads>"); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 95318eeb2f1..89fb265fc93 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -444,6 +444,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, t->step_over_bp.enabled = FALSE; t->step_over_bp.refcount = 0; t->stopped_xpoint = -1; + t->name[0] = '\0'; t->in_exception = FALSE; t->frames = NULL; t->num_frames = 0; @@ -451,8 +452,6 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, t->addr_mode = AddrModeFlat; t->suspended = FALSE; - snprintf(t->name, sizeof(t->name), "%04lx", tid); - list_add_head(&p->threads, &t->entry); return t;

1 0

Brendan Shanks : winedbg: Print thread names in 'info thread' listing.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: b2d9fbd578c1eb6a336b2a907f99fe0dfcdc9274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d9fbd578c1eb6a336b2a90… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:05 2022 -0800 winedbg: Print thread names in 'info thread' listing. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 3ac00df911d..2b8e377e6f4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -589,12 +589,14 @@ void info_win32_threads(void) THREADENTRY32 entry; BOOL ok; DWORD lastProcessId = 0; + struct dbg_process* p = NULL; + struct dbg_thread* t = NULL; entry.dwSize = sizeof(entry); ok = Thread32First(snap, &entry); - dbg_printf("%-8.8s %-8.8s %s (all id:s are in hex)\n", - "process", "tid", "prio"); + dbg_printf("%-8.8s %-8.8s %s %s (all IDs are in hex)\n", + "process", "tid", "prio", "name"); while (ok) { if (entry.th32OwnerProcessID != GetCurrentProcessId()) @@ -605,10 +607,10 @@ void info_win32_threads(void) */ if (entry.th32OwnerProcessID != lastProcessId) { - struct dbg_process* p = dbg_get_process(entry.th32OwnerProcessID); PROCESSENTRY32 pcs_entry; const char* exename; + p = dbg_get_process(entry.th32OwnerProcessID); if (p) exename = dbg_W2A(p->imageName, -1); else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry)) @@ -620,9 +622,11 @@ void info_win32_threads(void) entry.th32OwnerProcessID, p ? " (D)" : "", exename); lastProcessId = entry.th32OwnerProcessID; } - dbg_printf("\t%08lx %4ld%s\n", + t = dbg_get_thread(p, entry.th32ThreadID); + dbg_printf("\t%08lx %4ld%s %s\n", entry.th32ThreadID, entry.tpBasePri, - (entry.th32ThreadID == dbg_curr_tid) ? " <==" : ""); + (entry.th32ThreadID == dbg_curr_tid) ? " <==" : " ", + t ? t->name : ""); } ok = Thread32Next(snap, &entry);

1 0

Torge Matthies : powrprof: Add PowerUnregisterSuspendResumeNotification stub.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 2074e13a43ad07c635388fe3739225a2752b1754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2074e13a43ad07c635388fe3… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sun Feb 27 02:02:33 2022 +0100 powrprof: Add PowerUnregisterSuspendResumeNotification stub. Allegedly needed by Final Fantasy VII Remake to not crash on exit. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 7 +++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index c4af8ab9ce1..dc6e8bdaa15 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -333,6 +333,13 @@ DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) { FIXME("(0x%08lx,%p,%p) stub!\n", flags, recipient, handle); + *handle = (HPOWERNOTIFY)0xdeadbeef; + return ERROR_SUCCESS; +} + +DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p) stub!\n", handle); return ERROR_SUCCESS; } diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index bf12e14a323..cbd2e47c1f2 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -18,6 +18,7 @@ @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) @ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) +@ stdcall PowerUnregisterSuspendResumeNotification(ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 546e259a39a..6959a9aeb13 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -161,6 +161,7 @@ BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTIFY); +DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0