Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 38802: Fix background color used for DrawCaptionTemp with DC_INBUTTON
by weiden＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: weiden Date: Fri Jan 16 17:56:11 2009 New Revision: 38802 URL: http://svn.reactos.org/svn/reactos?rev=38802&view=rev Log: Fix background color used for DrawCaptionTemp with DC_INBUTTON Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Fri Jan 16 17:56:11 2009 @@ -1678,8 +1678,7 @@ if(uFlags & DC_INBUTTON) { hOldBrush = NtGdiSelectBrush(hMemDc, - IntGetSysColorBrush(uFlags & DC_ACTIVE ? - COLOR_BTNFACE : COLOR_BTNSHADOW)); + IntGetSysColorBrush(COLOR_3DFACE)); if(!hOldBrush) {

1 0

[arty] 38801: Prevent accessing NULL as a PE header when we have a bad file, found with Stefan100's help
by arty＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: arty Date: Fri Jan 16 17:44:29 2009 New Revision: 38801 URL: http://svn.reactos.org/svn/reactos?rev=38801&view=rev Log: Prevent accessing NULL as a PE header when we have a bad file, found with Stefan100's help Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Fri Jan 16 17:44:29 2009 @@ -481,6 +481,11 @@ /* Get image headers */ NtHeader = RtlImageNtHeader(ReadBuffer); + if (!NtHeader) + { + DbgPrint("Failed to read image (bad PE signature) %s\n", Name); + return NULL; + } /* Allocate memory for the driver */ ImageSize = NtHeader->OptionalHeader.SizeOfImage;

1 0

[cgutman] 38800: - Merge aicom-network-fixes up to r38799 - This should finally fix the "UNTRACK: SPECIFIED ALREADY FREE ITEM 0" bug
by cgutman＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: cgutman Date: Fri Jan 16 17:30:40 2009 New Revision: 38800 URL: http://svn.reactos.org/svn/reactos?rev=38800&view=rev Log: - Merge aicom-network-fixes up to r38799 - This should finally fix the "UNTRACK: SPECIFIED ALREADY FREE ITEM 0" bug Modified: trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Fri Jan 16 17:30:40 2009 @@ -293,8 +293,6 @@ IF->Index = ChosenIndex; - IPAddInterfaceRoute( IF ); - /* Add interface to the global interface list */ TcpipInterlockedInsertTailList(&InterfaceListHead, &IF->ListEntry, @@ -345,6 +343,21 @@ } +VOID DefaultProtocolHandler( + PIP_INTERFACE Interface, + PIP_PACKET IPPacket) +/* + * FUNCTION: Default handler for Internet protocols + * ARGUMENTS: + * NTE = Pointer to net table entry which the packet was received on + * IPPacket = Pointer to an IP packet that was received + */ +{ + TI_DbgPrint(MID_TRACE, ("[IF %x] Packet of unknown Internet protocol " + "discarded.\n", Interface)); +} + + VOID IPRegisterProtocol( UINT ProtocolNumber, IP_PROTOCOL_HANDLER Handler) @@ -362,22 +375,7 @@ return; } - ProtocolTable[ProtocolNumber] = Handler; -} - - -VOID DefaultProtocolHandler( - PIP_INTERFACE Interface, - PIP_PACKET IPPacket) -/* - * FUNCTION: Default handler for Internet protocols - * ARGUMENTS: - * NTE = Pointer to net table entry which the packet was received on - * IPPacket = Pointer to an IP packet that was received - */ -{ - TI_DbgPrint(MID_TRACE, ("[IF %x] Packet of unknown Internet protocol " - "discarded.\n", Interface)); + ProtocolTable[ProtocolNumber] = Handler ? Handler : DefaultProtocolHandler; } Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Fri Jan 16 17:30:40 2009 @@ -199,6 +199,7 @@ AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback); + IPAddInterfaceRoute(Loopback); TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[cgutman] 38799: - Don't call IPAddInterfaceRoute from IPRegisterInterface - Now we don't create NCEs with IPv4Address == 0 during adapter binding
by cgutman＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: cgutman Date: Fri Jan 16 17:15:41 2009 New Revision: 38799 URL: http://svn.reactos.org/svn/reactos?rev=38799&view=rev Log: - Don't call IPAddInterfaceRoute from IPRegisterInterface - Now we don't create NCEs with IPv4Address == 0 during adapter binding Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Fri Jan 16 17:15:41 2009 @@ -294,8 +294,6 @@ IF->Index = ChosenIndex; - IPAddInterfaceRoute( IF ); - /* Add interface to the global interface list */ TcpipInterlockedInsertTailList(&InterfaceListHead, &IF->ListEntry, Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Fri Jan 16 17:15:41 2009 @@ -199,6 +199,7 @@ AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback); + IPAddInterfaceRoute(Loopback); TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[arty] 38798: This actually used to work due to the work csrss does setting up low memory space. This fixes it to pass a QOS parameter as it isn't optional.
by arty＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: arty Date: Fri Jan 16 15:03:10 2009 New Revision: 38798 URL: http://svn.reactos.org/svn/reactos?rev=38798&view=rev Log: This actually used to work due to the work csrss does setting up low memory space. This fixes it to pass a QOS parameter as it isn't optional. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/csr.c [iso-8859-1] Fri Jan 16 15:03:10 2009 @@ -21,12 +21,18 @@ NTSTATUS Status; UNICODE_STRING PortName; ULONG ConnectInfoLength; + SECURITY_QUALITY_OF_SERVICE Qos; RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); ConnectInfoLength = 0; + Qos.Length = sizeof(Qos); + Qos.ImpersonationLevel = SecurityDelegation; + Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; + Qos.EffectiveOnly = FALSE; + Status = ZwConnectPort(&WindowsApiPort, &PortName, - NULL, + &Qos, NULL, NULL, NULL,

1 0

[mjmartin] 38797: - Reply 38790, with fix for npfsPeekPipe which was breaking rosautotests.
by mjmartin＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: mjmartin Date: Fri Jan 16 13:30:55 2009 New Revision: 38797 URL: http://svn.reactos.org/svn/reactos?rev=38797&view=rev Log: - Reply 38790, with fix for npfsPeekPipe which was breaking rosautotests. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Fri Jan 16 13:30:55 2009 @@ -373,9 +373,9 @@ return STATUS_INSTANCE_NOT_AVAILABLE; } - /* FIXME: Check pipe modes also! */ if (Fcb->MaximumInstances != Buffer->MaximumInstances || - Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart) + Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart || + Fcb->PipeType != Buffer->NamedPipeType) { DPRINT("Asked for invalid pipe mode.\n"); ExFreePool(Ccb); @@ -420,8 +420,11 @@ KeInitializeMutex(&Fcb->CcbListLock, 0); Fcb->PipeType = Buffer->NamedPipeType; - Fcb->WriteMode = Buffer->ReadMode; - Fcb->ReadMode = Buffer->ReadMode; + /* FIXME: Verify which is correct */ + Fcb->WriteMode = Buffer->ReadMode;//Buffer->NamedPipeType; + /* MSDN documentation reads that clients always start off in byte mode */ + Fcb->ReadMode = FILE_PIPE_BYTE_STREAM_MODE; + Fcb->CompletionMode = Buffer->CompletionMode; switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) { @@ -737,6 +740,10 @@ DPRINT("Client\n"); } + /* Disconnect the pipes */ + if (Ccb->OtherSide) Ccb->OtherSide->OtherSide = NULL; + if (Ccb) Ccb->OtherSide = NULL; + ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); FileObject->FsContext2 = NULL; Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Fri Jan 16 13:30:55 2009 @@ -29,6 +29,12 @@ /* Get the Pipe and data */ Fcb = Ccb->Fcb; Request = (PFILE_PIPE_INFORMATION)Info; + + if ((Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) && (Request->ReadMode == FILE_PIPE_MESSAGE_MODE)) + { + DPRINT("Cannot change readmode to message type on a byte type pipe!\n"); + return STATUS_ACCESS_DENIED; + } /* Set Pipe Data */ Fcb->ReadMode = Request->ReadMode; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Fri Jan 16 13:30:55 2009 @@ -202,7 +202,7 @@ { Server = (Ccb->PipeEnd == FILE_PIPE_SERVER_END); OtherSide = Ccb->OtherSide; - Ccb->OtherSide = NULL; + //Ccb->OtherSide = NULL; Ccb->PipeState = FILE_PIPE_DISCONNECTED_STATE; /* Lock the server first */ if (Server) @@ -216,7 +216,7 @@ ExAcquireFastMutex(&Ccb->DataListLock); } OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; - OtherSide->OtherSide = NULL; + //OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -365,6 +365,7 @@ PIO_STACK_LOCATION IoStack) { ULONG OutputBufferLength; + ULONG ReturnLength = 0; PFILE_PIPE_PEEK_BUFFER Reply; PNPFS_FCB Fcb; PNPFS_CCB Ccb; @@ -396,11 +397,21 @@ Reply->ReadDataAvailable = Ccb->ReadDataAvailable; DPRINT("ReadDataAvailable: %lu\n", Ccb->ReadDataAvailable); - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + ExAcquireFastMutex(&Ccb->DataListLock); + BufferPtr = Ccb->Data; + DPRINT("BufferPtr = %x\n", BufferPtr); + if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) { DPRINT("Byte Stream Mode\n"); Reply->MessageLength = Ccb->ReadDataAvailable; - DPRINT("Reply->MessageLength %d\n",Reply->MessageLength ); + DPRINT("Reply->MessageLength %lu\n",Reply->MessageLength ); + MessageCount = 1; + + if (Reply->Data[0] && (OutputBufferLength >= Ccb->ReadDataAvailable + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]))) + { + ReturnLength = Ccb->ReadDataAvailable; + memcpy(&Reply->Data[0], (PVOID)BufferPtr, Ccb->ReadDataAvailable); + } } else { @@ -410,7 +421,7 @@ if (ReadDataAvailable > 0) { memcpy(&Reply->MessageLength,Ccb->Data,sizeof(ULONG)); - BufferPtr = Ccb->Data; + /* NOTE: Modifying the structure in header file to keep track of NumberOfMessage would be better */ while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) { @@ -418,34 +429,38 @@ ASSERT(MessageLength > 0); - DPRINT("MessageLength = %d\n",MessageLength); + DPRINT("MessageLength = %lu\n",MessageLength); MessageCount++; ReadDataAvailable -= MessageLength; /* If its the first message, copy the Message if the size of buffer is large enough */ - if ((MessageCount==1) && (Reply->Data[0]) - && (OutputBufferLength >= (sizeof(FILE_PIPE_PEEK_BUFFER) + MessageLength))) + if (MessageCount==1) { - memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + + if ((Reply->Data[0]) + && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + { + ReturnLength = MessageLength; + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + } } BufferPtr =(PVOID)((ULONG)BufferPtr + MessageLength + sizeof(MessageLength)); - DPRINT("Message %d\n",MessageCount); + DPRINT("BufferPtr = %x\n", BufferPtr); DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); } if (ReadDataAvailable != 0) { - DPRINT1("This should never happen! Possible memory corruption.\n"); - return STATUS_UNSUCCESSFUL; + DPRINT1("Possible memory corruption.\n"); + ASSERT(FALSE); } } } + ExReleaseFastMutex(&Ccb->DataListLock); Reply->NumberOfMessages = MessageCount; - if (MessageCount > 0) - Reply->Data[0] = 0; - - Irp->IoStatus.Information = OutputBufferLength; + + Irp->IoStatus.Information = ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); Irp->IoStatus.Status = STATUS_SUCCESS; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Jan 16 13:30:55 2009 @@ -16,7 +16,6 @@ /* FUNCTIONS *****************************************************************/ -#ifndef NDEBUG VOID HexDump(PUCHAR Buffer, ULONG Length) { CHAR Line[65]; @@ -42,7 +41,6 @@ } DbgPrint("---------------\n"); } -#endif static DRIVER_CANCEL NpfsReadWriteCancelRoutine; static VOID NTAPI @@ -360,7 +358,6 @@ Irp->RequestorMode, FALSE, NULL); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -449,7 +446,7 @@ Irp->RequestorMode, FALSE, NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); + DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { @@ -480,9 +477,11 @@ } } ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); + + /* If the pipe type and read mode are both byte stream */ + if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)) + { + DPRINT("Byte stream mode: Ccb->Data %x\n", Ccb->Data); /* Byte stream mode */ while (Length > 0 && Ccb->ReadDataAvailable > 0) { @@ -522,115 +521,135 @@ break; } } - else - { - DPRINT("Message mode\n"); - - /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ - if (Ccb->ReadDataAvailable) - { - ULONG NextMessageLength=0; - //HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); - /*First get the size of the message */ - memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); - if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + else if (Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_TYPE) + { + ULONG ThisCopyLength = 0; + ULONG TotalLengthNeeded = min(Length, Ccb->ReadDataAvailable); + + DPRINT("Message mode: Ccb>Data %x\n", Ccb->Data); + + do + { + Buffer = (PVOID)((ULONG_PTR)Buffer + ThisCopyLength); + + /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ + if (Ccb->ReadDataAvailable) { - DPRINT1("This should never happen! Possible memory corruption.\n"); -#ifndef NDEBUG - HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); -#endif - ASSERT(FALSE); - } - - /* Use the smaller value */ - - CopyLength = min(NextMessageLength, Length); - - /* retrieve the message from the buffer */ - memcpy(Buffer, (PVOID)((ULONG)Ccb->Data + sizeof(NextMessageLength)), CopyLength); - - - if (Ccb->ReadDataAvailable > CopyLength) - { - if (CopyLength < NextMessageLength) + ULONG NextMessageLength = 0; + + /*First get the size of the message */ + memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); + + if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) { - /* Client only requested part of the message */ - - /* Calculate the remaining message new size */ - ULONG NewMessageSize = NextMessageLength-CopyLength; - - /* Write a new Message size to buffer for the part of the message still there */ - memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); - - /* Move the memory starting from end of partial Message just retrieved */ - memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), - (PVOID)((ULONG_PTR) Ccb->Data + CopyLength + sizeof(NewMessageSize)), - (ULONG)Ccb->WritePtr - ((ULONG)Ccb->Data + sizeof(NewMessageSize)) - CopyLength); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - CopyLength); - - /* Add CopyLength only to WriteQuotaAvailable as the - Message Size was replaced in the buffer */ - Ccb->WriteQuotaAvailable += CopyLength; + DPRINT("Possible memory corruption.\n"); + HexDump(Ccb->Data, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data); + ASSERT(FALSE); + } + + /* Use the smaller value */ + ThisCopyLength = min(NextMessageLength, Length); + + /* retrieve the message from the buffer */ + memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->Data + sizeof(NextMessageLength)), ThisCopyLength); + + if (Ccb->ReadDataAvailable > ThisCopyLength) + { + if (ThisCopyLength < NextMessageLength) + { + /* Client only requested part of the message */ + + /* Calculate the remaining message new size */ + ULONG NewMessageSize = NextMessageLength-ThisCopyLength; + + /* Write a new Message size to buffer for the part of the message still there */ + memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); + + /* Move the memory starting from end of partial Message just retrieved */ + memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), + (PVOID)((ULONG_PTR)Ccb->Data + ThisCopyLength + sizeof(NewMessageSize)), + (ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)) - + ThisCopyLength); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength); + + /* Add ThisCopyLength only to WriteQuotaAvailable as the + Message Size was replaced in the buffer */ + Ccb->WriteQuotaAvailable += ThisCopyLength; + } + else + { + /* Client wanted the entire message */ + + /* Move the memory starting from the next Message just retrieved */ + memmove(Ccb->Data, + (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), + (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data - NextMessageLength - + sizeof(NextMessageLength)); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength - + sizeof(NextMessageLength)); + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(NextMessageLength)); + } } else { - /* Client wanted the entire message */ - - /* Move the memory starting from the next Message just retrieved */ - memmove(Ccb->Data, - (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), - (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data - NextMessageLength - sizeof(NextMessageLength)); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - NextMessageLength); + /* This was the last Message, so just zero this messages for safety sake */ + memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); + + /* reset the write pointer to beginning of buffer */ + Ccb->WritePtr = Ccb->Data; /* Add both the message length and the header to the WriteQuotaAvailable as they both were removed */ - Ccb->WriteQuotaAvailable += (CopyLength + sizeof(NextMessageLength)); + Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(ULONG)); + + KeResetEvent(&Ccb->ReadEvent); + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + } } +#ifndef NDEBUG + DPRINT("Length %d Buffer %x\n",ThisCopyLength,Buffer); + HexDump((PUCHAR)Buffer, ThisCopyLength); +#endif + + Information += ThisCopyLength; + + Ccb->ReadDataAvailable -= ThisCopyLength; + + if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); } - else - { - /* This was the last Message, so just zero this messages for safety sake */ - memset(Ccb->Data,0,NextMessageLength + sizeof(NextMessageLength)); - - /* reset the write pointer to beginning of buffer */ - Ccb->WritePtr = Ccb->Data; - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (CopyLength + sizeof(ULONG)); - - KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - } -#ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); - HexDump((PUCHAR)Buffer, CopyLength); -#endif - - Information += CopyLength; - - Ccb->ReadDataAvailable -= CopyLength; - - if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); - } + + }while ((ThisCopyLength < TotalLengthNeeded) + && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + && (Ccb->ReadDataAvailable)); + if (Information > 0) { break; } + } + else + { + DPRINT1("Unhandled Pipe Mode with Read Mode!\n"); + ASSERT(FALSE); } } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); + + if (Status == STATUS_CANCELLED) + goto done; if (IoIsOperationSynchronous(Irp)) { @@ -718,15 +737,15 @@ if (Irp->MdlAddress == NULL) { - DPRINT1("Irp->MdlAddress == NULL\n"); + DPRINT("Irp->MdlAddress == NULL\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; } - if (ReaderCcb == NULL) - { - DPRINT1("Pipe is NOT connected!\n"); + if ((ReaderCcb == NULL) || (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) + { + DPRINT("Pipe is NOT connected!\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -739,7 +758,7 @@ if (ReaderCcb->Data == NULL) { - DPRINT1("Pipe is NOT writable!\n"); + DPRINT("Pipe is NOT writable!\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; @@ -749,6 +768,7 @@ Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); ExAcquireFastMutex(&ReaderCcb->DataListLock); + #ifndef NDEBUG DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); HexDump(Buffer, Length); @@ -774,7 +794,7 @@ FALSE, NULL); DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - ExAcquireFastMutex(&ReaderCcb->DataListLock); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -792,14 +812,14 @@ { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; - // ExReleaseFastMutex(&ReaderCcb->DataListLock); goto done; } - } - - if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); + ExAcquireFastMutex(&ReaderCcb->DataListLock); + } + + if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) && (Ccb->Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE)) + { + DPRINT("Byte stream mode: Ccb->Data %x, Ccb->WritePtr %x\n", ReaderCcb->Data, ReaderCcb->WritePtr); while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0) { @@ -816,7 +836,10 @@ } else { - TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - (ULONG_PTR)ReaderCcb->WritePtr); + + TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - + (ULONG_PTR)ReaderCcb->WritePtr); + memcpy(ReaderCcb->WritePtr, Buffer, TempLength); memcpy(ReaderCcb->Data, Buffer + TempLength, CopyLength - TempLength); ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->Data + CopyLength - TempLength); @@ -837,33 +860,38 @@ break; } } - else + else if ((Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_TYPE) && (Ccb->Fcb->WriteMode == FILE_PIPE_MESSAGE_MODE)) { /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ - /* FIXME: Check and verify ReadMode ByteStream */ - + DPRINT("Message mode: Ccb->Data %x, Ccb->WritePtr %x\n",ReaderCcb->Data, ReaderCcb->WritePtr); if (Length > 0) { /* Verify the WritePtr is still inside the buffer */ - if (((ULONG)ReaderCcb->WritePtr > ((ULONG)ReaderCcb->Data + (ULONG)ReaderCcb->MaxDataLength)) || - ((ULONG)ReaderCcb->WritePtr < (ULONG)ReaderCcb->Data)) + if (((ULONG_PTR)ReaderCcb->WritePtr > ((ULONG_PTR)ReaderCcb->Data + (ULONG_PTR)ReaderCcb->MaxDataLength)) || + ((ULONG_PTR)ReaderCcb->WritePtr < (ULONG_PTR)ReaderCcb->Data)) { DPRINT1("NPFS is writing out of its buffer. Report to developer!\n"); - DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength%d\n", - ReaderCcb->WritePtr,ReaderCcb->Data,ReaderCcb->MaxDataLength); + DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength %lu\n", + ReaderCcb->WritePtr, ReaderCcb->Data, ReaderCcb->MaxDataLength); ASSERT(FALSE); } CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable - sizeof(ULONG)); + if (CopyLength > ReaderCcb->WriteQuotaAvailable) + { + DPRINT1("Writing %lu byte to pipe would overflow as only %lu bytes are available\n", + CopyLength, ReaderCcb->ReadDataAvailable); + ASSERT(FALSE); + } /* First Copy the Length of the message into the pipes buffer */ memcpy(ReaderCcb->WritePtr, &CopyLength, sizeof(CopyLength)); /* Now the user buffer itself */ - memcpy((PVOID)((ULONG)ReaderCcb->WritePtr+ sizeof(CopyLength)), Buffer, CopyLength); + memcpy((PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength)), Buffer, CopyLength); /* Update the write pointer */ - ReaderCcb->WritePtr = (PVOID)((ULONG)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); + ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); Information += CopyLength; @@ -871,7 +899,7 @@ ReaderCcb->WriteQuotaAvailable -= (CopyLength + sizeof(ULONG)); - if ((ULONG)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) + if ((ULONG_PTR)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) { DPRINT1("QuotaAvailable is greater than buffer size!\n"); ASSERT(FALSE); @@ -885,6 +913,11 @@ break; } } + else + { + DPRINT1("Unhandled Pipe Type Mode and Read Write Mode!\n"); + ASSERT(FALSE); + } } ExReleaseFastMutex(&ReaderCcb->DataListLock);

