- Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/ir: Properly handle function-local indexable temps when flattening control flow.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: c5893288d9d8c49dfdbcd927cc94cb993a326d13 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5893288d9d8c49dfdbcd927cc94c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 20 15:44:23 2024 +0100 vkd3d-shader/ir: Properly handle function-local indexable temps when flattening control flow. They have to be considered code rather than declarations, as required for instance by the SPIR-V backend. --- libs/vkd3d-shader/ir.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f0bd8533..a379ba6d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2041,12 +2041,19 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte flattener->location = instruction->location; /* Declarations should occur before the first code block, which in hull shaders is marked by the first - * phase instruction, and in all other shader types begins with the first label instruction. */ - if (!after_declarations_section && !vsir_instruction_is_dcl(instruction) - && instruction->handler_idx != VKD3DSIH_NOP) + * phase instruction, and in all other shader types begins with the first label instruction. + * Declaring an indexable temp with function scope is not considered a declaration, + * because it needs to live inside a function. */ + if (!after_declarations_section && instruction->handler_idx != VKD3DSIH_NOP) { - after_declarations_section = true; - cf_flattener_emit_label(flattener, cf_flattener_alloc_block_id(flattener)); + bool is_function_indexable = instruction->handler_idx == VKD3DSIH_DCL_INDEXABLE_TEMP + && instruction->declaration.indexable_temp.has_function_scope; + + if (!vsir_instruction_is_dcl(instruction) || is_function_indexable) + { + after_declarations_section = true; + cf_flattener_emit_label(flattener, cf_flattener_alloc_block_id(flattener)); + } } cf_info = flattener->control_flow_depth

1 0

