- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d/atifs: Move fragment program compilation from set_tex_op_atifs() to atifs_apply_draw_state().
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: ef6e9a6bb450c667e35cafc7d24f0bb8b51985ef URL: https://gitlab.winehq.org/wine/wine/-/commit/ef6e9a6bb450c667e35cafc7d24f0b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 22:30:44 2023 -0600 wined3d/atifs: Move fragment program compilation from set_tex_op_atifs() to atifs_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d08e1578a67..4bdd0102682 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1011,6 +1011,11 @@ static void atifs_stage_constant(struct wined3d_context *context, const struct w } static void set_tex_op_atifs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL); +} + +static void atifs_update_shader(struct wined3d_context *context, const struct wined3d_state *state) { struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; const struct atifs_ffp_desc *desc, *last_shader = ctx_priv->last_shader; @@ -1233,6 +1238,10 @@ static void atifs_apply_draw_state(struct wined3d_context *context, const struct gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + atifs_update_shader(context, state); + + /* Note that atifs_update_shader() may set the constant update mask. */ constant_update_mask = context->constant_update_mask; if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS)

1 0

Zebediah Figura : wined3d/atifs: Move FFP bumpenv constant loading to atifs_apply_draw_state().
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 3d6c33f4506d2adc2ec76490f127ab1422016558 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d6c33f4506d2adc2ec76490f127ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 16:02:36 2023 -0600 wined3d/atifs: Move FFP bumpenv constant loading to atifs_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 83 +++++++++++++------------------------- 1 file changed, 27 insertions(+), 56 deletions(-)

1 0

Vijay Kiran Kamuju : taskschd: Return success from Principal_put_RunLevel.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 3db38ea7f4856b2856f1fd5c5f9d7272ff8d0063 URL: https://gitlab.winehq.org/wine/wine/-/commit/3db38ea7f4856b2856f1fd5c5f9d72… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:30:29 2024 +0100 taskschd: Return success from Principal_put_RunLevel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49877 --- dlls/taskschd/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 26cfeb950b0..99a2ccdf992 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1620,7 +1620,7 @@ static HRESULT WINAPI Principal_get_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TY static HRESULT WINAPI Principal_put_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE run_level) { FIXME("%p,%u: stub\n", iface, run_level); - return E_NOTIMPL; + return S_OK; } static const IPrincipalVtbl Principal_vtbl =

1 0

Zebediah Figura : wined3d/atifs: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 3153441f14bf3b6deb551b45b8c51cdf56de8e24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3153441f14bf3b6deb551b45b8c51c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 15:53:33 2023 -0600 wined3d/atifs: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1404db853b2..7be14f11b29 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -948,13 +948,16 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[WINED3D_MAX_FFP_TE static void atifs_tfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; +} + +static void atifs_update_ps_constants(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) +{ + struct atifs_context_private_data *ctx_priv = context_gl->c.fragment_pipe_data; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_color color; - if (!ctx_priv->last_shader - || ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) + if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) return; wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); @@ -1076,7 +1079,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined break; case ATIFS_CONSTANT_TFACTOR: - atifs_tfactor(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; break; case ATIFS_CONSTANT_STAGE: @@ -1253,18 +1256,24 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[] /* Context activation is done by the caller. */ 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; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + uint32_t constant_update_mask; - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } - else + if (use_ps(state)) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_SHADER_ATI); checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); + return; } + + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + + constant_update_mask = context->constant_update_mask; + + if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) + atifs_update_ps_constants(context_gl, state); } static void atifs_disable(const struct wined3d_context *context)

1 0

