Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[cgutman] 52553: [MSAFD] - Let WSPRecv handle WSPRecvFrom on a non-datagram socket (mswsock_new does this) - Fixes recvfrom on connection-oriented sockets

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jul 7 11:40:25 2011 New Revision: 52553 URL: http://svn.reactos.org/svn/reactos?rev=52553&view=rev Log: [MSAFD] - Let WSPRecv handle WSPRecvFrom on a non-datagram socket (mswsock_new does this) - Fixes recvfrom on connection-oriented sockets Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Thu Jul 7 11:40:25 2011 @@ -279,6 +279,20 @@ { *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; + } + + if (!(Socket->SharedData.ServiceFlags1 & XP1_CONNECTIONLESS)) + { + /* Call WSPRecv for a non-datagram socket */ + return WSPRecv(Handle, + lpBuffers, + dwBufferCount, + lpNumberOfBytesRead, + ReceiveFlags, + lpOverlapped, + lpCompletionRoutine, + lpThreadId, + lpErrno); } Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE,

13 years, 5 months

[cgutman] 52552: [AFD] - Rewrite user-mode send IRP handling so send errors get returned to the user properly - Fixes OskitTCP: ESHUTDOWN/EPIPE debug log spam when a chargen telnet session is termi...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jul 7 00:29:30 2011 New Revision: 52552 URL: http://svn.reactos.org/svn/reactos?rev=52552&view=rev Log: [AFD] - Rewrite user-mode send IRP handling so send errors get returned to the user properly - Fixes OskitTCP: ESHUTDOWN/EPIPE debug log spam when a chargen telnet session is terminated by the remote side Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Thu Jul 7 00:29:30 2011 @@ -23,7 +23,7 @@ PIO_STACK_LOCATION NextIrpSp; PAFD_SEND_INFO SendReq = NULL; PAFD_MAPBUF Map; - UINT TotalBytesCopied = 0, SpaceAvail, i; + UINT TotalBytesCopied = 0, TotalBytesProcessed = 0, SpaceAvail, i; /* * The Irp parameter passed in is the IRP of the stream between AFD and @@ -99,7 +99,42 @@ RtlMoveMemory( FCB->Send.Window, FCB->Send.Window + FCB->Send.BytesUsed, FCB->Send.BytesUsed - Irp->IoStatus.Information ); - FCB->Send.BytesUsed -= Irp->IoStatus.Information; + + TotalBytesProcessed = 0; + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && + TotalBytesProcessed != Irp->IoStatus.Information) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = GetLockedData(NextIrp, NextIrpSp); + Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); + + TotalBytesCopied = 0; + + for( i = 0; i < SendReq->BufferCount; i++ ) + TotalBytesCopied += SendReq->BufferArray[i].len; + + NextIrp->IoStatus.Status = Irp->IoStatus.Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + + TotalBytesProcessed += TotalBytesCopied; + + (void)IoSetCancelRoutine(NextIrp, NULL); + + UnlockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + FALSE ); + + if (NextIrp->MdlAddress) UnlockRequest(NextIrp, NextIrpSp); + + IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); + } + + ASSERT(TotalBytesProcessed == Irp->IoStatus.Information); + + FCB->Send.BytesUsed -= TotalBytesProcessed; while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = @@ -139,19 +174,6 @@ if (NextIrp != NULL) { FCB->Send.BytesUsed += TotalBytesCopied; - - NextIrp->IoStatus.Status = STATUS_SUCCESS; - NextIrp->IoStatus.Information = TotalBytesCopied; - - (void)IoSetCancelRoutine(NextIrp, NULL); - - UnlockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - FALSE ); - - if (NextIrp->MdlAddress) UnlockRequest(NextIrp, NextIrpSp); - - IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); } else break; @@ -198,6 +220,7 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PLIST_ENTRY NextIrpEntry; PIRP NextIrp; + PAFD_SEND_INFO SendReq; AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", Irp->IoStatus.Status, @@ -210,29 +233,47 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ - if (Irp->IoStatus.Status == STATUS_SUCCESS) - { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - if( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); - NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; - NextIrp->IoStatus.Information = 0; - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - (void)IoSetCancelRoutine(NextIrp, NULL); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; - } - - SocketStateUnlock( FCB ); + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + SendReq = GetLockedData(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(NextIrp, NULL); + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; + } + + ASSERT(!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); + + /* TDI spec guarantees FIFO ordering on IRPs */ + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + + SendReq = GetLockedData(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + + NextIrp->IoStatus.Status = Irp->IoStatus.Status; + NextIrp->IoStatus.Information = Irp->IoStatus.Information; + + (void)IoSetCancelRoutine(NextIrp, NULL); + + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + + UnlockRequest(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + + IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); + + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval(FCB->DeviceExt, FCB->FileObject); + + SocketStateUnlock(FCB); return STATUS_SUCCESS; } @@ -244,7 +285,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; - ULONG Information; UINT TotalBytesCopied = 0, i, SpaceAvail = 0; BOOLEAN NoSpace = FALSE; @@ -278,29 +318,33 @@ Status = TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); - if( NT_SUCCESS(Status) ) { - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); - - ExFreePool( TargetAddress ); - } - - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - - /* Even if we were pended, we're done with the user buffer at this - * point. */ - Information = SendReq->BufferArray[0].len; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); + if( NT_SUCCESS(Status) ) { + FCB->PollState &= ~AFD_EVENT_SEND; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING) + { + TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB); + } + + ExFreePool( TargetAddress ); + + SocketStateUnlock(FCB); + + return STATUS_PENDING; + } + else + { + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + } } if (FCB->DisconnectPending && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) @@ -370,6 +414,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_BUFFER_OVERFLOW, Irp, 0); } + SpaceAvail += TotalBytesCopied; NoSpace = TRUE; break; } @@ -394,12 +439,38 @@ return UnlockAndMaybeComplete ( FCB, STATUS_SUCCESS, Irp, TotalBytesCopied ); } - + + if (SpaceAvail) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; + } + if (!NoSpace) { - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); FCB->Send.BytesUsed += TotalBytesCopied; - AFD_DbgPrint(MID_TRACE,("Completed %d bytes\n", TotalBytesCopied)); + AFD_DbgPrint(MID_TRACE,("Copied %d bytes\n", TotalBytesCopied)); + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) + { + TdiSend(&FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB); + } + SocketStateUnlock(FCB); + + return STATUS_PENDING; } else { @@ -414,38 +485,6 @@ return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } } - - if (!FCB->SendIrp.InFlightRequest) - { - Status = TdiSend( &FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB ); - - if( Status == STATUS_PENDING ) - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", - Status, TotalBytesCopied)); - } - - if (SpaceAvail) - { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - else - { - FCB->PollState &= ~AFD_EVENT_SEND; - } - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied ); } NTSTATUS NTAPI @@ -456,7 +495,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO_UDP SendReq; - ULONG Information; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -514,27 +552,29 @@ if( NT_SUCCESS(Status) ) { FCB->PollState &= ~AFD_EVENT_SEND; - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING) + { + TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB); + } ExFreePool( TargetAddress ); - } - - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - - /* Even if we were pended, we're done with the user buffer at this - * point. */ - Information = SendReq->BufferArray[0].len; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); + + SocketStateUnlock(FCB); + + return STATUS_PENDING; + } + else + { + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + } }

13 years, 5 months

[tkreuzer] 52551: [RPCRT4] Fix MSVC version of call_server_func

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 7 00:21:41 2011 New Revision: 52551 URL: http://svn.reactos.org/svn/reactos?rev=52551&view=rev Log: [RPCRT4] Fix MSVC version of call_server_func Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Thu Jul 7 00:21:41 2011 @@ -841,11 +841,12 @@ __asm { push ebp + mov ebp, esp push edi ; Save registers push esi - mov ebp, esp mov eax, [ebp+16] ; Get stack size sub esp, eax ; Make room in stack for arguments + and esp, 0xFFFFFFF0 mov edi, esp mov ecx, eax mov esi, [ebp+12]

13 years, 5 months

[tfaber] 52550: [KMTESTS] - add support for special-purpose standalone drivers - add standalone driver to Example test

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jul 6 22:23:03 2011 New Revision: 52550 URL: http://svn.reactos.org/svn/reactos?rev=52550&view=rev Log: [KMTESTS] - add support for special-purpose standalone drivers - add standalone driver to Example test Added: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -4,7 +4,7 @@ # # subdirectories containing special-purpose drivers # -#add_subdirectory(something) +add_subdirectory(Example) # # kmtest_drv.sys driver Modified: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/d… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + <directory name="example"> + <xi:include href="example/example_drv.rbuild" /> + </directory> <xi:include href="kmtest.rbuild" /> <xi:include href="kmtest_drv.rbuild" /> </group> Added: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,15 @@ +include_directories( + ../include) + +list(APPEND EXAMPLE_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + Example_drv.c) + +add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE}) + +set_module_type(example_drv kernelmodedriver) +target_link_libraries(example_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(example_drv ntoskrnl hal) +set_property(TARGET example_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) + +add_cd_file(TARGET example_drv DESTINATION reactos/system32/drivers FOR all) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_EXAMPLE_H_ +#define _KMTEST_EXAMPLE_H_ + +typedef struct +{ + int a; + char b[8]; +} MY_STRUCT, *PMY_STRUCT; + +#define IOCTL_NOTIFY 1 +#define IOCTL_SEND_STRING 2 +#define IOCTL_SEND_MYSTRUCT 3 + +#endif /* !defined _KMTEST_EXAMPLE_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,246 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> + +#include <kmt_test.h> + +//#define NDEBUG +#include <debug.h> + +#include "Example.h" + +/* prototypes */ +static KMT_MESSAGE_HANDLER TestMessageHandler; +static KMT_IRP_HANDLER TestIrpHandler; + +/* globals */ +static PDRIVER_OBJECT TestDriverObject; + +/** + * @name TestEntry + * + * Test entry point. + * This is called by DriverEntry as early as possible, but with ResultBuffer + * initialized, so that test macros work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param RegistryPath + * Driver Registry Path + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param DeviceName + * Pointer to receive a test-specific name for the device to create + * @param Flags + * Pointer to a flags variable instructing DriverEntry how to proceed. + * See the KMT_TESTENTRY_FLAGS enumeration for possible values + * Initialized to zero on entry + * + * @return Status. + * DriverEntry will fail if this is a failure status + */ +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT("Entry!\n"); + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + *DeviceName = L"Example"; + + trace("Hi, this is the example driver\n"); + + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CLOSE, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +/** + * @name TestUnload + * + * Test unload routine. + * This is called by the driver's Unload routine as early as possible, with + * ResultBuffer and the test device object still valid, so that test macros + * work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by Unload before the call + * to TestEntry + * + * @return Status + */ +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + DPRINT("Unload!\n"); + + ok_irql(PASSIVE_LEVEL); + ok_eq_pointer(DriverObject, TestDriverObject); + + trace("Unloading example driver\n"); +} + +/** + * @name TestMessageHandler + * + * Test message handler routine + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +TestMessageHandler( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + switch (ControlCode) + { + case IOCTL_NOTIFY: + { + static int TimesReceived = 0; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 1 %d times\n", TimesReceived); + ok_eq_pointer(Buffer, NULL); + ok_eq_ulong((ULONG)InLength, 0LU); + ok_eq_ulong((ULONG)*OutLength, 0LU); + break; + } + case IOCTL_SEND_STRING: + { + static int TimesReceived = 0; + ANSI_STRING ExpectedString = RTL_CONSTANT_STRING("yay"); + ANSI_STRING ReceivedString; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 2 %d times\n", TimesReceived); + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_ulong((ULONG)InLength, (ULONG)ExpectedString.Length); + ok_eq_ulong((ULONG)*OutLength, 0LU); + ReceivedString.MaximumLength = ReceivedString.Length = (USHORT)InLength; + ReceivedString.Buffer = Buffer; + ok(RtlCompareString(&ExpectedString, &ReceivedString, FALSE) == 0, "Received string: %Z\n", &ReceivedString); + break; + } + case IOCTL_SEND_MYSTRUCT: + { + static int TimesReceived = 0; + MY_STRUCT ExpectedStruct = { 123, ":D" }; + MY_STRUCT ResultStruct = { 456, "!!!" }; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 3 %d times\n", TimesReceived); + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_ulong((ULONG)InLength, (ULONG)sizeof ExpectedStruct); + ok_eq_ulong((ULONG)*OutLength, 2LU * sizeof ExpectedStruct); + if (!skip(Buffer && InLength >= sizeof ExpectedStruct, "Cannot read from buffer!\n")) + ok(RtlCompareMemory(&ExpectedStruct, Buffer, sizeof ExpectedStruct) == sizeof ExpectedStruct, "Buffer does not contain expected values\n"); + + if (!skip(Buffer && *OutLength >= 2 * sizeof ExpectedStruct, "Cannot write to buffer!\n")) + { + RtlCopyMemory((PCHAR)Buffer + sizeof ExpectedStruct, &ResultStruct, sizeof ResultStruct); + *OutLength = 2 * sizeof ExpectedStruct; + } + break; + } + default: + ok(0, "Got an unknown message! DeviceObject=%p, ControlCode=%lu, Buffer=%p, In=%lu, Out=%lu bytes\n", + DeviceObject, ControlCode, Buffer, InLength, *OutLength); + break; + } + + return Status; +} + +/** + * @name TestIrpHandler + * + * Test IRP handler routine + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +TestIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("IRP!\n"); + + ok_irql(PASSIVE_LEVEL); + ok_eq_pointer(DeviceObject->DriverObject, TestDriverObject); + + if (IoStackLocation->MajorFunction == IRP_MJ_CREATE) + trace("Got IRP_MJ_CREATE!\n"); + else if (IoStackLocation->MajorFunction == IRP_MJ_CLOSE) + trace("Got IRP_MJ_CLOSE!\n"); + else + trace("Got an IRP!\n"); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -10,10 +10,14 @@ #include <windows.h> #include <kmt_test.h> +#include "Example.h" + START_TEST(Example) { /* do some user-mode stuff */ SYSTEM_INFO SystemInfo; + MY_STRUCT MyStruct[2] = { { 123, ":D" }, { 0 } }; + DWORD Length = sizeof MyStruct; trace("Message from user-mode\n"); @@ -23,4 +27,21 @@ /* now run the kernel-mode part (see Example.c). * If no user-mode part exists, this is what's done automatically */ KmtRunKernelTest("Example"); + + /* now start the special-purpose driver */ + KmtLoadDriver(L"Example", FALSE); + trace("After Entry\n"); + KmtOpenDriver(); + trace("After Create\n"); + + ok(KmtSendToDriver(IOCTL_NOTIFY) == ERROR_SUCCESS, "\n"); + ok(KmtSendStringToDriver(IOCTL_SEND_STRING, "yay") == ERROR_SUCCESS, "\n"); + ok(KmtSendBufferToDriver(IOCTL_SEND_MYSTRUCT, MyStruct, sizeof MyStruct[0], &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(MyStruct[1].a, 456); + ok_eq_str(MyStruct[1].b, "!!!"); + + KmtCloseDriver(); + trace("After Close\n"); + KmtUnloadDriver(); + trace("After Unload\n"); } Added: branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,14 @@ +<module name="example_drv" type="kernelmodedriver" installbase="system32/drivers" installname="example_drv.sys"> + <include base="kmtest_drv">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <library>kmtest_printf</library> + <define name="KMT_STANDALONE_DRIVER" /> + <file>Example_drv.c</file> + <directory name=".."> + <directory name="kmtest_drv"> + <file>kmtest_standalone.c</file> + </directory> + </directory> +</module> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -38,6 +38,40 @@ CHAR LogBuffer[ANYSIZE_ARRAY]; } KMT_RESULTBUFFER, *PKMT_RESULTBUFFER; +#ifdef KMT_STANDALONE_DRIVER +#define KMT_KERNEL_MODE + +typedef NTSTATUS (KMT_IRP_HANDLER)( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation); +typedef KMT_IRP_HANDLER *PKMT_IRP_HANDLER; + +NTSTATUS KmtRegisterIrpHandler(IN UCHAR MajorFunction, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_IRP_HANDLER IrpHandler); +NTSTATUS KmtUnregisterIrpHandler(IN UCHAR MajorFunction, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_IRP_HANDLER IrpHandler); + +typedef NTSTATUS (KMT_MESSAGE_HANDLER)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength); +typedef KMT_MESSAGE_HANDLER *PKMT_MESSAGE_HANDLER; + +NTSTATUS KmtRegisterMessageHandler(IN ULONG ControlCode OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_MESSAGE_HANDLER MessageHandler); +NTSTATUS KmtUnregisterMessageHandler(IN ULONG ControlCode OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_MESSAGE_HANDLER MessageHandler); + +typedef enum +{ + TESTENTRY_NO_CREATE_DEVICE = 1, + TESTENTRY_NO_REGISTER_DISPATCH = 2, + TESTENTRY_NO_REGISTER_UNLOAD = 4, +} KMT_TESTENTRY_FLAGS; + +NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, OUT INT *Flags); +VOID TestUnload(IN PDRIVER_OBJECT DriverObject); +#endif /* defined KMT_STANDALONE_DRIVER */ + #ifdef KMT_KERNEL_MODE /* Device Extension layout */ typedef struct @@ -55,7 +89,7 @@ DWORD KmtSendToDriver(IN DWORD ControlCode); DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); -DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer, IN OUT PDWORD Length); +DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); #endif /* defined KMT_USER_MODE */ extern PKMT_RESULTBUFFER ResultBuffer; @@ -105,7 +139,7 @@ #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) #define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ - 0xA00 + (ControlCode), \ + 0xC00 + (ControlCode), \ METHOD_BUFFERED, \ FILE_ANY_ACCESS) Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -192,6 +192,8 @@ { DWORD BytesRead; + assert(ControlCode < 0x400); + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), NULL, 0, NULL, 0, &BytesRead, NULL)) return GetLastError(); @@ -215,6 +217,8 @@ { DWORD BytesRead; + assert(ControlCode < 0x400); + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), (PVOID)String, strlen(String), NULL, 0, &BytesRead, NULL)) return GetLastError(); @@ -226,19 +230,23 @@ * * @param ControlCode * @param Buffer - * @param Length + * @param InLength + * @param OutLength * * @return Win32 error code as returned by DeviceIoControl */ DWORD KmtSendBufferToDriver( IN DWORD ControlCode, - IN OUT PVOID Buffer, - IN OUT PDWORD Length) -{ - assert(Length); - - if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), Buffer, *Length, NULL, 0, Length, NULL)) + IN OUT PVOID Buffer OPTIONAL, + IN DWORD InLength, + IN OUT PDWORD OutLength) +{ + assert(OutLength); + assert(Buffer || (!InLength && !*OutLength)); + assert(ControlCode < 0x400); + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), Buffer, InLength, Buffer, *OutLength, OutLength, NULL)) return GetLastError(); return ERROR_SUCCESS; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,7 +1,6 @@ <module name="kmtest_drv" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> - <library>ntdll</library> <library>hal</library> <library>pseh</library> <library>kmtest_printf</library> Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,513 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> + +#define KMT_DEFINE_TEST_FUNCTIONS +#include <kmt_test.h> + +//#define NDEBUG +#include <debug.h> + +#include <kmt_public.h> + +/* types */ +typedef struct +{ + UCHAR MajorFunction; + PDEVICE_OBJECT DeviceObject; + PKMT_IRP_HANDLER IrpHandler; +} KMT_IRP_HANDLER_ENTRY, *PKMT_IRP_HANDLER_ENTRY; + +typedef struct +{ + ULONG ControlCode; + PDEVICE_OBJECT DeviceObject; + PKMT_MESSAGE_HANDLER MessageHandler; +} KMT_MESSAGE_HANDLER_ENTRY, *PKMT_MESSAGE_HANDLER_ENTRY; + +/* Prototypes */ +DRIVER_INITIALIZE DriverEntry; +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH DriverDispatch; +static KMT_IRP_HANDLER DeviceControlHandler; + +/* Globals */ +static PDEVICE_OBJECT TestDeviceObject; +static PDEVICE_OBJECT KmtestDeviceObject; + +#define KMT_MAX_IRP_HANDLERS 256 +static KMT_IRP_HANDLER_ENTRY IrpHandlers[KMT_MAX_IRP_HANDLERS] = { { 0 } }; +#define KMT_MAX_MESSAGE_HANDLERS 256 +static KMT_MESSAGE_HANDLER_ENTRY MessageHandlers[KMT_MAX_MESSAGE_HANDLERS] = { { 0 } }; + +static const char *IrpMajorFunctionNames[] = +{ + "Create", + "CreateNamedPipe", + "Close", + "Read", + "Write", + "QueryInformation", + "SetInformation", + "QueryEa", + "SetEa", + "FlushBuffers", + "QueryVolumeInformation", + "SetVolumeInformation", + "DirectoryControl", + "FileSystemControl", + "DeviceControl", + "InternalDeviceControl/Scsi", + "Shutdown", + "LockControl", + "Cleanup", + "CreateMailslot", + "QuerySecurity", + "SetSecurity", + "Power", + "SystemControl", + "DeviceChange", + "QueryQuota", + "SetQuota", + "Pnp/PnpPower" +}; + +/** + * @name DriverEntry + * + * Driver entry point. + * + * @param DriverObject + * Driver Object + * @param RegistryPath + * Driver Registry Path + * + * @return Status + */ +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status = STATUS_SUCCESS; + WCHAR DeviceNameBuffer[128] = L"\\Device\\Kmtest-"; + UNICODE_STRING KmtestDeviceName; + PFILE_OBJECT KmtestFileObject; + PKMT_DEVICE_EXTENSION KmtestDeviceExtension; + UNICODE_STRING DeviceName; + PCWSTR DeviceNameSuffix; + INT Flags = 0; + int i; + + PAGED_CODE(); + + DPRINT("DriverEntry\n"); + + /* get the Kmtest device, so that we get a ResultBuffer pointer */ + RtlInitUnicodeString(&KmtestDeviceName, KMTEST_DEVICE_DRIVER_PATH); + Status = IoGetDeviceObjectPointer(&KmtestDeviceName, FILE_ALL_ACCESS, &KmtestFileObject, &KmtestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Kmtest device object pointer\n"); + goto cleanup; + } + + Status = ObReferenceObjectByPointer(KmtestDeviceObject, FILE_ALL_ACCESS, NULL, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference Kmtest device object\n"); + goto cleanup; + } + + ObDereferenceObject(KmtestFileObject); + KmtestFileObject = NULL; + KmtestDeviceExtension = KmtestDeviceObject->DeviceExtension; + ResultBuffer = KmtestDeviceExtension->ResultBuffer; + DPRINT("KmtestDeviceObject: %p\n", (PVOID)KmtestDeviceObject); + DPRINT("KmtestDeviceExtension: %p\n", (PVOID)KmtestDeviceExtension); + DPRINT("Setting ResultBuffer: %p\n", (PVOID)ResultBuffer); + + /* call TestEntry */ + RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + DeviceName.MaximumLength = sizeof DeviceNameBuffer; + TestEntry(DriverObject, RegistryPath, &DeviceNameSuffix, &Flags); + RtlAppendUnicodeToString(&DeviceName, DeviceNameSuffix); + + /* create test device */ + if (!(Flags & TESTENTRY_NO_CREATE_DEVICE)) + { + Status = IoCreateDevice(DriverObject, 0, &DeviceName, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, + TRUE, &TestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create device object %wZ\n", &DeviceName); + goto cleanup; + } + + DPRINT("DriverEntry. Created DeviceObject %p\n", + TestDeviceObject); + } + + /* initialize dispatch functions */ + if (!(Flags & TESTENTRY_NO_REGISTER_UNLOAD)) + DriverObject->DriverUnload = DriverUnload; + if (!(Flags & TESTENTRY_NO_REGISTER_DISPATCH)) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; ++i) + DriverObject->MajorFunction[i] = DriverDispatch; + +cleanup: + if (TestDeviceObject && !NT_SUCCESS(Status)) + { + IoDeleteDevice(TestDeviceObject); + TestDeviceObject = NULL; + } + + if (KmtestDeviceObject && !NT_SUCCESS(Status)) + { + ObDereferenceObject(KmtestDeviceObject); + KmtestDeviceObject = NULL; + if (KmtestFileObject) + ObDereferenceObject(KmtestFileObject); + } + + return Status; +} + +/** + * @name DriverUnload + * + * Driver cleanup funtion. + * + * @param DriverObject + * Driver Object + */ +static +VOID +NTAPI +DriverUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); + + DPRINT("DriverUnload\n"); + + TestUnload(DriverObject); + + if (TestDeviceObject) + IoDeleteDevice(TestDeviceObject); + + if (KmtestDeviceObject) + ObDereferenceObject(KmtestDeviceObject); +} + +/** + * @name KmtRegisterIrpHandler + * + * Register a handler with the IRP Dispatcher. + * If multiple registered handlers match an IRP, it is unspecified which of + * them is called on IRP reception + * + * @param MajorFunction + * IRP major function code to be handled + * @param DeviceObject + * Device Object to handle IRPs for. + * Can be NULL to indicate any device object + * @param IrpHandler + * Handler function to register. + * + * @return Status + */ +NTSTATUS +KmtRegisterIrpHandler( + IN UCHAR MajorFunction, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_IRP_HANDLER IrpHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + if (MajorFunction > IRP_MJ_MAXIMUM_FUNCTION) + { + Status = STATUS_INVALID_PARAMETER_1; + goto cleanup; + } + + if (IrpHandler == NULL) + { + Status = STATUS_INVALID_PARAMETER_3; + goto cleanup; + } + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + if (IrpHandlers[i].IrpHandler == NULL) + { + IrpHandlers[i].MajorFunction = MajorFunction; + IrpHandlers[i].DeviceObject = DeviceObject; + IrpHandlers[i].IrpHandler = IrpHandler; + goto cleanup; + } + + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + +cleanup: + return Status; +} + +/** + * @name KmtUnregisterIrpHandler + * + * Unregister a handler with the IRP Dispatcher. + * Parameters must be specified exactly as in the call to + * KmtRegisterIrpHandler. Only the first matching entry will be removed + * if multiple exist + * + * @param MajorFunction + * IRP major function code of the handler to be removed + * @param DeviceObject + * Device Object to of the handler to be removed + * @param IrpHandler + * Handler function of the handler to be removed + * + * @return Status + */ +NTSTATUS +KmtUnregisterIrpHandler( + IN UCHAR MajorFunction, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_IRP_HANDLER IrpHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + if (IrpHandlers[i].MajorFunction == MajorFunction && + IrpHandlers[i].DeviceObject == DeviceObject && + IrpHandlers[i].IrpHandler == IrpHandler) + { + IrpHandlers[i].IrpHandler = NULL; + goto cleanup; + } + + Status = STATUS_NOT_FOUND; + +cleanup: + return Status; +} + +/** + * @name DriverDispatch + * + * Driver Dispatch function + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static +NTSTATUS +NTAPI +DriverDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStackLocation; + int i; + + PAGED_CODE(); + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("DriverDispatch: Function=%s, Device=%p\n", + IrpMajorFunctionNames[IoStackLocation->MajorFunction], + DeviceObject); + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + { + if (IrpHandlers[i].MajorFunction == IoStackLocation->MajorFunction && + (IrpHandlers[i].DeviceObject == NULL || IrpHandlers[i].DeviceObject == DeviceObject) && + IrpHandlers[i].IrpHandler != NULL) + return IrpHandlers[i].IrpHandler(DeviceObject, Irp, IoStackLocation); + } + + /* default handler for DeviceControl */ + if (IoStackLocation->MajorFunction == IRP_MJ_DEVICE_CONTROL || + IoStackLocation->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL) + return DeviceControlHandler(DeviceObject, Irp, IoStackLocation); + + /* default handler */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/** + * @name KmtRegisterMessageHandler + * + * Register a handler with the DeviceControl Dispatcher. + * If multiple registered handlers match a message, it is unspecified which of + * them is called on message reception. + * NOTE: message handlers registered with this function will not be called + * if a custom IRP handler matching the corresponding IRP is installed! + * + * @param ControlCode + * Control code to be handled, as passed by the application. + * Can be 0 to indicate any control code + * @param DeviceObject + * Device Object to handle IRPs for. + * Can be NULL to indicate any device object + * @param MessageHandler + * Handler function to register. + * + * @return Status + */ +NTSTATUS +KmtRegisterMessageHandler( + IN ULONG ControlCode OPTIONAL, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_MESSAGE_HANDLER MessageHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + if (ControlCode >= 0x400) + { + Status = STATUS_INVALID_PARAMETER_1; + goto cleanup; + } + + if (MessageHandler == NULL) + { + Status = STATUS_INVALID_PARAMETER_2; + goto cleanup; + } + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + if (MessageHandlers[i].MessageHandler == NULL) + { + MessageHandlers[i].ControlCode = ControlCode; + MessageHandlers[i].DeviceObject = DeviceObject; + MessageHandlers[i].MessageHandler = MessageHandler; + goto cleanup; + } + + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + +cleanup: + return Status; +} + +/** + * @name KmtUnregisterMessageHandler + * + * Unregister a handler with the DeviceControl Dispatcher. + * Parameters must be specified exactly as in the call to + * KmtRegisterMessageHandler. Only the first matching entry will be removed + * if multiple exist + * + * @param ControlCode + * Control code of the handler to be removed + * @param DeviceObject + * Device Object to of the handler to be removed + * @param MessageHandler + * Handler function of the handler to be removed + * + * @return Status + */ +NTSTATUS +KmtUnregisterMessageHandler( + IN ULONG ControlCode OPTIONAL, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_MESSAGE_HANDLER MessageHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + if (MessageHandlers[i].ControlCode == ControlCode && + MessageHandlers[i].DeviceObject == DeviceObject && + MessageHandlers[i].MessageHandler == MessageHandler) + { + MessageHandlers[i].MessageHandler = NULL; + goto cleanup; + } + + Status = STATUS_NOT_FOUND; + +cleanup: + return Status; +} + +/** + * @name DeviceControlHandler + * + * Default IRP_MJ_DEVICE_CONTROL/IRP_MJ_INTERNAL_DEVICE_CONTROL handler + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +DeviceControlHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG ControlCode = (IoStackLocation->Parameters.DeviceIoControl.IoControlCode & 0x00000FFC) >> 2; + ULONG OutLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + int i; + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + { + if ((MessageHandlers[i].ControlCode == 0 || + MessageHandlers[i].ControlCode == ControlCode) && + (MessageHandlers[i].DeviceObject == NULL || MessageHandlers[i].DeviceObject == DeviceObject) && + MessageHandlers[i].MessageHandler != NULL) + { + Status = MessageHandlers[i].MessageHandler(DeviceObject, ControlCode, Irp->AssociatedIrp.SystemBuffer, + IoStackLocation->Parameters.DeviceIoControl.InputBufferLength, + &OutLength); + break; + } + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = OutLength; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 5 months