Giovanni Mascellani : vkd3d-compiler: Add an option to emit the signature when disassembling.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 9b0a9f63f714ec4bfe3c617c28ab7d21df6437f0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b0a9f63f714ec4bfe3c617c28ab7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 23:46:32 2024 +0100 vkd3d-compiler: Add an option to emit the signature when disassembling. --- programs/vkd3d-compiler/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2a2c6b96..2289bfba 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -191,8 +191,9 @@ static void print_usage(const char *program_name) " --formatting=<flags> Specify the formatting options for text output.\n" " <flags> is a comma separated list of formatting flags,\n" " optionally prefixed by '+' or '-'. Valid flags are\n" - " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" - " The 'indent' and 'header' flags are enabled by default.\n" + " 'colour', 'indent', 'offsets', 'header', 'raw-ids',\n" + " and 'signatures'. The 'indent' and 'header' flags are\n" + " enabled by default.\n" " --fragment-coordinate-origin=<origin>\n" " Specify the origin of fragment coordinates for SPIR-V\n" " targets. Valid values are 'upper-left' (default) and\n" @@ -300,11 +301,12 @@ static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) } opts[] = { - {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, - {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT}, - {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS}, - {"header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER}, - {"raw-ids", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_RAW_IDS}, + {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, + {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT}, + {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS}, + {"header", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER}, + {"raw-ids", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_RAW_IDS}, + {"signatures", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_IO_SIGNATURES}, }; char *tok;

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Do not make a copy of the buffer before returning it.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 94d641783bebaee46829d42715bc604b9090fbfe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/94d641783bebaee46829d42715bc6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 10 16:16:23 2024 +0100 vkd3d-shader/d3d-asm: Do not make a copy of the buffer before returning it. --- libs/vkd3d-shader/d3d_asm.c | 14 +------------- libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 3f86bd45..e0e8e4cd 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -2051,7 +2051,6 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, struct vkd3d_string_buffer *buffer; unsigned int indent, i, j; const char *indent_str; - void *code; static const struct vkd3d_d3d_asm_colours no_colours = { @@ -2150,18 +2149,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, } } - if ((code = vkd3d_malloc(buffer->content_size))) - { - memcpy(code, buffer->buffer, buffer->content_size); - out->size = buffer->content_size; - out->code = code; - } - else - { - result = VKD3D_ERROR_OUT_OF_MEMORY; - } - - vkd3d_string_buffer_cleanup(buffer); + vkd3d_shader_code_from_string_buffer(out, buffer); return result; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 462a5c25..a7eec378 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -226,6 +226,16 @@ void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *cache, struct cache->buffers[cache->count++] = buffer; } +void vkd3d_shader_code_from_string_buffer(struct vkd3d_shader_code *code, struct vkd3d_string_buffer *buffer) +{ + code->code = buffer->buffer; + code->size = buffer->content_size; + + buffer->buffer = NULL; + buffer->buffer_size = 0; + buffer->content_size = 0; +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8dca450f..2d9443f9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1409,6 +1409,7 @@ void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, struct vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function); int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args); +void vkd3d_shader_code_from_string_buffer(struct vkd3d_shader_code *code, struct vkd3d_string_buffer *buffer); struct vkd3d_bytecode_buffer {

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Describe the ASM dialect with a bunch of flags instead of a plain enum.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 9d9938966391e066809e1fb0d47253c43b6e02ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d9938966391e066809e1fb0d4725… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 23:14:33 2024 +0100 vkd3d-shader/d3d-asm: Describe the ASM dialect with a bunch of flags instead of a plain enum. --- libs/vkd3d-shader/d3d_asm.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index e0e8e4cd..31d95abe 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -377,7 +377,7 @@ struct vkd3d_d3d_asm_compiler struct vkd3d_string_buffer buffer; struct vkd3d_shader_version shader_version; struct vkd3d_d3d_asm_colours colours; - enum vsir_asm_dialect dialect; + enum vsir_asm_flags flags; const struct vkd3d_shader_instruction *current; }; @@ -1370,7 +1370,7 @@ static void shader_dump_reg_type(struct vkd3d_d3d_asm_compiler *compiler, struct vkd3d_string_buffer *buffer = &compiler->buffer; const char *dimension; - if (compiler->dialect != VSIR_ASM_VSIR) + if (!(compiler->flags & VSIR_ASM_FLAG_DUMP_TYPES)) return; if (reg->dimension < ARRAY_SIZE(dimensions)) @@ -2039,13 +2039,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, enum vsir_asm_dialect dialect) + struct vkd3d_shader_code *out, enum vsir_asm_flags flags) { const struct vkd3d_shader_version *shader_version = &program->shader_version; enum vkd3d_shader_compile_option_formatting_flags formatting; struct vkd3d_d3d_asm_compiler compiler = { - .dialect = dialect, + .flags = flags, }; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; @@ -2159,7 +2159,7 @@ void vkd3d_shader_trace(const struct vsir_program *program) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(program, NULL, &code, VSIR_ASM_VSIR) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(program, NULL, &code, VSIR_ASM_FLAG_DUMP_TYPES) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a7eec378..99d7c5bd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1601,7 +1601,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, switch (compile_info->target_type) { case VKD3D_SHADER_TARGET_D3D_ASM: - ret = vkd3d_dxbc_binary_to_text(&parser->program, compile_info, out, VSIR_ASM_D3D); + ret = vkd3d_dxbc_binary_to_text(&parser->program, compile_info, out, VSIR_ASM_FLAG_NONE); break; case VKD3D_SHADER_TARGET_GLSL: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2d9443f9..16413342 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1386,15 +1386,15 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; -enum vsir_asm_dialect +enum vsir_asm_flags { - VSIR_ASM_VSIR, - VSIR_ASM_D3D, + VSIR_ASM_FLAG_NONE = 0, + VSIR_ASM_FLAG_DUMP_TYPES = 0x1, }; enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, enum vsir_asm_dialect dialect); + struct vkd3d_shader_code *out, enum vsir_asm_flags flags); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer);

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Refactor dumping a write mask to a dedicated function.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 01a687a7fc97978d8da263a28b09e7d917959f14 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/01a687a7fc97978d8da263a28b09e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 19 15:44:09 2024 +0100 vkd3d-shader/d3d-asm: Refactor dumping a write mask to a dedicated function. --- libs/vkd3d-shader/d3d_asm.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 31d95abe..98ff9d9e 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1383,31 +1383,39 @@ static void shader_dump_reg_type(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, ">"); } +static void shader_print_write_mask(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, uint32_t mask, const char *suffix) +{ + unsigned int i = 0; + char buffer[5]; + + if (mask & VKD3DSP_WRITEMASK_0) + buffer[i++] = 'x'; + if (mask & VKD3DSP_WRITEMASK_1) + buffer[i++] = 'y'; + if (mask & VKD3DSP_WRITEMASK_2) + buffer[i++] = 'z'; + if (mask & VKD3DSP_WRITEMASK_3) + buffer[i++] = 'w'; + buffer[i++] = '\0'; + + vkd3d_string_buffer_printf(&compiler->buffer, "%s.%s%s%s%s", prefix, + compiler->colours.write_mask, buffer, compiler->colours.reset, suffix); +} + static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_dst_param *param, bool is_declaration) { - struct vkd3d_string_buffer *buffer = &compiler->buffer; uint32_t write_mask = param->write_mask; shader_dump_register(compiler, &param->reg, is_declaration); if (write_mask && param->reg.dimension == VSIR_DIMENSION_VEC4) { - static const char write_mask_chars[] = "xyzw"; - if (data_type_is_64_bit(param->reg.data_type)) write_mask = vsir_write_mask_32_from_64(write_mask); - shader_addline(buffer, ".%s", compiler->colours.write_mask); - if (write_mask & VKD3DSP_WRITEMASK_0) - shader_addline(buffer, "%c", write_mask_chars[0]); - if (write_mask & VKD3DSP_WRITEMASK_1) - shader_addline(buffer, "%c", write_mask_chars[1]); - if (write_mask & VKD3DSP_WRITEMASK_2) - shader_addline(buffer, "%c", write_mask_chars[2]); - if (write_mask & VKD3DSP_WRITEMASK_3) - shader_addline(buffer, "%c", write_mask_chars[3]); - shader_addline(buffer, "%s", compiler->colours.reset); + shader_print_write_mask(compiler, "", write_mask, ""); } shader_print_precision(compiler, &param->reg);

1 0

Giovanni Mascellani : tests: Test emitting the signature.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 6163d82485960b38ab53c0b4f15a08e5e8dac7ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6163d82485960b38ab53c0b4f15a0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 19 17:08:11 2024 +0100 tests: Test emitting the signature. --- tests/vkd3d_shader_api.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 605 insertions(+)

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Support emitting the shader signature.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: vkd3d Branch: master Commit: 9aa86901e38789409c0a5c9705540c4167f9e517 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9aa86901e38789409c0a5c9705540… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 23:30:06 2024 +0100 vkd3d-shader/d3d-asm: Support emitting the shader signature. --- include/vkd3d_shader.h | 6 + libs/vkd3d-shader/d3d_asm.c | 185 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 192 insertions(+), 4 deletions(-)

1 0

Esme Povirk : mscoree: Implement CLRRuntimeHost_Start.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: 934cfb86b5e2b485b4b90e1eeac4021733559591 URL: https://gitlab.winehq.org/wine/wine/-/commit/934cfb86b5e2b485b4b90e1eeac402… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu Mar 7 20:18:03 2024 +0000 mscoree: Implement CLRRuntimeHost_Start. --- dlls/mscoree/corruntimehost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 1a546f343e0..f5a3831c90e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -814,8 +814,12 @@ static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) { - FIXME("(%p)\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + MonoDomain *dummy; + + TRACE("%p\n", This); + + return RuntimeHost_GetDefaultDomain(This, NULL, &dummy); } static HRESULT WINAPI CLRRuntimeHost_Stop(ICLRRuntimeHost* iface)

1 0

Paul Gofman : windows.media.speech: Force debug info in critical sections.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: d30dafa14d799c4b605391ef27a56baa241824cc URL: https://gitlab.winehq.org/wine/wine/-/commit/d30dafa14d799c4b605391ef27a56b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:39:56 2024 -0600 windows.media.speech: Force debug info in critical sections. --- dlls/windows.media.speech/async.c | 4 ++-- dlls/windows.media.speech/recognizer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 3c5f450cc65..2b2dc394305 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -366,7 +366,7 @@ HRESULT async_action_create( IInspectable *invoker, async_action_callback callba if (invoker) IInspectable_AddRef((impl->invoker = invoker)); - InitializeCriticalSection(&impl->cs); + InitializeCriticalSectionEx(&impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_action.cs"); /* AddRef to keep the obj alive in the callback. */ @@ -745,7 +745,7 @@ HRESULT async_operation_inspectable_create( const GUID *iid, if (invoker) IInspectable_AddRef((impl->invoker = invoker)); - InitializeCriticalSection(&impl->cs); + InitializeCriticalSectionEx(&impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_operation.cs"); /* AddRef to keep the obj alive in the callback. */ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 790d127fc64..a98970d35f9 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -1126,7 +1126,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface if (FAILED(hr = recognizer_factory_create_audio_capture(session))) goto error; - InitializeCriticalSection(&session->cs); + InitializeCriticalSectionEx(&session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": recognition_session.cs"); /* Init ISpeechRecognizer */

1 0

Paul Gofman : quartz: Force debug info in critical sections.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: ec666970053f13e3b345fd14494caf0a2a5c6826 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec666970053f13e3b345fd14494caf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:32:25 2024 -0600 quartz: Force debug info in critical sections. --- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/memallocator.c | 2 +- dlls/quartz/systemclock.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f96555ff78c..b2d6e137d49 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -422,7 +422,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; object->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; - InitializeCriticalSection(&object->sample_cs); + InitializeCriticalSectionEx(&object->sample_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); InitializeConditionVariable(&object->sample_cv); object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9b2b2b4e93b..f2c44498109 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5704,9 +5704,9 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL return hr; } - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.cs"); - InitializeCriticalSection(&object->event_cs); + InitializeCriticalSectionEx(&object->event_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->event_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.event_cs"); object->defaultclock = TRUE; diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 87869b4d6b2..ca786ab0046 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -920,7 +920,7 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) if (!(pMemAlloc = CoTaskMemAlloc(sizeof(*pMemAlloc)))) return E_OUTOFMEMORY; - InitializeCriticalSection(&pMemAlloc->csState); + InitializeCriticalSectionEx(&pMemAlloc->csState, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); pMemAlloc->csState.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": StdMemAllocator.csState"); pMemAlloc->pMemory = NULL; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 244bfd294b6..47297150051 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -341,7 +341,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; list_init(&object->sinks); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); TRACE("Created system clock %p.\n", object);

1 0