Zebediah Figura : wined3d/atifs: Move texture constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 0e0ee3e21b6b3620e7ac315d3af476dcf7d0304a URL: https://gitlab.winehq.org/wine/wine/-/commit/0e0ee3e21b6b3620e7ac315d3af476… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 15:56:17 2023 -0600 wined3d/atifs: Move texture constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 7be14f11b29..ff9542867fc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -957,12 +957,22 @@ static void atifs_update_ps_constants(struct wined3d_context_gl *context_gl, con const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_color color; - if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) - return; + if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] == ATIFS_CONSTANT_TFACTOR) + { + wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); + GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)); + checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)"); + } - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)); - checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)"); + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + { + if (ctx_priv->last_shader->constants[i] == ATIFS_CONSTANT_STAGE) + { + wined3d_color_from_d3dcolor(&color, state->texture_states[i][WINED3D_TSS_CONSTANT]); + GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(i), &color.r)); + checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(i), &color.r)"); + } + } } static void set_bumpmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -997,19 +1007,7 @@ static void set_bumpmat(struct wined3d_context *context, const struct wined3d_st static void atifs_stage_constant(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_color color; - - if (!ctx_priv->last_shader - || ctx_priv->last_shader->constants[stage] != ATIFS_CONSTANT_STAGE) - return; - - wined3d_color_from_d3dcolor(&color, state->texture_states[stage][WINED3D_TSS_CONSTANT]); - GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(stage), &color.r)); - checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(stage), &color.r)"); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } static void set_tex_op_atifs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -1079,11 +1077,8 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined break; case ATIFS_CONSTANT_TFACTOR: - context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - break; - case ATIFS_CONSTANT_STAGE: - atifs_stage_constant(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; break; default:

1 0

