- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 17b9c453117ca8e4b180934262f0aed221a0c7da URL: https://gitlab.winehq.org/wine/wine/-/commit/17b9c453117ca8e4b180934262f0ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 13:14:30 2023 -0600 wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/ffp_gl.c | 4 ++-- dlls/wined3d/glsl_shader.c | 5 ++--- dlls/wined3d/nvidia_texture_shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8a31d67662d..9ca6dd8ff46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5740,7 +5740,7 @@ struct arbfp_ffp_desc }; /* Context activation is done by the caller. */ -static void arbfp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 45e6c081ba0..925b712f372 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1251,7 +1251,7 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[] }; /* Context activation is done by the caller. */ -static void atifs_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void atifs_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index 0b5f1fab653..dbc82a1ba4d 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4840,7 +4840,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = }; /* Context activation is done by the caller. */ -static void ffp_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void ffp_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void ffp_pipe_disable(const struct wined3d_context *context) {} @@ -4967,7 +4967,7 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline = .states = ffp_fragmentstate_template, }; -static void none_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void none_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void none_pipe_disable(const struct wined3d_context *context) {} diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4cff60b1775..5a2133bf5a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11563,7 +11563,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_shader_compile, }; -static void glsl_vertex_pipe_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void glsl_vertex_pipe_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {} @@ -12060,8 +12060,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = .vp_states = glsl_vertex_pipe_vp_states, }; -static void glsl_fragment_pipe_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) +static void glsl_fragment_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index c68dc42b690..0575e72ef43 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -660,7 +660,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvrc_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; @@ -685,7 +685,7 @@ static void nvrc_disable(const struct wined3d_context *context) } /* Context activation is done by the caller. */ -static void nvts_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvts_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 70affa1558e..5be17815d3a 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1136,7 +1136,7 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo return &spirv_shader_backend_vk; } -static void spirv_vertex_pipe_vk_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void spirv_vertex_pipe_vk_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } @@ -1219,7 +1219,7 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) } static void spirv_fragment_pipe_vk_fp_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) + struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74c0ea52f3a..ae9e049a054 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,7 +2001,7 @@ struct wined3d_state_entry_template struct wined3d_fragment_pipe_ops { - void (*fp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*fp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*fp_disable)(const struct wined3d_context *context); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter); @@ -2029,7 +2029,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { - void (*vp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*vp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*vp_disable)(const struct wined3d_context *context); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter);

1 0

Zebediah Figura : wined3d: Introduce a separate fp_disable() method.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: b64cc15d615659200643f0094f07133ec8b028b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b64cc15d615659200643f0094f0713… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:32:17 2023 -0600 wined3d: Introduce a separate fp_disable() method. Analogous to shader_disable(). We'd like to pass a wined3d_state pointer to fp_enable() to let it handle actually compiling the fragment pipeline, which doesn't mesh well conceptually with its use in shader_disable(). --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++------- dlls/wined3d/ati_fragment_shader.c | 27 ++++++++++++------ dlls/wined3d/ffp_gl.c | 37 ++++++++++++------------ dlls/wined3d/glsl_shader.c | 25 +++++++++------- dlls/wined3d/nvidia_texture_shader.c | 55 ++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 8 +++++- dlls/wined3d/wined3d_private.h | 1 + 8 files changed, 117 insertions(+), 67 deletions(-)

1 0

