commit 06c275a6431a096b1fc08c75ef2ba209ed42a3e4
author Alexandre Julliard <julliard@winehq.org> Sun May 02 14:32:27 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun May 02 14:32:27 1999 +0000
tree 63ecb7d9d27571d7b5477b7f279a6dec1f355dc4
parent 50b3d7b3e3df5f7a94d3985622b3f8686f38d6fc

Converted to the new debugging interface (done with the help of the
script written by Patrik Stridvall).

scheduler/critsection.c

diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index a94a7b9..0349aea 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -8,11 +8,11 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "thread.h"
 
 DEFAULT_DEBUG_CHANNEL(win32)
@@ -40,7 +40,7 @@
     if (crit->LockSemaphore)
     {
         if (crit->RecursionCount)  /* Should not happen */
-            MSG("Deleting owned critical section (%p)\n", crit );
+            ERR_(win32)("Deleting owned critical section (%p)\n", crit );
 
         crit->LockCount      = -1;
         crit->RecursionCount = 0;
@@ -61,7 +61,7 @@
 
     if (!crit->LockSemaphore)
     {
-    	FIXME(win32,"entering uninitialized section(%p)?\n",crit);
+    	FIXME_(win32)("entering uninitialized section(%p)?\n",crit);
     	InitializeCriticalSection(crit);
     }
     if (InterlockedIncrement( &crit->LockCount ))
@@ -75,7 +75,7 @@
 
         if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
         {
-            FIXME( win32, "Crst %p belongs to process %ld, current is %ld!\n", 
+            FIXME_(win32)("Crst %p belongs to process %ld, current is %ld!\n", 
                           crit, crit->Reserved, GetCurrentProcessId() );
             return;
         }
@@ -83,17 +83,17 @@
         res = WaitForSingleObject( crit->LockSemaphore, 5000L );
         if ( res == WAIT_TIMEOUT )
         {
-            ERR( win32, "Critical section %p wait timed out, retrying (60 sec)\n", crit );
+            ERR_(win32)("Critical section %p wait timed out, retrying (60 sec)\n", crit );
             res = WaitForSingleObject( crit->LockSemaphore, 60000L );
         }
         if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
         {
-            ERR( win32, "Critical section %p wait timed out, retrying (5 min)\n", crit );
+            ERR_(win32)("Critical section %p wait timed out, retrying (5 min)\n", crit );
             res = WaitForSingleObject( crit->LockSemaphore, 300000L );
         }
         if (res != STATUS_WAIT_0)
         {
-            ERR(win32, "Critical section %p wait failed err=%lx\n", crit, res );
+            ERR_(win32)("Critical section %p wait failed err=%lx\n", crit, res );
             /* FIXME: should raise an exception */
         }
     }
@@ -165,7 +165,7 @@
 
     else if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
     {
-        FIXME( win32, "(%p) called for %08lx first, %08lx now: making global\n", 
+        FIXME_(win32)("(%p) called for %08lx first, %08lx now: making global\n", 
                crit, crit->Reserved, GetCurrentProcessId() );
 
         MakeCriticalSectionGlobal( crit );
@@ -183,7 +183,7 @@
         if ( crit->Reserved )  /* not global */
             DeleteCriticalSection( crit );
         else
-            FIXME( win32, "(%p) for %08lx: Crst is global, don't know whether to delete\n", 
+            FIXME_(win32)("(%p) for %08lx: Crst is global, don't know whether to delete\n", 
                    crit, GetCurrentProcessId() );
     }
 }