[tfaber] 52549: [KMTESTS] - add a user-mode part to the example testlist.c - misc fixes

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jul 6 18:55:21 2011 New Revision: 52549 URL: http://svn.reactos.org/svn/reactos?rev=52549&view=rev Log: [KMTESTS] - add a user-mode part to the example testlist.c - misc fixes Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -50,6 +50,9 @@ kmtest/service.c kmtest/support.c kmtest/testlist.c + + example/Example_user.c + kmtest/kmtest.rc) add_executable(kmtest ${KMTEST_SOURCE}) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test kernel-mode part + * PURPOSE: Kernel-Mode Test Suite Example kernel-mode test part * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example user-mode test part + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <kmt_test.h> + +START_TEST(Example) +{ + /* do some user-mode stuff */ + SYSTEM_INFO SystemInfo; + + trace("Message from user-mode\n"); + + GetSystemInfo(&SystemInfo); + ok(SystemInfo.dwActiveProcessorMask != 0, "No active processors?!\n"); + + /* now run the kernel-mode part (see Example.c). + * If no user-mode part exists, this is what's done automatically */ + KmtRunKernelTest("Example"); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -46,6 +46,8 @@ PMDL Mdl; } KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; #elif defined KMT_USER_MODE +DWORD KmtRunKernelTest(IN PCSTR TestName); + VOID KmtLoadDriver(IN PCWSTR ServiceName, IN BOOLEAN RestartIfRunning); VOID KmtUnloadDriver(VOID); VOID KmtOpenDriver(VOID); Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -8,4 +8,7 @@ <file>support.c</file> <file>testlist.c</file> </directory> + <directory name="example"> + <file>Example_user.c</file> + </directory> </module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -26,7 +26,7 @@ #define LOGBUFFER_SIZE 65000 #define RESULTBUFFER_SIZE FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]) -static HANDLE KmtestHandle; +HANDLE KmtestHandle; PCSTR ErrorFileAndLine = "No error"; static void OutputError(DWORD Error); @@ -223,15 +223,14 @@ TestFunction(); goto cleanup; } - + // not found in user-mode test list, call driver - if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_RUN_TEST, (PVOID)TestName, strlen(TestName), NULL, 0, &BytesRead, NULL)) - error_goto(Error, cleanup); + Error = KmtRunKernelTest(TestName); cleanup: if (!Error) - OutputResult(TestName); - + Error = OutputResult(TestName); + KmtFreeResultBuffer(ResultBuffer); return Error; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -50,6 +50,31 @@ /* test support functions for special-purpose drivers */ +extern HANDLE KmtestHandle; + +/** + * @name KmtRunKernelTest + * + * Run the specified kernel-mode test part + * + * @param TestName + * Name of the test to run + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtRunKernelTest( + IN PCSTR TestName) +{ + DWORD Error = ERROR_SUCCESS; + DWORD BytesRead; + + if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_RUN_TEST, (PVOID)TestName, strlen(TestName), NULL, 0, &BytesRead, NULL)) + error(Error); + + return Error; +} + static WCHAR TestServiceName[MAX_PATH]; static SC_HANDLE TestServiceHandle; static HANDLE TestDeviceHandle; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -14,6 +14,7 @@ VOID Test_Delete(VOID); VOID Test_Start(VOID); VOID Test_Stop(VOID); +VOID Test_Example(VOID); /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -22,5 +23,6 @@ { "-delete", Test_Delete }, { "-start", Test_Start }, { "-stop", Test_Stop, }, + { "Example", Test_Example }, { NULL, NULL }, };

