Skip to content

W
wine-winehq
Commit 91b398c3 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

- use STATUS_TIMEOUT instead of WAIT_TIMEOUT

- add RTL_ to one more CRITICAL_SECTION_DEBUG
parent 6c45b626
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/ntdll/critsection.c
View file @ 91b398c3
...@@ -117,7 +117,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION * ...@@ -117,7 +117,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *
if (!GetProcessHeap()) crit->DebugInfo = NULL; if (!GetProcessHeap()) crit->DebugInfo = NULL;
else else
{ {
crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CRITICAL_SECTION_DEBUG)); crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG));
if (crit->DebugInfo) if (crit->DebugInfo)
{ {
crit->DebugInfo->Type = 0; crit->DebugInfo->Type = 0;
...@@ -234,7 +234,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) ...@@ -234,7 +234,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )
time.QuadPart = -5000 * 10000; /* 5 seconds */ time.QuadPart = -5000 * 10000; /* 5 seconds */
status = NtWaitForSingleObject( sem, FALSE, &time ); status = NtWaitForSingleObject( sem, FALSE, &time );
if ( status == WAIT_TIMEOUT ) if ( status == STATUS_TIMEOUT )
{ {
const char *name = NULL; const char *name = NULL;
if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[1]; if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[1];
...@@ -243,7 +243,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) ...@@ -243,7 +243,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )
crit, debugstr_a(name), GetCurrentThreadId(), (DWORD)crit->OwningThread ); crit, debugstr_a(name), GetCurrentThreadId(), (DWORD)crit->OwningThread );
time.QuadPart = -60000 * 10000; time.QuadPart = -60000 * 10000;
status = NtWaitForSingleObject( sem, FALSE, &time ); status = NtWaitForSingleObject( sem, FALSE, &time );
if ( status == WAIT_TIMEOUT && TRACE_ON(relay) ) if ( status == STATUS_TIMEOUT && TRACE_ON(relay) )
{ {
ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n",
crit, debugstr_a(name), GetCurrentThreadId(), (DWORD) crit->OwningThread ); crit, debugstr_a(name), GetCurrentThreadId(), (DWORD) crit->OwningThread );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment