Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:LPC]: Rename a flag I've introduced sooner, and remove an unneeded variable + code formatting.

Browse source 
svn path=/trunk/; revision=59967
This commit is contained in:
Hermès Bélusca-Maïto 2013-09-02 22:19:41 +00:00
parent 74803ae9ec
commit 1afcdab0c1
4 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/include/internal/lpc.h
View file

@ -60,7 +60,7 @@
// //
// LPC Locking Flags // LPC Locking Flags
// //
#define LPCP_LOCK_OWNED 1 #define LPCP_LOCK_HELD 1
#define LPCP_LOCK_RELEASE 2 #define LPCP_LOCK_RELEASE 2
// //

10
reactos/ntoskrnl/lpc/close.c
View file

@ -55,7 +55,7 @@ LpcpFreeToPortZone(IN PLPCP_MESSAGE Message,
PLPCP_CONNECTION_MESSAGE ConnectMessage; PLPCP_CONNECTION_MESSAGE ConnectMessage;
PLPCP_PORT_OBJECT ClientPort = NULL; PLPCP_PORT_OBJECT ClientPort = NULL;
PETHREAD Thread = NULL; PETHREAD Thread = NULL;
BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD);
BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE); BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE);
PAGED_CODE(); PAGED_CODE();
@ -186,7 +186,7 @@ LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
Thread->LpcReplyMessage = NULL; Thread->LpcReplyMessage = NULL;
/* And remove the message from the port zone */ /* And remove the message from the port zone */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD);
NextEntry = Port->LpcReplyChainHead.Flink; NextEntry = Port->LpcReplyChainHead.Flink;
} }
@ -213,7 +213,7 @@ LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
InitializeListHead(&Message->Entry); InitializeListHead(&Message->Entry);
/* Remove it from the port zone */ /* Remove it from the port zone */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD);
} }
/* Release the lock */ /* Release the lock */
@ -407,7 +407,7 @@ LpcpDeletePort(IN PVOID ObjectBody)
/* Free queued messages */ /* Free queued messages */
RemoveEntryList(&Message->Entry); RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry); InitializeListHead(&Message->Entry);
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD);
/* Restart at the head */ /* Restart at the head */
NextEntry = ListHead->Flink; NextEntry = ListHead->Flink;
@ -420,7 +420,7 @@ LpcpDeletePort(IN PVOID ObjectBody)
/* Remove it */ /* Remove it */
RemoveEntryList(&Message->Entry); RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry); InitializeListHead(&Message->Entry);
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD);
/* Restart at the head */ /* Restart at the head */
NextEntry = ListHead->Flink; NextEntry = ListHead->Flink;

14
reactos/ntoskrnl/lpc/reply.c
View file