13 years, 5 months

[tkreuzer] 52548: [NTOSKRNL] - Fix completely broken code to detect invalid MSR access in KiTrap0DHandler - Fix MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 6 18:23:04 2011 New Revision: 52548 URL: http://svn.reactos.org/svn/reactos?rev=52548&view=rev Log: [NTOSKRNL] - Fix completely broken code to detect invalid MSR access in KiTrap0DHandler - Fix MSVC warnings Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Jul 6 18:23:04 2011 @@ -42,7 +42,7 @@ 0xEE, /* OUT */ 0xEF, /* OUT */ 0x6E, /* OUTS */ - 0x6F, /* OUTS */ + 0x6F, /* OUTS */ }; PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler; @@ -143,7 +143,7 @@ KiCommonExit(TrapFrame, 0); /* Restore previous mode */ - KeGetCurrentThread()->PreviousMode = TrapFrame->PreviousPreviousMode; + KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; /* Check for user mode exit */ if (TrapFrame->SegCs & MODE_MASK) @@ -174,7 +174,7 @@ KiCommonExit(TrapFrame, 0); /* Restore previous mode */ - KeGetCurrentThread()->PreviousMode = TrapFrame->PreviousPreviousMode; + KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; /* Check if this was a V8086 trap */ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); @@ -213,7 +213,7 @@ Parameter1, Parameter2, Parameter3, - TrapFrame); + TrapFrame); } DECLSPEC_NORETURN @@ -463,7 +463,7 @@ // // Note that in reality, we are already on the NMI tss -- we just need to // update the PCR to reflect this - // + // PCR->TSS = NmiTss; __writeeflags(__readeflags() &~ EFLAGS_NESTED_TASK); TssGdt->HighWord.Bits.Dpl = 0; @@ -527,7 +527,7 @@ // Although the CPU disabled NMIs, we just did a BIOS Call, which could've // totally changed things. // - // We have to make sure we're still in our original NMI -- a nested NMI + // We have to make sure we're still in our original NMI -- a nested NMI // will point back to the NMI TSS, and in that case we're hosed. // if (PCR->TSS->Backlink != KGDT_NMI_TSS) @@ -652,7 +652,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Bring IRQL back */ @@ -910,7 +910,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Bring IRQL back */ @@ -933,7 +933,7 @@ /* Enable interrupts and check error code */ _enable(); if (!TrapFrame->ErrCode) - { + { /* FIXME: Use SEH */ Instructions = (PUCHAR)TrapFrame->Eip; @@ -1047,7 +1047,7 @@ TrapFrame); } - /* + /* * Check for a fault during checking of the user instruction. * * Note that the SEH handler will catch invalid EIP, but we could be dealing @@ -1059,7 +1059,7 @@ { /* Not implemented */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* @@ -1100,7 +1100,7 @@ if (Instructions[0] == 0xCF) { /* - * Some evil shit is going on here -- this is not the SS:ESP you're + * Some evil shit is going on here -- this is not the SS:ESP you're * looking for! Instead, this is actually CS:EIP you're looking at! * Why? Because part of the trap frame actually corresponds to the IRET * stack during the trap exit! @@ -1121,8 +1121,8 @@ /* So since we're not dealing with the above case, check for RDMSR/WRMSR */ if ((Instructions[0] == 0xF) && // 2-byte opcode - (((Instructions[1] >> 8) == 0x30) || // RDMSR - ((Instructions[2] >> 8) == 0x32))) // WRMSR + ((Instructions[1] == 0x32) || // RDMSR + (Instructions[1] == 0x30))) // WRMSR { /* Unknown CPU MSR, so raise an access violation */ KiDispatchException0Args(STATUS_ACCESS_VIOLATION, @@ -1211,7 +1211,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Check for syscall fault */ @@ -1496,7 +1496,7 @@ /* Save previous mode */ TrapFrame->PreviousPreviousMode = Thread->PreviousMode; - /* Save the SEH chain and terminate it for now */ + /* Save the SEH chain and terminate it for now */ TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END; @@ -1533,7 +1533,7 @@ goto ExitCall; } - /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ + /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ Result = KiConvertToGuiThread(); if (!NT_SUCCESS(Result)) { @@ -1541,7 +1541,7 @@ //SetLastWin32Error(RtlNtStatusToDosError(Result)); goto ExitCall; } - + /* Reload trap frame and descriptor table pointer from new stack */ TrapFrame = *(volatile PVOID*)&Thread->TrapFrame; DescriptorTable = (PVOID)(*(volatile ULONG_PTR*)&Thread->ServiceTable + Offset); Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Jul 6 18:23:04 2011 @@ -452,7 +452,7 @@ PLIST_ENTRY ListHead; PPOOL_HEADER Entry, NextEntry, FragmentEntry; KIRQL OldIrql; - ULONG BlockSize, i; + USHORT BlockSize, i; // // Some sanity checks @@ -495,7 +495,8 @@ // request would've been treated as a POOL_MAX_ALLOC earlier and resulted in // the direct allocation of pages. // - i = (NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) / POOL_BLOCK_SIZE; + i = (USHORT)((NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) + / POOL_BLOCK_SIZE); // // Loop in the free lists looking for a block if this size. Start with the @@ -748,7 +749,7 @@ IN ULONG TagToFree) { PPOOL_HEADER Entry, NextEntry; - ULONG BlockSize; + USHORT BlockSize; KIRQL OldIrql; POOL_TYPE PoolType; PPOOL_DESCRIPTOR PoolDesc;