Eric Pouech : kernel32/tests: Check if thread is suspended in debugger attachment tests.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 5efab1175287421c3977e3cb3a537500824cd777 URL: https://gitlab.winehq.org/wine/wine/-/commit/5efab1175287421c3977e3cb3a5375… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Feb 14 11:10:58 2024 +0100 kernel32/tests: Check if thread is suspended in debugger attachment tests. Looks like thread is suspended until DBG_CONTINUE is sent on thread creation debug event. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 9fb953f281a..301714342e4 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -416,16 +416,34 @@ static void wait_for_breakpoint_(unsigned line, struct debugger_context *ctx) ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); } +#define check_thread_running(h) ok(_check_thread_suspend_count(h) == 0, "Expecting running thread\n") +#define check_thread_suspended(h) ok(_check_thread_suspend_count(h) > 0, "Expecting suspended thread\n") + +static LONG _check_thread_suspend_count(HANDLE h) +{ + DWORD suspend_count; + + suspend_count = SuspendThread(h); + if (suspend_count != (DWORD)-1 && ResumeThread(h) == (DWORD)-1) + return (DWORD)-2; + return suspend_count; +} + static void process_attach_events(struct debugger_context *ctx, BOOL pass_exception) { DEBUG_EVENT ev; BOOL ret; + HANDLE prev_thread; ctx->ev.dwDebugEventCode = -1; next_event(ctx, 0); ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + todo_wine + check_thread_suspended(ctx->ev.u.CreateProcessInfo.hThread); + prev_thread = ctx->ev.u.CreateProcessInfo.hThread; next_event(ctx, 0); + if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) /* Vista+ reports ntdll.dll before reporting threads */ { ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); @@ -434,7 +452,13 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except } while (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) + { + todo_wine + check_thread_suspended(ctx->ev.u.CreateThread.hThread); + check_thread_running(prev_thread); + prev_thread = ctx->ev.u.CreateThread.hThread; next_event(ctx, 0); + } do { @@ -455,9 +479,12 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except DWORD last_threads[5]; unsigned thd_idx = 0, i; + check_thread_running(prev_thread); + /* sometimes (at least Win10) several thread creations are reported here */ do { + check_thread_running(ctx->ev.u.CreateThread.hThread); if (thd_idx < ARRAY_SIZE(last_threads)) last_threads[thd_idx++] = ctx->ev.dwThreadId; next_event(ctx, WAIT_EVENT_TIMEOUT);

1 0