@ -48,7 +48,7 @@ LpcpFreeDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
/* Unlink and free it */ /* Unlink and free it */
RemoveEntryList(&Message->Entry); RemoveEntryList(&Message->Entry);
InitializeListHead(&Message->Entry); InitializeListHead(&Message->Entry);
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD);
break; break;
} }
@ -63,7 +63,7 @@ LpcpSaveDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
IN PLPCP_MESSAGE Message, IN PLPCP_MESSAGE Message,
IN ULONG LockFlags) IN ULONG LockFlags)
{ {
BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD);
PAGED_CODE(); PAGED_CODE();
@ -238,7 +238,7 @@ NtReplyPort(IN HANDLE PortHandle,
Request) != LPC_REQUEST))) Request) != LPC_REQUEST)))
{ {
/* It isn't, fail */ /* It isn't, fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
if (ConnectionPort) ObDereferenceObject(ConnectionPort); if (ConnectionPort) ObDereferenceObject(ConnectionPort);
ObDereferenceObject(WakeupThread); ObDereferenceObject(WakeupThread);
ObDereferenceObject(Port); ObDereferenceObject(Port);
@ -257,7 +257,7 @@ NtReplyPort(IN HANDLE PortHandle,
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(WakeupThread); ObDereferenceObject(WakeupThread);
ObDereferenceObject(Port); ObDereferenceObject(Port);
_SEH2_YIELD(return _SEH2_GetExceptionCode()); _SEH2_YIELD(return _SEH2_GetExceptionCode());
@ -482,7 +482,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
Request) != LPC_REQUEST))) Request) != LPC_REQUEST)))
{ {
/* It isn't, fail */ /* It isn't, fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
if (ConnectionPort) ObDereferenceObject(ConnectionPort); if (ConnectionPort) ObDereferenceObject(ConnectionPort);
ObDereferenceObject(WakeupThread); ObDereferenceObject(WakeupThread);
ObDereferenceObject(Port); ObDereferenceObject(Port);
@ -639,7 +639,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
if (Message->Request.u2.s2.DataInfoOffset) if (Message->Request.u2.s2.DataInfoOffset)
{ {
/* It does, save it, and don't free the message below */ /* It does, save it, and don't free the message below */
LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_OWNED); LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_HELD);
Message = NULL; Message = NULL;
} }
} }
@ -661,7 +661,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
if (Message) if (Message)
{ {
/* Free it and release the lock */ /* Free it and release the lock */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
} }
else else
{ {

49
reactos/ntoskrnl/lpc/send.c
View file

@ -104,7 +104,7 @@ LpcRequestPort(IN PVOID PortObject,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
} }
@ -115,7 +115,7 @@ LpcRequestPort(IN PVOID PortObject,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
} }
@ -134,7 +134,7 @@ LpcRequestPort(IN PVOID PortObject,
if (QueuePort) if (QueuePort)
{ {
/* Generate the Message ID and set it */ /* Generate the Message ID and set it */
Message->Request.MessageId = LpcpNextMessageId++; Message->Request.MessageId = LpcpNextMessageId++;
if (!LpcpNextMessageId) LpcpNextMessageId = 1; if (!LpcpNextMessageId) LpcpNextMessageId = 1;
Message->Request.CallbackId = 0; Message->Request.CallbackId = 0;
@ -144,7 +144,7 @@ LpcRequestPort(IN PVOID PortObject,
/* Insert the message in our chain */ /* Insert the message in our chain */
InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
/* Release the lock and release the semaphore */ /* Release the lock and the semaphore */
KeEnterCriticalRegion(); KeEnterCriticalRegion();
KeReleaseGuardedMutex(&LpcpLock); KeReleaseGuardedMutex(&LpcpLock);
LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); LpcpCompleteWait(QueuePort->MsgQueue.Semaphore);
@ -156,15 +156,16 @@ LpcRequestPort(IN PVOID PortObject,
KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE); KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE);
} }
/* We're done */
KeLeaveCriticalRegion(); KeLeaveCriticalRegion();
/* We're done */
if (ConnectionPort) ObDereferenceObject(ConnectionPort); if (ConnectionPort) ObDereferenceObject(ConnectionPort);
LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message); LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
/* If we got here, then free the message and fail */ /* If we got here, then free the message and fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
if (ConnectionPort) ObDereferenceObject(ConnectionPort); if (ConnectionPort) ObDereferenceObject(ConnectionPort);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -284,7 +285,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
if (!QueuePort) if (!QueuePort)
{ {
/* We have no connected port, fail */ /* We have no connected port, fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -300,7 +301,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
} }
@ -312,7 +313,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
} }
@ -331,7 +332,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
Message->SenderPort = Port; Message->SenderPort = Port;
/* Generate the Message ID and set it */ /* Generate the Message ID and set it */
Message->Request.MessageId = LpcpNextMessageId++; Message->Request.MessageId = LpcpNextMessageId++;
if (!LpcpNextMessageId) LpcpNextMessageId = 1; if (!LpcpNextMessageId) LpcpNextMessageId = 1;
Message->Request.CallbackId = 0; Message->Request.CallbackId = 0;
@ -413,7 +414,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
} }
/* Free the message */ /* Free the message */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
} }
else else
{ {
@ -452,7 +453,6 @@ NtRequestPort(IN HANDLE PortHandle,
PLPCP_MESSAGE Message; PLPCP_MESSAGE Message;
KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
PETHREAD Thread = PsGetCurrentThread(); PETHREAD Thread = PsGetCurrentThread();
PKSEMAPHORE Semaphore;
PAGED_CODE(); PAGED_CODE();
@ -536,7 +536,7 @@ NtRequestPort(IN HANDLE PortHandle,
if (!QueuePort) if (!QueuePort)
{ {
/* We have no connected port, fail */ /* We have no connected port, fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -550,7 +550,7 @@ NtRequestPort(IN HANDLE PortHandle,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -563,7 +563,7 @@ NtRequestPort(IN HANDLE PortHandle,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -585,7 +585,7 @@ NtRequestPort(IN HANDLE PortHandle,
Message->SenderPort = Port; Message->SenderPort = Port;
/* Generate the Message ID and set it */ /* Generate the Message ID and set it */
Message->Request.MessageId = LpcpNextMessageId++; Message->Request.MessageId = LpcpNextMessageId++;
if (!LpcpNextMessageId) LpcpNextMessageId = 1; if (!LpcpNextMessageId) LpcpNextMessageId = 1;
Message->Request.CallbackId = 0; Message->Request.CallbackId = 0;
@ -595,13 +595,10 @@ NtRequestPort(IN HANDLE PortHandle,
/* Insert the message in our chain */ /* Insert the message in our chain */
InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
/* Release the lock and get the semaphore we'll use later */ /* Release the lock and the semaphore */
KeEnterCriticalRegion(); KeEnterCriticalRegion();
KeReleaseGuardedMutex(&LpcpLock); KeReleaseGuardedMutex(&LpcpLock);
LpcpCompleteWait(QueuePort->MsgQueue.Semaphore);
/* Now release the semaphore */
Semaphore = QueuePort->MsgQueue.Semaphore;
LpcpCompleteWait(Semaphore);
/* If this is a waitable port, wake it up */ /* If this is a waitable port, wake it up */
if (QueuePort->Flags & LPCP_WAITABLE_PORT) if (QueuePort->Flags & LPCP_WAITABLE_PORT)
@ -629,7 +626,7 @@ NtRequestPort(IN HANDLE PortHandle,
Status); Status);
/* The wait failed, free the message */ /* The wait failed, free the message */
if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
if (ConnectionPort) ObDereferenceObject(ConnectionPort); if (ConnectionPort) ObDereferenceObject(ConnectionPort);
@ -762,7 +759,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
if (!QueuePort) if (!QueuePort)
{ {
/* We have no connected port, fail */ /* We have no connected port, fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -779,7 +776,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -792,7 +789,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
if (!ConnectionPort) if (!ConnectionPort)
{ {
/* Fail */ /* Fail */
LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE);
ObDereferenceObject(Port); ObDereferenceObject(Port);
return STATUS_PORT_DISCONNECTED; return STATUS_PORT_DISCONNECTED;
} }
@ -812,7 +809,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
Message->SenderPort = Port; Message->SenderPort = Port;
/* Generate the Message ID and set it */ /* Generate the Message ID and set it */
Message->Request.MessageId = LpcpNextMessageId++; Message->Request.MessageId = LpcpNextMessageId++;
if (!LpcpNextMessageId) LpcpNextMessageId = 1; if (!LpcpNextMessageId) LpcpNextMessageId = 1;
Message->Request.CallbackId = 0; Message->Request.CallbackId = 0;