March 2024 - Wine-Commits - list.winehq.org

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

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

March 7, 2024

Module: wine Branch: master Commit: 3fd83279c07cfc94c79bcc348d9c8c9a323ae97f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fd83279c07cfc94c79bcc348d9c8c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:36:44 2024 -0600 winegstreamer: Force debug info in critical sections. --- dlls/winegstreamer/media_sink.c | 2 +- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 4 ++-- dlls/winegstreamer/wg_sample.c | 2 +- dlls/winegstreamer/wm_reader.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 6c8d69f73df..5ee2c44dc70 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -1243,7 +1243,7 @@ static HRESULT media_sink_create(IMFByteStream *bytestream, const char *format, media_sink->async_callback.lpVtbl = &media_sink_callback_vtbl; media_sink->refcount = 1; media_sink->state = STATE_OPENED; - InitializeCriticalSection(&media_sink->cs); + InitializeCriticalSectionEx(&media_sink->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); media_sink->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); IMFByteStream_AddRef((media_sink->bytestream = bytestream)); list_init(&media_sink->stream_sinks); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9cc54f8e146..3b5469932f3 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1634,7 +1634,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc IMFByteStream_AddRef(context->stream); object->file_size = context->file_size; object->rate = 1.0f; - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 44e13d05c2a..6c126fa13e2 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1663,7 +1663,7 @@ static HRESULT parser_create(enum wg_parser_type type, BOOL output_compressed, s return E_OUTOFMEMORY; } - InitializeCriticalSection(&object->streaming_cs); + InitializeCriticalSectionEx(&object->streaming_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->streaming_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.streaming_cs"); InitializeConditionVariable(&object->flushing_cv); @@ -2145,7 +2145,7 @@ static struct parser_source *create_pin(struct parser *filter, GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); - InitializeCriticalSection(&pin->flushing_cs); + InitializeCriticalSectionEx(&pin->flushing_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); InitializeConditionVariable(&pin->eos_cv); diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 31281066957..9427dad0f93 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -283,7 +283,7 @@ HRESULT wg_sample_queue_create(struct wg_sample_queue **out) if (!(queue = calloc(1, sizeof(*queue)))) return E_OUTOFMEMORY; - InitializeCriticalSection(&queue->cs); + InitializeCriticalSectionEx(&queue->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); list_init(&queue->samples); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index e3a2bfc343b..18910f87d40 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2658,9 +2658,9 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IUnknown *outer, void **out) object->outer = outer ? outer : &object->IUnknown_inner; object->refcount = 1; - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); - InitializeCriticalSection(&object->shutdown_cs); + InitializeCriticalSectionEx(&object->shutdown_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->shutdown_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.shutdown_cs"); TRACE("Created reader %p.\n", object);

1 0

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

March 7, 2024

Module: wine Branch: master Commit: 8857df969c1ea917dafe46c143ed3f7905d404d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8857df969c1ea917dafe46c143ed3f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:33:37 2024 -0600 urlmon: Force debug info in critical sections. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/bindprot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 07a00558eec..b36fa161781 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1474,7 +1474,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB ret->bindinfo.cbSize = sizeof(BINDINFO); - InitializeCriticalSection(&ret->section); + InitializeCriticalSectionEx(&ret->section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Binding.section"); hres = get_callback(pbc, &ret->callback); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index ec52ac5e999..0a7afc75e1b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1468,7 +1468,7 @@ HRESULT create_binding_protocol(BindProtocol **protocol) ret->notif_hwnd = get_notif_hwnd(); ret->protocol_handler = &ret->default_protocol_handler.IInternetProtocol_iface; ret->protocol_sink_handler = &ret->default_protocol_handler.IInternetProtocolSink_iface; - InitializeCriticalSection(&ret->section); + InitializeCriticalSectionEx(&ret->section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BindProtocol.section"); URLMON_LockModule();

1 0