Zebediah Figura : dinput/tests: Return void from test_winmm_joystick().
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: a97a4af0ddd237108b42ca4c4239b5d207b085b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a97a4af0ddd237108b42ca4c4239b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 3 12:04:23 2023 -0500 dinput/tests: Return void from test_winmm_joystick(). --- dlls/dinput/tests/joystick8.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 788f59549c2..0553cb96a63 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4464,7 +4464,7 @@ done: cleanup_registry_keys(); } -static BOOL test_winmm_joystick(void) +static void test_winmm_joystick(void) { #include "psh_hid_macros.h" const unsigned char report_desc[] = @@ -4821,8 +4821,6 @@ static BOOL test_winmm_joystick(void) done: hid_device_stop( &desc, 1 ); cleanup_registry_keys(); - - return device != NULL; } #define check_interface( a, b, c ) check_interface_( __LINE__, a, b, c )

1 0

Zebediah Figura : wined3d: Merge shader_load_constants() into shader_select().
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: c8a98e03c8f13664c6d3c43897da5e2443b79ab1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a98e03c8f13664c6d3c43897da5e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 13:57:55 2023 -0600 wined3d: Merge shader_load_constants() into shader_select(). Arguably there is a benefit here in that it reduces shader backend state application down to a single method, although whether that is an improvement may be up for debate. More saliently, we would like to move FFP state application out of the state table and into a linear state function. In practice that function will probably be vp_enable / fp_enable. In that case we will need those functions, and hence also shader_select(), to be called when more states are dirty. This does not in itself mean that shader_load_constants() needs to be merged with shader_select(), but it does remove the primary impetus for keeping them separate. Rename to shader_apply_draw_state() to reflect the adjusted purpose, as suggested by Henri Verbeet. --- dlls/wined3d/arb_program_shader.c | 40 +++++++++++++++++++-------------------- dlls/wined3d/context_gl.c | 16 +++++----------- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++--------------- dlls/wined3d/shader.c | 7 ++----- dlls/wined3d/shader_spirv.c | 11 ++--------- dlls/wined3d/wined3d_private.h | 4 +--- 7 files changed, 54 insertions(+), 64 deletions(-)

1 0

Zebediah Figura : wined3d: Introduce a separate vp_disable() method.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 9880e29d69a227b7ae0031ddaff0148768d1be7e URL: https://gitlab.winehq.org/wine/wine/-/commit/9880e29d69a227b7ae0031ddaff014… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:21:52 2023 -0600 wined3d: Introduce a separate vp_disable() method. Analogous to shader_disable(). We'd like to pass a wined3d_state pointer to vp_enable() to let it handle actually compiling the vertex pipeline, which doesn't mesh well conceptually with its use in shader_disable(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ffp_gl.c | 29 +++++++++++++++++------------ dlls/wined3d/glsl_shader.c | 17 ++++++++++------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4e856c6a616..a1f56406a0a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4778,7 +4778,7 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT] && priv->last_vs_color_unclamp) { diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index d52d198e545..8d8a14107eb 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4842,6 +4842,8 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = /* Context activation is done by the caller. */ static void ffp_pipe_enable(const struct wined3d_context *context, BOOL enable) {} +static void ffp_pipe_disable(const struct wined3d_context *context) {} + static void *ffp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { return shader_priv; @@ -4879,12 +4881,13 @@ static unsigned int vp_ffp_get_emul_mask(const struct wined3d_adapter *adapter) const struct wined3d_vertex_pipe_ops ffp_vertex_pipe = { - ffp_pipe_enable, - vp_ffp_get_caps, - vp_ffp_get_emul_mask, - ffp_alloc, - ffp_free, - vp_ffp_states, + .vp_enable = ffp_pipe_enable, + .vp_disable = ffp_pipe_disable, + .vp_get_caps = vp_ffp_get_caps, + .vp_get_emul_mask = vp_ffp_get_emul_mask, + .vp_alloc = ffp_alloc, + .vp_free = ffp_free, + .vp_states = vp_ffp_states, }; static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) @@ -4965,6 +4968,8 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline = static void none_pipe_enable(const struct wined3d_context *context, BOOL enable) {} +static void none_pipe_disable(const struct wined3d_context *context) {} + static void *none_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { return shader_priv; @@ -4984,12 +4989,12 @@ static unsigned int vp_none_get_emul_mask(const struct wined3d_adapter *adapter) const struct wined3d_vertex_pipe_ops none_vertex_pipe = { - none_pipe_enable, - vp_none_get_caps, - vp_none_get_emul_mask, - none_alloc, - none_free, - NULL, + .vp_enable = none_pipe_enable, + .vp_disable = none_pipe_disable, + .vp_get_caps = vp_none_get_caps, + .vp_get_emul_mask = vp_none_get_emul_mask, + .vp_alloc = none_alloc, + .vp_free = none_free, }; static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e9a3b3467b..07b3d002c67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10820,7 +10820,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte GL_EXTCALL(glUseProgram(0)); checkGLcall("glUseProgram"); - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, FALSE); if (needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) @@ -11565,6 +11565,8 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = static void glsl_vertex_pipe_vp_enable(const struct wined3d_context *context, BOOL enable) {} +static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {} + static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; @@ -12049,12 +12051,13 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = * - Implement vertex tweening. */ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = { - glsl_vertex_pipe_vp_enable, - glsl_vertex_pipe_vp_get_caps, - glsl_vertex_pipe_vp_get_emul_mask, - glsl_vertex_pipe_vp_alloc, - glsl_vertex_pipe_vp_free, - glsl_vertex_pipe_vp_states, + .vp_enable = glsl_vertex_pipe_vp_enable, + .vp_disable = glsl_vertex_pipe_vp_disable, + .vp_get_caps = glsl_vertex_pipe_vp_get_caps, + .vp_get_emul_mask = glsl_vertex_pipe_vp_get_emul_mask, + .vp_alloc = glsl_vertex_pipe_vp_alloc, + .vp_free = glsl_vertex_pipe_vp_free, + .vp_states = glsl_vertex_pipe_vp_states, }; static void glsl_fragment_pipe_enable(const struct wined3d_context *context, BOOL enable) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b72a3df8737..e047e3da03d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1952,7 +1952,7 @@ static void shader_none_disable(void *shader_priv, struct wined3d_context *conte { struct shader_none_priv *priv = shader_priv; - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, FALSE); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1eac7373ee3..ca14564d7d6 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -904,7 +904,7 @@ static void shader_spirv_disable(void *shader_priv, struct wined3d_context *cont struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct shader_spirv_priv *priv = shader_priv; - priv->vertex_pipe->vp_enable(context, false); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, false); context_vk->compute.vk_pipeline = VK_NULL_HANDLE; @@ -1141,6 +1141,11 @@ static void spirv_vertex_pipe_vk_vp_enable(const struct wined3d_context *context /* Nothing to do. */ } +static void spirv_vertex_pipe_vk_vp_disable(const struct wined3d_context *context) +{ + /* Nothing to do. */ +} + static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { memset(caps, 0, sizeof(*caps)); @@ -1200,6 +1205,7 @@ static const struct wined3d_state_entry_template spirv_vertex_pipe_vk_vp_states[ static const struct wined3d_vertex_pipe_ops spirv_vertex_pipe_vk = { .vp_enable = spirv_vertex_pipe_vk_vp_enable, + .vp_disable = spirv_vertex_pipe_vk_vp_disable, .vp_get_caps = spirv_vertex_pipe_vk_vp_get_caps, .vp_get_emul_mask = spirv_vertex_pipe_vk_vp_get_emul_mask, .vp_alloc = spirv_vertex_pipe_vk_vp_alloc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 033e0d6b9dc..8c562ba5daf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2029,6 +2029,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_context *context, BOOL enable); + void (*vp_disable)(const struct wined3d_context *context); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv);

1 0

Paul Gofman : vcomp: Force debug info in critical sections.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: c65d0a0770bdcd60ecf579d7506b62b200e6386e URL: https://gitlab.winehq.org/wine/wine/-/commit/c65d0a0770bdcd60ecf579d7506b62… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:02:43 2024 -0600 vcomp: Force debug info in critical sections. --- dlls/vcomp/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 63ec0502b9b..91afea33112 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1712,7 +1712,7 @@ static CRITICAL_SECTION *alloc_critsect(void) ExitProcess(1); } - InitializeCriticalSection(critsect); + InitializeCriticalSectionEx(critsect, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); return critsect; }

1 0

Paul Gofman : webservices: Force debug info in critical sections.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 95e12689e6e100e11e7857a12a714311c6cb4c93 URL: https://gitlab.winehq.org/wine/wine/-/commit/95e12689e6e100e11e7857a12a7143… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:06:25 2024 -0600 webservices: Force debug info in critical sections. --- dlls/webservices/channel.c | 6 +++--- dlls/webservices/error.c | 2 +- dlls/webservices/heap.c | 2 +- dlls/webservices/listener.c | 2 +- dlls/webservices/msg.c | 2 +- dlls/webservices/proxy.c | 2 +- dlls/webservices/reader.c | 2 +- dlls/webservices/writer.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5851fd9d4af..b58a2d44457 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -252,9 +252,9 @@ static struct channel *alloc_channel(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = CHANNEL_MAGIC; - InitializeCriticalSection( &ret->cs ); - InitializeCriticalSection( &ret->send_q.cs ); - InitializeCriticalSection( &ret->recv_q.cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->send_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->recv_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.cs"); ret->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.send_q.cs"); ret->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.recv_q.cs"); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index aa1a9744f34..9e57f454ce9 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -67,7 +67,7 @@ static struct error *alloc_error(void) } ret->magic = ERROR_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": error.cs"); prop_init( error_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index b2ee514b970..71ef42c9530 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -184,7 +184,7 @@ static struct heap *alloc_heap(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = HEAP_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); prop_init( heap_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 3112d5d84fd..da4e135703f 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -141,7 +141,7 @@ static struct listener *alloc_listener(void) free( ret ); return NULL; } - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); prop_init( listener_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 7f6cd028163..5912195e015 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -108,7 +108,7 @@ static struct msg *alloc_msg(void) ret->state = WS_MESSAGE_STATE_EMPTY; ret->header_size = HEADER_ARRAY_SIZE; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": msg.cs"); prop_init( msg_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index bde4cdb168f..d00ad4ad70b 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -62,7 +62,7 @@ static struct proxy *alloc_proxy(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = PROXY_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy.cs"); prop_init( proxy_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0c8ddcea035..0cd974c9118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -422,7 +422,7 @@ static struct reader *alloc_reader(void) ret->nb_prefixes = ret->nb_prefixes_allocated = 1; ret->magic = READER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); prop_init( reader_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 6923035f00c..df8535f8647 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -109,7 +109,7 @@ static struct writer *alloc_writer(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = WRITER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": writer.cs"); prop_init( writer_props, count, ret->prop, &ret[1] );

1 0

Paul Gofman : mapi32: Force debug info in critical sections.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 0efd48113e767667fa1a255ee5b3ce5be9ee697f URL: https://gitlab.winehq.org/wine/wine/-/commit/0efd48113e767667fa1a255ee5b3ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 14:58:03 2024 -0600 mapi32: Force debug info in critical sections. --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 95176829f7e..8018ceecd4d 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -2335,7 +2335,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALLOCATEBUFFER *lpAlloc, lpPropData->ulObjAccess = IPROP_READWRITE; lpPropData->ulNumValues = 0; list_init(&lpPropData->values); - InitializeCriticalSection(&lpPropData->cs); + InitializeCriticalSectionEx(&lpPropData->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); *lppPropData = &lpPropData->IPropData_iface; }

1 0

Paul Gofman : rpcrt4: Force debug info in critical sections.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 139d624787a2c629cf640a413c4faabfc2bf40b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/139d624787a2c629cf640a413c4faa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:01:47 2024 -0600 rpcrt4: Force debug info in critical sections. --- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpc_transport.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 6a6768e1677..c3eec9558dd 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -72,7 +72,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->refs = 1; list_init(&assoc->free_connection_pool); list_init(&assoc->context_handle_list); - InitializeCriticalSection(&assoc->cs); + InitializeCriticalSectionEx(&assoc->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); assoc->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcAssoc.cs"); assoc->Protseq = strdup(Protseq); assoc->NetworkAddr = strdup(NetworkAddr); @@ -463,7 +463,7 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - InitializeCriticalSection(&context_handle->lock); + InitializeCriticalSectionEx(&context_handle->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 41431ebca02..eb733f69980 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -965,7 +965,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->ops = ops; list_init(&(*ps)->listeners); list_init(&(*ps)->connections); - InitializeCriticalSection(&(*ps)->cs); + InitializeCriticalSectionEx(&(*ps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); list_add_head(&protseqs, &(*ps)->entry); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 62bbd9f2939..8d53e7cee35 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1756,7 +1756,7 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) httpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); httpc->async_data->refs = 1; httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSW); - InitializeCriticalSection(&httpc->async_data->cs); + InitializeCriticalSectionEx(&httpc->async_data->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; } diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 122ab94f17c..37d82f330dc 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -950,7 +950,7 @@ static struct threaddata *get_or_create_threaddata(void) tdata = calloc(1, sizeof(*tdata)); if (!tdata) return NULL; - InitializeCriticalSection(&tdata->cs); + InitializeCriticalSectionEx(&tdata->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); tdata->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threaddata.cs"); tdata->thread_id = GetCurrentThreadId();

1 0