1 0

[sginsberg] 38796: - Add function tags - Documentary fix from last commit -- DbgkpPostFakeThreadMessage: Implement missing handling of 2 failure cases
by sginsberg＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: sginsberg Date: Fri Jan 16 10:56:00 2009 New Revision: 38796 URL: http://svn.reactos.org/svn/reactos?rev=38796&view=rev Log: - Add function tags - Documentary fix from last commit -- DbgkpPostFakeThreadMessage: Implement missing handling of 2 failure cases Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Fri Jan 16 10:56:00 2009 @@ -1504,6 +1504,9 @@ /* PUBLIC FUNCTIONS **********************************************************/ +/* + * @implemented + */ NTSTATUS NTAPI NtCreateDebugObject(OUT PHANDLE DebugHandle, @@ -1589,6 +1592,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtDebugContinue(IN HANDLE DebugHandle, @@ -1719,6 +1725,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtDebugActiveProcess(IN HANDLE ProcessHandle, @@ -1792,6 +1801,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtRemoveProcessDebug(IN HANDLE ProcessHandle, @@ -1837,6 +1849,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtSetInformationDebugObject(IN HANDLE DebugHandle, @@ -1914,6 +1929,9 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtWaitForDebugEvent(IN HANDLE DebugHandle,

1 0

