projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Sync up to trunk head (r64716).
[reactos.git]
/
ntoskrnl
/
lpc
/
close.c
diff --git
a/ntoskrnl/lpc/close.c
b/ntoskrnl/lpc/close.c
index
1d37b59
..
74796d3
100644
(file)
--- a/
ntoskrnl/lpc/close.c
+++ b/
ntoskrnl/lpc/close.c
@@
-50,14
+50,17
@@
LpcExitThread(IN PETHREAD Thread)
VOID
NTAPI
LpcpFreeToPortZone(IN PLPCP_MESSAGE Message,
VOID
NTAPI
LpcpFreeToPortZone(IN PLPCP_MESSAGE Message,
- IN ULONG Flags)
+ IN ULONG
Lock
Flags)
{
PLPCP_CONNECTION_MESSAGE ConnectMessage;
PLPCP_PORT_OBJECT ClientPort = NULL;
PETHREAD Thread = NULL;
{
PLPCP_CONNECTION_MESSAGE ConnectMessage;
PLPCP_PORT_OBJECT ClientPort = NULL;
PETHREAD Thread = NULL;
- BOOLEAN LockHeld = Flags & 1, ReleaseLock = Flags & 2;
+ BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD);
+ BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE);
+
PAGED_CODE();
PAGED_CODE();
- LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. Flags: %lx\n", Message, Flags);
+
+ LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. LockFlags: %lx\n", Message, LockFlags);
/* Acquire the lock if not already */
if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock);
/* Acquire the lock if not already */
if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock);
@@
-183,7
+186,7
@@
LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
Thread->LpcReplyMessage = NULL;
/* And remove the message from the port zone */
Thread->LpcReplyMessage = NULL;
/* And remove the message from the port zone */
- LpcpFreeToPortZone(Message,
1
);
+ LpcpFreeToPortZone(Message,
LPCP_LOCK_HELD
);
NextEntry = Port->LpcReplyChainHead.Flink;
}
NextEntry = Port->LpcReplyChainHead.Flink;
}
@@
-210,7
+213,7
@@
LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
InitializeListHead(&Message->Entry);
/* Remove it from the port zone */
InitializeListHead(&Message->Entry);
/* Remove it from the port zone */
- LpcpFreeToPortZone(Message,
1
);
+ LpcpFreeToPortZone(Message,
LPCP_LOCK_HELD
);
}
/* Release the lock */
}
/* Release the lock */
@@
-404,7
+407,7
@@
LpcpDeletePort(IN PVOID ObjectBody)
/* Free queued messages */
RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry);
/* Free queued messages */
RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry);
- LpcpFreeToPortZone(Message,
1
);
+ LpcpFreeToPortZone(Message,
LPCP_LOCK_HELD
);
/* Restart at the head */
NextEntry = ListHead->Flink;
/* Restart at the head */
NextEntry = ListHead->Flink;
@@
-417,7
+420,7
@@
LpcpDeletePort(IN PVOID ObjectBody)
/* Remove it */
RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry);
/* Remove it */
RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry);
- LpcpFreeToPortZone(Message,
1
);
+ LpcpFreeToPortZone(Message,
LPCP_LOCK_HELD
);
/* Restart at the head */
NextEntry = ListHead->Flink;
/* Restart at the head */
NextEntry = ListHead->Flink;