Got rid of SYSTEM_LOCK macros.
diff --git a/windows/queue.c b/windows/queue.c
index 73392cb..a8ef93f 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -305,17 +305,16 @@
{
MESSAGEQUEUE *queue;
- SYSTEM_LOCK();
+ HeapLock( SystemHeap ); /* FIXME: a bit overkill */
queue = GlobalLock16( hQueue );
if ( !queue || (queue->magic != QUEUE_MAGIC) )
{
- SYSTEM_UNLOCK();
+ HeapUnlock( SystemHeap );
return NULL;
}
queue->lockCount++;
- SYSTEM_UNLOCK();
-
+ HeapUnlock( SystemHeap );
return queue;
}
@@ -330,7 +329,7 @@
{
if (queue)
{
- SYSTEM_LOCK();
+ HeapLock( SystemHeap ); /* FIXME: a bit overkill */
if ( --queue->lockCount == 0 )
{
@@ -340,7 +339,7 @@
GlobalFree16( queue->self );
}
- SYSTEM_UNLOCK();
+ HeapUnlock( SystemHeap );
}
}
@@ -547,7 +546,7 @@
/* flush sent messages */
QUEUE_FlushMessages( msgQueue );
- SYSTEM_LOCK();
+ HeapLock( SystemHeap ); /* FIXME: a bit overkill */
/* Release per queue data if present */
if ( msgQueue->pQData )
@@ -575,7 +574,7 @@
if (pPrev && *pPrev) *pPrev = msgQueue->next;
msgQueue->self = 0;
- SYSTEM_UNLOCK();
+ HeapUnlock( SystemHeap );
/* free up resource used by MESSAGEQUEUE strcture */
msgQueue->lockCount--;
@@ -1401,13 +1400,13 @@
queuePtr = (MESSAGEQUEUE *)QUEUE_Lock( hQueue );
queuePtr->thdb = THREAD_Current();
- SYSTEM_LOCK();
+ HeapLock( SystemHeap ); /* FIXME: a bit overkill */
SetThreadQueue16( 0, hQueue );
thdb->teb.queue = hQueue;
queuePtr->next = hFirstQueue;
hFirstQueue = hQueue;
- SYSTEM_UNLOCK();
+ HeapUnlock( SystemHeap );
QUEUE_Unlock( queuePtr );
}