13 years, 5 months

[tkreuzer] 52547: [NPFS] Fix 2nd stage pool corruption. CCBs are organized in a linked list in the corresponding Fcb, which is protected by Fcb->CcbListLock. They are also linked together server <-...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 6 18:14:42 2011 New Revision: 52547 URL: http://svn.reactos.org/svn/reactos?rev=52547&view=rev Log: [NPFS] Fix 2nd stage pool corruption. CCBs are organized in a linked list in the corresponding Fcb, which is protected by Fcb->CcbListLock. They are also linked together server <-> client. This way they can be referenced without holding the lock. This lead to a race condition where a CCB's link was modified after the CCB was deleted. Fix this by using a reference counter and adding appropriate functions. Also make use of pool tags. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/dirctl.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h 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] Wed Jul 6 18:14:42 2011 @@ -16,6 +16,76 @@ //#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS *****************************************************************/ + +static +VOID +NpfsDeleteFcb(PNPFS_FCB Fcb) +{ + PNPFS_VCB Vcb = Fcb->Vcb; + + KeLockMutex(&Vcb->PipeListLock); + RemoveEntryList(&Fcb->PipeListEntry); + KeUnlockMutex(&Vcb->PipeListLock); + RtlFreeUnicodeString(&Fcb->PipeName); + ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); +} + +static +PNPFS_CCB +NpfsAllocateCcb(CCB_TYPE Type, PNPFS_FCB Fcb) +{ + PNPFS_CCB Ccb; + + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_CCB), TAG_NPFS_CCB); + if (!Ccb) + { + return NULL; + } + + RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); + + Ccb->RefCount = 1; + Ccb->Type = Type; + Ccb->Fcb = Fcb; + Ccb->OtherSide = NULL; + + return Ccb; +} + +static +VOID +NpfsReferenceCcb(PNPFS_CCB Ccb) +{ + ASSERT(Ccb->RefCount > 0); + InterlockedIncrement((PLONG)&Ccb->RefCount); +} + +static +VOID +NpfsDereferenceCcb(PNPFS_CCB Ccb) +{ + /* Decrement reference count */ + ASSERT(Ccb->RefCount > 0); + if (InterlockedDecrement((PLONG)&Ccb->RefCount) == 0) + { + /* Its zero, delete CCB */ + ExFreePoolWithTag(Ccb, TAG_NPFS_CCB); + } +} + +static +VOID +NpfsCcbSetOtherSide(PNPFS_CCB Ccb, PNPFS_CCB OtherSide) +{ + /* Dereference old other side */ + if (Ccb->OtherSide) NpfsDereferenceCcb(Ccb->OtherSide); + + /* Reference the new other side */ + if (OtherSide) NpfsReferenceCcb(OtherSide); + + /* Set new value */ + Ccb->OtherSide = OtherSide; +} PNPFS_FCB NpfsFindPipe(PNPFS_VCB Vcb, @@ -114,17 +184,12 @@ DPRINT("NpfsOpenFileSystem()\n"); - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + Ccb = NpfsAllocateCcb(CCB_DEVICE, Fcb); if (Ccb == NULL) { IoStatus->Status = STATUS_NO_MEMORY; return; } - - RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); - - Ccb->Type = CCB_DEVICE; - Ccb->Fcb = Fcb; FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -145,17 +210,12 @@ DPRINT("NpfsOpenRootDirectory()\n"); - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + Ccb = NpfsAllocateCcb(CCB_DIRECTORY, Fcb); if (Ccb == NULL) { IoStatus->Status = STATUS_NO_MEMORY; return; } - - RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); - - Ccb->Type = CCB_DIRECTORY; - Ccb->Fcb = Fcb; FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -244,8 +304,7 @@ * Step 1. Find the pipe we're trying to open. */ KeLockMutex(&Vcb->PipeListLock); - Fcb = NpfsFindPipe(Vcb, - &FileObject->FileName); + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb == NULL) { /* Not found, bail out with error. */ @@ -267,7 +326,7 @@ /* * Step 2. Create the client CCB. */ - ClientCcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + ClientCcb = NpfsAllocateCcb(CCB_PIPE, Fcb); if (ClientCcb == NULL) { DPRINT("No memory!\n"); @@ -277,11 +336,8 @@ return STATUS_NO_MEMORY; } - ClientCcb->Type = CCB_PIPE; ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; - ClientCcb->Fcb = Fcb; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; - ClientCcb->OtherSide = NULL; #ifndef USING_PROPER_NPFS_WAIT_SEMANTICS ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; #else @@ -294,11 +350,13 @@ /* Initialize data list. */ if (Fcb->OutboundQuota) { - ClientCcb->Data = ExAllocatePool(PagedPool, Fcb->OutboundQuota); + ClientCcb->Data = ExAllocatePoolWithTag(PagedPool, + Fcb->OutboundQuota, + TAG_NPFS_CCB_DATA); if (ClientCcb->Data == NULL) { DPRINT("No memory!\n"); - ExFreePool(ClientCcb); + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -367,10 +425,10 @@ DPRINT("No listening server CCB found!\n"); if (ClientCcb->Data) { - ExFreePool(ClientCcb->Data); + ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); } - ExFreePool(ClientCcb); + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_OBJECT_PATH_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -391,10 +449,10 @@ if (ClientCcb->Data) { - ExFreePool(ClientCcb->Data); - } - - ExFreePool(ClientCcb); + ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); + } + + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -413,8 +471,8 @@ /* Connect to listening server side */ if (ServerCcb) { - ClientCcb->OtherSide = ServerCcb; - ServerCcb->OtherSide = ClientCcb; + NpfsCcbSetOtherSide(ClientCcb, ServerCcb); + NpfsCcbSetOtherSide(ServerCcb, ClientCcb); ClientCcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerCcb->PipeState = FILE_PIPE_CONNECTED_STATE; KeSetEvent(&ServerCcb->ConnectEvent, IO_NO_INCREMENT, FALSE); @@ -467,23 +525,12 @@ return STATUS_INVALID_PARAMETER; } - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); - if (Ccb == NULL) - { - Irp->IoStatus.Status = STATUS_NO_MEMORY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NO_MEMORY; - } - - Ccb->Type = CCB_PIPE; - Ccb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; KeLockMutex(&Vcb->PipeListLock); /* * First search for existing Pipe with the same name. */ - Fcb = NpfsFindPipe(Vcb, - &FileObject->FileName); + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb != NULL) { /* @@ -495,7 +542,6 @@ if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { DPRINT("Out of instances.\n"); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSTANCE_NOT_AVAILABLE; @@ -506,7 +552,6 @@ Fcb->PipeType != Buffer->NamedPipeType) { DPRINT("Asked for invalid pipe mode.\n"); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_ACCESS_DENIED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_ACCESS_DENIED; @@ -515,11 +560,10 @@ else { NewPipe = TRUE; - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); if (Fcb == NULL) { KeUnlockMutex(&Vcb->PipeListLock); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -530,12 +574,13 @@ Fcb->Vcb = Vcb; Fcb->PipeName.Length = FileObject->FileName.Length; Fcb->PipeName.MaximumLength = Fcb->PipeName.Length + sizeof(UNICODE_NULL); - Fcb->PipeName.Buffer = ExAllocatePool(NonPagedPool, Fcb->PipeName.MaximumLength); + Fcb->PipeName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + Fcb->PipeName.MaximumLength, + TAG_NPFS_NAMEBLOCK); if (Fcb->PipeName.Buffer == NULL) { KeUnlockMutex(&Vcb->PipeListLock); - ExFreePool(Fcb); - ExFreePool(Ccb); + ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -623,20 +668,33 @@ KeUnlockMutex(&Vcb->PipeListLock); } + Ccb = NpfsAllocateCcb(CCB_PIPE, Fcb); + if (Ccb == NULL) + { + if (NewPipe) + { + NpfsDeleteFcb(Fcb); + } + + Irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + Ccb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; + if (Fcb->InboundQuota) { - Ccb->Data = ExAllocatePool(PagedPool, Fcb->InboundQuota); + Ccb->Data = ExAllocatePoolWithTag(PagedPool, + Fcb->InboundQuota, + TAG_NPFS_CCB_DATA); if (Ccb->Data == NULL) { - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); if (NewPipe) { - KeLockMutex(&Vcb->PipeListLock); - RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&Vcb->PipeListLock); - RtlFreeUnicodeString(&Fcb->PipeName); - ExFreePool(Fcb); + NpfsDeleteFcb(Fcb); } Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -662,7 +720,6 @@ Ccb->Fcb = Fcb; Ccb->PipeEnd = FILE_PIPE_SERVER_END; Ccb->PipeState = FILE_PIPE_LISTENING_STATE; - Ccb->OtherSide = NULL; DPRINT("CCB: %p\n", Ccb); @@ -753,6 +810,8 @@ if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->OtherSide)) { OtherSide = Ccb->OtherSide; + ASSERT(OtherSide->OtherSide == Ccb); + /* Lock the server first */ if (Server) { @@ -764,7 +823,11 @@ ExAcquireFastMutex(&OtherSide->DataListLock); ExAcquireFastMutex(&Ccb->DataListLock); } - OtherSide->OtherSide = NULL; + + /* Unlink FCBs */ + NpfsCcbSetOtherSide(OtherSide, NULL); + NpfsCcbSetOtherSide(Ccb, NULL); + /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -824,7 +887,7 @@ ExAcquireFastMutex(&Ccb->DataListLock); if (Ccb->Data) { - ExFreePool(Ccb->Data); + ExFreePoolWithTag(Ccb->Data, TAG_NPFS_CCB_DATA); Ccb->Data = NULL; Ccb->ReadPtr = NULL; Ccb->WritePtr = NULL; @@ -871,7 +934,7 @@ { DPRINT("Closing the file system!\n"); - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); FileObject->FsContext = NULL; FileObject->FsContext2 = NULL; @@ -886,9 +949,10 @@ DPRINT("Closing the root directory!\n"); if (Ccb->u.Directory.SearchPattern.Buffer != NULL) - ExFreePool(Ccb->u.Directory.SearchPattern.Buffer); - - ExFreePool(Ccb); + ExFreePoolWithTag(Ccb->u.Directory.SearchPattern.Buffer, + TAG_NPFS_NAMEBLOCK); + + NpfsDereferenceCcb(Ccb); FileObject->FsContext = NULL; FileObject->FsContext2 = NULL; @@ -920,8 +984,9 @@ /* Disconnect the pipes */ if (Ccb->OtherSide) { - Ccb->OtherSide->OtherSide = NULL; - Ccb->OtherSide = NULL; + ASSERT(Ccb->OtherSide->OtherSide == Ccb); + NpfsCcbSetOtherSide(Ccb->OtherSide, NULL); + NpfsCcbSetOtherSide(Ccb, NULL); } ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); @@ -930,18 +995,14 @@ RemoveEntryList(&Ccb->CcbListEntry); - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); KeUnlockMutex(&Fcb->CcbListLock); if (IsListEmpty(&Fcb->ServerCcbListHead) && IsListEmpty(&Fcb->ClientCcbListHead)) { - KeLockMutex(&Vcb->PipeListLock); - RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&Vcb->PipeListLock); - RtlFreeUnicodeString(&Fcb->PipeName); - ExFreePool(Fcb); + NpfsDeleteFcb(Fcb); FileObject->FsContext = NULL; } Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Wed Jul 6 18:14:42 2011 @@ -71,7 +71,9 @@ if (SearchPattern != NULL) { Ccb->u.Directory.SearchPattern.Buffer = - ExAllocatePool(NonPagedPool, SearchPattern->Length + sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, + SearchPattern->Length + sizeof(WCHAR), + TAG_NPFS_NAMEBLOCK); if (Ccb->u.Directory.SearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -87,7 +89,9 @@ else { Ccb->u.Directory.SearchPattern.Buffer = - ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, + 2 * sizeof(WCHAR), + TAG_NPFS_NAMEBLOCK); if (Ccb->u.Directory.SearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; 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] Wed Jul 6 18:14:42 2011 @@ -441,7 +441,9 @@ /* Calculate the pipe name length and allocate the buffer */ PipeName.Length = WaitPipe->NameLength + sizeof(WCHAR); PipeName.MaximumLength = PipeName.Length + sizeof(WCHAR); - PipeName.Buffer = ExAllocatePool(NonPagedPool, PipeName.MaximumLength); + PipeName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + PipeName.MaximumLength, + TAG_NPFS_NAMEBLOCK); if (PipeName.Buffer == NULL) { DPRINT1("Could not allocate memory for the pipe name!\n"); @@ -471,7 +473,7 @@ KeUnlockMutex(&Vcb->PipeListLock); /* Release the pipe name buffer */ - ExFreePool(PipeName.Buffer); + ExFreePoolWithTag(PipeName.Buffer, TAG_NPFS_NAMEBLOCK); /* Fail if not pipe was found */ if (Fcb == NULL) Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] Wed Jul 6 18:14:42 2011 @@ -86,13 +86,13 @@ Vcb->MaxQuota = 64 * PAGE_SIZE; /* Create the device FCB */ - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DEVICE; Fcb->Vcb = Vcb; Vcb->DeviceFcb = Fcb; /* Create the root directory FCB */ - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DIRECTORY; Fcb->Vcb = Vcb; Vcb->RootFcb = Fcb; Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Wed Jul 6 18:14:42 2011 @@ -4,6 +4,12 @@ #include <ntifs.h> #include <ndk/iotypes.h> #include <pseh/pseh2.h> + +#define TAG_NPFS_CCB 'cFpN' +#define TAG_NPFS_CCB_DATA 'iFpN' /* correct? */ +#define TAG_NPFS_FCB 'FFpN' +#define TAG_NPFS_NAMEBLOCK 'nFpN' +#define TAG_NPFS_THREAD_CONTEXT 'tFpN' #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) @@ -87,6 +93,7 @@ ULONG PipeState; ULONG ReadDataAvailable; ULONG WriteQuotaAvailable; + ULONG RefCount; LIST_ENTRY ReadRequestListHead; 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] Wed Jul 6 18:14:42 2011 @@ -194,12 +194,11 @@ { /* it exist an other thread with empty wait slots, we can remove our thread from the list */ RemoveEntryList(&ThreadContext->ListEntry); - ThreadContext->Vcb->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1; + ExFreePoolWithTag(ThreadContext, TAG_NPFS_THREAD_CONTEXT); KeUnlockMutex(&ThreadContext->Vcb->PipeListLock); break; } } - ExFreePool(ThreadContext); } static NTSTATUS @@ -234,7 +233,9 @@ if (ListEntry == &Vcb->ThreadListHead) { - ThreadContext = ExAllocatePool(NonPagedPool, sizeof(NPFS_THREAD_CONTEXT)); + ThreadContext = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPFS_THREAD_CONTEXT), + TAG_NPFS_THREAD_CONTEXT); if (ThreadContext == NULL) { KeUnlockMutex(&Vcb->PipeListLock); @@ -257,7 +258,7 @@ (PVOID)ThreadContext); if (!NT_SUCCESS(Status)) { - ExFreePool(ThreadContext); + ExFreePoolWithTag(ThreadContext, TAG_NPFS_THREAD_CONTEXT); KeUnlockMutex(&Vcb->PipeListLock); return Status; } @@ -638,7 +639,7 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + CopyLength); Length -= CopyLength; } - else + else { KeResetEvent(&Ccb->ReadEvent);