[dchapyshev] 38795: - Fix bug with addition of duplicates to the devices list - Other small changes
by dchapyshev＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: dchapyshev Date: Fri Jan 16 10:53:32 2009 New Revision: 38795 URL: http://svn.reactos.org/svn/reactos?rev=38795&view=rev Log: - Fix bug with addition of duplicates to the devices list - Other small changes Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Fri Jan 16 10:53:32 2009 @@ -310,12 +310,10 @@ LoadString(hApplet, IDS_ADDNEWDEVICE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - Item.pszText = (LPTSTR) szBuffer; - Item.iItem = 0; + Item.pszText = (LPWSTR) szBuffer; + Item.iItem = (INT) ListView_GetItemCount(hList); Item.iImage = -1; (VOID) ListView_InsertItem(hList, &Item); - - (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); hDevInfo = SetupDiGetClassDevsEx(NULL, NULL, NULL, DIGCF_ALLCLASSES | DIGCF_PRESENT, NULL, NULL, 0); @@ -328,6 +326,8 @@ DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); for (Index = 0; TRUE; Index++) { + szBuffer[0] = L'\0'; + if (!SetupDiEnumDeviceInfo(hDevInfo, Index, &DevInfoData)) break; if (CM_Get_DevNode_Status_Ex(&ulStatus, &ulProblemNumber, DevInfoData.DevInst, 0, NULL) == CR_SUCCESS) @@ -378,17 +378,21 @@ pstrStatusText = (PWSTR)HeapAlloc(hProcessHeap, 0, sizeof(szStatusText)); lstrcpy(pstrStatusText, szStatusText); - /* Set device name */ - Item.pszText = (LPWSTR) szBuffer; - Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - Item.lParam = (LPARAM) pstrStatusText; - Item.iItem = (INT) ListView_GetItemCount(hList); - (VOID) ListView_InsertItem(hList, &Item); + if (szBuffer[0] != L'\0') + { + /* Set device name */ + Item.pszText = (LPWSTR) szBuffer; + Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + Item.lParam = (LPARAM) pstrStatusText; + Item.iItem = (INT) ListView_GetItemCount(hList); + (VOID) ListView_InsertItem(hList, &Item); + } DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); } (VOID) ListView_SetImageList(hList, ImageListData.ImageList, LVSIL_SMALL); + (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); SetupDiDestroyDeviceInfoList(hDevInfo); } @@ -406,12 +410,6 @@ } break; - case WM_COMMAND: - { - - } - break; - case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; @@ -420,43 +418,32 @@ { case PSN_SETACTIVE: { - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); } break; - case NM_CLICK: + case PSN_WIZNEXT: { Index = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_PROBELIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); - if (Index != -1) + if (Index == -1) Index = 0; + + if (Index == 0) { - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); } - } - break; - - case PSN_WIZNEXT: - { - Index = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_PROBELIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); - if (Index != -1) + else { - if (Index == 0) - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); - } - else - { - LVITEM Item; - PWSTR pts; - - ZeroMemory(&Item, sizeof(LV_ITEM)); - Item.mask = LVIF_PARAM; - Item.iItem = Index; - (VOID) ListView_GetItem(GetDlgItem(hwndDlg, IDC_PROBELIST), &Item); - pts = (PWSTR) Item.lParam; - wcscpy(pDeviceStatusText, pts); - - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE); - } + LVITEM Item; + PWSTR pts; + + ZeroMemory(&Item, sizeof(LV_ITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = Index; + (VOID) ListView_GetItem(GetDlgItem(hwndDlg, IDC_PROBELIST), &Item); + pts = (PWSTR) Item.lParam; + wcscpy(pDeviceStatusText, pts); + + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE); } return TRUE; } @@ -535,8 +522,6 @@ { /* Set title font */ SendDlgItemMessage(hwndDlg, IDC_FINISHTITLE, WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE); - /* Set status text */ - SetWindowText(GetDlgItem(hwndDlg, IDC_HWSTATUSEDIT), pDeviceStatusText); } break; @@ -548,6 +533,9 @@ { case PSN_SETACTIVE: { + /* Set status text */ + SetWindowText(GetDlgItem(hwndDlg, IDC_HWSTATUSEDIT), pDeviceStatusText); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH | PSWIZB_BACK); } break;

