NTDLL: use STATUS_TIMEOUT instead of WAIT_TIMEOUT

Mike McCormack mike at codeweavers.com
Sat Jun 25 03:07:51 CDT 2005


Changelog:
* use STATUS_TIMEOUT instead of WAIT_TIMEOUT
* add RTL_ to one more CRITICAL_SECTION_DEBUG
-------------- next part --------------
Index: dlls/ntdll/critsection.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/critsection.c,v
retrieving revision 1.30
diff -u -p -r1.30 critsection.c
--- dlls/ntdll/critsection.c	21 Jun 2005 09:52:41 -0000	1.30
+++ dlls/ntdll/critsection.c	25 Jun 2005 08:08:27 -0000
@@ -117,7 +117,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSec
     if (!GetProcessHeap()) crit->DebugInfo = NULL;
     else
     {
-        crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CRITICAL_SECTION_DEBUG));
+        crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG));
         if (crit->DebugInfo)
         {
             crit->DebugInfo->Type = 0;
@@ -234,7 +234,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSecti
 
         time.QuadPart = -5000 * 10000;  /* 5 seconds */
         status = NtWaitForSingleObject( sem, FALSE, &time );
-        if ( status == WAIT_TIMEOUT )
+        if ( status == STATUS_TIMEOUT )
         {
             const char *name = NULL;
             if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[1];
@@ -243,7 +243,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSecti
                  crit, debugstr_a(name), GetCurrentThreadId(), (DWORD)crit->OwningThread );
             time.QuadPart = -60000 * 10000;
             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",
                      crit, debugstr_a(name), GetCurrentThreadId(), (DWORD) crit->OwningThread );


More information about the wine-patches mailing list