February 2024 - Wine-Commits

Vijay Kiran Kamuju : taskschd: Implement IRegistrationTrigger_putEnabled.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: ea552a6f39771d24061b5bdd88e10371883645fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ea552a6f39771d24061b5bdd88e103… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:01:12 2024 +0100 taskschd: Implement IRegistrationTrigger_putEnabled. --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7ed69728b76..6c94c8ec8f3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -326,6 +326,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) typedef struct { IRegistrationTrigger IRegistrationTrigger_iface; + BOOL enabled; LONG ref; } RegistrationTrigger; @@ -502,8 +503,11 @@ static HRESULT WINAPI RegistrationTrigger_get_Enabled(IRegistrationTrigger *ifac static HRESULT WINAPI RegistrationTrigger_put_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL enabled) { RegistrationTrigger *This = impl_from_IRegistrationTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = !!enabled; + return S_OK; } static HRESULT WINAPI RegistrationTrigger_get_Delay(IRegistrationTrigger *iface, BSTR *pDelay) @@ -555,6 +559,7 @@ static HRESULT RegistrationTrigger_create(ITrigger **trigger) registration_trigger->IRegistrationTrigger_iface.lpVtbl = &RegistrationTrigger_vtbl; registration_trigger->ref = 1; + registration_trigger->enabled = FALSE; *trigger = (ITrigger*)&registration_trigger->IRegistrationTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bc7c654e9a2..31f6e586e90 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1406,7 +1406,7 @@ static void test_registration_trigger(ITrigger *trigger) todo_wine ok(enabled == VARIANT_TRUE, "got %d\n", enabled); hr = IRegistrationTrigger_put_Enabled(reg_trigger, VARIANT_FALSE); - todo_wine ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); + ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); enabled = VARIANT_TRUE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled);

1 0

Vijay Kiran Kamuju : taskschd: Implement TaskService_get_ConnectedDomain.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: c2a4f3810b17f9efa3c848b473b19f641f7881f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a4f3810b17f9efa3c848b473b19f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Feb 27 13:28:47 2024 +0100 taskschd: Implement TaskService_get_ConnectedDomain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48110 --- dlls/taskschd/task.c | 26 ++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 21 +++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2fc5e15a599..76cba042164 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3936,6 +3936,7 @@ typedef struct DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -4108,6 +4109,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; DWORD len; HRESULT hr; RPC_WSTR binding_str; @@ -4127,6 +4129,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!GetUserNameW(user_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); + len = ARRAY_SIZE(domain_name); + if(!GetEnvironmentVariableW(L"USERDOMAIN", domain_name, len)) + { + if (!GetComputerNameExW(ComputerNameDnsHostname, domain_name, &len)) + return HRESULT_FROM_WIN32(GetLastError()); + wcsupr(domain_name); + } + if (!is_variant_null(&server)) { const WCHAR *server_name; @@ -4166,6 +4176,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V lstrcpyW(task_svc->comp_name, comp_name); lstrcpyW(task_svc->user_name, user_name); + lstrcpyW(task_svc->domain_name, domain_name); task_svc->connected = TRUE; return S_OK; @@ -4220,8 +4231,19 @@ static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *u static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR *domain) { - FIXME("%p,%p: stub\n", iface, domain); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, domain); + + if (!domain) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *domain = SysAllocString(task_svc->domain_name); + if (!*domain) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_HighestVersion(ITaskService *iface, DWORD *version) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65d34dffd33..31e9878a48a 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -60,11 +60,13 @@ static BOOL check_win_version(int min_major, int min_minor) rtlver.dwMinorVersion >= min_minor); } #define is_win8_plus() check_win_version(6, 2) +#define is_win10_plus() check_win_version(10, 0) static void test_Connect(void) { WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; DWORD len; HRESULT hr; BSTR bstr; @@ -100,6 +102,12 @@ static void test_Connect(void) hr = ITaskService_get_ConnectedUser(service, &bstr); ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + hr = ITaskService_get_ConnectedDomain(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#lx\n", hr); + + hr = ITaskService_get_ConnectedDomain(service, &bstr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ @@ -159,6 +167,19 @@ static void test_Connect(void) ok(!lstrcmpW(user_name, bstr), "username %s != user name %s\n", wine_dbgstr_w(user_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); + len = ARRAY_SIZE(domain_name); + if (!GetEnvironmentVariableW(L"USERDOMAIN", domain_name, len)) + { + GetComputerNameExW(ComputerNameDnsHostname, domain_name, &len); + if (is_win10_plus()) + wcsupr(domain_name); + } + + hr = ITaskService_get_ConnectedDomain(service, &bstr); + ok(hr == S_OK, "get_ConnectedDomain error %#lx\n", hr); + ok(!lstrcmpW(domain_name, bstr), "domainname %s != domain name %s\n", wine_dbgstr_w(domain_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskService_Release(service); }

1 0

Vijay Kiran Kamuju : taskschd: Add IRegistrationTrigger stub implementation.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 4b9e76914aa0573abe3c4e186b9c95b0f859e4d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b9e76914aa0573abe3c4e186b9c95… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 20:49:06 2024 +0100 taskschd: Add IRegistrationTrigger stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46773 --- dlls/taskschd/task.c | 238 ++++++++++++++++++++++++++++++++++++++++ dlls/taskschd/tests/scheduler.c | 31 ++++++ 2 files changed, 269 insertions(+)

1 0

Vijay Kiran Kamuju : taskschd: Implement IRegistrationTrigger_getEnabled.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: e1e0db6ebe18fa8f206246e4a0f572d5b9dd4387 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1e0db6ebe18fa8f206246e4a0f572… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:07:28 2024 +0100 taskschd: Implement IRegistrationTrigger_getEnabled. --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6c94c8ec8f3..2fc5e15a599 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -496,8 +496,13 @@ static HRESULT WINAPI RegistrationTrigger_put_EndBoundary(IRegistrationTrigger * static HRESULT WINAPI RegistrationTrigger_get_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL *enabled) { RegistrationTrigger *This = impl_from_IRegistrationTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI RegistrationTrigger_put_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL enabled) @@ -559,7 +564,7 @@ static HRESULT RegistrationTrigger_create(ITrigger **trigger) registration_trigger->IRegistrationTrigger_iface.lpVtbl = &RegistrationTrigger_vtbl; registration_trigger->ref = 1; - registration_trigger->enabled = FALSE; + registration_trigger->enabled = TRUE; *trigger = (ITrigger*)&registration_trigger->IRegistrationTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 31f6e586e90..65d34dffd33 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1402,16 +1402,16 @@ static void test_registration_trigger(ITrigger *trigger) enabled = VARIANT_FALSE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled); - todo_wine ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); - todo_wine ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); hr = IRegistrationTrigger_put_Enabled(reg_trigger, VARIANT_FALSE); ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); enabled = VARIANT_TRUE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled); - todo_wine ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); - todo_wine ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); IRegistrationTrigger_Release(reg_trigger); }

1 0

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

Feb. 27, 2024

Module: wine Branch: master Commit: f5ba517323e6b3a1930c8a1911c24d788fddf71e URL: https://gitlab.winehq.org/wine/wine/-/commit/f5ba517323e6b3a1930c8a1911c24d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:38:02 2024 -0600 wined3d: Force debug info in critical sections. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80994f5f0fd..fbd59e94d22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4145,7 +4145,7 @@ struct wined3d_shader_limits #define wined3d_lock_init(lock, name) wined3d_lock_init_(lock, __FILE__ ": " name) static inline void wined3d_lock_init_(CRITICAL_SECTION *lock, const char *name) { - InitializeCriticalSection(lock); + InitializeCriticalSectionEx(lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (lock->DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) lock->DebugInfo->Spare[0] = (DWORD_PTR)name; }

1 0

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

Feb. 27, 2024

Module: wine Branch: master Commit: ed8b7b5e2a5bf48ee2689751e39214bc57de576a URL: https://gitlab.winehq.org/wine/wine/-/commit/ed8b7b5e2a5bf48ee2689751e39214… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:36:43 2024 -0600 netapi32: Force debug info in critical sections. --- dlls/netapi32/nbcmdqueue.c | 2 +- dlls/netapi32/nbnamecache.c | 2 +- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/netbios.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.c b/dlls/netapi32/nbcmdqueue.c index df15c616261..f02e5eb12d8 100644 --- a/dlls/netapi32/nbcmdqueue.c +++ b/dlls/netapi32/nbcmdqueue.c @@ -61,7 +61,7 @@ struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) if (queue) { queue->heap = heap; - InitializeCriticalSection(&queue->cs); + InitializeCriticalSectionEx(&queue->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBCmdQueue.cs"); queue->head = NULL; } diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 0ec9a9d5158..5bc529addac 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -100,7 +100,7 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) if (cache) { cache->heap = heap; - InitializeCriticalSection(&cache->cs); + InitializeCriticalSectionEx(&cache->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cache->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBNameCache.cs"); cache->entryExpireTimeMS = entryExpireTimeMS; cache->head = NULL; diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index c364a116fca..7eac6477439 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1036,7 +1036,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) if (session) { session->fd = fd; - InitializeCriticalSection(&session->cs); + InitializeCriticalSectionEx(&session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBTSession.cs"); *sess = session; } diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e74c9bf1b0f..d7414a8db07 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -103,7 +103,7 @@ static UCHAR nbResizeAdapterTable(UCHAR newSize) void NetBIOSInit(void) { memset(&gNBTable, 0, sizeof(gNBTable)); - InitializeCriticalSection(&gNBTable.cs); + InitializeCriticalSectionEx(&gNBTable.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.cs"); } @@ -211,7 +211,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) gNBTable.table[i].impl.ifIndex = ifIndex; gNBTable.table[i].impl.data = data; gNBTable.table[i].cmdQueue = NBCmdQueueCreate(GetProcessHeap()); - InitializeCriticalSection(&gNBTable.table[i].cs); + InitializeCriticalSectionEx(&gNBTable.table[i].cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.table[i].cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.NetBIOSAdapter.cs"); gNBTable.table[i].enabled = TRUE; ret = TRUE;

1 0

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

Feb. 27, 2024

Module: wine Branch: master Commit: c837cb3e77e3201c15075b1108139c3f8be398f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c837cb3e77e3201c15075b1108139c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:37:14 2024 -0600 rsaenh: Force debug info in critical sections. --- dlls/rsaenh/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 88887b9f45f..e0f828f72ce 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -55,7 +55,7 @@ void init_handle_table(struct handle_table *lpTable) lpTable->paEntries = NULL; lpTable->iEntries = 0; lpTable->iFirstFree = 0; - InitializeCriticalSection(&lpTable->mutex); + InitializeCriticalSectionEx(&lpTable->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex"); }

1 0

Vijay Kiran Kamuju : include: Add IRegistrationTrigger definition.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: c34159db3960104d96d6d0804476b5feda8bd522 URL: https://gitlab.winehq.org/wine/wine/-/commit/c34159db3960104d96d6d0804476b5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 20:25:02 2024 +0100 include: Add IRegistrationTrigger definition. --- include/taskschd.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/taskschd.idl b/include/taskschd.idl index d5577555e56..6c5e5533934 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -407,6 +407,18 @@ interface IDailyTrigger : ITrigger [propput] HRESULT RandomDelay([in] BSTR randomDelay); } +[ + uuid(4c8fec3a-c218-4e0c-b23d-629024db91a2), + oleautomation, + dual, + nonextensible +] +interface IRegistrationTrigger : ITrigger +{ + [propget] HRESULT Delay([out, retval] BSTR *pDelay); + [propput] HRESULT Delay([in] BSTR delay); +} + [ object, oleautomation,

1 0

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

Feb. 27, 2024

Module: wine Branch: master Commit: a02d35d386e5e04def0b304729c083421d1532b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a02d35d386e5e04def0b304729c083… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:35:12 2024 -0600 msvcrt: Force debug info in critical sections. --- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/lock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a9879879301..c612758f033 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1637,7 +1637,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, this->shutdown_count = this->shutdown_size = 0; this->shutdown_events = NULL; - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ThreadScheduler"); list_init(&this->scheduled_chores); @@ -3525,7 +3525,7 @@ _ReentrantBlockingLock* __thiscall _ReentrantBlockingLock_ctor(_ReentrantBlockin { TRACE("(%p)\n", this); - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _ReentrantBlockingLock"); return this; } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b4e80a4b5d0..a3a872d4be3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -606,7 +606,7 @@ static FILE* msvcrt_alloc_fp(void) { if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { - InitializeCriticalSection(&((file_crit*)file)->crit); + InitializeCriticalSectionEx(&((file_crit*)file)->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); } MSVCRT_stream_idx++; diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 216d3d71504..886bb625b10 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -44,7 +44,7 @@ static inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initial static inline void msvcrt_initialize_mlock( int locknum ) { - InitializeCriticalSection( &(lock_table[ locknum ].crit) ); + InitializeCriticalSectionEx( &(lock_table[ locknum ].crit), 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); lock_table[ locknum ].crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": LOCKTABLEENTRY.crit"); msvcrt_mlock_set_entry_initialized( locknum, TRUE ); }

1 0

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

Feb. 27, 2024

Module: wine Branch: master Commit: bca70386925c1858d81ae50cbbeeafbe5031341f URL: https://gitlab.winehq.org/wine/wine/-/commit/bca70386925c1858d81ae50cbbeeaf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:31:31 2024 -0600 msvcp: Force debug info in critical sections. --- dlls/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c297f635e90..e8998383ecc 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -264,7 +264,7 @@ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { CRITICAL_SECTION *cs = operator_new(sizeof(*cs)); - InitializeCriticalSection(cs); + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); this->mutex = cs; return this; @@ -347,7 +347,7 @@ void __cdecl _Init_locks__Init_locks_ctor(_Init_locks *this) { for(i=0; i<_MAX_LOCK; i++) { - InitializeCriticalSection(&lockit_cs[i]); + InitializeCriticalSectionEx(&lockit_cs[i], 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lockit_cs[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } }

1 0