1 0

[sginsberg] 38794: - DbgkpPostFakeThreadMessage: Implement missing - DbgkpSetProcessDebugObject: Fix the traversing of the debug object's event list - Implement DbgkClearProcessDebugObject
by sginsberg＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: sginsberg Date: Fri Jan 16 10:48:17 2009 New Revision: 38794 URL: http://svn.reactos.org/svn/reactos?rev=38794&view=rev Log: - DbgkpPostFakeThreadMessage: Implement missing - DbgkpSetProcessDebugObject: Fix the traversing of the debug object's event list - Implement DbgkClearProcessDebugObject Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Fri Jan 16 10:48:17 2009 @@ -712,9 +712,27 @@ DebugObject); if (!NT_SUCCESS(Status)) { - /* We failed. FIXME: Handle this */ - DPRINT1("Unhandled Dbgk codepath!\n"); - ASSERT(FALSE); + /* Resume the thread if it was suspended */ + if (Flags & DEBUG_EVENT_SUSPEND) PsResumeThread(ThisThread, NULL); + + /* Check if we acquired rundown */ + if (Flags & DEBUG_EVENT_RELEASE) + { + /* Release it */ + ExReleaseRundownProtection(&ThisThread->RundownProtect); + } + + /* If this was a process create, check if we got a handle */ + if ((ApiMessage.ApiNumber == DbgKmCreateProcessApi) && + (CreateProcess->FileHandle)) + { + /* Close it */ + ObCloseHandle(CreateProcess->FileHandle, KernelMode); + } + + /* Release our reference and break out */ + ObDereferenceObject(ThisThread); + break; } /* Check if this was the first message */ @@ -736,9 +754,10 @@ /* Check the API status */ if (!NT_SUCCESS(Status)) { - /* We failed. FIXME: Handle this */ - DPRINT1("Unhandled Dbgk codepath!\n"); - ASSERT(FALSE); + /* Dereference and fail */ + if (pFirstThread) ObDereferenceObject(pFirstThread); + if (pLastThread) ObDereferenceObject(pLastThread); + return Status; } /* Make sure we have a first thread */ @@ -1274,8 +1293,9 @@ NextEntry = DebugObject->EventList.Flink; while (NextEntry != &DebugObject->EventList) { - /* Get the debug event */ + /* Get the debug event and go to the next entry */ DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); + NextEntry = NextEntry->Flink; DBGKTRACE(DBGK_PROCESS_DEBUG, "DebugEvent: %p Flags: %lx TH: %p/%p\n", DebugEvent, DebugEvent->Flags, DebugEvent->BackoutThread, PsGetCurrentThread()); @@ -1339,9 +1359,6 @@ ExReleaseRundownProtection(&EventThread->RundownProtect); } } - - /* Go to the next entry */ - NextEntry = NextEntry->Flink; } /* Release the debug object */ @@ -1358,7 +1375,7 @@ { /* Remove the event */ NextEntry = RemoveHeadList(&TempList); - DebugEvent = CONTAINING_RECORD (NextEntry, DEBUG_EVENT, EventList); + DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); /* Wake it */ DbgkpWakeTarget(DebugEvent); @@ -1372,12 +1389,88 @@ NTSTATUS NTAPI DbgkClearProcessDebugObject(IN PEPROCESS Process, - IN PDEBUG_OBJECT SourceDebugObject) -{ - /* FIXME: TODO */ - DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p DebugObject: %p\n", + IN PDEBUG_OBJECT SourceDebugObject OPTIONAL) +{ + PDEBUG_OBJECT DebugObject; + PDEBUG_EVENT DebugEvent; + LIST_ENTRY TempList; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + DBGKTRACE(DBGK_OBJECT_DEBUG, "Process: %p DebugObject: %p\n", Process, SourceDebugObject); - return STATUS_UNSUCCESSFUL; + + /* Acquire the port lock */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Get the Process Debug Object */ + DebugObject = Process->DebugPort; + + /* + * Check if the process had an object and it matches, + * or if the process had an object but none was specified + * (in which we are called from NtTerminateProcess) + */ + if ((DebugObject) && + ((DebugObject == SourceDebugObject) || + (SourceDebugObject == NULL))) + { + /* Clear the debug port */ + Process->DebugPort = NULL; + + /* Release the port lock and remove the PEB flag */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + DbgkpMarkProcessPeb(Process); + } + else + { + /* Release the port lock and fail */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + return STATUS_PORT_NOT_SET; + } + + /* Initialize the temporary list */ + InitializeListHead(&TempList); + + /* Acquire the Object */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Loop the events */ + NextEntry = DebugObject->EventList.Flink; + while (NextEntry != &DebugObject->EventList) + { + /* Get the Event and go to the next entry */ + DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); + NextEntry = NextEntry->Flink; + + /* Check that it belongs to the specified process */ + if (DebugEvent->Process == Process) + { + /* Insert it into the temporary list */ + RemoveEntryList(&DebugEvent->EventList); + InsertTailList(&TempList, &DebugEvent->EventList); + } + } + + /* Release the Object */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Release the initial reference */ + ObDereferenceObject(DebugObject); + + /* Loop our temporary list */ + while (!IsListEmpty(&TempList)) + { + /* Remove the event */ + NextEntry = RemoveHeadList(&TempList); + DebugEvent = CONTAINING_RECORD(NextEntry, DEBUG_EVENT, EventList); + + /* Wake it up */ + DebugEvent->Status = STATUS_DEBUGGER_INACTIVE; + DbgkpWakeTarget(DebugEvent); + } + + /* Return Success */ + return STATUS_SUCCESS; } VOID

