Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24666: - Add lpc\ntlpc directory when NTLPC = 1. - Add function stubs in appropriate files. - Implement NtConnectPort (stub to NtSecureConnectPort). Implement NtReplyWaitReceivePort (stub to NtReplyWaitReceivePortEx). Everything else is unimplemented. - Implement LpcpInitSystem and object callbacks LpcpDeletePort and LpcpClosePort. - Add internal lpc.h header.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 17:28:50 2006 New Revision: 24666 URL: http://svn.reactos.org/svn/reactos?rev=24666&view=rev Log: - Add lpc\ntlpc directory when NTLPC = 1. - Add function stubs in appropriate files. - Implement NtConnectPort (stub to NtSecureConnectPort). Implement NtReplyWaitReceivePort (stub to NtReplyWaitReceivePortEx). Everything else is unimplemented. - Implement LpcpInitSystem and object callbacks LpcpDeletePort and LpcpClosePort. - Add internal lpc.h header. Added: trunk/reactos/ntoskrnl/lpc/ntlpc/ trunk/reactos/ntoskrnl/lpc/ntlpc/close.c trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c trunk/reactos/ntoskrnl/lpc/ntlpc/create.c trunk/reactos/ntoskrnl/lpc/ntlpc/listen.c trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h trunk/reactos/ntoskrnl/lpc/ntlpc/port.c trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c trunk/reactos/ntoskrnl/lpc/ntlpc/send.c Added: trunk/reactos/ntoskrnl/lpc/ntlpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/close.c… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/close.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/close.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,395 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/close.c + * PURPOSE: Local Procedure Call: Rundown, Cleanup, Deletion + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +LpcExitThread(IN PETHREAD Thread) +{ + PLPCP_MESSAGE Message; + + /* Acquire the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Make sure that the Reply Chain is empty */ + if (!IsListEmpty(&Thread->LpcReplyChain)) + { + /* It's not, remove the entry */ + RemoveEntryList(&Thread->LpcReplyChain); + } + + /* Set the thread in exit mode */ + Thread->LpcExitThreadCalled = TRUE; + Thread->LpcReplyMessageId = 0; + + /* Check if there's a reply message */ + Message = Thread->LpcReplyMessage; + if (Message) + { + /* FIXME: TODO */ + ASSERT(FALSE); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); +} + +VOID +NTAPI +LpcpFreeToPortZone(IN PLPCP_MESSAGE Message, + IN ULONG Flags) +{ + PLPCP_CONNECTION_MESSAGE ConnectMessage; + PLPCP_PORT_OBJECT ClientPort = NULL; + PETHREAD Thread = NULL; + BOOLEAN LockHeld = Flags & 1; + PAGED_CODE(); + LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. Flags: %lx\n", Message, Flags); + + /* Acquire the lock if not already */ + if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock); + + /* Check if the queue list is empty */ + if (!IsListEmpty(&Message->Entry)) + { + /* Remove and re-initialize */ + RemoveEntryList(&Message->Entry); + InitializeListHead(&Message->Entry); + } + + /* Check if we've already replied */ + if (Message->RepliedToThread) + { + /* Set thread to dereference and clean up */ + Thread = Message->RepliedToThread; + Message->RepliedToThread = NULL; + } + + /* Check if this is a connection request */ + if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST) + { + /* Get the connection message */ + ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); + + /* Clear the client port */ + ClientPort = ConnectMessage->ClientPort; + if (ClientPort) ConnectMessage->ClientPort = NULL; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + /* Check if we had anything to dereference */ + if (Thread) ObDereferenceObject(Thread); + if (ClientPort) ObDereferenceObject(ClientPort); + + /* Free the entry */ + ExFreeToPagedLookasideList(&LpcpMessagesLookaside, Message); + + /* Reacquire the lock if needed */ + if ((LockHeld) && !(Flags & 2)) KeAcquireGuardedMutex(&LpcpLock); +} + +VOID +NTAPI +LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port, + IN BOOLEAN Destroy) +{ + PLIST_ENTRY ListHead, NextEntry; + PETHREAD Thread; + PLPCP_MESSAGE Message; + PLPCP_CONNECTION_MESSAGE ConnectMessage; + LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags); + + /* Hold the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Disconnect the port to which this port is connected */ + if (Port->ConnectedPort) Port->ConnectedPort->ConnectedPort = NULL; + + /* Check if this is a connection port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) + { + /* Delete the name */ + Port->Flags |= LPCP_NAME_DELETED; + } + + /* Walk all the threads waiting and signal them */ + ListHead = &Port->LpcReplyChainHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the Thread */ + Thread = CONTAINING_RECORD(NextEntry, ETHREAD, LpcReplyChain); + + /* Make sure we're not in exit */ + if (Thread->LpcExitThreadCalled) break; + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* Remove and reinitialize the List */ + RemoveEntryList(&Thread->LpcReplyChain); + InitializeListHead(&Thread->LpcReplyChain); + + /* Check if someone is waiting */ + if (!KeReadStateSemaphore(&Thread->LpcReplySemaphore)) + { + /* Get the message and check if it's a connection request */ + Message = Thread->LpcReplyMessage; + if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST) + { + /* Get the connection message */ + ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); + + /* Check if it had a section */ + if (ConnectMessage->SectionToMap) + { + /* Dereference it */ + ObDereferenceObject(ConnectMessage->SectionToMap); + } + } + + /* Clear the reply message */ + Thread->LpcReplyMessage = NULL; + + /* And remove the message from the port zone */ + LpcpFreeToPortZone(Message, TRUE); + } + + /* Release the semaphore and reset message id count */ + Thread->LpcReplyMessageId = 0; + LpcpCompleteWait(&Thread->LpcReplySemaphore); + } + + /* Reinitialize the list head */ + InitializeListHead(&Port->LpcReplyChainHead); + + /* Loop queued messages */ + ListHead = &Port->MsgQueue.ReceiveHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the message */ + Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry); + NextEntry = NextEntry->Flink; + + /* Free and reinitialize it's list head */ + InitializeListHead(&Message->Entry); + + /* Remove it from the port zone */ + LpcpFreeToPortZone(Message, TRUE); + } + + /* Reinitialize the message queue list head */ + InitializeListHead(&Port->MsgQueue.ReceiveHead); + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + /* Check if we have to free the port entirely */ + if (Destroy) + { + /* Check if the semaphore exists */ + if (Port->MsgQueue.Semaphore) + { + /* Use the semaphore to find the port queue and free it */ + ExFreePool(CONTAINING_RECORD(Port->MsgQueue.Semaphore, + LPCP_NONPAGED_PORT_QUEUE, + Semaphore)); + } + } +} + +VOID +NTAPI +LpcpClosePort(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)Object; + LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags); + + /* Only Server-side Connection Ports need clean up*/ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) + { + /* Check the handle count */ + switch (SystemHandleCount) + { + /* No handles left */ + case 0: + + /* Destroy the port queue */ + LpcpDestroyPortQueue(Port, TRUE); + break; + + /* Last handle remaining */ + case 1: + + /* Reset the queue only */ + LpcpDestroyPortQueue(Port, FALSE); + + /* More handles remain, do nothing */ + default: + break; + } + } +} + +VOID +NTAPI +LpcpFreePortClientSecurity(IN PLPCP_PORT_OBJECT Port) +{ + /* Check if this is a client port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT) + { + /* Check if security is static */ + if (!(Port->Flags & LPCP_SECURITY_DYNAMIC)) + { + /* Check if we have a token */ + if (Port->StaticSecurity.ClientToken) + { + /* Free security */ + SeDeleteClientSecurity(&Port->StaticSecurity); + } + } + } +} + +VOID +NTAPI +LpcpDeletePort(IN PVOID ObjectBody) +{ + LARGE_INTEGER Timeout; + PETHREAD Thread; + PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)ObjectBody; + PLPCP_PORT_OBJECT ConnectionPort; + PLPCP_MESSAGE Message; + PLIST_ENTRY ListHead, NextEntry; + HANDLE Pid; + CLIENT_DIED_MSG ClientDiedMsg; + Timeout.QuadPart = -1000000; + PAGED_CODE(); + LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags); + + /* Check if this is a communication port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT) + { + /* Acquire the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Get the thread */ + Thread = Port->ClientThread; + if (Thread) + { + /* Clear it */ + Port->ClientThread = NULL; + + /* Release the lock and dereference */ + KeReleaseGuardedMutex(&LpcpLock); + ObDereferenceObject(Thread); + } + else + { + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + } + } + + /* Check if this is a client-side port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT) + { + /* Setup the client died message */ + ClientDiedMsg.h.u1.s1.TotalLength = sizeof(ClientDiedMsg); + ClientDiedMsg.h.u1.s1.DataLength = sizeof(ClientDiedMsg.CreateTime); + ClientDiedMsg.h.u2.ZeroInit = LPC_PORT_CLOSED; + ClientDiedMsg.CreateTime = PsGetCurrentProcess()->CreateTime; + + /* Send it */ + for (;;) + { + /* Send the message */ + if (LpcRequestPort(Port, + &ClientDiedMsg.h) != STATUS_NO_MEMORY) break; + + /* Wait until trying again */ + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } + } + + /* Destroy the port queue */ + LpcpDestroyPortQueue(Port, TRUE); + + /* Check if we had a client view */ + if (Port->ClientSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(), + Port->ClientSectionBase); + + /* Check for a server view */ + if (Port->ServerSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(), + Port->ServerSectionBase); + + /* Get the connection port */ + ConnectionPort = Port->ConnectionPort; + if (ConnectionPort) + { + /* Get the PID */ + Pid = PsGetCurrentProcessId(); + + /* Acquire the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Loop the data lists */ + ListHead = &ConnectionPort->LpcDataInfoChainHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the message */ + Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry); + NextEntry = NextEntry->Flink; + + /* Check if the PID matches */ + if (Message->Request.ClientId.UniqueProcess == Pid) + { + /* Remove it */ + RemoveEntryList(&Message->Entry); + LpcpFreeToPortZone(Message, TRUE); + } + } + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + /* Dereference the object unless it's the same port */ + if (ConnectionPort != Port) ObDereferenceObject(ConnectionPort); + } + + /* Check if this is a connection port with a server process*/ + if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && + (ConnectionPort->ServerProcess)) + { + /* Dereference the server process */ + ObDereferenceObject(ConnectionPort->ServerProcess); + ConnectionPort->ServerProcess = NULL; + } + + /* Free client security */ + LpcpFreePortClientSecurity(Port); + LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p deleted\n", Port); +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/complet… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,47 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/lpc/complete.c +* PURPOSE: Local Procedure Call: Connection Completion +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtAcceptConnectPort(OUT PHANDLE PortHandle, + IN PVOID PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage, + IN BOOLEAN AcceptConnection, + IN PPORT_VIEW ClientView, + IN PREMOTE_PORT_VIEW ServerView) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtCompleteConnectPort(IN HANDLE PortHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/connect… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,65 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/connect.c + * PURPOSE: Local Procedure Call: Connection Management + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtSecureConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE Qos, + IN OUT PPORT_VIEW ClientView OPTIONAL, + IN PSID ServerSid OPTIONAL, + IN OUT PREMOTE_PORT_VIEW ServerView OPTIONAL, + OUT PULONG MaxMessageLength OPTIONAL, + IN OUT PVOID ConnectionInformation OPTIONAL, + IN OUT PULONG ConnectionInformationLength OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE Qos, + IN PPORT_VIEW ClientView, + IN PREMOTE_PORT_VIEW ServerView, + OUT PULONG MaxMessageLength, + IN PVOID ConnectionInformation, + OUT PULONG ConnectionInformationLength) +{ + /* Call the newer API */ + return NtSecureConnectPort(PortHandle, + PortName, + Qos, + ClientView, + NULL, + ServerView, + MaxMessageLength, + ConnectionInformation, + ConnectionInformationLength); +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/create.… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/create.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/create.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,77 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/create.c + * PURPOSE: Local Procedure Call: Port/Queue/Message Creation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +LpcpCreatePort(OUT PHANDLE PortHandle, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG MaxConnectionInfoLength, + IN ULONG MaxMessageLength, + IN ULONG MaxPoolUsage, + IN BOOLEAN Waitable) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtCreatePort(OUT PHANDLE PortHandle, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG MaxConnectInfoLength, + IN ULONG MaxDataLength, + IN ULONG MaxPoolUsage) +{ + PAGED_CODE(); + + /* Call the internal API */ + return LpcpCreatePort(PortHandle, + ObjectAttributes, + MaxConnectInfoLength, + MaxDataLength, + MaxPoolUsage, + FALSE); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtCreateWaitablePort(OUT PHANDLE PortHandle, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG MaxConnectInfoLength, + IN ULONG MaxDataLength, + IN ULONG MaxPoolUsage) +{ + PAGED_CODE(); + + /* Call the internal API */ + return LpcpCreatePort(PortHandle, + ObjectAttributes, + MaxConnectInfoLength, + MaxDataLength, + MaxPoolUsage, + TRUE); +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/listen.… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/listen.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/listen.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,31 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/listen.c + * PURPOSE: Local Procedure Call: Listening + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtListenPort(IN HANDLE PortHandle, + OUT PPORT_MESSAGE ConnectMessage) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h Mon Oct 30 17:28:50 2006 @@ -1,0 +1,216 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/lpc.h +* PURPOSE: Internal header for the Local Procedure Call +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +// +// Define this if you want debugging support +// +#define _LPC_DEBUG_ 0x01 + +// +// These define the Debug Masks Supported +// +#define LPC_CREATE_DEBUG 0x01 +#define LPC_CLOSE_DEBUG 0x02 +#define LPC_CONNECT_DEBUG 0x04 +#define LPC_LISTEN_DEBUG 0x08 +#define LPC_REPLY_DEBUG 0x10 +#define LPC_COMPLETE_DEBUG 0x20 +#define LPC_SEND_DEBUG 0x40 + +// +// Debug/Tracing support +// +#if _LPC_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define LPCTRACE(x, ...) \ + { \ + DbgPrintEx("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrintEx(__VA_ARGS__); \ + } +#else +#define LPCTRACE(x, ...) \ + if (x & LpcpTraceLevel) \ + { \ + DbgPrint("%s [%.16s:%lx] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName, \ + PsGetCurrentThreadId()); \ + DbgPrint(__VA_ARGS__); \ + } +#endif +#endif + +// +// Gets the message type, removing the kernel-mode flag +// +#define LpcpGetMessageType(x) \ + ((x)->u2.s2.MessageType &~ LPCP_KERNEL_MESSAGE) + +// +// Waits on an LPC semaphore for a receive operation +// +#define LpcpReceiveWait(s, w) \ +{ \ + LPCTRACE(LPC_REPLY_DEBUG, "Wait: %p\n", s); \ + Status = KeWaitForSingleObject(s, \ + WrLpcReceive, \ + w, \ + FALSE, \ + NULL); \ + LPCTRACE(LPC_REPLY_DEBUG, "Wait done: %lx\n", Status); \ +} + +// +// Waits on an LPC semaphore for a reply operation +// +#define LpcpReplyWait(s, w) \ +{ \ + LPCTRACE(LPC_SEND_DEBUG, "Wait: %p\n", s); \ + Status = KeWaitForSingleObject(s, \ + WrLpcReply, \ + w, \ + FALSE, \ + NULL); \ + LPCTRACE(LPC_SEND_DEBUG, "Wait done: %lx\n", Status); \ + if (Status == STATUS_USER_APC) \ + { \ + /* We were preempted by an APC */ \ + if (KeReadStateSemaphore(s)) \ + { \ + /* It's still signaled, so wait on it */ \ + KeWaitForSingleObject(s, \ + Executive, \ + KernelMode, \ + FALSE, \ + NULL); \ + Status = STATUS_SUCCESS; \ + } \ + } \ +} + +// +// Waits on an LPC semaphore for a connect operation +// +#define LpcpConnectWait(s, w) \ +{ \ + LPCTRACE(LPC_CONNECT_DEBUG, "Wait: %p\n", s); \ + Status = KeWaitForSingleObject(s, \ + Executive, \ + w, \ + FALSE, \ + NULL); \ + LPCTRACE(LPC_CONNECT_DEBUG, "Wait done: %lx\n", Status);\ + if (Status == STATUS_USER_APC) \ + { \ + /* We were preempted by an APC */ \ + if (KeReadStateSemaphore(s)) \ + { \ + /* It's still signaled, so wait on it */ \ + KeWaitForSingleObject(s, \ + Executive, \ + KernelMode, \ + FALSE, \ + NULL); \ + Status = STATUS_SUCCESS; \ + } \ + } \ +} + +// +// Releases an LPC Semaphore to complete a wait +// +#define LpcpCompleteWait(s) \ +{ \ + /* Release the semaphore */ \ + LPCTRACE(LPC_SEND_DEBUG, "Release: %p\n", s); \ + KeReleaseSemaphore(s, 1, 1, FALSE); \ +} + +// +// Internal flag used for Kernel LPC Messages +// +#define LPCP_KERNEL_MESSAGE 0x8000 + +// +// Internal Port Management +// +VOID +NTAPI +LpcpClosePort( + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount +); + +VOID +NTAPI +LpcpDeletePort( + IN PVOID ObjectBody +); + +NTSTATUS +NTAPI +LpcpInitializePortQueue( + IN PLPCP_PORT_OBJECT Port +); + +VOID +NTAPI +LpcpFreeToPortZone( + IN PLPCP_MESSAGE Message, + IN ULONG Flags +); + +VOID +NTAPI +LpcpMoveMessage( + IN PPORT_MESSAGE Destination, + IN PPORT_MESSAGE Origin, + IN PVOID Data, + IN ULONG MessageType, + IN PCLIENT_ID ClientId +); + +VOID +NTAPI +LpcpSaveDataInfoMessage( + IN PLPCP_PORT_OBJECT Port, + IN PLPCP_MESSAGE Message +); + +// +// Module-external utlity functions +// +VOID +NTAPI +LpcExitThread( + IN PETHREAD Thread +); + +// +// Initialization functions +// +NTSTATUS +NTAPI +LpcpInitSystem( + VOID +); + +// +// Global data inside the Process Manager +// +extern POBJECT_TYPE LpcPortObjectType; +extern ULONG LpcpNextMessageId, LpcpNextCallbackId; +extern KGUARDED_MUTEX LpcpLock; +extern PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; +extern ULONG LpcpMaxMessageSize; +extern ULONG LpcpTraceLevel; Added: trunk/reactos/ntoskrnl/lpc/ntlpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/port.c?… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/port.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/port.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,108 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/port.c + * PURPOSE: Local Procedure Call: Port Management + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +POBJECT_TYPE LpcPortObjectType; +ULONG LpcpMaxMessageSize; +PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; +KGUARDED_MUTEX LpcpLock; +ULONG LpcpTraceLevel = 0xFFFFFFFF; +ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1; + +static GENERIC_MAPPING LpcpPortMapping = +{ + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + 0, + PORT_ALL_ACCESS +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +INIT_FUNCTION +NTAPI +LpcpInitSystem(VOID) +{ + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + + /* Setup the LPC Lock */ + KeInitializeGuardedMutex(&LpcpLock); + + /* Create the Port Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Port"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.GenericMapping = LpcpPortMapping; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.CloseProcedure = LpcpClosePort; + ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; + ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &LpcPortObjectType); + + /* Allocate the LPC lookaside list */ + LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE; + ExInitializePagedLookasideList(&LpcpMessagesLookaside, + NULL, + NULL, + 0, + LpcpMaxMessageSize, + TAG('L', 'p', 'c', 'M'), + 32); + + /* We're done */ + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +NtImpersonateClientOfPort(IN HANDLE PortHandle, + IN PPORT_MESSAGE ClientMessage) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtQueryPortInformationProcess(VOID) +{ + /* This is all this function does */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +NtQueryInformationPort(IN HANDLE PortHandle, + IN PORT_INFORMATION_CLASS PortInformationClass, + OUT PVOID PortInformation, + IN ULONG PortInformationLength, + OUT PULONG ReturnLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,109 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/reply.c + * PURPOSE: Local Procedure Call: Receive (Replies) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtReplyPort(IN HANDLE PortHandle, + IN PPORT_MESSAGE LpcReply) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtReplyWaitReceivePortEx(IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage, + IN PLARGE_INTEGER Timeout OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtReplyWaitReceivePort(IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage) +{ + /* Call the newer API */ + return NtReplyWaitReceivePortEx(PortHandle, + PortContext, + ReplyMessage, + ReceiveMessage, + NULL); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtReplyWaitReplyPort(IN HANDLE PortHandle, + IN PPORT_MESSAGE ReplyMessage) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtReadRequestData(IN HANDLE PortHandle, + IN PPORT_MESSAGE Message, + IN ULONG Index, + IN PVOID Buffer, + IN ULONG BufferLength, + OUT PULONG Returnlength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtWriteRequestData(IN HANDLE PortHandle, + IN PPORT_MESSAGE Message, + IN ULONG Index, + IN PVOID Buffer, + IN ULONG BufferLength, + OUT PULONG ReturnLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/lpc/ntlpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/send.c?… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/send.c (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/send.c Mon Oct 30 17:28:50 2006 @@ -1,0 +1,68 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/lpc/send.c + * PURPOSE: Local Procedure Call: Sending (Requests) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "lpc.h" +#define NDEBUG +#include <internal/debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LpcRequestPort(IN PVOID Port, + IN PPORT_MESSAGE LpcMessage) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* +* @unimplemented +*/ +NTSTATUS +NTAPI +LpcRequestWaitReplyPort(IN PVOID Port, + IN PPORT_MESSAGE LpcMessageRequest, + OUT PPORT_MESSAGE LpcMessageReply) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtRequestPort(IN HANDLE PortHandle, + IN PPORT_MESSAGE LpcMessage) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtRequestWaitReplyPort(IN HANDLE PortHandle, + IN PPORT_MESSAGE LpcRequest, + IN OUT PPORT_MESSAGE LpcReply) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */

1 0

[ion] 24665: - Implement the rest of Hard Error support. - Kernel support is complete (except temporary LPC hack), and CSRSS properly receives the event and sends it off to win32csr's hard error handler (much like on NT). However, the handler doesn't call NtUserHardErrorControl nor do much of the complex sequence of events that NT does, instead, we only display a hello-world style message box. Anyone up for implementing the rest is welcome.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 17:20:45 2006 New Revision: 24665 URL: http://svn.reactos.org/svn/reactos?rev=24665&view=rev Log: - Implement the rest of Hard Error support. - Kernel support is complete (except temporary LPC hack), and CSRSS properly receives the event and sends it off to win32csr's hard error handler (much like on NT). However, the handler doesn't call NtUserHardErrorControl nor do much of the complex sequence of events that NT does, instead, we only display a hello-world style message box. Anyone up for implementing the rest is welcome. Modified: trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.def Modified: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ex/error.c (original) +++ trunk/reactos/ntoskrnl/ex/error.c Mon Oct 30 17:20:45 2006 @@ -112,11 +112,6 @@ HANDLE PortHandle; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PAGED_CODE(); - DPRINT1("Hard error, baby!: %lx, %lx, %lx %p\n", - ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - Parameters); /* Check if this error will shutdown the system */ if (ValidResponseOptions == OptionShutdownSystem) @@ -235,15 +230,42 @@ Parameters, sizeof(ULONG_PTR) * NumberOfParameters); - /* Send the message */ + /* Send the LPC Message */ Status = LpcRequestWaitReplyPort(PortHandle, (PVOID)Message, (PVOID)Message); - DPRINT1("Checkpoint 2: %lx\n", Status); - } - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (NT_SUCCESS(Status)) + { + /* Check what kind of response we got */ + if ((Message->Response != ResponseReturnToCaller) && + (Message->Response != ResponseNotHandled) && + (Message->Response != ResponseAbort) && + (Message->Response != ResponseCancel) && + (Message->Response != ResponseIgnore) && + (Message->Response != ResponseNo) && + (Message->Response != ResponseOk) && + (Message->Response != ResponseRetry) && + (Message->Response != ResponseYes) && + (Message->Response != ResponseTryAgain) && + (Message->Response != ResponseContinue)) + { + /* Reset to a default one */ + Message->Response = ResponseReturnToCaller; + } + + /* Set the response */ + *Response = Message->Response; + } + } + else + { + /* Set defaults */ + *Response = ResponseReturnToCaller; + Status = STATUS_SUCCESS; + } + + /* Return status */ + return Status; } /*++ Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Mon Oct 30 17:20:45 2006 @@ -429,22 +429,26 @@ { HANDLE PortHandle; NTSTATUS Status; - - /* This is a SICK hack */ - Status = ObOpenObjectByPointer(Port, - 0, - NULL, - PORT_ALL_ACCESS, - LpcPortObjectType, - KernelMode, - &PortHandle); - DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); - - /* Call the Nt function. Do a ring transition to get Kmode. */ + UNICODE_STRING PortName; + ULONG ConnectInfoLength; + + // + // OMG HAXX! + // + RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); + ConnectInfoLength = 0; + Status = ZwConnectPort(&PortHandle, + &PortName, + NULL, + NULL, + NULL, + NULL, + NULL, + &ConnectInfoLength); + Status = ZwRequestWaitReplyPort(PortHandle, LpcMessageRequest, LpcMessageReply); - DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); /* Close the handle */ ObCloseHandle(PortHandle, KernelMode); Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Mon Oct 30 17:20:45 2006 @@ -288,7 +288,7 @@ Status = EiReplyOrRequestPort(Port->OtherPort, LpcRequest, - LPC_REQUEST, + LpcRequest->u2.s2.Type == LPC_ERROR_EVENT ? LPC_ERROR_EVENT : LPC_REQUEST, Port); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Oct 30 17:20:45 2006 @@ -104,6 +104,20 @@ } } +BOOL FASTCALL CallHardError(void); + +static +VOID +NTAPI +CsrHandleHardError(IN PCSRSS_PROCESS_DATA ProcessData, + IN OUT PHARDERROR_MSG Message) +{ + DPRINT1("CSR: received hard error %lx\n", Message->Status); + + /* Call the hard error handler in win32csr */ + CallHardError(); +} + static VOID STDCALL @@ -133,7 +147,7 @@ DPRINT1("NtReplyWaitReceivePort failed\n"); break; } - + /* If the connection was closed, handle that */ if (Request->Header.u2.s2.Type == LPC_PORT_CLOSED) { @@ -161,9 +175,18 @@ continue; } - /* Call the Handler */ - CsrApiCallHandler(ProcessData, Request); - + /* Check if we got a hard error */ + if (Request->Header.u2.s2.Type == LPC_ERROR_EVENT) + { + /* Call the Handler */ + CsrHandleHardError(ProcessData, (PHARDERROR_MSG)Request); + } + else + { + /* Call the Handler */ + CsrApiCallHandler(ProcessData, Request); + } + /* Send back the reply */ Reply = Request; } Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h Mon Oct 30 17:20:45 2006 @@ -43,9 +43,12 @@ typedef BOOL (STDCALL *CSRPLUGIN_INIT_COMPLETE_PROC)(void); +typedef BOOL (STDCALL *CSRPLUGIN_HARDERROR_PROC)(void); + typedef BOOL (STDCALL *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRSS_OBJECT_DEFINITION *ObjectDefinitions, CSRPLUGIN_INIT_COMPLETE_PROC *InitCompleteProc, + CSRPLUGIN_HARDERROR_PROC *HardErrorProc, PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap); Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Mon Oct 30 17:20:45 2006 @@ -27,6 +27,9 @@ static unsigned InitCompleteProcCount; static CSRPLUGIN_INIT_COMPLETE_PROC *InitCompleteProcs = NULL; + +static unsigned HardErrorProcCount; +static CSRPLUGIN_HARDERROR_PROC *HardErrorProcs = NULL; HANDLE hSbApiPort = (HANDLE) 0; @@ -64,6 +67,34 @@ InitCompleteProcCount++; return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +CsrpAddHardErrorProc(CSRPLUGIN_HARDERROR_PROC Proc) +{ + CSRPLUGIN_HARDERROR_PROC *NewProcs; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + NewProcs = RtlAllocateHeap(CsrssApiHeap, 0, + (HardErrorProcCount + 1) + * sizeof(CSRPLUGIN_HARDERROR_PROC)); + if (NULL == NewProcs) + { + return STATUS_NO_MEMORY; + } + if (0 != HardErrorProcCount) + { + RtlCopyMemory(NewProcs, HardErrorProcs, + HardErrorProcCount * sizeof(CSRPLUGIN_HARDERROR_PROC)); + RtlFreeHeap(CsrssApiHeap, 0, HardErrorProcs); + } + + NewProcs[HardErrorProcCount] = Proc; + HardErrorProcs = NewProcs; + HardErrorProcCount++; + + return STATUS_SUCCESS; } /********************************************************************** @@ -88,6 +119,27 @@ } return Ok; +} + +BOOL +FASTCALL +CallHardError(void) +{ + BOOL Ok; + unsigned i; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + Ok = TRUE; + if (0 != HardErrorProcCount) + { + for (i = 0; i < HardErrorProcCount && Ok; i++) + { + Ok = (*(HardErrorProcs[i]))(); + } + } + + return Ok; } ULONG @@ -182,6 +234,7 @@ PCSRSS_API_DEFINITION ApiDefinitions; PCSRSS_OBJECT_DEFINITION ObjectDefinitions; CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; + CSRPLUGIN_HARDERROR_PROC HardErrorProc; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -202,7 +255,7 @@ Exports.CsrReleaseObjectProc = CsrReleaseObject; Exports.CsrEnumProcessesProc = CsrEnumProcesses; if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc, - &Exports, CsrssApiHeap)) + &HardErrorProc, &Exports, CsrssApiHeap)) { return STATUS_UNSUCCESSFUL; } @@ -221,6 +274,7 @@ { Status = CsrpAddInitCompleteProc(InitCompleteProc); } + if (HardErrorProc) Status = CsrpAddHardErrorProc(HardErrorProc); return Status; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Mon Oct 30 17:20:45 2006 @@ -163,10 +163,19 @@ return TRUE; } +static BOOL STDCALL +Win32CsrHardError(void) +{ + MessageBox(0, "Hard Error", "TODO", 0); + return TRUE; +} + + BOOL STDCALL Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRSS_OBJECT_DEFINITION *ObjectDefinitions, CSRPLUGIN_INIT_COMPLETE_PROC *InitComplete, + CSRPLUGIN_HARDERROR_PROC *HardError, PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap) { @@ -179,6 +188,7 @@ *ApiDefinitions = Win32CsrApiDefinitions; *ObjectDefinitions = Win32CsrObjectDefinitions; *InitComplete = Win32CsrInitComplete; + *HardError = Win32CsrHardError; return TRUE; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.def (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.def Mon Oct 30 17:20:45 2006 @@ -5,4 +5,4 @@ EXPORTS -Win32CsrInitialization@20 +Win32CsrInitialization@24

