wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Alex Henrie : msi: Fix memory leak in ready_media (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: c39f785b34692ee994b2449cc17a96815517e9bf URL: https://gitlab.winehq.org/wine/wine/-/commit/c39f785b34692ee994b2449cc17a96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:00:19 2023 -0600 msi: Fix memory leak in ready_media (scan-build). base_url was never freed, and can simply be enlarged instead of copying it to a new buffer. --- dlls/msi/media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 513e04b1b7e..50673f99cae 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -855,11 +855,11 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) WCHAR temppath[MAX_PATH], *p, *url; free( cabinet_file ); - if (!(url = malloc( (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) + if (!(url = realloc( base_url, (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) { + free( base_url ); return ERROR_OUTOFMEMORY; } - lstrcpyW( url, base_url ); lstrcatW( url, mi->cabinet ); if ((rc = msi_download_file( url, temppath )) != ERROR_SUCCESS) {

1 0

Alex Henrie : msi: Make TransformView_Create static.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 1da5618cbac1214082bfb897dc81804d14fc6e9e URL: https://gitlab.winehq.org/wine/wine/-/commit/1da5618cbac1214082bfb897dc8180… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:19:33 2023 -0600 msi: Make TransformView_Create static. --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e83c076ab23..77fa20502c5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2765,7 +2765,7 @@ static const MSIVIEWOPS transform_view_ops = NULL }; -UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) +static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL AND `new` = 1";

1 0

Alex Henrie : msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: daa20d9d636057d7009ff3652a8577b423d23fcf URL: https://gitlab.winehq.org/wine/wine/-/commit/daa20d9d636057d7009ff3652a8577… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:15:35 2023 -0600 msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build). Instead of ERROR_SUCCESS. --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f65250766a4..e83c076ab23 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2856,7 +2856,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV MSI_ViewClose( q ); msiobj_release( &q->hdr ); free( tv ); - return r; + return ERROR_OUTOFMEMORY; } while (MSI_ViewFetch( q, &rec ) == ERROR_SUCCESS)

1 0

Alex Henrie : mscms: Fix double free on error path in EnumColorProfilesA (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: abfc151e0b1e0a8361514a71d8d288fbd5160673 URL: https://gitlab.winehq.org/wine/wine/-/commit/abfc151e0b1e0a8361514a71d8d288… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:59:31 2023 -0600 mscms: Fix double free on error path in EnumColorProfilesA (scan-build). If fileW is not null, it is freed at the end of the function. --- dlls/mscms/profile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 9c4b6be8342..5ecd5f83273 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -810,6 +810,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, if (!(ret = header_from_file( fileW, &header ))) { free( fileW ); + fileW = NULL; continue; }

1 0

Alex Henrie : wusa: Fix double free on error path in read_update_package (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 935626b48809b26ab4a215992bf5169af0a28153 URL: https://gitlab.winehq.org/wine/wine/-/commit/935626b48809b26ab4a215992bf516… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:57:49 2023 -0600 wusa: Fix double free on error path in read_update_package (scan-build). If read_identity returns FALSE, it has already called clear_identity. --- programs/wusa/manifest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 620da4fc63b..83d4125133f 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -587,7 +587,7 @@ static BOOL read_update_package(IXMLDOMElement *child, WCHAR *tagname, void *con list_add_tail(update_list, &entry->entry); return TRUE; } - free_dependency(entry); + free(entry); } return FALSE;

1 0

Piotr Caban : msvcr100: Use Context blocking functions in critical_section class.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 7e060adfccb8789d5b9b25792e2de9395fb60012 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e060adfccb8789d5b9b25792e2de9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 3 19:42:06 2023 +0200 msvcr100: Use Context blocking functions in critical_section class. --- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcrt/concurrency.c | 65 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index cfeb03fa235..5b77a8164e8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,7 +47,7 @@ typedef struct cs_queue { void *ctx; struct cs_queue *next; - BOOL free; + LONG status; int unknown; } cs_queue; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 598444f3a53..d41832f6763 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -214,12 +214,14 @@ struct scheduled_chore { }; /* keep in sync with msvcp90/msvcp90.h */ +#define CS_UNLOCK 1 +#define CS_TIMEOUT 2 typedef struct cs_queue { Context *ctx; struct cs_queue *next; #if _MSVCR_VER >= 110 - LONG free; + LONG status; int unknown; #endif } cs_queue; @@ -2417,14 +2419,6 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) { TRACE("(%p)\n", this); - if(!keyed_event) { - HANDLE event; - - NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); - if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) - NtClose(event); - } - this->unk_active.ctx = NULL; this->head = this->tail = NULL; return this; @@ -2474,10 +2468,11 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) } memset(q, 0, sizeof(*q)); + q->ctx = get_current_context(); last = InterlockedExchangePointer(&cs->tail, q); if(last) { last->next = q; - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + call_Context_Block(q->ctx); } cs_set_head(cs, q); @@ -2539,7 +2534,7 @@ void __thiscall critical_section_unlock(critical_section *this) while(1) { cs_queue *next; - if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) + if(!InterlockedCompareExchange(&this->unk_active.next->status, CS_UNLOCK, 0)) break; next = this->unk_active.next; @@ -2554,7 +2549,7 @@ void __thiscall critical_section_unlock(critical_section *this) } #endif - NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); + call_Context_Unblock(this->unk_active.next->ctx); } /* ?native_handle@critical_section@Concurrency@@QAEAAV12@XZ */ @@ -2567,17 +2562,26 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th } #if _MSVCR_VER >= 110 +static void WINAPI timeout_unlock(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) +{ + cs_queue *q = ctx; + + if(!InterlockedCompareExchange(&q->status, CS_TIMEOUT, 0)) + call_Context_Unblock(q->ctx); +} + /* ?try_lock_for@critical_section@Concurrency@@QAE_NI@Z */ /* ?try_lock_for@critical_section@Concurrency@@QEAA_NI@Z */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock_for, 8) bool __thiscall critical_section_try_lock_for( critical_section *this, unsigned int timeout) { + Context *ctx = get_current_context(); cs_queue *q, *last; TRACE("(%p %d)\n", this, timeout); - if(this->unk_active.ctx == get_current_context()) { + if(this->unk_active.ctx == ctx) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type); @@ -2585,25 +2589,36 @@ bool __thiscall critical_section_try_lock_for( if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this); + q->ctx = ctx; last = InterlockedExchangePointer(&this->tail, q); if(last) { + TP_TIMER *tp_timer; LARGE_INTEGER to; - NTSTATUS status; FILETIME ft; last->next = q; GetSystemTimeAsFileTime(&ft); to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; - status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); - if(status == STATUS_TIMEOUT) { - if(!InterlockedExchange(&q->free, TRUE)) - return FALSE; - /* A thread has signaled the event and is block waiting. */ - /* We need to catch the event to wake the thread. */ - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + ft.dwHighDateTime = to.QuadPart >> 32; + ft.dwLowDateTime = to.QuadPart; + + tp_timer = CreateThreadpoolTimer(timeout_unlock, q, NULL); + if(!tp_timer) { + FIXME("throw exception?\n"); + return FALSE; } + SetThreadpoolTimer(tp_timer, &ft, 0, 0); + + call_Context_Block(q->ctx); + + SetThreadpoolTimer(tp_timer, NULL, 0, 0); + WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); + CloseThreadpoolTimer(tp_timer); + + if(q->status == CS_TIMEOUT) + return FALSE; } cs_set_head(this, q); @@ -2863,6 +2878,14 @@ event* __thiscall event_ctor(event *this) { TRACE("(%p)\n", this); + if(!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + this->waiters = NULL; this->signaled = FALSE; critical_section_ctor(&this->cs);

1 0

Piotr Caban : msvcr100: Use Context to store critical_section owner.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 51388af06fc6a6fbd9ee78a762aa2b15924d00cb URL: https://gitlab.winehq.org/wine/wine/-/commit/51388af06fc6a6fbd9ee78a762aa2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 22:17:52 2023 +0200 msvcr100: Use Context to store critical_section owner. --- dlls/msvcp140/tests/msvcp140.c | 2 +- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcrt/concurrency.c | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 640e44e5b7c..6affa2f9c29 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -150,6 +150,7 @@ typedef struct typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -157,7 +158,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b996ae84a46..cfeb03fa235 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -45,6 +45,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -52,7 +53,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index fd8e42fd35d..e5a5ff0435d 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -90,6 +90,7 @@ typedef unsigned char MSVCRT_bool; typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -97,7 +98,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 84ee0f1817a..598444f3a53 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -216,6 +216,7 @@ struct scheduled_chore { /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { + Context *ctx; struct cs_queue *next; #if _MSVCR_VER >= 110 LONG free; @@ -225,7 +226,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; #if _MSVCR_VER >= 110 void *unknown[2]; @@ -2425,7 +2425,7 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) NtClose(event); } - this->unk_thread_id = 0; + this->unk_active.ctx = NULL; this->head = this->tail = NULL; return this; } @@ -2458,7 +2458,7 @@ static inline void spin_wait_for_next_cs(cs_queue *q) static inline void cs_set_head(critical_section *cs, cs_queue *q) { - cs->unk_thread_id = GetCurrentThreadId(); + cs->unk_active.ctx = get_current_context(); cs->unk_active.next = q->next; cs->head = &cs->unk_active; } @@ -2467,7 +2467,7 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) { cs_queue *last; - if(cs->unk_thread_id == GetCurrentThreadId()) { + if(cs->unk_active.ctx == get_current_context()) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type); @@ -2507,7 +2507,7 @@ bool __thiscall critical_section_try_lock(critical_section *this) TRACE("(%p)\n", this); - if(this->unk_thread_id == GetCurrentThreadId()) + if(this->unk_active.ctx == get_current_context()) return FALSE; memset(&q, 0, sizeof(q)); @@ -2529,7 +2529,7 @@ void __thiscall critical_section_unlock(critical_section *this) { TRACE("(%p)\n", this); - this->unk_thread_id = 0; + this->unk_active.ctx = NULL; this->head = NULL; if(InterlockedCompareExchangePointer(&this->tail, NULL, &this->unk_active) == &this->unk_active) return; @@ -2577,7 +2577,7 @@ bool __thiscall critical_section_try_lock_for( TRACE("(%p %d)\n", this, timeout); - if(this->unk_thread_id == GetCurrentThreadId()) { + if(this->unk_active.ctx == get_current_context()) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type);

1 0

Rémi Bernon : kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 6e2381425332bade9e298a6c8b41cc06b8f5fc49 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e2381425332bade9e298a6c8b41cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 2 21:45:34 2023 +0200 kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber. --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f6eb6b0e51e..721d61f60f5 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1035,7 +1035,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertFiberToThread(void) /*********************************************************************** * ConvertThreadToFiber (kernelbase.@) */ -LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiber( LPVOID param ) +LPVOID WINAPI /* DECLSPEC_HOTPATCH */ ConvertThreadToFiber( LPVOID param ) { return ConvertThreadToFiberEx( param, 0 ); }

1 0

Zebediah Figura : ntdll: Simplify critical section timeout logic.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: ead421b744fd311be9b0c3e7c388e89fe377773f URL: https://gitlab.winehq.org/wine/wine/-/commit/ead421b744fd311be9b0c3e7c388e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 25 17:30:13 2023 -0500 ntdll: Simplify critical section timeout logic. Make it more consistent, as well. Currently we alternate between 5 seconds and 60; instead just make it a consistent 60 after the first wait. When +relay is on, always wait for 300 seconds, instead of alternating between 60 and 300. --- dlls/ntdll/sync.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9e4aa38ff2b..fa64917029a 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -299,6 +299,8 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { + unsigned int timeout = 5; + /* Don't allow blocking on a critical section during process termination */ if (RtlDllShutdownInProgress()) { @@ -309,24 +311,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { - NTSTATUS status = wait_semaphore( crit, 5 ); + NTSTATUS status = wait_semaphore( crit, timeout ); - if ( status == STATUS_TIMEOUT ) - { - const char *name = crit_section_get_name( crit ); + if (status == STATUS_WAIT_0) break; - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 60 ); + timeout = (TRACE_ON(relay) ? 300 : 60); - if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) - { - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 300 ); - } - } - if (status == STATUS_WAIT_0) break; + ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (%u sec)\n", + crit, debugstr_a(crit_section_get_name(crit)), GetCurrentThreadId(), HandleToULong(crit->OwningThread), timeout ); } if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS;

1 0

Zebediah Figura : ntdll: Do not throw deadlock exceptions for Wine critical sections.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 7520294840ac59fcc6b2f3d4a92ef160c43f87b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7520294840ac59fcc6b2f3d4a92ef1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 25 16:39:45 2023 -0500 ntdll: Do not throw deadlock exceptions for Wine critical sections. This is actually a public debugging facility, but currently applies exclusively to Wine internal locks. While we could expand this feature to all critical sections, no application is known to depend on it, and the fact that it is a debugging feature means it is not very likely we will ever find one. As far as Wine is concerned, I believe this feature is unused. I have not heard any mention of it in at least five years. Moreover, we have a different tool for debugging critical section timeouts, namely, the ERR messages in the same function. These messages provide just as much information while being less destructive to the process state. --- dlls/ntdll/sync.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ec974ee2af0..9e4aa38ff2b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -299,8 +299,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { - LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; - /* Don't allow blocking on a critical section during process termination */ if (RtlDllShutdownInProgress()) { @@ -311,9 +309,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { - EXCEPTION_RECORD rec; NTSTATUS status = wait_semaphore( crit, 5 ); - timeout -= 5; if ( status == STATUS_TIMEOUT ) { @@ -322,31 +318,15 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 60 ); - timeout -= 60; if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) { ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 300 ); - timeout -= 300; } } if (status == STATUS_WAIT_0) break; - - /* Throw exception only for Wine internal locks */ - if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; - - /* only throw deadlock exception if configured timeout is reached */ - if (timeout > 0) continue; - - rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; - rec.ExceptionFlags = 0; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = RtlRaiseException; /* sic */ - rec.NumberParameters = 1; - rec.ExceptionInformation[0] = (ULONG_PTR)crit; - RtlRaiseException( &rec ); } if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS;

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2023