1 0

[mjmartin] 38793: - Revert 38790 as i broke autotests.
by mjmartin＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: mjmartin Date: Fri Jan 16 09:59:03 2009 New Revision: 38793 URL: http://svn.reactos.org/svn/reactos?rev=38793&view=rev Log: - Revert 38790 as i broke autotests. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Fri Jan 16 09:59:03 2009 @@ -373,9 +373,9 @@ return STATUS_INSTANCE_NOT_AVAILABLE; } + /* FIXME: Check pipe modes also! */ if (Fcb->MaximumInstances != Buffer->MaximumInstances || - Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart || - Fcb->PipeType != Buffer->NamedPipeType) + Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart) { DPRINT("Asked for invalid pipe mode.\n"); ExFreePool(Ccb); @@ -388,7 +388,6 @@ { NewPipe = TRUE; Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); - if (Fcb == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); @@ -421,11 +420,8 @@ KeInitializeMutex(&Fcb->CcbListLock, 0); Fcb->PipeType = Buffer->NamedPipeType; - /* FIXME: Verify which is correct */ - Fcb->WriteMode = Buffer->ReadMode;//Buffer->NamedPipeType; - /* MSDN documentation read that clients always start off in byte mode */ - Fcb->ReadMode = FILE_PIPE_BYTE_STREAM_MODE; - + Fcb->WriteMode = Buffer->ReadMode; + Fcb->ReadMode = Buffer->ReadMode; Fcb->CompletionMode = Buffer->CompletionMode; switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) { @@ -741,10 +737,6 @@ DPRINT("Client\n"); } - /* Disconnect the pipes */ - if (Ccb->OtherSide) Ccb->OtherSide->OtherSide = NULL; - if (Ccb) Ccb->OtherSide = NULL; - ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); FileObject->FsContext2 = NULL; Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Fri Jan 16 09:59:03 2009 @@ -29,12 +29,6 @@ /* Get the Pipe and data */ Fcb = Ccb->Fcb; Request = (PFILE_PIPE_INFORMATION)Info; - - if ((Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Request->ReadMode == FILE_PIPE_MESSAGE_MODE)) - { - DPRINT("Cannot change readmode to message type on a byte type pipe!\n"); - return STATUS_ACCESS_DENIED; - } /* Set Pipe Data */ Fcb->ReadMode = Request->ReadMode; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Fri Jan 16 09:59:03 2009 @@ -202,7 +202,7 @@ { Server = (Ccb->PipeEnd == FILE_PIPE_SERVER_END); OtherSide = Ccb->OtherSide; - //Ccb->OtherSide = NULL; + Ccb->OtherSide = NULL; Ccb->PipeState = FILE_PIPE_DISCONNECTED_STATE; /* Lock the server first */ if (Server) @@ -216,7 +216,7 @@ ExAcquireFastMutex(&Ccb->DataListLock); } OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; - //OtherSide->OtherSide = NULL; + OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -365,7 +365,6 @@ PIO_STACK_LOCATION IoStack) { ULONG OutputBufferLength; - ULONG ReturnLength = 0; PFILE_PIPE_PEEK_BUFFER Reply; PNPFS_FCB Fcb; PNPFS_CCB Ccb; @@ -397,21 +396,11 @@ Reply->ReadDataAvailable = Ccb->ReadDataAvailable; DPRINT("ReadDataAvailable: %lu\n", Ccb->ReadDataAvailable); - ExAcquireFastMutex(&Ccb->DataListLock); - BufferPtr = Ccb->Data; - DPRINT("BufferPtr = %x\n", BufferPtr); - if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) + if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte Stream Mode\n"); Reply->MessageLength = Ccb->ReadDataAvailable; - DPRINT("Reply->MessageLength %lu\n",Reply->MessageLength ); - MessageCount = 1; - ReturnLength = Ccb->ReadDataAvailable; - - if (Reply->Data[0] && (OutputBufferLength >= ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]))) - { - memcpy(&Reply->Data[0], (PVOID)BufferPtr, Ccb->ReadDataAvailable); - } + DPRINT("Reply->MessageLength %d\n",Reply->MessageLength ); } else { @@ -421,7 +410,7 @@ if (ReadDataAvailable > 0) { memcpy(&Reply->MessageLength,Ccb->Data,sizeof(ULONG)); - + BufferPtr = Ccb->Data; /* NOTE: Modifying the structure in header file to keep track of NumberOfMessage would be better */ while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) { @@ -429,37 +418,34 @@ ASSERT(MessageLength > 0); - DPRINT("MessageLength = %lu\n",MessageLength); + DPRINT("MessageLength = %d\n",MessageLength); MessageCount++; ReadDataAvailable -= MessageLength; /* If its the first message, copy the Message if the size of buffer is large enough */ - if (MessageCount==1) + if ((MessageCount==1) && (Reply->Data[0]) + && (OutputBufferLength >= (sizeof(FILE_PIPE_PEEK_BUFFER) + MessageLength))) { - ReturnLength = MessageLength; - if ((Reply->Data[0]) - && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) - { - memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); - } + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); } BufferPtr =(PVOID)((ULONG)BufferPtr + MessageLength + sizeof(MessageLength)); - DPRINT("BufferPtr = %x\n", BufferPtr); + DPRINT("Message %d\n",MessageCount); DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); } if (ReadDataAvailable != 0) { - DPRINT1("Possible memory corruption.\n"); - ASSERT(FALSE); + DPRINT1("This should never happen! Possible memory corruption.\n"); + return STATUS_UNSUCCESSFUL; } } } - ExReleaseFastMutex(&Ccb->DataListLock); Reply->NumberOfMessages = MessageCount; - - Irp->IoStatus.Information = ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); + if (MessageCount > 0) + Reply->Data[0] = 0; + + Irp->IoStatus.Information = OutputBufferLength; Irp->IoStatus.Status = STATUS_SUCCESS; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Jan 16 09:59:03 2009 @@ -16,6 +16,7 @@ /* FUNCTIONS *****************************************************************/ +#ifndef NDEBUG VOID HexDump(PUCHAR Buffer, ULONG Length) { CHAR Line[65]; @@ -41,6 +42,7 @@ } DbgPrint("---------------\n"); } +#endif static DRIVER_CANCEL NpfsReadWriteCancelRoutine; static VOID NTAPI @@ -358,6 +360,7 @@ Irp->RequestorMode, FALSE, NULL); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -446,7 +449,7 @@ Irp->RequestorMode, FALSE, NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); + DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { @@ -477,11 +480,9 @@ } } ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - - /* If the pipe type and read mode are both byte stream */ - if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)) - { - DPRINT("Byte stream mode: Ccb->Data %x\n", Ccb->Data); + if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + { + DPRINT("Byte stream mode\n"); /* Byte stream mode */ while (Length > 0 && Ccb->ReadDataAvailable > 0) { @@ -521,135 +522,115 @@ break; } } - else if (Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_MODE) - { - ULONG ThisCopyLength = 0; - ULONG TotalLengthNeeded = min(Length, Ccb->ReadDataAvailable); - - DPRINT("Message mode: Ccb>Data %x\n", Ccb->Data); - - do - { - Buffer = (PVOID)((ULONG_PTR)Buffer + ThisCopyLength); - - /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ - if (Ccb->ReadDataAvailable) - { - ULONG NextMessageLength = 0; - - /*First get the size of the message */ - memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); - - if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + else + { + DPRINT("Message mode\n"); + + /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ + if (Ccb->ReadDataAvailable) + { + ULONG NextMessageLength=0; + //HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); + /*First get the size of the message */ + memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); + if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + { + DPRINT1("This should never happen! Possible memory corruption.\n"); +#ifndef NDEBUG + HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); +#endif + ASSERT(FALSE); + } + + /* Use the smaller value */ + + CopyLength = min(NextMessageLength, Length); + + /* retrieve the message from the buffer */ + memcpy(Buffer, (PVOID)((ULONG)Ccb->Data + sizeof(NextMessageLength)), CopyLength); + + + if (Ccb->ReadDataAvailable > CopyLength) + { + if (CopyLength < NextMessageLength) { - DPRINT("Possible memory corruption.\n"); - HexDump(Ccb->Data, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data); - ASSERT(FALSE); - } - - /* Use the smaller value */ - ThisCopyLength = min(NextMessageLength, Length); - - /* retrieve the message from the buffer */ - memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->Data + sizeof(NextMessageLength)), ThisCopyLength); - - if (Ccb->ReadDataAvailable > ThisCopyLength) - { - if (ThisCopyLength < NextMessageLength) - { - /* Client only requested part of the message */ - - /* Calculate the remaining message new size */ - ULONG NewMessageSize = NextMessageLength-ThisCopyLength; - - /* Write a new Message size to buffer for the part of the message still there */ - memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); - - /* Move the memory starting from end of partial Message just retrieved */ - memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), - (PVOID)((ULONG_PTR)Ccb->Data + ThisCopyLength + sizeof(NewMessageSize)), - (ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)) - - ThisCopyLength); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength); - - /* Add ThisCopyLength only to WriteQuotaAvailable as the - Message Size was replaced in the buffer */ - Ccb->WriteQuotaAvailable += ThisCopyLength; - } - else - { - /* Client wanted the entire message */ - - /* Move the memory starting from the next Message just retrieved */ - memmove(Ccb->Data, - (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), - (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data - NextMessageLength - - sizeof(NextMessageLength)); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength - - sizeof(NextMessageLength)); - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(NextMessageLength)); - } + /* Client only requested part of the message */ + + /* Calculate the remaining message new size */ + ULONG NewMessageSize = NextMessageLength-CopyLength; + + /* Write a new Message size to buffer for the part of the message still there */ + memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); + + /* Move the memory starting from end of partial Message just retrieved */ + memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), + (PVOID)((ULONG_PTR) Ccb->Data + CopyLength + sizeof(NewMessageSize)), + (ULONG)Ccb->WritePtr - ((ULONG)Ccb->Data + sizeof(NewMessageSize)) - CopyLength); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - CopyLength); + + /* Add CopyLength only to WriteQuotaAvailable as the + Message Size was replaced in the buffer */ + Ccb->WriteQuotaAvailable += CopyLength; } else { - /* This was the last Message, so just zero this messages for safety sake */ - memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); - - /* reset the write pointer to beginning of buffer */ - Ccb->WritePtr = Ccb->Data; + /* Client wanted the entire message */ + + /* Move the memory starting from the next Message just retrieved */ + memmove(Ccb->Data, + (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), + (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data - NextMessageLength - sizeof(NextMessageLength)); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - NextMessageLength); /* Add both the message length and the header to the WriteQuotaAvailable as they both were removed */ - Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(ULONG)); - - KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } + Ccb->WriteQuotaAvailable += (CopyLength + sizeof(NextMessageLength)); } + } + else + { + /* This was the last Message, so just zero this messages for safety sake */ + memset(Ccb->Data,0,NextMessageLength + sizeof(NextMessageLength)); + + /* reset the write pointer to beginning of buffer */ + Ccb->WritePtr = Ccb->Data; + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (CopyLength + sizeof(ULONG)); + + KeResetEvent(&Ccb->ReadEvent); + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + } + } #ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",ThisCopyLength,Buffer); - HexDump((PUCHAR)Buffer, ThisCopyLength); + DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); + HexDump((PUCHAR)Buffer, CopyLength); #endif - Information += ThisCopyLength; - - Ccb->ReadDataAvailable -= ThisCopyLength; - - if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); - } - - }while ((ThisCopyLength < TotalLengthNeeded) - && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - && (Ccb->ReadDataAvailable)); - + Information += CopyLength; + + Ccb->ReadDataAvailable -= CopyLength; + + if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); + } if (Information > 0) { break; } - } - else - { - DPRINT1("Unhandled Pipe Mode with Read Mode!\n"); - ASSERT(FALSE); } } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - - if (Status == STATUS_CANCELLED) - goto done; if (IoIsOperationSynchronous(Irp)) { @@ -737,15 +718,15 @@ if (Irp->MdlAddress == NULL) { - DPRINT("Irp->MdlAddress == NULL\n"); + DPRINT1("Irp->MdlAddress == NULL\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; } - if ((ReaderCcb == NULL) || (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) - { - DPRINT("Pipe is NOT connected!\n"); + if (ReaderCcb == NULL) + { + DPRINT1("Pipe is NOT connected!\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -758,7 +739,7 @@ if (ReaderCcb->Data == NULL) { - DPRINT("Pipe is NOT writable!\n"); + DPRINT1("Pipe is NOT writable!\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; @@ -768,7 +749,6 @@ Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); ExAcquireFastMutex(&ReaderCcb->DataListLock); - #ifndef NDEBUG DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); HexDump(Buffer, Length); @@ -794,7 +774,7 @@ FALSE, NULL); DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - + ExAcquireFastMutex(&ReaderCcb->DataListLock); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -812,14 +792,14 @@ { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; + // ExReleaseFastMutex(&ReaderCcb->DataListLock); goto done; } - ExAcquireFastMutex(&ReaderCcb->DataListLock); - } - - if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE)) - { - DPRINT("Byte stream mode: Ccb->Data %x, Ccb->WritePtr %x\n", ReaderCcb->Data, ReaderCcb->WritePtr); + } + + if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) + { + DPRINT("Byte stream mode\n"); while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0) { @@ -836,10 +816,7 @@ } else { - - TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - - (ULONG_PTR)ReaderCcb->WritePtr); - + TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - (ULONG_PTR)ReaderCcb->WritePtr); memcpy(ReaderCcb->WritePtr, Buffer, TempLength); memcpy(ReaderCcb->Data, Buffer + TempLength, CopyLength - TempLength); ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->Data + CopyLength - TempLength); @@ -860,38 +837,33 @@ break; } } - else if ((Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_MODE) && (Ccb->Fcb->WriteMode == FILE_PIPE_MESSAGE_MODE)) + else { /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ - DPRINT("Message mode: Ccb->Data %x, Ccb->WritePtr %x\n",ReaderCcb->Data, ReaderCcb->WritePtr); + /* FIXME: Check and verify ReadMode ByteStream */ + if (Length > 0) { /* Verify the WritePtr is still inside the buffer */ - if (((ULONG_PTR)ReaderCcb->WritePtr > ((ULONG_PTR)ReaderCcb->Data + (ULONG_PTR)ReaderCcb->MaxDataLength)) || - ((ULONG_PTR)ReaderCcb->WritePtr < (ULONG_PTR)ReaderCcb->Data)) + if (((ULONG)ReaderCcb->WritePtr > ((ULONG)ReaderCcb->Data + (ULONG)ReaderCcb->MaxDataLength)) || + ((ULONG)ReaderCcb->WritePtr < (ULONG)ReaderCcb->Data)) { DPRINT1("NPFS is writing out of its buffer. Report to developer!\n"); - DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength %lu\n", - ReaderCcb->WritePtr, ReaderCcb->Data, ReaderCcb->MaxDataLength); + DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength%d\n", + ReaderCcb->WritePtr,ReaderCcb->Data,ReaderCcb->MaxDataLength); ASSERT(FALSE); } CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable - sizeof(ULONG)); - if (CopyLength > ReaderCcb->WriteQuotaAvailable) - { - DPRINT1("Writing %lu byte to pipe would overflow as only %lu bytes are available\n", - CopyLength, ReaderCcb->ReadDataAvailable); - ASSERT(FALSE); - } /* First Copy the Length of the message into the pipes buffer */ memcpy(ReaderCcb->WritePtr, &CopyLength, sizeof(CopyLength)); /* Now the user buffer itself */ - memcpy((PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength)), Buffer, CopyLength); + memcpy((PVOID)((ULONG)ReaderCcb->WritePtr+ sizeof(CopyLength)), Buffer, CopyLength); /* Update the write pointer */ - ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); + ReaderCcb->WritePtr = (PVOID)((ULONG)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); Information += CopyLength; @@ -899,7 +871,7 @@ ReaderCcb->WriteQuotaAvailable -= (CopyLength + sizeof(ULONG)); - if ((ULONG_PTR)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) + if ((ULONG)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) { DPRINT1("QuotaAvailable is greater than buffer size!\n"); ASSERT(FALSE); @@ -913,11 +885,6 @@ break; } } - else - { - DPRINT1("Unhandled Pipe Type Mode and Read Write Mode!\n"); - ASSERT(FALSE); - } } ExReleaseFastMutex(&ReaderCcb->DataListLock);

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