1 0

[ion] 24664: - SMSS: Send QOS structure when creating new ports, it's not optional on NT LPC. Send maximum port length when creating new ports, it's not optional on NT LPC. Create 2 listening threads on NTLPC, instead of just one. [AUDIT: Unlock smlib, it's fully internal and specific to ROS without any relationship to NT. The author used clean-room tests and documentation]. - Fix various LPC structures in the NDK. Fix some prototypes too. - Don't export PEPORT or PLPCP_PORT_OBJECT outside of /l
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 17:17:37 2006 New Revision: 24664 URL: http://svn.reactos.org/svn/reactos?rev=24664&view=rev Log: - SMSS: Send QOS structure when creating new ports, it's not optional on NT LPC. Send maximum port length when creating new ports, it's not optional on NT LPC. Create 2 listening threads on NTLPC, instead of just one. [AUDIT: Unlock smlib, it's fully internal and specific to ROS without any relationship to NT. The author used clean-room tests and documentation]. - Fix various LPC structures in the NDK. Fix some prototypes too. - Don't export PEPORT or PLPCP_PORT_OBJECT outside of /lpc and use PVOID isntead. - Add a new RBUILD setting called NTLPC, which enables NTLPC when turned on. Modified: trunk/reactos/base/system/smss/debug.c trunk/reactos/base/system/smss/smapi.c trunk/reactos/base/system/smss/smss.rbuild trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/lpcfuncs.h trunk/reactos/include/ndk/lpctypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/lib/smlib/compses.c (props changed) trunk/reactos/lib/smlib/connect.c (contents, props changed) trunk/reactos/lib/smlib/execpgm.c (props changed) trunk/reactos/lib/smlib/lookupss.c (props changed) trunk/reactos/lib/smlib/precomp.h (props changed) trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/base/system/smss/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/debug.c?r… ============================================================================== --- trunk/reactos/base/system/smss/debug.c (original) +++ trunk/reactos/base/system/smss/debug.c Mon Oct 30 17:17:37 2006 @@ -153,7 +153,7 @@ Status = SmpCreatePT(& DbgSsApiPort, SM_DBGSS_PORT_NAME, 0, /* MaxDataSize */ - 0, /* MaxMessageSize */ + sizeof(PORT_MESSAGE), /* MaxMessageSize */ 0, /* PoolCharge */ DbgSsApiPortThread, & hDbgSsApiPortThread); @@ -166,7 +166,7 @@ Status = SmpCreatePT(& DbgUiApiPort, SM_DBGUI_PORT_NAME, 0, /* MaxDataSize */ - 0, /* MaxMessageSize */ + sizeof(PORT_MESSAGE), /* MaxMessageSize */ 0, /* PoolCharge */ DbgUiApiPortThread, NULL); Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c (original) +++ trunk/reactos/base/system/smss/smapi.c Mon Oct 30 17:17:37 2006 @@ -44,10 +44,8 @@ return (PSM_CONNECT_DATA)(PortMessage + 1); } -#if !defined(__USE_NT_LPC__) NTSTATUS STDCALL SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request); -#endif /********************************************************************** * SmpCallbackServer/2 @@ -68,6 +66,7 @@ ULONG CallbackPortNameLength = SM_SB_NAME_MAX_LENGTH; /* TODO: compute length */ SB_CONNECT_DATA SbConnectData; ULONG SbConnectDataLength = sizeof SbConnectData; + SECURITY_QUALITY_OF_SERVICE SecurityQos; DPRINT("SM: %s called\n", __FUNCTION__); @@ -84,10 +83,15 @@ RtlInitUnicodeString (& CallbackPortName, ClientData->SbApiPortName); + SecurityQos.Length = sizeof (SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + SbConnectData.SmApiMax = (sizeof SmApi / sizeof SmApi[0]); Status = NtConnectPort (& ClientData->SbApiPort, & CallbackPortName, - NULL, + &SecurityQos, NULL, NULL, NULL, @@ -245,7 +249,7 @@ } } DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__); -#if defined(__USE_NT_LPC__) +#if defined(NTLPC) Status = NtAcceptConnectPort (ClientDataApiPort, Context, (PPORT_MESSAGE) Request, @@ -276,7 +280,7 @@ __FUNCTION__, Status); return Status; } -#if !defined(__USE_NT_LPC__) /* ReactOS LPC */ +#if !defined(NTLPC) /* ReactOS LPC */ DPRINT("SM: %s: server side comm port thread (ROS LPC)\n", __FUNCTION__); Status = RtlCreateUserThread(NtCurrentProcess(), NULL, @@ -369,8 +373,8 @@ Status = NtCreatePort(&SmApiPort, &ObjectAttributes, - 0, - 0, + sizeof(SM_CONNECT_DATA), + sizeof(SM_PORT_MESSAGE), 0); if (!NT_SUCCESS(Status)) { @@ -386,11 +390,35 @@ 0, 0, 0, +#ifdef NTLPC + (PTHREAD_START_ROUTINE)SmpApiConnectedThread, + &SmApiPort, +#else (PTHREAD_START_ROUTINE)SmpApiThread, (PVOID)SmApiPort, +#endif NULL, NULL); +#ifdef NTLPC + // + // On NT LPC, we need a second thread to handle incoming connections + // generated by incoming requests, otherwise the thread handling + // the request will be busy sending the LPC message, without any other + // thread being busy to receive the LPC message. + // + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE)SmpApiConnectedThread, + &SmApiPort, + NULL, + NULL); +#endif + return(Status); } Modified: trunk/reactos/base/system/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.rbui… ============================================================================== --- trunk/reactos/base/system/smss/smss.rbuild (original) +++ trunk/reactos/base/system/smss/smss.rbuild Mon Oct 30 17:17:37 2006 @@ -3,6 +3,9 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> + <if property="NTLPC" value="1"> + <define name="NTLPC" /> + </if> <library>nt</library> <library>smlib</library> <library>ntdll</library> Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Mon Oct 30 17:17:37 2006 @@ -185,7 +185,9 @@ ResponseNo, ResponseOk, ResponseRetry, - ResponseYes + ResponseYes, + ResponseTryAgain, + ResponseContinue } HARDERROR_RESPONSE, *PHARDERROR_RESPONSE; // Modified: trunk/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpcfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpcfuncs.h (original) +++ trunk/reactos/include/ndk/lpcfuncs.h Mon Oct 30 17:17:37 2006 @@ -34,8 +34,15 @@ LpcRequestWaitReplyPort( IN PVOID Port, IN PPORT_MESSAGE LpcMessageRequest, - OUT PPORT_MESSAGE LpcMessageReply) -; + OUT PPORT_MESSAGE LpcMessageReply +); + +NTSTATUS +NTAPI +LpcRequestPort( + IN PVOID Port, + IN PPORT_MESSAGE LpcMessage +); #endif // Modified: trunk/reactos/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpctypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpctypes.h (original) +++ trunk/reactos/include/ndk/lpctypes.h Mon Oct 30 17:17:37 2006 @@ -39,7 +39,21 @@ // // Port Object Access Masks // +#define PORT_CONNECT 0x1 #define PORT_ALL_ACCESS 0x1 + +// +// Port Object Flags +// +#define LPCP_CONNECTION_PORT 0x00000001 +#define LPCP_UNCONNECTED_PORT 0x00000002 +#define LPCP_COMMUNICATION_PORT 0x00000003 +#define LPCP_CLIENT_PORT 0x00000004 +#define LPCP_PORT_TYPE_MASK 0x0000000F +#define LPCP_PORT_DELETED 0x10000000 +#define LPCP_WAITABLE_PORT 0x20000000 +#define LPCP_NAME_DELETED 0x40000000 +#define LPCP_SECURITY_DYNAMIC 0x80000000 // // LPC Message Types @@ -170,7 +184,7 @@ typedef struct _LPCP_PORT_QUEUE { PLPCP_NONPAGED_PORT_QUEUE NonPagedPortQueue; - KSEMAPHORE Semaphore; + PKSEMAPHORE Semaphore; LIST_ENTRY ReceiveHead; } LPCP_PORT_QUEUE, *PLPCP_PORT_QUEUE; @@ -179,8 +193,6 @@ // typedef struct _LPCP_PORT_OBJECT { - ULONG Length; - ULONG Flags; struct _LPCP_PORT_OBJECT *ConnectionPort; struct _LPCP_PORT_OBJECT *ConnectedPort; LPCP_PORT_QUEUE MsgQueue; @@ -188,13 +200,17 @@ PVOID ClientSectionBase; PVOID ServerSectionBase; PVOID PortContext; - ULONG MaxMessageLength; - ULONG MaxConnectionInfoLength; PETHREAD ClientThread; SECURITY_QUALITY_OF_SERVICE SecurityQos; SECURITY_CLIENT_CONTEXT StaticSecurity; LIST_ENTRY LpcReplyChainHead; LIST_ENTRY LpcDataInfoChainHead; + PEPROCESS ServerProcess; + PEPROCESS MappingProcess; + ULONG MaxMessageLength; + ULONG MaxConnectionInfoLength; + ULONG Flags; + KEVENT WaitEvent; } LPCP_PORT_OBJECT, *PLPCP_PORT_OBJECT; // Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Mon Oct 30 17:17:37 2006 @@ -109,6 +109,14 @@ HANDLE NTAPI PsGetProcessId(PEPROCESS Process); + +NTSTATUS +NTAPI +PsLookupProcessThreadByCid( + IN PCLIENT_ID Cid, + OUT PEPROCESS *Process OPTIONAL, + OUT PETHREAD *Thread +); #endif Propchange: trunk/reactos/lib/smlib/compses.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/smlib/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/connect.c?rev=24… ============================================================================== --- trunk/reactos/lib/smlib/connect.c (original) +++ trunk/reactos/lib/smlib/connect.c Mon Oct 30 17:17:37 2006 @@ -78,7 +78,7 @@ SecurityQos.Length = sizeof (SecurityQos); SecurityQos.ImpersonationLevel = SecurityIdentification; - SecurityQos.ContextTrackingMode = TRUE; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; SecurityQos.EffectiveOnly = TRUE; RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME); Propchange: trunk/reactos/lib/smlib/connect.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/smlib/execpgm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/smlib/lookupss.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/smlib/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ex/error.c (original) +++ trunk/reactos/ntoskrnl/ex/error.c Mon Oct 30 17:17:37 2006 @@ -17,7 +17,7 @@ /* GLOBALS ****************************************************************/ BOOLEAN ExReadyForErrors = FALSE; -PEPORT ExpDefaultErrorPort = NULL; +PVOID ExpDefaultErrorPort = NULL; PEPROCESS ExpDefaultErrorPortProcess = NULL; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h Mon Oct 30 17:17:37 2006 @@ -20,7 +20,9 @@ extern POBJECT_TYPE LpcPortObjectType; extern ULONG LpcpNextMessageId; +#ifndef NTLPC extern FAST_MUTEX LpcpLock; +#endif typedef struct _EPORT_LISTENER { @@ -73,13 +75,6 @@ LIST_ENTRY QueueListEntry; PORT_MESSAGE Message; } QUEUEDMESSAGE, *PQUEUEDMESSAGE; - -NTSTATUS -NTAPI -LpcRequestPort( - PEPORT Port, - PPORT_MESSAGE LpcMessage -); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Mon Oct 30 17:17:37 2006 @@ -175,7 +175,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - if (Class >= 0 && Class < ClassListEntries) + if (Class < ClassListEntries) { if (!(ClassList[Class].Flags & ICIF_SET)) { @@ -226,7 +226,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - if (Class >= 0 && Class < ClassListEntries) + if (Class < ClassListEntries) { if (!(ClassList[Class].Flags & ICIF_QUERY)) { Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Mon Oct 30 17:17:37 2006 @@ -34,10 +34,11 @@ * * @implemented */ -NTSTATUS STDCALL LpcRequestPort (IN PEPORT Port, +NTSTATUS STDCALL LpcRequestPort (IN PVOID PortObject, IN PPORT_MESSAGE LpcMessage) { NTSTATUS Status; + PEPORT Port = (PEPORT)PortObject; DPRINT("LpcRequestPort(PortHandle %08x, LpcMessage %08x)\n", Port, LpcMessage); Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Oct 30 17:17:37 2006 @@ -9,6 +9,9 @@ <define name="__NO_CTYPE_INLINES" /> <define name="__USE_W32API" /> <define name="WIN9X_COMPAT_SPINLOCK" /> + <if property="NTLPC" value="1"> + <define name="NTLPC" /> + </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ReactOS">include/reactos/drivers</include> @@ -220,19 +223,35 @@ <file>loader.c</file> <file>rtl.c</file> </directory> - <directory name="lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>query.c</file> - <file>queue.c</file> - <file>receive.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> + <if property="NTLPC" value="0"> + <directory name="lpc"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>query.c</file> + <file>queue.c</file> + <file>receive.c</file> + <file>reply.c</file> + <file>send.c</file> + </directory> + </if> + <if property="NTLPC" value="1"> + <directory name="lpc"> + <directory name="ntlpc"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>reply.c</file> + <file>send.c</file> + </directory> + </directory> + </if> <directory name="mm"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Mon Oct 30 17:17:37 2006 @@ -361,7 +361,7 @@ { HANDLE hProcess; PEPROCESS Process, Parent; - PEPORT ExceptionPortObject; + PVOID ExceptionPortObject; PDEBUG_OBJECT DebugObject; PSECTION_OBJECT SectionObject; NTSTATUS Status, AccessStatus; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Mon Oct 30 17:17:37 2006 @@ -486,7 +486,7 @@ HANDLE PortHandle = NULL; HANDLE TokenHandle = NULL; PROCESS_SESSION_INFORMATION SessionInfo = {0}; - PEPORT ExceptionPort; + PVOID ExceptionPort; PAGED_CODE(); /* Verify Information Class validity */

1 0

[janderwald] 24663: - zero complete buffer - increase buffer when reading more data than current capacity
by janderwald＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: janderwald Date: Mon Oct 30 15:58:35 2006 New Revision: 24663 URL: http://svn.reactos.org/svn/reactos?rev=24663&view=rev Log: - zero complete buffer - increase buffer when reading more data than current capacity Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 30 15:58:35 2006 @@ -15,6 +15,8 @@ namespace System_ { +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) + //--------------------------------------------------------------------------------------- NamedPipeReader::NamedPipeReader() : h_Pipe(NULL) { @@ -94,14 +96,15 @@ string::size_type NamedPipeReader::readPipe(string &Buffer) { TCHAR * buf = (TCHAR *)Buffer.c_str(); - string::size_type size = Buffer.capacity(); + string::size_type buffer_size = Buffer.capacity(); + string::size_type bytes_read = 0; DWORD cbRead; BOOL fSuccess; TCHAR * localbuf; - DWORD localsize = 100; + DWORD localsize = MIN(100, buffer_size); //#ifdef NDEBUG - memset(buf, 0x0, sizeof(TCHAR) * size); + memset(buf, 0x0, sizeof(TCHAR) * buffer_size); //#endif #ifdef __LINUX__ @@ -115,7 +118,7 @@ { do { - ZeroMemory(localbuf, sizeof(localsize) * sizeof(TCHAR)); + ZeroMemory(localbuf, localsize * sizeof(TCHAR)); fSuccess = ReadFile( h_Pipe, @@ -127,8 +130,16 @@ if (! fSuccess && GetLastError() != ERROR_MORE_DATA) break; - _tcscat(buf, localbuf); - + if(bytes_read + cbRead > buffer_size) + { + Buffer.reserve(bytes_read + localsize * 3); + buf = (TCHAR *)Buffer.c_str(); + buffer_size = Buffer.capacity(); + } + + memcpy(&buf[bytes_read], localbuf, cbRead); + bytes_read += cbRead; + } while (!fSuccess); // repeat loop if ERROR_MORE_DATA } while (localbuf[_tcslen(localbuf)-1] != '\n');

1 0

[cwittich] 24662: -force include of warning.h from WDK -removed CRT_SECURE_NO_DEPRECATE because it is declared in warning.h -set warning level to /W3 -set calling convention to stdcall -use nasmw for asm files
by cwittich＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: cwittich Date: Mon Oct 30 15:53:25 2006 New Revision: 24662 URL: http://svn.reactos.org/svn/reactos?rev=24662&view=rev Log: -force include of warning.h from WDK -removed CRT_SECURE_NO_DEPRECATE because it is declared in warning.h -set warning level to /W3 -set calling convention to stdcall -use nasmw for asm files Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Oct 30 15:53:25 2006 @@ -253,6 +253,7 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"warning.h\"\r\n" ); fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); @@ -299,9 +300,6 @@ { // this is a define in MinGW w32api, but not Microsoft's headers defines.insert ( "STDCALL=__stdcall" ); - // MinGW doesn't have a safe-string library yet - defines.insert ( "_CRT_SECURE_NO_DEPRECATE" ); - defines.insert ( "_CRT_NON_CONFORMING_SWPRINTFS" ); } if ( lib || exe ) @@ -358,12 +356,11 @@ fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); } - fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "4" ); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "3" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 0); // 2=__stdcall 0=__cdecl + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); // 2=__stdcall 0=__cdecl fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : release ? "3": "4"); // 3=/Zi 4=ZI fprintf ( OUT, "\t\t\t<Tool\r\n" ); @@ -583,7 +580,7 @@ else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) { fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n"); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );

1 0

[janderwald] 24661: - use ReactOS_Debug as a default os when DBG && unattended setup mode is defined - set timeout to zero in unattended mode && DBG defined
by janderwald＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: janderwald Date: Mon Oct 30 15:41:17 2006 New Revision: 24661 URL: http://svn.reactos.org/svn/reactos?rev=24661&view=rev Log: - use ReactOS_Debug as a default os when DBG && unattended setup mode is defined - set timeout to zero in unattended mode && DBG defined Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Mon Oct 30 15:41:17 2006 @@ -43,22 +43,48 @@ IniSection = IniCacheAppendSection(IniCache, L"FREELOADER"); - /* DefaultOS=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, +#ifdef DBG + if (IsUnattendedSetup) + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"DefaultOS", + L"ReactOS_Debug"); + } + else +#endif + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, INSERT_LAST, L"DefaultOS", L"ReactOS"); - - /* Timeout=0 or 10 */ - IniCacheInsertKey(IniSection, + } + +#ifdef DBG + if (IsUnattendedSetup) +#endif + { + /* Timeout=0 for unattended or non debug*/ + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", -#ifndef DBG L"0"); -#else + } +#ifdef DBG + else + { + /* Timeout=0 or 10 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"TimeOut", L"10"); + } #endif /* Create "Display" section */ Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Mon Oct 30 15:41:17 2006 @@ -75,6 +75,8 @@ extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; +extern BOOLEAN IsUnattendedSetup; + #endif /* __USETUP_H__*/

1 0

[weiden] 24660: Implement GetTickCount64
by weiden＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: weiden Date: Mon Oct 30 14:56:28 2006 New Revision: 24660 URL: http://svn.reactos.org/svn/reactos?rev=24660&view=rev Log: Implement GetTickCount64 Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Mon Oct 30 14:56:28 2006 @@ -519,6 +519,7 @@ GetThreadSelectorEntry@12 GetThreadTimes@20 GetTickCount@0 +GetTickCount64@0 GetTimeFormatA@24 GetTimeFormatW@24 GetTimeZoneInformation@4 Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c Mon Oct 30 14:56:28 2006 @@ -401,6 +401,16 @@ /* * @implemented */ +ULONGLONG WINAPI +GetTickCount64(VOID) +{ + return (ULONGLONG)SharedUserData->TickCountLowDeprecated * (ULONGLONG)SharedUserData->TickCountMultiplier / 16777216; +} + + +/* + * @implemented + */ BOOL STDCALL SystemTimeToTzSpecificLocalTime( LPTIME_ZONE_INFORMATION lpTimeZoneInformation, Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Mon Oct 30 14:56:28 2006 @@ -1592,6 +1592,9 @@ BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); DWORD WINAPI GetTickCount(VOID); +#if (_WIN32_WINNT >= 0x0600) +ULONGLONG WINAPI GetTickCount64(VOID); +#endif DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,DWORD,PDWORD); BOOL WINAPI GetUserNameA (LPSTR,PDWORD);

1 0

[cwittich] 24659: now it is possible to build bootcd and bootcdregtest with the same tree (without changing any files)
by cwittich＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: cwittich Date: Thu Oct 26 12:45:16 2006 New Revision: 24659 URL: http://svn.reactos.org/svn/reactos?rev=24659&view=rev Log: now it is possible to build bootcd and bootcdregtest with the same tree (without changing any files) Modified: trunk/reactos/Makefile trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=24659&r1=2465… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Oct 26 12:45:16 2006 @@ -402,6 +402,12 @@ ROS_OUTPUT=output-$(ARCH)-r \ world + +regtest: + $(cp) boot\bootdata\unattend.inf.sample output-i386\cd\reactos\unattend.inf + $(MAKE) bootcdregtest + $(rm) output-i386\cd\reactos\unattend.inf + .PHONY: msvc msvc: $(RBUILD_TARGET) $(ECHO_RBUILD) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 26 12:45:16 2006 @@ -398,7 +398,7 @@ media\inf\usb.inf 6 media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 -;boot\bootdata\unattend.inf 6 optional +boot\bootdata\unattend.inf 6 optional ; Subsystems

1 0

[ion] 24658: - Make CSRSS register the default hard error port on startup. - Stubplement the System Hard Error handler (it simply bugchecks) - Fully implement ExRaiseHardError when called from user-mode so that the strings and parameters are properly captured into user-mode memory. - Almost completely implement ExpRaiseHardError which is responsible for actually doing the error. However, ROS LPC is screwed up so sending the LPC Message crashes since the port isn't in a listening state or somethi
by ion＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: ion Date: Thu Oct 26 08:55:34 2006 New Revision: 24658 URL: http://svn.reactos.org/svn/reactos?rev=24658&view=rev Log: - Make CSRSS register the default hard error port on startup. - Stubplement the System Hard Error handler (it simply bugchecks) - Fully implement ExRaiseHardError when called from user-mode so that the strings and parameters are properly captured into user-mode memory. - Almost completely implement ExpRaiseHardError which is responsible for actually doing the error. However, ROS LPC is screwed up so sending the LPC Message crashes since the port isn't in a listening state or something. - Would appreciate some advice on how to get the LPC message to CSRSS. - Fix Get/SetErrorMode. The Native API uses an inverted value of SEM_FAILCRITICALERRORS, so this must be handled in win32. - Cleanup formatting of RaiseException, and only normalize the paramter count if we're actualy going to use it. - Implement LpcRequestWaitReplyPort as a big hack, but it should work. Modified: trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/include/ndk/lpcfuncs.h trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Thu Oct 26 08:55:34 2006 @@ -18,65 +18,89 @@ LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; UINT -STDCALL +WINAPI GetErrorMode(VOID) { - NTSTATUS Status; - UINT ErrMode; - - Status = NtQueryInformationProcess(NtCurrentProcess(), + NTSTATUS Status; + UINT ErrMode; + + /* Query the current setting */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + (PVOID)&ErrMode, + sizeof(ErrMode), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail if we couldn't query */ + SetLastErrorByStatus(Status); + return 0; + } + + /* Check if NOT failing critical errors was requested */ + if (ErrMode & SEM_FAILCRITICALERRORS) + { + /* Mask it out, since the native API works differently */ + ErrMode &= ~SEM_FAILCRITICALERRORS; + } + else + { + /* OR it if the caller didn't, due to different native semantics */ + ErrMode |= SEM_FAILCRITICALERRORS; + } + + /* Return the mode */ + return ErrMode; +} + +/* + * @implemented + */ +UINT +WINAPI +SetErrorMode(IN UINT uMode) +{ + UINT PrevErrMode, NewMode; + NTSTATUS Status; + + /* Get the previous mode */ + PrevErrMode = GetErrorMode(); + NewMode = uMode; + + /* Check if failing critical errors was requested */ + if (NewMode & SEM_FAILCRITICALERRORS) + { + /* Mask it out, since the native API works differently */ + NewMode &= ~SEM_FAILCRITICALERRORS; + } + else + { + /* OR it if the caller didn't, due to different native semantics */ + NewMode |= SEM_FAILCRITICALERRORS; + } + + /* Set the new mode */ + Status = NtSetInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, - (PVOID)&ErrMode, - sizeof(ErrMode), - NULL); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - - return ErrMode; + (PVOID)&NewMode, + sizeof(NewMode)); + if(!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); + + /* Return the previous mode */ + return PrevErrMode; } /* * @implemented */ -UINT -STDCALL -SetErrorMode(UINT uMode) -{ - UINT PrevErrMode; - NTSTATUS Status; - - PrevErrMode = GetErrorMode(); - - Status = NtSetInformationProcess(NtCurrentProcess(), - ProcessDefaultHardErrorMode, - (PVOID)&uMode, - sizeof(uMode)); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - - return PrevErrMode; -} - - -/* - * @implemented - */ LPTOP_LEVEL_EXCEPTION_FILTER -STDCALL +WINAPI SetUnhandledExceptionFilter( - LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter - ) + IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) { return InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, lpTopLevelExceptionFilter); } - /* * Private helper function to lookup the module name from a given address. @@ -268,59 +292,54 @@ return EXCEPTION_EXECUTE_HANDLER; } - /* * @implemented */ VOID -STDCALL -RaiseException ( - DWORD dwExceptionCode, - DWORD dwExceptionFlags, - DWORD nNumberOfArguments, - CONST ULONG_PTR * lpArguments OPTIONAL - ) -{ - EXCEPTION_RECORD ExceptionRecord; - - /* Do NOT normalize dwExceptionCode: it will be done in - * NTDLL.RtlRaiseException(). - */ - ExceptionRecord.ExceptionCode = dwExceptionCode; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.ExceptionAddress = (PVOID) RaiseException; - /* - * Normalize dwExceptionFlags. - */ - ExceptionRecord.ExceptionFlags = (dwExceptionFlags & EXCEPTION_NONCONTINUABLE); - /* - * Normalize nNumberOfArguments. - */ - if (EXCEPTION_MAXIMUM_PARAMETERS < nNumberOfArguments) - { - nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; - } - /* - * If the exception has no argument, - * ignore nNumberOfArguments and lpArguments. - */ - if (NULL == lpArguments) - { - ExceptionRecord.NumberParameters = 0; - } - else - { - ExceptionRecord.NumberParameters = nNumberOfArguments; - for ( nNumberOfArguments = 0; - (nNumberOfArguments < ExceptionRecord.NumberParameters); - nNumberOfArguments ++ - ) - { - ExceptionRecord.ExceptionInformation [nNumberOfArguments] - = *lpArguments ++; - } - } - RtlRaiseException (& ExceptionRecord); +WINAPI +RaiseException(IN DWORD dwExceptionCode, + IN DWORD dwExceptionFlags, + IN DWORD nNumberOfArguments, + IN CONST ULONG_PTR *lpArguments OPTIONAL) +{ + EXCEPTION_RECORD ExceptionRecord; + + /* Setup the exception record */ + ExceptionRecord.ExceptionCode = dwExceptionCode; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionAddress = (PVOID)RaiseException; + ExceptionRecord.ExceptionFlags = dwExceptionFlags & EXCEPTION_NONCONTINUABLE; + + /* Check if we have arguments */ + if (!lpArguments) + { + /* We don't */ + ExceptionRecord.NumberParameters = 0; + } + else + { + /* We do, normalize the count */ + if (nNumberOfArguments > EXCEPTION_MAXIMUM_PARAMETERS) + { + nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; + } + + /* Set the count of parameters */ + ExceptionRecord.NumberParameters = nNumberOfArguments; + + /* Loop each parameter */ + for (nNumberOfArguments = 0; + (nNumberOfArguments < ExceptionRecord.NumberParameters); + nNumberOfArguments ++) + { + /* Copy the exception information */ + ExceptionRecord.ExceptionInformation[nNumberOfArguments] = + *lpArguments++; + } + } + + /* Raise the exception */ + RtlRaiseException(&ExceptionRecord); } /* EOF */ Modified: trunk/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpcfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpcfuncs.h (original) +++ trunk/reactos/include/ndk/lpcfuncs.h Thu Oct 26 08:55:34 2006 @@ -23,6 +23,20 @@ // Dependencies // #include <umtypes.h> + +// +// LPC Exports +// +#ifndef NTOS_MODE_USER +NTKERNELAPI +NTSTATUS +NTAPI +LpcRequestWaitReplyPort( + IN PVOID Port, + IN PPORT_MESSAGE LpcMessageRequest, + OUT PPORT_MESSAGE LpcMessageReply) +; +#endif // // Native calls Modified: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ex/error.c (original) +++ trunk/reactos/ntoskrnl/ex/error.c Thu Oct 26 08:55:34 2006 @@ -23,6 +23,51 @@ /* FUNCTIONS ****************************************************************/ /*++ +* @name ExpRaiseHardError +* +* For now it's a stub +* +* @param ErrorStatus +* FILLME +* +* @param NumberOfParameters +* FILLME +* +* @param UnicodeStringParameterMask +* FILLME +* +* @param Parameters +* FILLME +* +* @param ValidResponseOptions +* FILLME +* +* @param Response +* FILLME +* +* @return None +* +* @remarks None +* +*--*/ +NTSTATUS +NTAPI +ExpSystemErrorHandler(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN BOOLEAN Shutdown) +{ + /* FIXME: STUB */ + KeBugCheckEx(FATAL_UNHANDLED_HARD_ERROR, + ErrorStatus, + 0, + 0, + 0); + return STATUS_SUCCESS; +} + +/*++ * @name ExpRaiseHardError * * For now it's a stub @@ -50,7 +95,7 @@ * @remarks None * *--*/ -VOID +NTSTATUS NTAPI ExpRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, @@ -59,7 +104,146 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { + PEPROCESS Process = PsGetCurrentProcess(); + PETHREAD Thread = PsGetCurrentThread(); + UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; + PHARDERROR_MSG Message = (PHARDERROR_MSG)Buffer; + NTSTATUS Status; + HANDLE PortHandle; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PAGED_CODE(); + DPRINT1("Hard error, baby!: %lx, %lx, %lx %p\n", + ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters); + + /* Check if this error will shutdown the system */ + if (ValidResponseOptions == OptionShutdownSystem) + { + /* Check for privilege */ + if (!SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode)) + { + /* No rights */ + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Don't handle any new hard errors */ + ExReadyForErrors = FALSE; + } + + /* Check if hard errors are not disabled */ + if (!Thread->HardErrorsAreDisabled) + { + /* Check if we can't do errors anymore, and this is serious */ + if ((!ExReadyForErrors) && (NT_ERROR(ErrorStatus))) + { + /* Use the system handler */ + ExpSystemErrorHandler(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + (PreviousMode != KernelMode) ? TRUE: FALSE); + } + } + + /* Check if we have an exception port */ + if (Process->ExceptionPort) + { + /* Check if hard errors should be processed */ + if (Process->DefaultHardErrorProcessing & 1) + { + /* Use the port */ + PortHandle = Process->ExceptionPort; + } + else + { + /* It's disabled, check if the error overrides it */ + if (ErrorStatus & 0x10000000) + { + /* Use the port anyway */ + PortHandle = Process->ExceptionPort; + } + else + { + /* No such luck */ + PortHandle = NULL; + } + } + } + else + { + /* Check if hard errors are enabled */ + if (Process->DefaultHardErrorProcessing & 1) + { + /* Use our default system port */ + PortHandle = ExpDefaultErrorPort; + } + else + { + /* It's disabled, check if the error overrides it */ + if (ErrorStatus & 0x10000000) + { + /* Use the port anyway */ + PortHandle = ExpDefaultErrorPort; + } + else + { + /* No such luck */ + PortHandle = NULL; + } + } + } + + /* If hard errors are disabled, do nothing */ + if (Thread->HardErrorsAreDisabled) PortHandle = NULL; + + /* Now check if we have a port */ + if (PortHandle) + { + /* Check if this is the default process */ + if (Process == ExpDefaultErrorPortProcess) + { + /* We can't handle the error, check if this is critical */ + if (NT_ERROR(ErrorStatus)) + { + /* It is, invoke the system handler */ + ExpSystemErrorHandler(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + (PreviousMode != KernelMode) ? TRUE: FALSE); + + /* If we survived, return to caller */ + *Response = ResponseReturnToCaller; + return STATUS_SUCCESS; + } + } + + /* Setup the LPC Message */ + Message->h.u1.Length = (sizeof(HARDERROR_MSG) << 16) | + (sizeof(HARDERROR_MSG) - sizeof(PORT_MESSAGE)); + Message->h.u2.ZeroInit = LPC_ERROR_EVENT; + Message->Status = ErrorStatus &~ 0x10000000; + Message->ValidResponseOptions = ValidResponseOptions; + Message->UnicodeStringParameterMask = UnicodeStringParameterMask; + Message->NumberOfParameters = NumberOfParameters; + KeQuerySystemTime(&Message->ErrorTime); + + /* Copy the parameters */ + if (Parameters) RtlMoveMemory(&Message->Parameters, + Parameters, + sizeof(ULONG_PTR) * NumberOfParameters); + + /* Send the message */ + Status = LpcRequestWaitReplyPort(PortHandle, + (PVOID)Message, + (PVOID)Message); + DPRINT1("Checkpoint 2: %lx\n", Status); + } + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /*++ @@ -155,7 +339,7 @@ * @remarks None * *--*/ -VOID +NTSTATUS NTAPI ExRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, @@ -164,15 +348,121 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { - /* FIXME: Capture to user-mode! */ + ULONG Size; + UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; + ULONG i; + PULONG_PTR UserData = NULL, ParameterBase; + PUNICODE_STRING StringBase; + PWSTR BufferBase; + ULONG SafeResponse; + NTSTATUS Status; + PAGED_CODE(); + + /* Check if we have parameters */ + if (Parameters) + { + /* Check if we have strings */ + if (UnicodeStringParameterMask) + { + /* Add the maximum possible size */ + Size = (sizeof(ULONG_PTR) + sizeof(UNICODE_STRING)) * + MAXIMUM_HARDERROR_PARAMETERS + sizeof(UNICODE_STRING); + + /* Loop each parameter */ + for (i = 0; i < NumberOfParameters; i++) + { + /* Check if it's part of the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Copy it */ + RtlMoveMemory(&CapturedParams[i], + &Parameters[i], + sizeof(UNICODE_STRING)); + + /* Increase the size */ + Size += CapturedParams[i].MaximumLength; + } + } + + /* Allocate the user data region */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID*)&UserData, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) return Status; + + /* Set the pointers to our various data */ + ParameterBase = UserData; + StringBase = (PVOID)((ULONG_PTR)UserData + + sizeof(ULONG_PTR) * + MAXIMUM_HARDERROR_PARAMETERS); + BufferBase = (PVOID)((ULONG_PTR)StringBase + + sizeof(UNICODE_STRING) * + MAXIMUM_HARDERROR_PARAMETERS); + + /* Loop parameters again */ + for (i = 0; i < NumberOfParameters; i++) + { + /* Check if we're in the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Update the base */ + ParameterBase[i] = (ULONG_PTR)&StringBase[i]; + + /* Copy the string buffer */ + RtlMoveMemory(BufferBase, + CapturedParams[i].Buffer, + CapturedParams[i].MaximumLength); + + /* Set buffer */ + CapturedParams[i].Buffer = BufferBase; + + /* Copy the string structure */ + RtlMoveMemory(&StringBase[i], + &CapturedParams[i], + sizeof(UNICODE_STRING)); + + /* Update the pointer */ + BufferBase += CapturedParams[i].MaximumLength; + } + else + { + /* No need to copy any strings */ + ParameterBase[i] = Parameters[i]; + } + } + } + else + { + /* Just keep the data as is */ + UserData = Parameters; + } + } /* Now call the worker function */ - ExpRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - Parameters, - ValidResponseOptions, - Response); + Status = ExpRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + UserData, + ValidResponseOptions, + &SafeResponse); + + /* Check if we had done user-mode allocation */ + if ((UserData) && (UserData != Parameters)) + { + /* We did! Delete it */ + Size = 0; + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&UserData, + &Size, + MEM_RELEASE); + } + + /* Return status and the response */ + *Response = SafeResponse; + return Status; } /*++ @@ -223,13 +513,11 @@ ULONG i; ULONG ParamSize; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - DPRINT1("Hard error %x\n", ErrorStatus); /* Validate parameter count */ if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) { /* Fail */ - DPRINT1("Invalid parameters\n"); return STATUS_INVALID_PARAMETER_2; } @@ -237,7 +525,6 @@ if ((Parameters) && !(NumberOfParameters)) { /* Fail */ - DPRINT1("Invalid parameters\n"); return STATUS_INVALID_PARAMETER_2; } @@ -401,7 +688,7 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Check if we have the Privilege */ - if(!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { DPRINT1("NtSetDefaultHardErrorPort: Caller requires " "the SeTcbPrivilege privilege!\n"); @@ -409,7 +696,7 @@ } /* Only called once during bootup, make sure we weren't called yet */ - if(!ExReadyForErrors) + if (!ExReadyForErrors) { /* Reference the port */ Status = ObReferenceObjectByHandle(PortHandle, @@ -418,9 +705,7 @@ PreviousMode, (PVOID*)&ExpDefaultErrorPort, NULL); - - /* Check for Success */ - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Save the data */ ExpDefaultErrorPortProcess = PsGetCurrentProcess(); Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Thu Oct 26 08:55:34 2006 @@ -419,18 +419,36 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS -STDCALL -LpcRequestWaitReplyPort ( - IN PEPORT Port, - IN PPORT_MESSAGE LpcMessageRequest, - OUT PPORT_MESSAGE LpcMessageReply - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +NTAPI +LpcRequestWaitReplyPort(IN PVOID Port, + IN PPORT_MESSAGE LpcMessageRequest, + OUT PPORT_MESSAGE LpcMessageReply) +{ + HANDLE PortHandle; + NTSTATUS Status; + + /* This is a SICK hack */ + Status = ObOpenObjectByPointer(Port, + 0, + NULL, + PORT_ALL_ACCESS, + LpcPortObjectType, + KernelMode, + &PortHandle); + DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); + + /* Call the Nt function. Do a ring transition to get Kmode. */ + Status = ZwRequestWaitReplyPort(PortHandle, + LpcMessageRequest, + LpcMessageReply); + DPRINT1("LPC Hack active: %lx %lx\n", Status, PortHandle); + + /* Close the handle */ + ObCloseHandle(PortHandle, KernelMode); + return Status; } /* EOF */ Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Thu Oct 26 08:55:34 2006 @@ -14,60 +14,6 @@ #define NDEBUG #include <internal/debug.h> - -/********************************************************************** - * NAME - * LpcSendDebugMessagePort/3 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL -LpcSendDebugMessagePort (IN PEPORT Port, - IN PDBGKM_MSG Message, - OUT PDBGKM_MSG Reply) -{ - NTSTATUS Status; - KIRQL oldIrql; - PQUEUEDMESSAGE ReplyMessage; - - Status = EiReplyOrRequestPort(Port, - &Message->h, - LPC_REQUEST, - Port); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Port); - return(Status); - } - KeReleaseSemaphore(&Port->OtherPort->Semaphore, IO_NO_INCREMENT, 1, FALSE); - - /* - * Wait for a reply - */ - KeWaitForSingleObject(&Port->Semaphore, - UserRequest, - UserMode, - FALSE, - NULL); - - /* - * Dequeue the reply - */ - KeAcquireSpinLock(&Port->Lock, &oldIrql); - ReplyMessage = EiDequeueMessagePort(Port); - KeReleaseSpinLock(&Port->Lock, oldIrql); - memcpy(Reply, &ReplyMessage->Message, ReplyMessage->Message.u1.s1.TotalLength); - ExFreePool(ReplyMessage); - - return(STATUS_SUCCESS); -} - /********************************************************************** * NAME Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Thu Oct 26 08:55:34 2006 @@ -555,7 +555,11 @@ return Status; } - +static NTSTATUS +CsrpCreateHardErrorPort (int argc, char ** argv, char ** envp) +{ + return NtSetDefaultHardErrorPort(hApiPort); +} typedef NTSTATUS (* CSR_INIT_ROUTINE)(int,char**,char**); @@ -568,6 +572,7 @@ {TRUE, CsrpRegisterSubsystem, "register with SM"}, {TRUE, CsrpCreateHeap, "create the CSR heap"}, {TRUE, CsrpCreateApiPort, "create the api port \\Windows\\ApiPort"}, + {TRUE, CsrpCreateHardErrorPort, "create the hard error port"}, {TRUE, CsrpCreateObjectDirectory,"create the object directory \\Windows"}, {TRUE, CsrpLoadKernelModeDriver, "load Kmode driver"}, {TRUE, CsrpInitVideo, "initialize video"},

1 0

[ion] 24657: - Fix dozens of missing typecast errors. - Other MSVC/WDK compatibility fixes.
by ion＠svn.reactos.org 26 Oct '06

26 Oct '06

Author: ion Date: Thu Oct 26 05:49:51 2006 New Revision: 24657 URL: http://svn.reactos.org/svn/reactos?rev=24657&view=rev Log: - Fix dozens of missing typecast errors. - Other MSVC/WDK compatibility fixes. Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/iofuncs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/fs/name.c trunk/reactos/ntoskrnl/fs/util.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/rtl/misc.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Thu Oct 26 05:49:51 2006 @@ -91,6 +91,15 @@ ExfUnblockPushLock( PEX_PUSH_LOCK PushLock, PVOID CurrentWaitBlock +); + +// +// Resource Functions +// +BOOLEAN +NTAPI +ExTryToAcquireResourceExclusiveLite( + IN PERESOURCE Resource ); #endif Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Thu Oct 26 05:49:51 2006 @@ -104,6 +104,13 @@ #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ MUTANT_QUERY_STATE) + +#define TIMER_QUERY_STATE 0x0001 +#define TIMER_MODIFY_STATE 0x0002 +#define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + TIMER_QUERY_STATE | \ + TIMER_MODIFY_STATE) #endif // Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Thu Oct 26 05:49:51 2006 @@ -31,8 +31,10 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -//#pragma intrinsic(_enable) -//#pragma intrinsic(_disable) +void _enable(void); +void _disable(void); +#pragma intrinsic(_enable) +#pragma intrinsic(_disable) #endif // @@ -208,5 +210,12 @@ IN PTIME_FIELDS RtcTime ); -#endif -#endif +NTHALAPI +VOID +NTAPI +HalSetRealTimeClock( + IN PTIME_FIELDS RtcTime +); + +#endif +#endif Modified: trunk/reactos/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iofuncs.h (original) +++ trunk/reactos/include/ndk/iofuncs.h Thu Oct 26 05:49:51 2006 @@ -671,7 +671,6 @@ IN ULONG OutputBufferSize ); -#ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS NTAPI @@ -679,7 +678,6 @@ IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); -#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Thu Oct 26 05:49:51 2006 @@ -29,6 +29,16 @@ // // Object Functions // +NTKERNELAPI +NTSTATUS +NTAPI +ObAssignSecurity( + IN PACCESS_STATE AccessState, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PVOID Object, + IN POBJECT_TYPE Type +); + NTKERNELAPI NTSTATUS NTAPI Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Oct 26 05:49:51 2006 @@ -478,10 +478,10 @@ #ifndef __NTDDK_H #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) -#endif #define TIMER_QUERY_STATE 0x0001 #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|TIMER_QUERY_STATE|TIMER_MODIFY_STATE) +#endif /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg. Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Thu Oct 26 05:49:51 2006 @@ -358,7 +358,7 @@ for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { PFN_TYPE Page; - Page = MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT; + Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); Status = MmPageOutPhysicalAddress(Page); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Oct 26 05:49:51 2006 @@ -276,8 +276,8 @@ Length = wcslen(StartPtr); - KeyName.Length = Length * sizeof(WCHAR); - KeyName.MaximumLength = KeyName.Length + sizeof(WCHAR); + KeyName.Length = (USHORT)Length * sizeof(WCHAR); + KeyName.MaximumLength = (USHORT)KeyName.Length + sizeof(WCHAR); KeyName.Buffer = ExAllocatePool(NonPagedPool, KeyName.MaximumLength); RtlCopyMemory(KeyName.Buffer, @@ -751,7 +751,7 @@ { ObjectNameInfo->Name.Buffer = (PWCHAR)(ObjectNameInfo + 1); ObjectNameInfo->Name.Length = 0; - ObjectNameInfo->Name.MaximumLength = Length - sizeof(OBJECT_NAME_INFORMATION); + ObjectNameInfo->Name.MaximumLength = (USHORT)Length - sizeof(OBJECT_NAME_INFORMATION); } @@ -931,13 +931,13 @@ if (TargetPath->Buffer == NULL && TargetPath->MaximumLength == 0) { TargetPath->Length = 0; - TargetPath->MaximumLength = ValueCell->DataSize + sizeof(WCHAR); + TargetPath->MaximumLength = (USHORT)ValueCell->DataSize + sizeof(WCHAR); TargetPath->Buffer = ExAllocatePool(NonPagedPool, TargetPath->MaximumLength); } - TargetPath->Length = min(TargetPath->MaximumLength - sizeof(WCHAR), - (ULONG) ValueCell->DataSize); + TargetPath->Length = min((USHORT)TargetPath->MaximumLength - sizeof(WCHAR), + (USHORT)ValueCell->DataSize); if (ValueCell->DataSize > 0) { Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Thu Oct 26 05:49:51 2006 @@ -512,7 +512,7 @@ DPRINT("PID: %d, TID: %d CS %04x/%04x\n", ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, ((PETHREAD)CurrentThread)->Cid.UniqueThread, - Trapframe->SegCs, + Trapframe->Cs, CurrentThread->TrapFrame ? CurrentThread->TrapFrame->SegCs : 0); if (CurrentThread->TrapFrame == NULL) { Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c (original) +++ trunk/reactos/ntoskrnl/ex/locale.c Thu Oct 26 05:49:51 2006 @@ -80,7 +80,7 @@ if (NT_SUCCESS(Status)) { /* Return the language */ - *LanguageId = Value; + *LanguageId = (USHORT)Value; } } else Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Oct 26 05:49:51 2006 @@ -71,7 +71,7 @@ ScaledIdle = Prcb->IdleThread->KernelTime * 100; TotalTime = Prcb->KernelTime + Prcb->UserTime; if (TotalTime != 0) - *CpuUsage = 100 - (ScaledIdle / TotalTime); + *CpuUsage = (ULONG)(100 - (ScaledIdle / TotalTime)); else *CpuUsage = 0; } @@ -211,7 +211,9 @@ /* * Get the environment variable */ - Result = HalGetEnvironmentVariable(AName.Buffer, ValueBufferLength, Value); + Result = HalGetEnvironmentVariable(AName.Buffer, + (USHORT)ValueBufferLength, + Value); if(!Result) { RtlFreeAnsiString(&AName); Modified: trunk/reactos/ntoskrnl/fs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/name.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/fs/name.c (original) +++ trunk/reactos/ntoskrnl/fs/name.c Thu Oct 26 05:49:51 2006 @@ -297,13 +297,13 @@ } /* Now we have the First Part */ - FirstPart->Length = (i-FirstLoop); + FirstPart->Length = (USHORT)(i - FirstLoop); FirstPart->MaximumLength = FirstPart->Length; /* +2?? */ FirstPart->Buffer = &Name.Buffer[FirstLoop]; /* Make the second part if something is still left */ if (i<Name.Length) { - RemainingPart->Length = (Name.Length - (i+1)); + RemainingPart->Length = (USHORT)(Name.Length - (i+1)); RemainingPart->MaximumLength = RemainingPart->Length; /* +2?? */ RemainingPart->Buffer = &Name.Buffer[i+1]; } Modified: trunk/reactos/ntoskrnl/fs/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/util.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/fs/util.c (original) +++ trunk/reactos/ntoskrnl/fs/util.c Thu Oct 26 05:49:51 2006 @@ -42,8 +42,10 @@ ULONG i; /* Allocate the Resource Buffer */ - FsRtlpResources = FsRtlAllocatePool(NonPagedPool, - FSRTL_MAX_RESOURCES*sizeof(ERESOURCE)); + FsRtlpResources = FsRtlAllocatePoolWithTag(NonPagedPool, + FSRTL_MAX_RESOURCES * + sizeof(ERESOURCE), + TAG('F', 's', 'R', 'e')); /* Initialize the Resources */ for (i = 0; i < FSRTL_MAX_RESOURCES; i++) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Oct 26 05:49:51 2006 @@ -593,7 +593,7 @@ return STATUS_INSUFFICIENT_RESOURCES; KeyName.Length = 0; - KeyName.MaximumLength = KeyNameLength; + KeyName.MaximumLength = (USHORT)KeyNameLength; KeyName.Buffer = KeyNameBuffer; /* @@ -619,7 +619,7 @@ ExFreePool(KeyNameBuffer); return Status; } - KeyName.Length += DriverKeyLength - sizeof(UNICODE_NULL); + KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL); } else { @@ -750,7 +750,7 @@ sizeof(GUID)); /* The new entry is the index */ - FoundIndex = IopBusTypeGuidList->GuidCount; + FoundIndex = (USHORT)IopBusTypeGuidList->GuidCount; IopBusTypeGuidList->GuidCount++; Quickie: @@ -928,7 +928,7 @@ Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->MinorFunction = MinorFunction; + IrpSp->MinorFunction = (UCHAR)MinorFunction; if (Stack) { @@ -1618,14 +1618,14 @@ Status = STATUS_UNSUCCESSFUL; else { - KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength; + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; } goto cleanup; } if (Status != STATUS_OBJECT_NAME_NOT_FOUND) { - KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength; + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; goto cleanup; } @@ -2711,7 +2711,7 @@ IndexDevice++; /* Open device key */ - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE, hDevicesKey, NULL); Status = ZwOpenKey( @@ -2832,7 +2832,7 @@ goto cleanup; } IndexSubKey++; - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; Status = IopEnumerateDetectedDevices( @@ -2878,7 +2878,7 @@ else { /* Assign hardware id to this device */ - ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; + ValueName.Length = ValueName.MaximumLength = (USHORT)pValueInformation->DataLength; ValueName.Buffer = (PWCHAR)pValueInformation->Data; if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) ValueName.Length -= sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Oct 26 05:49:51 2006 @@ -438,21 +438,21 @@ LdrInit1(); /* Set the NX Support policy */ - SharedUserData->NXSupportPolicy = NXSupportPolicy; + SharedUserData->NXSupportPolicy = (UCHAR)NXSupportPolicy; /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_MMX); + (KeFeatureBits & KF_MMX) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (KeFeatureBits & KF_CMPXCHG8B); + (KeFeatureBits & KF_CMPXCHG8B) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)); + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)); + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_3DNOW); + (KeFeatureBits & KF_3DNOW) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (KeFeatureBits & KF_RDTSC); + (KeFeatureBits & KF_RDTSC) ? TRUE: FALSE; /* Set up the thread-related fields in the PRCB */ Prcb->CurrentThread = InitThread; @@ -514,7 +514,7 @@ { KDESCRIPTOR GdtDescriptor, IdtDescriptor; KGDTENTRY TssSelector, PcrSelector; - ULONG Tr, Fs; + USHORT Tr, Fs; /* Get GDT and IDT descriptors */ Ke386GetGlobalDescriptorTable(GdtDescriptor); @@ -666,7 +666,7 @@ InitialThread, (PVOID)InitialStack, (PKPRCB)__readfsdword(KPCR_PRCB), - Cpu, + (CCHAR)Cpu, KeLoaderBlock); /* Set the priority of this thread to 0 */ Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Thu Oct 26 05:49:51 2006 @@ -94,8 +94,8 @@ /* Save the old offset and base, and set the new ones */ OldOffset = Process->IopmOffset; OldBase = Tss->IoMapBase; - Process->IopmOffset = IOPM_OFFSET; - Tss->IoMapBase = IOPM_OFFSET; + Process->IopmOffset = (USHORT)IOPM_OFFSET; + Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ Ki386SetupAndExitToV86Mode(VdmTeb); Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Thu Oct 26 05:49:51 2006 @@ -281,7 +281,7 @@ * due to the current ""scheduler"" in ROS, it can't be done * cleanly since it actualyl dispatches threads instead. */ - Thread->Priority = Priority; + Thread->Priority = (SCHAR)Priority; } else { @@ -310,7 +310,7 @@ if (OldPriority != Priority) { /* Set it */ - Thread->Priority = Priority; + Thread->Priority = (SCHAR)Priority; /* Choose action based on thread's state */ if (Thread->State == Ready) @@ -383,7 +383,7 @@ { KAFFINITY OldAffinity; ULONG ProcessorMask; - ULONG i; + CCHAR i; PKPCR Pcr; /* Make sure that the affinity is valid */ Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Thu Oct 26 05:49:51 2006 @@ -1145,7 +1145,7 @@ RtlCopyMemory(NameBuffer, Module->FullDllName.Buffer, PathLength); RtlCopyMemory(NameBuffer + (PathLength / sizeof(WCHAR)), DriverName.Buffer, DriverName.Length); NameString.Buffer = NameBuffer; - NameString.MaximumLength = NameString.Length = PathLength + DriverName.Length; + NameString.MaximumLength = NameString.Length = (USHORT)PathLength + DriverName.Length; /* NULL-terminate */ NameString.MaximumLength += sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Thu Oct 26 05:49:51 2006 @@ -65,7 +65,7 @@ MessageReply->Message.ClientId.UniqueProcess = PsGetCurrentProcessId(); MessageReply->Message.ClientId.UniqueThread = PsGetCurrentThreadId(); - MessageReply->Message.u2.s2.Type = MessageType; + MessageReply->Message.u2.s2.Type = (CSHORT)MessageType; MessageReply->Message.MessageId = InterlockedIncrementUL(&LpcpNextMessageId); KeAcquireSpinLock(&Port->Lock, &oldIrql); @@ -276,7 +276,7 @@ CRequest = (PEPORT_CONNECT_REQUEST_MESSAGE)&Request->Message; memcpy(&Header, &Request->Message, sizeof(PORT_MESSAGE)); - Header.u1.s1.DataLength = CRequest->ConnectDataLength; + Header.u1.s1.DataLength = (CSHORT)CRequest->ConnectDataLength; Header.u1.s1.TotalLength = Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); if (PreviousMode != KernelMode) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Thu Oct 26 05:49:51 2006 @@ -586,7 +586,7 @@ RetrievalPointers = PagingFileList[MmCoreDumpPageFile]->RetrievalPointers; /* Dump the header. */ - MdlMap[0] = MmGetPhysicalAddress(MmCoreDumpPageFrame).QuadPart >> PAGE_SHIFT; + MdlMap[0] = (ULONG)(MmGetPhysicalAddress(MmCoreDumpPageFrame).QuadPart >> PAGE_SHIFT); #if defined(__GNUC__) DiskOffset = MmGetOffsetPageFile(RetrievalPointers, (LARGE_INTEGER)0LL); Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Oct 26 05:49:51 2006 @@ -163,7 +163,7 @@ /* Save the result */ Context->HashValue = HashValue; - Context->HashIndex = HashIndex; + Context->HashIndex = (USHORT)HashIndex; /* Get the root entry and set it as our lookup bucket */ AllocatedEntry = &Directory->HashBuckets[HashIndex]; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Thu Oct 26 05:49:51 2006 @@ -61,7 +61,7 @@ NTAPI ObInit2(VOID) { - ULONG i; + CCHAR i; PKPRCB Prcb; PNPAGED_LOOKASIDE_LIST CurrentList = NULL; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 26 05:49:51 2006 @@ -332,8 +332,8 @@ } /* Setup the string */ - CapturedName->Length = StringLength; - CapturedName->MaximumLength = MaximumLength; + CapturedName->Length = (USHORT)StringLength; + CapturedName->MaximumLength = (USHORT)MaximumLength; CapturedName->Buffer = StringBuffer; /* Make sure we have a buffer */ Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Thu Oct 26 05:49:51 2006 @@ -12,10 +12,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ObInitSymbolicLinkImplementation) -#endif /* GLOBALS ******************************************************************/ @@ -165,8 +161,8 @@ if (NewTargetPath != FullPath->Buffer) ExFreePool(FullPath->Buffer); /* Update the path values */ - FullPath->Length = LengthUsed; - FullPath->MaximumLength = MaximumLength; + FullPath->Length = (USHORT)LengthUsed; + FullPath->MaximumLength = (USHORT)MaximumLength; FullPath->Buffer = NewTargetPath; /* Tell the parse routine to start reparsing */ @@ -247,7 +243,7 @@ { /* Round it down */ CapturedLinkTarget.MaximumLength = - ALIGN_DOWN(CapturedLinkTarget.MaximumLength, WCHAR); + (USHORT)ALIGN_DOWN(CapturedLinkTarget.MaximumLength, WCHAR); } /* Fail if the length is odd, or if the maximum is smaller or 0 */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Oct 26 05:49:51 2006 @@ -658,9 +658,9 @@ if (!NT_SUCCESS(Status)) goto Cleanup; /* Compute Quantum and Priority */ - Process->Pcb.BasePriority = PspComputeQuantumAndPriority(Process, - 0, - &Quantum); + Process->Pcb.BasePriority = (SCHAR)PspComputeQuantumAndPriority(Process, + 0, + &Quantum); Process->Pcb.QuantumReset = Quantum; /* Check if we have a parent other then the initial system process */ @@ -912,7 +912,7 @@ NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process) { - return Process->ProcessExiting; + return (BOOLEAN)Process->ProcessExiting; } /* @@ -1083,7 +1083,7 @@ PsSetProcessPriorityClass(PEPROCESS Process, ULONG PriorityClass) { - Process->PriorityClass = PriorityClass; + Process->PriorityClass = (UCHAR)PriorityClass; } /* Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Thu Oct 26 05:49:51 2006 @@ -141,7 +141,7 @@ } /* Check if the thread is impersonating */ - IsImpersonating = Thread->ActiveImpersonationInfo; + IsImpersonating = (BOOLEAN)Thread->ActiveImpersonationInfo; if (IsImpersonating) { /* Set TEB data */ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Oct 26 05:49:51 2006 @@ -382,8 +382,8 @@ Source, Length); - UniDest->MaximumLength = Length; - UniDest->Length = Length - sizeof (WCHAR); + UniDest->MaximumLength = (USHORT)Length; + UniDest->Length = (USHORT)Length - sizeof (WCHAR); return TRUE; } Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c Thu Oct 26 05:49:51 2006 @@ -73,9 +73,9 @@ if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) { RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)lpVersionInformation; - InfoEx->wServicePackMajor = (NtOSCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = NtOSCSDVersion & 0xFF; - InfoEx->wSuiteMask = SharedUserData->SuiteMask; + InfoEx->wServicePackMajor = (USHORT)(NtOSCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = (USHORT)(NtOSCSDVersion & 0xFF); + InfoEx->wSuiteMask = (USHORT)SharedUserData->SuiteMask; InfoEx->wProductType = SharedUserData->NtProductType; } Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=24657… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Thu Oct 26 05:49:51 2006 @@ -810,7 +810,7 @@ /* Build the new security descrtiptor */ RtlCreateSecurityDescriptorRelative(RelSD, SECURITY_DESCRIPTOR_REVISION); - RelSD->Control = Control; + RelSD->Control = (USHORT)Control; Current = (ULONG_PTR)(RelSD + 1); Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Thu Oct 26 05:49:51 2006 @@ -340,7 +340,7 @@ RtlCreateSecurityDescriptor(NewSd, SECURITY_DESCRIPTOR_REVISION1); /* We always build a self-relative descriptor */ - NewSd->Control = Control | SE_SELF_RELATIVE; + NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); @@ -754,7 +754,7 @@ RtlCreateSecurityDescriptor(Descriptor, SECURITY_DESCRIPTOR_REVISION); - Descriptor->Control = Control | SE_SELF_RELATIVE; + Descriptor->Control = (USHORT)Control | SE_SELF_RELATIVE; Current = (ULONG_PTR)Descriptor + sizeof(SECURITY_DESCRIPTOR); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Thu Oct 26 05:49:51 2006 @@ -621,7 +621,7 @@ PsImpersonateClient(ServerThread, ClientContext->ClientToken, 1, - (ULONG)b, + b, ClientContext->SecurityQos.ImpersonationLevel); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs