Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24686: - disk.sys: Don't fail IOCTL_GET_PARTITION_INFO for Partition 0. This is perfectly valid (and needed for some code I'll add later). - IopGetDiskInformation: Treat the partition buffer as a simple PULONG array. - KeUpdateSystemTime: Fix memory addressing to silence GAS compile-time warning.
by ion＠svn.reactos.org 05 Nov '06

05 Nov '06

Author: ion Date: Sun Nov 5 23:43:07 2006 New Revision: 24686 URL: http://svn.reactos.org/svn/reactos?rev=24686&view=rev Log: - disk.sys: Don't fail IOCTL_GET_PARTITION_INFO for Partition 0. This is perfectly valid (and needed for some code I'll add later). - IopGetDiskInformation: Treat the partition buffer as a simple PULONG array. - KeUpdateSystemTime: Fix memory addressing to silence GAS compile-time warning. Modified: trunk/reactos/drivers/storage/disk/disk.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Sun Nov 5 23:43:07 2006 @@ -1129,10 +1129,10 @@ { Status = STATUS_INFO_LENGTH_MISMATCH; } - else if (DiskData->PartitionNumber == 0) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - } + //else if (DiskData->PartitionNumber == 0) +// { +// Status = STATUS_INVALID_DEVICE_REQUEST; + //} else { PPARTITION_INFORMATION PartitionInfo; Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Sun Nov 5 23:43:07 2006 @@ -134,7 +134,7 @@ PIRP Irp; IO_STATUS_BLOCK StatusBlock; LARGE_INTEGER PartitionOffset; - PPARTITION_SECTOR PartitionBuffer; + PULONG PartitionBuffer; /* Build the name */ sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); @@ -241,10 +241,7 @@ /* Calculate the MBR checksum */ Checksum = 0; - for (j = 0; j < 128; j++) - { - Checksum += ((PULONG)PartitionBuffer)[j]; - } + for (j = 0; j < 128; j++) Checksum += PartitionBuffer[j]; /* Save the signature and checksum */ *CheckSum = ~Checksum + 1; Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Sun Nov 5 23:43:07 2006 @@ -207,12 +207,12 @@ mov [_KeTickCount+4], edx /* Store in in shared data too */ - mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+8], edx - mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx - mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx + mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+8], edx + mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx + mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx /* FIXME: HACK */ - mov [USER_SHARED_DATA], ecx + mov ds:[USER_SHARED_DATA], ecx IncompleteTick:

1 0

[ion] 24685: - Simplify LPC Message allocation with an LpcpAllocateFromPortZone macro. - Move LPC Macros/inlines to lpc_x.h - Implement LpcRequestPort. - Fix a bug in CsrTerminateProcess which was setting up incorrect sizes for the LPC message. - Add some debug output to csrss. - NTLPC works perfectly now, except for a bug on shutdown which doesn't properly close LPC processes.
by ion＠svn.reactos.org 05 Nov '06

05 Nov '06

Author: ion Date: Sun Nov 5 23:31:35 2006 New Revision: 24685 URL: http://svn.reactos.org/svn/reactos?rev=24685&view=rev Log: - Simplify LPC Message allocation with an LpcpAllocateFromPortZone macro. - Move LPC Macros/inlines to lpc_x.h - Implement LpcRequestPort. - Fix a bug in CsrTerminateProcess which was setting up incorrect sizes for the LPC message. - Add some debug output to csrss. - NTLPC works perfectly now, except for a bug on shutdown which doesn't properly close LPC processes. Added: trunk/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/close.c trunk/reactos/ntoskrnl/lpc/ntlpc/connect.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 trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/close.c Sun Nov 5 23:31:35 2006 @@ -40,7 +40,7 @@ if (Message) { /* FIXME: TODO */ - ASSERT(FALSE); + KEBUGCHECK(0); } /* Release the lock */ Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Sun Nov 5 23:31:35 2006 @@ -301,25 +301,15 @@ ConnectionInfoLength = Port->MaxConnectionInfoLength; } - /* Allocate a message from the port zone while holding the lock */ - KeAcquireGuardedMutex(&LpcpLock); - Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); + /* Allocate a message from the port zone */ + Message = LpcpAllocateFromPortZone(); if (!Message) { /* Fail if we couldn't allocate a message */ - KeReleaseGuardedMutex(&LpcpLock); if (SectionToMap) ObDereferenceObject(SectionToMap); ObDereferenceObject(ClientPort); return STATUS_NO_MEMORY; } - - /* Initialize it */ - InitializeListHead(&Message->Entry); - Message->RepliedToThread = NULL; - Message->Request.u2.ZeroInit = 0; - - /* Release the lock */ - KeReleaseGuardedMutex(&LpcpLock); /* Set pointer to the connection message and fill in the CID */ ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/lpc.h Sun Nov 5 23:31:35 2006 @@ -46,97 +46,6 @@ } #endif #endif - -// -// Gets the message type, removing the kernel-mode flag -// -#define LpcpGetMessageType(x) \ - ((x)->u2.s2.Type &~ 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 @@ -214,3 +123,8 @@ extern PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; extern ULONG LpcpMaxMessageSize; extern ULONG LpcpTraceLevel; + +// +// Inlined Functions +// +#include "lpc_x.h" Added: trunk/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h (added) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h Sun Nov 5 23:31:35 2006 @@ -1,0 +1,122 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/lpc_x.h +* PURPOSE: Intenral Inlined Functions for Local Procedure Call +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +// +// Gets the message type, removing the kernel-mode flag +// +#define LpcpGetMessageType(x) \ + ((x)->u2.s2.Type &~ LPC_KERNELMODE_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); \ +} + +// +// Allocates a new message +// +PLPCP_MESSAGE +FORCEINLINE +LpcpAllocateFromPortZone(VOID) +{ + PLPCP_MESSAGE Message; + + /* Allocate a message from the port zone while holding the lock */ + KeAcquireGuardedMutex(&LpcpLock); + Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); + if (!Message) + { + /* Fail, and let caller cleanup */ + KeReleaseGuardedMutex(&LpcpLock); + return NULL; + } + + /* Initialize it */ + InitializeListHead(&Message->Entry); + Message->RepliedToThread = NULL; + Message->Request.u2.ZeroInit = 0; + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + return Message; +} Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/port.c Sun Nov 5 23:31:35 2006 @@ -19,7 +19,7 @@ ULONG LpcpMaxMessageSize; PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; KGUARDED_MUTEX LpcpLock; -ULONG LpcpTraceLevel = 0xFFFFFFFF; +ULONG LpcpTraceLevel = LPC_CLOSE_DEBUG; ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1; static GENERIC_MAPPING LpcpPortMapping = Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/reply.c Sun Nov 5 23:31:35 2006 @@ -230,24 +230,18 @@ return Status; } - /* Acquire the LPC Lock */ - KeAcquireGuardedMutex(&LpcpLock); - - /* Allocate a new message */ - Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); + /* Allocate a message from the port zone */ + Message = LpcpAllocateFromPortZone(); if (!Message) { - /* Out of memory, fail */ - KeReleaseGuardedMutex(&LpcpLock); + /* Fail if we couldn't allocate a message */ ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); return STATUS_NO_MEMORY; } - /* Initialize the header */ - InitializeListHead(&Message->Entry); - Message->RepliedToThread = NULL; - Message->Request.u2.ZeroInit = 0; + /* Keep the lock acquired */ + KeAcquireGuardedMutex(&LpcpLock); /* Make sure this is the reply the thread is waiting for */ if (WakeupThread->LpcReplyMessageId != ReplyMessage->MessageId) @@ -284,7 +278,7 @@ if (!(WakeupThread->LpcExitThreadCalled) && !(IsListEmpty(&WakeupThread->LpcReplyChain))) { - /* Remove us from it and reinitiailize it */ + /* Remove us from it and reinitialize it */ RemoveEntryList(&WakeupThread->LpcReplyChain); InitializeListHead(&WakeupThread->LpcReplyChain); } Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/send.c Sun Nov 5 23:31:35 2006 @@ -16,15 +16,136 @@ /* PUBLIC FUNCTIONS **********************************************************/ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI -LpcRequestPort(IN PVOID Port, +LpcRequestPort(IN PVOID PortObject, IN PPORT_MESSAGE LpcMessage) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)PortObject, QueuePort; + ULONG MessageType; + PLPCP_MESSAGE Message; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PAGED_CODE(); + LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", Port, LpcMessage); + + /* Check if this is a non-datagram message */ + if (LpcMessage->u2.s2.Type) + { + /* Get the message type */ + MessageType = LpcpGetMessageType(LpcMessage); + + /* Validate it */ + if ((MessageType < LPC_DATAGRAM) || (MessageType > LPC_CLIENT_DIED)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } + + /* Mark this as a kernel-mode message only if we really came from there */ + if ((PreviousMode == KernelMode) && + (LpcMessage->u2.s2.Type & LPC_KERNELMODE_MESSAGE)) + { + /* We did, this is a kernel mode message */ + MessageType |= LPC_KERNELMODE_MESSAGE; + } + } + else + { + /* This is a datagram */ + MessageType = LPC_DATAGRAM; + } + + /* Can't have data information on this type of call */ + if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER; + + /* Validate message sizes */ + if ((LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || + (LpcMessage->u1.s1.TotalLength <= LpcMessage->u1.s1.DataLength)) + { + /* Fail */ + return STATUS_PORT_MESSAGE_TOO_LONG; + } + + /* Allocate a new message */ + Message = LpcpAllocateFromPortZone(); + if (!Message) return STATUS_NO_MEMORY; + + /* Clear the context */ + Message->PortContext = NULL; + + /* Copy the message */ + LpcpMoveMessage(&Message->Request, + LpcMessage, + LpcMessage + 1, + MessageType, + &PsGetCurrentThread()->Cid); + + /* Acquire the LPC lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Check if this is anything but a connection port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) + { + /* The queue port is the connected port */ + QueuePort = Port->ConnectedPort; + if (QueuePort) + { + /* Check if this is a client port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT) + { + /* Then copy the context */ + Message->PortContext = QueuePort->PortContext; + QueuePort = Port->ConnectionPort; + } + else if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT) + { + /* Any other kind of port, use the connection port */ + QueuePort = Port->ConnectionPort; + } + } + } + else + { + /* For connection ports, use the port itself */ + QueuePort = PortObject; + } + + /* Make sure we have a port */ + if (QueuePort) + { + /* Generate the Message ID and set it */ + Message->Request.MessageId = LpcpNextMessageId++; + if (!LpcpNextMessageId) LpcpNextMessageId = 1; + Message->Request.CallbackId = 0; + + /* No Message ID for the thread */ + PsGetCurrentThread()->LpcReplyMessageId = 0; + + /* Insert the message in our chain */ + InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); + + /* Release the lock and release the semaphore */ + KeReleaseGuardedMutex(&LpcpLock); + LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); + + /* If this is a waitable port, wake it up */ + if (QueuePort->Flags & LPCP_WAITABLE_PORT) + { + /* Wake it */ + KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE); + } + + /* We're done */ + LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message); + return STATUS_SUCCESS; + } + + /* If we got here, then free the message and fail */ + LpcpFreeToPortZone(Message, TRUE); + KeReleaseGuardedMutex(&LpcpLock); + return STATUS_PORT_DISCONNECTED; } /* @@ -127,17 +248,11 @@ return STATUS_PORT_MESSAGE_TOO_LONG; } - /* Acquire the lock */ - KeAcquireGuardedMutex(&LpcpLock); - - /* Allocate a message */ - Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); - KeReleaseGuardedMutex(&LpcpLock); - - /* Check if allocation worked */ + /* Allocate a message from the port zone */ + Message = LpcpAllocateFromPortZone(); if (!Message) { - /* Fail */ + /* Fail if we couldn't allocate a message */ ObDereferenceObject(Port); return STATUS_NO_MEMORY; } Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c Sun Nov 5 23:31:35 2006 @@ -260,8 +260,8 @@ CSR_API(CsrTerminateProcess) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (ProcessData == NULL) { 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 Sun Nov 5 23:31:35 2006 @@ -72,9 +72,9 @@ unsigned DefIndex; ULONG Type; - DPRINT("CSR: Calling handler for type: %x.\n", Request->Type); + DPRINT1("CSR: Calling handler for type: %x.\n", Request->Type); Type = Request->Type & 0xFFFF; /* FIXME: USE MACRO */ - DPRINT("CSR: API Number: %x ServerID: %x\n",Type, Request->Type >> 16); + DPRINT1("CSR: API Number: %x ServerID: %x\n",Type, Request->Type >> 16); /* FIXME: Extract DefIndex instead of looping */ for (DefIndex = 0; ! Found && DefIndex < ApiDefinitionsCount; DefIndex++) @@ -218,13 +218,14 @@ &Request->Header); if (!NT_SUCCESS(Status)) { - DPRINT1("NtReplyWaitReceivePort failed\n"); - break; + DPRINT1("NtReplyWaitReceivePort failed: %lx\n", Status); + break; } /* If the connection was closed, handle that */ if (Request->Header.u2.s2.Type == LPC_PORT_CLOSED) { + DPRINT1("Port died, oh well\n"); CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); break; } @@ -236,9 +237,16 @@ continue; } + if (Request->Header.u2.s2.Type == LPC_CLIENT_DIED) + { + DPRINT1("Clietn died, oh well\n"); + Reply = NULL; + continue; + } + DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", - Request->Type, - Request->Header.ClientId.UniqueProcess); + Request->Type, + Request->Header.ClientId.UniqueThread); /* Get the Process Data */ ProcessData = CsrGetProcessData(Request->Header.ClientId.UniqueProcess); @@ -252,7 +260,7 @@ if (ProcessData->Terminated) { DPRINT1("Message %d: process %d already terminated\n", - Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess); + Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess); continue; } @@ -271,7 +279,7 @@ /* Send back the reply */ Reply = Request; } - + /* Close the port and exit the thread */ NtClose(ServerPort); RtlExitUserThread(STATUS_SUCCESS);

1 0

[ion] 24684: - Fix boot. - Fix GUI boot (bootvid). - Fix cmlib bug.
by ion＠svn.reactos.org 05 Nov '06

05 Nov '06

Author: ion Date: Sun Nov 5 23:28:59 2006 New Revision: 24684 URL: http://svn.reactos.org/svn/reactos?rev=24684&view=rev Log: - Fix boot. - Fix GUI boot (bootvid). - Fix cmlib bug. Modified: trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Sun Nov 5 23:28:59 2006 @@ -94,6 +94,8 @@ Interval.QuadPart = -PALETTE_FADE_TIME; #else + +#if 0 if (AnimBarPos == 0) { VidSolidColorFill(0x173, 354, 0x178, 354 + 9, 0); @@ -104,14 +106,21 @@ 0xe8 + AnimBarPos * 8, 354 + 9, 0); } - + if (AnimBarPos >= 3) + { VidBufferToScreenBlt(_Square1, 0xeb + AnimBarPos * 8, 354, 6, 9, 4); + } if (AnimBarPos >= 2 && AnimBarPos <= 16) + { VidBufferToScreenBlt(_Square2, 0xf3 + AnimBarPos * 8, 354, 6, 9, 4); + } if (AnimBarPos >= 1 && AnimBarPos <= 15) + { VidBufferToScreenBlt(_Square3, 0xfb + AnimBarPos * 8, 354, 6, 9, 4); - + } +#endif + if (Iteration <= PALETTE_FADE_STEPS) { Interval.QuadPart = -PALETTE_FADE_TIME; @@ -270,7 +279,7 @@ KeWaitForSingleObject(&ShutdownCompleteEvent, Executive, KernelMode, FALSE, NULL); DPRINT1("Bootvid thread to finish.\n"); - VidResetDisplay(); + //VidResetDisplay(); } Modified: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.h (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.h Sun Nov 5 23:28:59 2006 @@ -45,7 +45,7 @@ typedef VOID (NTAPI *PVID_CLEAN_UP)(VOID); typedef VOID (NTAPI *PVID_RESET_DISPLAY)(VOID); typedef VOID (NTAPI *PVID_BUFFER_TO_SCREEN_BLT)(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); -typedef VOID (NTAPI *PVID_SCREEN_TO_BUFFER_BLT)(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); +typedef VOID (NTAPI *PVID_SCREEN_TO_BUFFER_BLT)(PUCHAR, ULONG, ULONG, ULONG, ULONG, LONG); typedef VOID (NTAPI *PVID_BITBLT)(PUCHAR, ULONG, ULONG); typedef VOID (NTAPI *PVID_SOLID_COLOR_FILL)(ULONG, ULONG, ULONG, ULONG, ULONG); typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PCSTR); Modified: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vga.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vga.c Sun Nov 5 23:28:59 2006 @@ -282,7 +282,7 @@ IN ULONG Top, IN ULONG Width, IN ULONG Height, - IN ULONG Delta) + IN LONG Delta) { UCHAR Plane; UCHAR b; @@ -321,7 +321,7 @@ ULONG bfOffBits; UCHAR ClrUsed; ULONG Index; - ULONG Delta; + LONG Delta; BitmapInfoHeader = (PBITMAPINFOHEADER)Buffer; Palette = (LPRGBQUAD)(Buffer + BitmapInfoHeader->biSize); @@ -364,7 +364,7 @@ Buffer += bfOffBits; while (InputPos < BitmapInfoHeader->biSizeImage && - OutputPos < Delta * BitmapInfoHeader->biHeight * 2) + OutputPos < (ULONG)Delta * BitmapInfoHeader->biHeight * 2) { Length = Buffer[InputPos++]; if (Length > 0) Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vgatext.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vgatext.c Sun Nov 5 23:28:59 2006 @@ -141,7 +141,7 @@ IN ULONG Top, IN ULONG Width, IN ULONG Height, - IN ULONG Delta) + IN LONG Delta) { } Modified: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_x… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_xbox.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_xbox.c Sun Nov 5 23:28:59 2006 @@ -61,7 +61,7 @@ IN ULONG Top, IN ULONG Width, IN ULONG Height, - IN ULONG Delta) + IN LONG Delta) { } Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sun Nov 5 23:28:59 2006 @@ -1578,6 +1578,8 @@ }; } PORT_MESSAGE, *PPORT_MESSAGE; +#define LPC_KERNELMODE_MESSAGE (CSHORT)((USHORT)0x8000) + typedef struct _PORT_VIEW { ULONG Length; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2468… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sun Nov 5 23:28:59 2006 @@ -148,10 +148,10 @@ HvInitialize( PHHIVE RegistryHive, ULONG Operation, + ULONG HiveType, + ULONG HiveFlags, ULONG_PTR HiveData OPTIONAL, ULONG Cluster OPTIONAL, - ULONG Flags, - ULONG FileType, PALLOCATE_ROUTINE Allocate, PFREE_ROUTINE Free, PFILE_READ_ROUTINE FileRead, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Nov 5 23:28:59 2006 @@ -948,6 +948,7 @@ /* Wait 5 seconds for it to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000); Status = ZwWaitForSingleObject(ProcessHandle, FALSE, &Timeout); + if (!NoGuiBoot) InbvFinalizeBootLogo(); if (Status == STATUS_SUCCESS) { /* Bugcheck the system if SMSS couldn't initialize */ Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Sun Nov 5 23:28:59 2006 @@ -101,7 +101,14 @@ } /* Return whether this is the CD or not */ - if (DeviceNumber != 1) return TRUE; + if (DeviceNumber != 1) + { + /* Hack until IoAssignDriveLetters is fixed */ + swprintf(SharedUserData->NtSystemRoot, L"D:\\reactos"); + return TRUE; + } + + /* Failed */ return FALSE; }

1 0

[jimtabor] 24683: Part of the Win32k User32 Compatibility Project. - Create IntLoadKeyboardLayout - Code assimilated from win32k ntuser keyboard.c and Wine. - Process and load a new keyboard layout. - Creates the HKL for processing in NtUserLoadKeyboardLayoutEx. - Load and computes module offset so NtUserLoadKeyboardLayoutEx can process it (read it in), load (EngLoadImage) and set the table entry point. This data is saved in a new structure connected to a list of keyboard layouts that was create
by jimtabor＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: jimtabor Date: Mon Oct 30 22:38:37 2006 New Revision: 24683 URL: http://svn.reactos.org/svn/reactos?rev=24683&view=rev Log: Part of the Win32k User32 Compatibility Project. - Create IntLoadKeyboardLayout - Code assimilated from win32k ntuser keyboard.c and Wine. - Process and load a new keyboard layout. - Creates the HKL for processing in NtUserLoadKeyboardLayoutEx. - Load and computes module offset so NtUserLoadKeyboardLayoutEx can process it (read it in), load (EngLoadImage) and set the table entry point. This data is saved in a new structure connected to a list of keyboard layouts that was created during win32k init. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Mon Oct 30 22:38:37 2006 @@ -32,8 +32,12 @@ #include <wine/debug.h> + +/* Directory to load key layouts from */ +#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" + + /* GLOBALS *******************************************************************/ - typedef struct __TRACKINGLIST { TRACKMOUSEEVENT tme; @@ -44,6 +48,209 @@ static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ + + +/* LOCALE FUNCTIONS **********************************************************/ + +/* + * Utility function to read a value from the registry more easily. + * + * IN PUNICODE_STRING KeyName -> Name of key to open + * IN PUNICODE_STRING ValueName -> Name of value to open + * OUT PUNICODE_STRING ReturnedValue -> String contained in registry + * + * Returns NTSTATUS + */ + +static +NTSTATUS FASTCALL +ReadRegistryValue( PUNICODE_STRING KeyName, + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + UNICODE_STRING Temp; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + if( !NT_SUCCESS(Status) ) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if( Status != STATUS_BUFFER_TOO_SMALL ) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof( *KeyValuePartialInfo ); + KeyValuePartialInfo = LocalAlloc(LMEM_ZEROINIT, ResLength); + Length = ResLength; + + if( !KeyValuePartialInfo ) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if( !NT_SUCCESS(Status) ) + { + NtClose(KeyHandle); + LocalFree(KeyValuePartialInfo); + return Status; + } + + Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; + Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + RtlInitUnicodeString(ReturnedValue,L""); + RtlAppendUnicodeStringToString(ReturnedValue,&Temp); + + LocalFree(KeyValuePartialInfo); + NtClose(KeyHandle); + + return Status; +} + + +static +HKL FASTCALL +IntLoadKeyboardLayout( LPCWSTR pwszKLID, + UINT Flags) +{ + HANDLE Handle; + HINSTANCE KBModule = 0; + FARPROC pAddr = 0; + DWORD offTable = 0; + HKL hKL; + NTSTATUS Status; + WCHAR LocaleBuffer[16]; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING DefaultLocale; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + LCID LocaleId; + PWCHAR KeyboardLayoutWSTR; + ULONG_PTR layout; + LANGID langid; + + layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); + +// LocaleId = GetSystemDefaultLCID(); + + LocaleId = (LCID) layout; + + /* Create the HKL to be used by NtUserLoadKeyboardLayoutEx*/ + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* FIXME */ + else + layout |= layout << 16; + + DPRINT("Input = %S\n", pwszKLID ); + + DPRINT("DefaultLocale = %lx\n", LocaleId); + + swprintf(LocaleBuffer, L"%08lx", LocaleId); + + DPRINT("DefaultLocale = %S\n", LocaleBuffer); + RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); + + RtlInitUnicodeString(&LayoutKeyName, + L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" + L"\\Control\\KeyboardLayouts\\"); + + RtlAppendUnicodeStringToString(&LayoutKeyName,&DefaultLocale); + + RtlInitUnicodeString(&LayoutValueName,L"Layout File"); + + Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); + + RtlFreeUnicodeString(&LayoutKeyName); + + DPRINT("Read registry and got %wZ\n", &LayoutFile); + + RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); + RtlAppendUnicodeStringToString(&FullLayoutPath,&LayoutFile); + + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + + RtlFreeUnicodeString(&LayoutFile); + + KeyboardLayoutWSTR = LocalAlloc(LMEM_ZEROINIT, + FullLayoutPath.Length + sizeof(WCHAR)); + + if( !KeyboardLayoutWSTR ) + { + DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); + RtlFreeUnicodeString(&FullLayoutPath); + return NULL; + } + memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, FullLayoutPath.Length); + + KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; + + KBModule = LoadLibraryW(KeyboardLayoutWSTR); + + DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); + + if( !KBModule ) + DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + + pAddr = GetProcAddress( KBModule, (LPCSTR) 1); + offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! + + DPRINT( "Load Keyboard Module Offset: %x\n", offTable ); + + FreeLibrary(KBModule); + + Handle = CreateFileW( KeyboardLayoutWSTR, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + 0, + NULL); + + hKL = NtUserLoadKeyboardLayoutEx( Handle, + offTable, + (HKL) layout, + &DefaultLocale, + (UINT) layout, + Flags); + + NtClose(Handle); + + LocalFree(KeyboardLayoutWSTR); + RtlFreeUnicodeString(&FullLayoutPath); + + return hKL; +} /* FUNCTIONS *****************************************************************/ @@ -315,19 +522,17 @@ ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); RtlFreeUnicodeString(&pwszKLIDW); return ret; - -} - - -/* - * @unimplemented +} + + +/* + * @implemented */ HKL STDCALL LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - UNIMPLEMENTED; - return (HKL)0; + return IntLoadKeyboardLayout( pwszKLID, Flags); }

1 0

[ion] 24682: - In my fear of accidentally comitting NTLPC = 1, I forgot to make the initial NTLPC = 0 commit, so LPC was never getting compiled at all. This fixes it.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 22:20:08 2006 New Revision: 24682 URL: http://svn.reactos.org/svn/reactos?rev=24682&view=rev Log: - In my fear of accidentally comitting NTLPC = 1, I forgot to make the initial NTLPC = 0 commit, so LPC was never getting compiled at all. This fixes it. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Mon Oct 30 22:20:08 2006 @@ -69,4 +69,12 @@ --> <property name="NSWPAT" value="0" /> + +<property name="NTLPC" value="0" /> + </rbuild>

1 0

[ion] 24681: - Properly initialize the Port Message header in NTDLL's Csr Routines and Win32k's as well. - It is now possible to boot into GUI and use the Command Line/Console (heavy LPC user) in NTLPC mode. - NTLPC is still disabled in trunk however, because there are still bugs and missing functionality.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 22:12:17 2006 New Revision: 24681 URL: http://svn.reactos.org/svn/reactos?rev=24681&view=rev Log: - Properly initialize the Port Message header in NTDLL's Csr Routines and Win32k's as well. - It is now possible to boot into GUI and use the Command Line/Console (heavy LPC user) in NTLPC mode. - NTLPC is still disabled in trunk however, because there are still bugs and missing functionality. Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c (original) +++ trunk/reactos/dll/ntdll/csr/connect.c Mon Oct 30 22:12:17 2006 @@ -59,6 +59,7 @@ DPRINT("CsrClientCallServer\n"); /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); ApiMessage->Header.u1.s1.TotalLength = RequestLength; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/csr.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Mon Oct 30 22:12:17 2006 @@ -54,6 +54,7 @@ return STATUS_INVALID_PORT_HANDLE; } + Request->Header.u2.ZeroInit = 0; Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);

1 0

[ion] 24680: - Use Emanuelle's design for SMSS's LPC Code in CSRSS as well so that it can be portable between ROS LPC and NT LPC.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 21:45:22 2006 New Revision: 24680 URL: http://svn.reactos.org/svn/reactos?rev=24680&view=rev Log: - Use Emanuelle's design for SMSS's LPC Code in CSRSS as well so that it can be portable between ROS LPC and NT LPC. Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/init.c 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 21:45:22 2006 @@ -118,7 +118,81 @@ CallHardError(); } -static +NTSTATUS STDCALL +CsrpHandleConnectionRequest (PPORT_MESSAGE Request, + IN HANDLE hApiListenPort) +{ + NTSTATUS Status; + HANDLE ServerPort = (HANDLE) 0; + PCSRSS_PROCESS_DATA ProcessData = NULL; + REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); + ServerPort = NULL; + + DPRINT1("CSR: %s: Handling: %p\n", __FUNCTION__, Request); + + Status = NtAcceptConnectPort(&ServerPort, +#ifdef NTLPC + NULL, + Request, +#else + hApiListenPort, + NULL, +#endif + TRUE, + 0, + & LpcRead); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtAcceptConnectPort() failed\n"); + return Status; + } + + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); + if (ProcessData == NULL) + { + DPRINT1("Unable to allocate or find data for process 0x%x\n", + Request->ClientId.UniqueProcess); + Status = STATUS_UNSUCCESSFUL; + return Status; + } + + ProcessData->CsrSectionViewBase = LpcRead.ViewBase; + ProcessData->CsrSectionViewSize = LpcRead.ViewSize; + + Status = NtCompleteConnectPort(ServerPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtCompleteConnectPort() failed\n"); + return Status; + } + +#if !defined(NTLPC) /* ReactOS LPC */ + HANDLE ServerThread = (HANDLE) 0; + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE)ClientConnectionThread, + ServerPort, + & ServerThread, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: Unable to create server thread\n"); + return Status; + } + + NtClose(ServerThread); +#endif + + Status = STATUS_SUCCESS; + DPRINT1("CSR: %s done\n", __FUNCTION__); + return Status; +} + VOID STDCALL ClientConnectionThread(HANDLE ServerPort) @@ -155,6 +229,13 @@ break; } + if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST) + { + CsrpHandleConnectionRequest((PPORT_MESSAGE)Request, ServerPort); + Reply = NULL; + continue; + } + DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", Request->Type, Request->Header.ClientId.UniqueProcess); @@ -205,93 +286,38 @@ * "\Windows\ApiPort". */ DWORD STDCALL -ServerApiPortThread (PVOID PortHandle) -{ - NTSTATUS Status = STATUS_SUCCESS; - BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; - PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; - HANDLE hApiListenPort = * (PHANDLE) PortHandle; - HANDLE ServerPort = (HANDLE) 0; - HANDLE ServerThread = (HANDLE) 0; - PCSRSS_PROCESS_DATA ProcessData = NULL; - - CsrInitProcessData(); - - DPRINT1("CSR: %s called", __FUNCTION__); - - for (;;) - { - REMOTE_PORT_VIEW LpcRead; - LpcRead.Length = sizeof(LpcRead); - ServerPort = NULL; - - Status = NtListenPort (hApiListenPort, Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); - break; - } - Status = NtAcceptConnectPort(& ServerPort, -#ifdef NTLPC - NULL, - Request, -#else - hApiListenPort, - NULL, -#endif - TRUE, - 0, - & LpcRead); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtAcceptConnectPort() failed\n"); - break; - } - - ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request->ClientId.UniqueProcess); - Status = STATUS_UNSUCCESSFUL; - break; - } - - - ProcessData->CsrSectionViewBase = LpcRead.ViewBase; - ProcessData->CsrSectionViewSize = LpcRead.ViewSize; - - Status = NtCompleteConnectPort(ServerPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtCompleteConnectPort() failed\n"); - break; - } - - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE)ClientConnectionThread, - ServerPort, - & ServerThread, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: Unable to create server thread\n"); - break; - } - NtClose(ServerThread); - } - if (ServerPort) - { - NtClose(ServerPort); - } - NtClose(PortHandle); - NtTerminateThread(NtCurrentThread(), Status); - return 0; +ServerApiPortThread (HANDLE hApiListenPort) +{ + NTSTATUS Status = STATUS_SUCCESS; + BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; + PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; + + DPRINT1("CSR: %s called", __FUNCTION__); + + for (;;) + { + REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); + + Status = NtListenPort (hApiListenPort, Request); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); + break; + } + + Status = CsrpHandleConnectionRequest(Request, hApiListenPort); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + break; + } + } + + NtClose(hApiListenPort); + NtTerminateThread(NtCurrentThread(), Status); + return 0; } /********************************************************************** @@ -304,9 +330,8 @@ * connection request (from the SM). */ DWORD STDCALL -ServerSbApiPortThread (PVOID PortHandle) -{ - HANDLE hSbApiPortListen = * (PHANDLE) PortHandle; +ServerSbApiPortThread (HANDLE hSbApiPortListen) +{ HANDLE hConnectedPort = (HANDLE) 0; PORT_MESSAGE Request; PVOID Context = NULL; Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h Mon Oct 30 21:45:22 2006 @@ -104,6 +104,9 @@ DWORD STDCALL ServerApiPortThread (PVOID PortHandle); DWORD STDCALL ServerSbApiPortThread (PVOID PortHandle); DWORD STDCALL Console_Api( PVOID unused ); +VOID +NTAPI +ClientConnectionThread(HANDLE ServerPort); extern 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 21:45:22 2006 @@ -331,7 +331,7 @@ 0, 0, (PTHREAD_START_ROUTINE) ListenThread, - Port, + *Port, NULL, NULL); return Status; @@ -528,9 +528,14 @@ { DPRINT("CSR: %s called\n", __FUNCTION__); + CsrInitProcessData(); return CsrpCreateListenPort (L"\\Windows\\ApiPort", & hApiPort, +#ifdef NTLPC + (PTHREAD_START_ROUTINE)ClientConnectionThread); +#else ServerApiPortThread); +#endif } /**********************************************************************

1 0

[ion] 24679: - Fix incorrect parameter shuffle in NtAcceptConnectPort. CSRSS now initializes properly and kernel32 gets loaded, but fails when connecting.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 20:04:49 2006 New Revision: 24679 URL: http://svn.reactos.org/svn/reactos?rev=24679&view=rev Log: - Fix incorrect parameter shuffle in NtAcceptConnectPort. CSRSS now initializes properly and kernel32 gets loaded, but fails when connecting. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 20:04:49 2006 @@ -42,8 +42,8 @@ IN PVOID PortContext OPTIONAL, IN PPORT_MESSAGE ReplyMessage, IN BOOLEAN AcceptConnection, - IN PPORT_VIEW ClientView, - IN PREMOTE_PORT_VIEW ServerView) + IN PPORT_VIEW ServerView, + IN PREMOTE_PORT_VIEW ClientView) { PLPCP_PORT_OBJECT ConnectionPort, ServerPort, ClientPort; PVOID ClientSectionToMap = NULL; @@ -66,14 +66,14 @@ ServerView); /* Validate the size of the server view */ - if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW))) + if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; } /* Validate the size of the client view */ - if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW))) + if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER;

1 0

[ion] 24678: - Add support for mapping the client section in NtAcceptConnectPort.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 19:54:45 2006 New Revision: 24678 URL: http://svn.reactos.org/svn/reactos?rev=24678&view=rev Log: - Add support for mapping the client section in NtAcceptConnectPort. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 19:54:45 2006 @@ -51,10 +51,11 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; ULONG ConnectionInfoLength; - PLPCP_MESSAGE Msg; - PLPCP_CONNECTION_MESSAGE ConnectMsg; + PLPCP_MESSAGE Message; + PLPCP_CONNECTION_MESSAGE ConnectMessage; PEPROCESS ClientProcess; PETHREAD ClientThread; + LARGE_INTEGER SectionOffset; PAGED_CODE(); LPCTRACE(LPC_COMPLETE_DEBUG, "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n", @@ -100,11 +101,11 @@ } /* Now get the message and connection message */ - Msg = ClientThread->LpcReplyMessage; - ConnectMsg = (PLPCP_CONNECTION_MESSAGE)(Msg + 1); + Message = ClientThread->LpcReplyMessage; + ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); /* Get the client and connection port as well */ - ClientPort = ConnectMsg->ClientPort; + ClientPort = ConnectMessage->ClientPort; ConnectionPort = ClientPort->ConnectionPort; /* Make sure that the reply is being sent to the proper server process */ @@ -122,7 +123,7 @@ ClientThread->LpcReplyMessageId = 0; /* Clear the client port for now as well, then release the lock */ - ConnectMsg->ClientPort = NULL; + ConnectMessage->ClientPort = NULL; KeReleaseGuardedMutex(&LpcpLock); /* Get the connection information length */ @@ -134,18 +135,18 @@ } /* Set the sizes of our reply message */ - Msg->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + + Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + ConnectionInfoLength; - Msg->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + - Msg->Request.u1.s1.DataLength; + Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + + Message->Request.u1.s1.DataLength; /* Setup the reply message */ - Msg->Request.u2.s2.Type = LPC_REPLY; - Msg->Request.u2.s2.DataInfoOffset = 0; - Msg->Request.ClientId = ReplyMessage->ClientId; - Msg->Request.MessageId = ReplyMessage->MessageId; - Msg->Request.ClientViewSize = 0; - RtlMoveMemory(ConnectMsg + 1, ReplyMessage + 1, ConnectionInfoLength); + Message->Request.u2.s2.Type = LPC_REPLY; + Message->Request.u2.s2.DataInfoOffset = 0; + Message->Request.ClientId = ReplyMessage->ClientId; + Message->Request.MessageId = ReplyMessage->MessageId; + Message->Request.ClientViewSize = 0; + RtlMoveMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength); /* At this point, if the caller refused the connection, go to cleanup */ if (!AcceptConnection) goto Cleanup; @@ -180,19 +181,46 @@ /* Also set the creator CID */ ServerPort->Creator = PsGetCurrentThread()->Cid; - ClientPort->Creator = Msg->Request.ClientId; + ClientPort->Creator = Message->Request.ClientId; /* Get the section associated and then clear it, while inside the lock */ KeAcquireGuardedMutex(&LpcpLock); - ClientSectionToMap = ConnectMsg->SectionToMap; - ConnectMsg->SectionToMap = NULL; + ClientSectionToMap = ConnectMessage->SectionToMap; + ConnectMessage->SectionToMap = NULL; KeReleaseGuardedMutex(&LpcpLock); /* Now check if there's a client section */ if (ClientSectionToMap) { - /* FIXME: TODO */ - ASSERT(FALSE); + /* Setup the offset */ + SectionOffset.QuadPart = ConnectMessage->ClientView.SectionOffset; + + /* Map the section */ + Status = MmMapViewOfSection(ClientSectionToMap, + PsGetCurrentProcess(), + &ServerPort->ClientSectionBase, + 0, + 0, + &SectionOffset, + &ConnectMessage->ClientView.ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + + /* Update the offset and check for mapping status */ + ConnectMessage->ClientView.SectionOffset = SectionOffset.LowPart; + if (NT_SUCCESS(Status)) + { + /* Set the view base */ + ConnectMessage->ClientView.ViewRemoteBase = ServerPort-> + ClientSectionBase; + } + else + { + /* Otherwise, quit */ + ObDereferenceObject(ServerPort); + goto Cleanup; + } } /* Check if there's a server section */ @@ -223,8 +251,8 @@ if (ClientView) { /* Fill it out */ - ClientView->ViewBase = ConnectMsg->ClientView.ViewRemoteBase; - ClientView->ViewSize = ConnectMsg->ClientView.ViewSize; + ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase; + ClientView->ViewSize = ConnectMessage->ClientView.ViewSize; } /* Return the handle to user mode */ @@ -232,8 +260,8 @@ LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %lx. Messages: %p/%p. Ports: %p/%p/%p\n", Handle, - Msg, - ConnectMsg, + Message, + ConnectMessage, ServerPort, ClientPort, ConnectionPort); @@ -244,7 +272,7 @@ /* Set this message as the LPC Reply message while holding the lock */ KeAcquireGuardedMutex(&LpcpLock); - ClientThread->LpcReplyMessage = Msg; + ClientThread->LpcReplyMessage = Message; KeReleaseGuardedMutex(&LpcpLock); /* Clear the thread pointer so it doesn't get cleaned later */

1 0

[ion] 24677: - Fix parameter checks in NtAcceptConnectPort. - Make CSRSS properly fill out the ServerView structure's length so that it can be validated by the kernel.
by ion＠svn.reactos.org 30 Oct '06

30 Oct '06

Author: ion Date: Mon Oct 30 19:50:20 2006 New Revision: 24677 URL: http://svn.reactos.org/svn/reactos?rev=24677&view=rev Log: - Fix parameter checks in NtAcceptConnectPort. - Make CSRSS properly fill out the ServerView structure's length so that it can be validated by the kernel. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: 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 (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 19:50:20 2006 @@ -65,14 +65,14 @@ ServerView); /* Validate the size of the server view */ - if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) + if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; } /* Validate the size of the client view */ - if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) + if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; 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 19:50:20 2006 @@ -222,6 +222,7 @@ for (;;) { REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); ServerPort = NULL; Status = NtListenPort (hApiListenPort, Request);

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