13 years, 5 months

[rharabien] 52546: [CDFS][FASTFAT][NPFS] - Fix MSVC warnings

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jul 5 13:55:39 2011 New Revision: 52546 URL: http://svn.reactos.org/svn/reactos?rev=52546&view=rev Log: [CDFS][FASTFAT][NPFS] - Fix MSVC warnings Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/npfs/dirctl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -143,7 +143,7 @@ ULONG RootStart; ULONG RootSize; WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; - ULONG VolumeLabelLength; + USHORT VolumeLabelLength; ULONG SerialNumber; } CDINFO, *PCDINFO; Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -40,7 +40,7 @@ PUNICODE_STRING RelativeFileName, PUNICODE_STRING AbsoluteFileName) { - ULONG Length; + USHORT Length; PFCB Fcb; NTSTATUS Status; Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -533,7 +533,7 @@ /* Copy short name */ ASSERT(Fcb->ShortNameU.Length / sizeof(WCHAR) <= 12); - Info->ShortNameLength = Fcb->ShortNameU.Length; + Info->ShortNameLength = (CCHAR)Fcb->ShortNameU.Length; RtlCopyMemory(Info->ShortName, Fcb->ShortNameU.Buffer, Fcb->ShortNameU.Length); return(STATUS_SUCCESS); Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -153,7 +153,7 @@ ASSERT(Fcb != NULL); /* If buffer can't hold at least the file name length, bail out */ - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) return STATUS_BUFFER_OVERFLOW; /* Calculate file name length in bytes */ Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -46,7 +46,7 @@ PCDINFO CdInfo) { PPVD Pvd; - ULONG i; + USHORT i; PUCHAR pc; PWCHAR pw; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -379,7 +379,7 @@ ASSERT(FCB != NULL); /* If buffer can't hold at least the file name length, bail out */ - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) return STATUS_BUFFER_OVERFLOW; /* Save file name length, and as much file len, as buffer length allows */ Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -21,7 +21,7 @@ PULONG Size) { PIO_STACK_LOCATION Stack; - LONG BufferLength = 0; + ULONG BufferLength = 0; PUNICODE_STRING SearchPattern = NULL; FILE_INFORMATION_CLASS FileInformationClass; ULONG FileIndex = 0; 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] Tue Jul 5 13:55:39 2011 @@ -21,7 +21,7 @@ CHAR Line[65]; UCHAR ch; const char Hex[] = "0123456789ABCDEF"; - int i, j; + ULONG i, j; DbgPrint("---------------\n");

13 years, 5 months

[rharabien] 52545: [MSAFD] - Fix MSVC warning

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jul 5 12:21:17 2011 New Revision: 52545 URL: http://svn.reactos.org/svn/reactos?rev=52545&view=rev Log: [MSAFD] - Fix MSVC warning Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Jul 5 12:21:17 2011 @@ -806,7 +806,8 @@ IO_STATUS_BLOCK IOSB; PAFD_POLL_INFO PollInfo; NTSTATUS Status; - LONG HandleCount, OutCount = 0; + ULONG HandleCount; + LONG OutCount = 0; ULONG PollBufferSize; PVOID PollBuffer; ULONG i, j = 0, x; @@ -823,7 +824,7 @@ if ( HandleCount == 0 ) { - AFD_DbgPrint(MAX_TRACE,("HandleCount: %d. Return SOCKET_ERROR\n", + AFD_DbgPrint(MAX_TRACE,("HandleCount: %u. Return SOCKET_ERROR\n", HandleCount)); if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; @@ -831,7 +832,7 @@ PollBufferSize = sizeof(*PollInfo) + ((HandleCount - 1) * sizeof(AFD_HANDLE)); - AFD_DbgPrint(MID_TRACE,("HandleCount: %d BufferSize: %d\n", + AFD_DbgPrint(MID_TRACE,("HandleCount: %u BufferSize: %u\n", HandleCount, PollBufferSize)); /* Convert Timeout to NT Format */

13 years, 5 months

[gadamopoulos] 52544: [uxtheme] - Use double buffering when painting the caption

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 5 10:15:09 2011 New Revision: 52544 URL: http://svn.reactos.org/svn/reactos?rev=52544&view=rev Log: [uxtheme] - Use double buffering when painting the caption Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Jul 5 10:15:09 2011 @@ -26,6 +26,10 @@ BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ HRGN hRgn; int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; } DRAW_CONTEXT, *PDRAW_CONTEXT; typedef enum @@ -59,6 +63,7 @@ #define BUTTON_GAP_SIZE 2 +#define MENU_BAR_ITEMS_SPACE (12) HFONT hMenuFont = NULL; HFONT hMenuFontBold = NULL; @@ -235,6 +240,29 @@ } static void +ThemeStartBufferedPaint(PDRAW_CONTEXT pcontext, int cx, int cy) +{ + HBITMAP hbmp; + + pcontext->hDCScreen = pcontext->hDC; + pcontext->hDC = CreateCompatibleDC(pcontext->hDCScreen); + hbmp = CreateCompatibleBitmap(pcontext->hDCScreen, cx, cy); + pcontext->hbmpOld = (HBITMAP)SelectObject(pcontext->hDC, hbmp); +} + +static void +ThemeEndBufferedPaint(PDRAW_CONTEXT pcontext, int x, int y, int cx, int cy) +{ + HBITMAP hbmp; + BitBlt(pcontext->hDCScreen, 0, 0, cx, cy, pcontext->hDC, x, y, SRCCOPY); + hbmp = (HBITMAP) SelectObject(pcontext->hDC, pcontext->hbmpOld); + DeleteObject(pcontext->hDC); + DeleteObject(hbmp); + + pcontext->hDC = pcontext->hDCScreen; +} + +static void ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, RECT* prcCurrent, CAPTIONBUTTON buttonId, @@ -663,7 +691,9 @@ if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) { + ThemeStartBufferedPaint(pcontext, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawCaption(pcontext, prcCurrent); + ThemeEndBufferedPaint(pcontext, 0, 0, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawBorders(pcontext, prcCurrent); } else

13 years, 5 months

← Newer
1
...
44
45
46
47
48
49
50
51
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011