Hans Leidekker : wbemprox: Handle implicit property in object path.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 4cc9ee7e6747a4df3c7b93c95eed4f8fcadbf8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc9ee7e6747a4df3c7b93c95eed4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 23 13:37:46 2024 +0100 wbemprox: Handle implicit property in object path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55619 --- dlls/wbemprox/services.c | 54 ++++++++++++++++++++++++++++++++-------- dlls/wbemprox/table.c | 21 ++++++++++++++++ dlls/wbemprox/tests/query.c | 14 +++++++++-- dlls/wbemprox/wbemprox_private.h | 5 ++-- 4 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 436097c1e8d..53b731d8b10 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -336,6 +336,14 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } +void free_path( struct path *path ) +{ + if (!path) return; + free( path->class ); + free( path->filter ); + free( path ); +} + HRESULT parse_path( const WCHAR *str, struct path **ret ) { struct path *path; @@ -391,7 +399,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) } q = p; - while (*p && *p != '.') p++; + while (*p && *p != '.' && *p != '=') p++; len = p - q; if (!(path->class = malloc( (len + 1) * sizeof(WCHAR) ))) @@ -411,26 +419,50 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) len = q - p; if (!(path->filter = malloc( (len + 1) * sizeof(WCHAR) ))) { - free( path->class ); - free( path ); + free_path( path ); return E_OUTOFMEMORY; } memcpy( path->filter, p, len * sizeof(WCHAR) ); path->filter[len] = 0; path->filter_len = len; } + else if (p[0] == '=' && p[1]) + { + WCHAR *key; + UINT len_key; + + while (*q) q++; + len = q - p; + + if (!(key = get_first_key_property( WBEMPROX_NAMESPACE_CIMV2, path->class ))) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + len_key = wcslen( key ); + + if (!(path->filter = malloc( (len + len_key + 1) * sizeof(WCHAR) ))) + { + free( key ); + free_path( path ); + return E_OUTOFMEMORY; + } + wcscpy( path->filter, key ); + memcpy( path->filter + len_key, p, len * sizeof(WCHAR) ); + path->filter_len = len + len_key; + path->filter[path->filter_len] = 0; + free( key ); + } + else if (p[0]) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + *ret = path; return S_OK; } -void free_path( struct path *path ) -{ - if (!path) return; - free( path->class ); - free( path->filter ); - free( path ); -} - WCHAR *query_from_path( const struct path *path ) { static const WCHAR selectW[] = L"SELECT * FROM %s WHERE %s"; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 67f57878ea5..573cf035245 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -449,3 +449,24 @@ BSTR get_method_name( enum wbm_namespace ns, const WCHAR *class, UINT index ) release_table( table ); return NULL; } + +WCHAR *get_first_key_property( enum wbm_namespace ns, const WCHAR *class ) +{ + struct table *table; + WCHAR *ret = NULL; + UINT i; + + if (!(table = find_table( ns, class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (table->columns[i].type & COL_FLAG_KEY) + { + ret = wcsdup( table->columns[i].name ); + break; + } + } + + release_table( table ); + return ret; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f5a3c2a14cd..f06e0a431ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2286,8 +2286,7 @@ static void test_SystemRestore( IWbemServices *services ) static void test_Win32_LogicalDisk( IWbemServices *services ) { - BSTR wql = SysAllocString( L"wql" ); - BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -2329,6 +2328,17 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk = \"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk=\"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + IWbemClassObject_Release( obj ); + SysFreeString( query ); SysFreeString( wql ); } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 8e065bee0b9..655e3db27c2 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -241,8 +241,9 @@ VARTYPE to_vartype( CIMTYPE ); void destroy_array( struct array *, CIMTYPE ); BOOL is_result_prop( const struct view *, const WCHAR * ); HRESULT get_properties( const struct view *, UINT, LONG, SAFEARRAY ** ); -HRESULT get_object( enum wbm_namespace ns, const WCHAR *, IWbemClassObject ** ); -BSTR get_method_name( enum wbm_namespace ns, const WCHAR *, UINT ); +HRESULT get_object( enum wbm_namespace, const WCHAR *, IWbemClassObject ** ); +BSTR get_method_name( enum wbm_namespace, const WCHAR *, UINT ); +WCHAR *get_first_key_property( enum wbm_namespace, const WCHAR * ); void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ); HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** );

1 0

Hans Leidekker : netprofm: Set return pointer to NULL in networks_enum_Next().
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: d2df3c2c21f02a23a5c852c83f26e2bd7483d80f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2df3c2c21f02a23a5c852c83f26e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 26 15:23:51 2024 +0100 netprofm: Set return pointer to NULL in networks_enum_Next(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56271 --- dlls/netprofm/list.c | 2 ++ dlls/netprofm/tests/list.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d6eb1265ac5..31534c7f4b9 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -812,6 +812,8 @@ static HRESULT WINAPI networks_enum_Next( TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); + if (!ret) return E_POINTER; + *ret = NULL; if (fetched) *fetched = 0; if (!count) return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 05b6851a2d8..bb3d0f59be8 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -381,14 +381,21 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); ok( hr == S_OK, "got %08lx\n", hr ); ok(network_iter != NULL, "network_iter not set\n"); + hr = IEnumNetworks_Next( network_iter, 0, NULL, NULL ); + ok( hr == E_POINTER, "got %08lx\n", hr ); + network = (INetwork *)0xdeadbeef; while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { + ok( network != (INetwork *)0xdeadbeef, "network not set\n" ); connected = 1; hr = INetwork_get_IsConnected( network, &connected ); ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == -1 || connected == 0, "got %d\n", connected ); INetwork_Release( network ); + network = (INetwork *)0xdeadbeef; } + ok( hr == S_FALSE, "got %08lx\n", hr ); + ok( network == NULL, "network not set\n" ); IEnumNetworks_Release( network_iter ); hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_CONNECTED, &network_iter );

1 0

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

Feb. 26, 2024

Module: wine Branch: master Commit: 03e3bd947fef8f0eed7eb8c674b3d2ae917db8ea URL: https://gitlab.winehq.org/wine/wine/-/commit/03e3bd947fef8f0eed7eb8c674b3d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:24:33 2024 -0600 wmwcore: Force debug info in critical sections. --- dlls/wmvcore/async_reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 3a8556a5f0a..ef657d561ba 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1924,9 +1924,9 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) goto failed; IWMReader_Release(&object->IWMReader_iface); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.cs"); - InitializeCriticalSection(&object->callback_cs); + InitializeCriticalSectionEx(&object->callback_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->callback_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.callback_cs"); QueryPerformanceFrequency(&object->clock_frequency);

1 0

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

Feb. 26, 2024

Module: wine Branch: master Commit: f4a3f573c279213b710f9eef6bd391a5cb193568 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a3f573c279213b710f9eef6bd391… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:26:15 2024 -0600 browseui: Force debug info in critical sections. --- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index f7a5e4b449f..6ea983626a4 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -149,7 +149,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9834a4089f2..da73dbb4740 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -626,7 +626,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This);

1 0

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

Feb. 26, 2024

Module: wine Branch: master Commit: 0d51cce2fb6b5828b663805d72ed35d201c328e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d51cce2fb6b5828b663805d72ed35… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:22:43 2024 -0600 wbemprox: Force debug info in critical sections. --- dlls/wbemprox/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 53b731d8b10..3b55a534de9 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -992,7 +992,7 @@ HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVO ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; ws->ns = ns; - InitializeCriticalSection( &ws->cs ); + InitializeCriticalSectionEx( &ws->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs"); if (context) IWbemContext_Clone( context, &ws->context );

1 0