Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[cgutman] 57234: [WS2_32_APITEST] - Add a test for NtReadFile on a socket

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 4 03:02:40 2012 New Revision: 57234 URL: http://svn.reactos.org/svn/reactos?rev=57234&view=rev Log: [WS2_32_APITEST] - Add a test for NtReadFile on a socket Modified: trunk/rostests/apitests/ws2_32/recv.c Modified: trunk/rostests/apitests/ws2_32/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/recv.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] Tue Sep 4 03:02:40 2012 @@ -7,6 +7,7 @@ #include <stdio.h> #include <wine/test.h> +#include <winternl.h> #include <windows.h> #include "ws2_32.h" @@ -25,6 +26,10 @@ int iResult; SOCKET sck; WSADATA wdata; + NTSTATUS status; + IO_STATUS_BLOCK readIosb; + HANDLE readEvent; + LARGE_INTEGER readOffset; /* Start up Winsock */ iResult = WSAStartup(MAKEWORD(2, 2), &wdata); @@ -73,6 +78,41 @@ SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); ok(memcmp(szBuf1, szBuf2, RECV_BUF), "equal\n"); + /* Create an event for NtReadFile */ + readOffset.QuadPart = 0LL; + memcpy(szBuf1, szBuf2, RECV_BUF); + status = NtCreateEvent(&readEvent, + EVENT_ALL_ACCESS, + NULL, + NotificationEvent, + FALSE); + if (status != 0) + { + ok(0, "Failed to create event\n"); + return 0; + } + + /* Try reading the socket using the NT file API */ + status = NtReadFile((HANDLE)sck, + readEvent, + NULL, + NULL, + &readIosb, + szBuf1, + RECV_BUF, + &readOffset, + NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(readEvent, INFINITE); + status = readIosb.Status; + } + + ok(status == 0, "Read failed with status 0x%x\n", (unsigned int)status); + ok(memcmp(szBuf2, szBuf1, RECV_BUF), "equal\n"); + ok(readIosb.Information == RECV_BUF, "Short read\n"); + + NtClose(readEvent); closesocket(sck); WSACleanup(); return 1;

12 years

[cgutman] 57233: [AFD] - Fix handling of IRP_MJ_READ and IRP_MJ_WRITE to allow passing sockets as parameters to NtReadFile and NtWriteFile

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 4 03:01:15 2012 New Revision: 57233 URL: http://svn.reactos.org/svn/reactos?rev=57233&view=rev Log: [AFD] - Fix handling of IRP_MJ_READ and IRP_MJ_WRITE to allow passing sockets as parameters to NtReadFile and NtWriteFile Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -81,7 +81,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(BindReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(BindReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -44,7 +44,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectOptions = LockRequest(Irp, IrpSp, FALSE); + PVOID ConnectOptions = LockRequest(Irp, IrpSp, FALSE, NULL); UINT ConnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -80,7 +80,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); + PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -144,7 +144,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectData = LockRequest(Irp, IrpSp, FALSE); + PVOID ConnectData = LockRequest(Irp, IrpSp, FALSE, NULL); UINT ConnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -179,7 +179,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectDataSize = LockRequest(Irp, IrpSp, FALSE); + PUINT ConnectDataSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -406,7 +406,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ConnectReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(ConnectReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -60,7 +60,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID Context = LockRequest(Irp, IrpSp, FALSE); + PVOID Context = LockRequest(Irp, IrpSp, FALSE, NULL); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -13,7 +13,7 @@ AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, TRUE); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, TRUE, NULL); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PLIST_ENTRY CurrentEntry; @@ -99,7 +99,7 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, FALSE); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, FALSE, NULL); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PCHAR NewBuffer; Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -217,7 +217,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ListenReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(ListenReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -18,7 +18,10 @@ } /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ) { +PVOID LockRequest( PIRP Irp, + PIO_STACK_LOCATION IrpSp, + BOOLEAN Output, + KPROCESSOR_MODE *LockMode) { BOOLEAN LockFailed = FALSE; ASSERT(!Irp->MdlAddress); @@ -50,7 +53,46 @@ Irp->MdlAddress = NULL; return NULL; } - } else return NULL; + + /* The mapped address goes in index 1 */ + Irp->Tail.Overlay.DriverContext[1] = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (!Irp->Tail.Overlay.DriverContext[1]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to get mapped address\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + /* The allocated address goes in index 0 */ + Irp->Tail.Overlay.DriverContext[0] = ExAllocatePool(NonPagedPool, MmGetMdlByteCount(Irp->MdlAddress)); + if (!Irp->Tail.Overlay.DriverContext[0]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + RtlCopyMemory(Irp->Tail.Overlay.DriverContext[0], + Irp->Tail.Overlay.DriverContext[1], + MmGetMdlByteCount(Irp->MdlAddress)); + + /* If we don't want a copy back, we zero the mapped address pointer */ + if (!Output) + { + Irp->Tail.Overlay.DriverContext[1] = NULL; + } + + /* We're using a user-mode buffer directly */ + if (LockMode != NULL) + { + *LockMode = UserMode; + } + } + else return NULL; break; case IRP_MJ_READ: @@ -65,6 +107,8 @@ FALSE, NULL ); if( Irp->MdlAddress ) { + PAFD_RECV_INFO AfdInfo; + _SEH2_TRY { MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -77,44 +121,49 @@ Irp->MdlAddress = NULL; return NULL; } - } else return NULL; + + /* We need to create the info struct that AFD expects for all send/recv requests */ + C_ASSERT(sizeof(AFD_RECV_INFO) == sizeof(AFD_SEND_INFO)); + AfdInfo = ExAllocatePool(NonPagedPool, sizeof(AFD_RECV_INFO) + sizeof(AFD_WSABUF)); + if (!AfdInfo) + { + AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + /* We'll append the buffer array to this struct */ + AfdInfo->BufferArray = (PAFD_WSABUF)(AfdInfo + 1); + AfdInfo->BufferCount = 1; + + /* Setup the default flags values */ + AfdInfo->AfdFlags = 0; + AfdInfo->TdiFlags = 0; + + /* Now build the buffer array */ + AfdInfo->BufferArray[0].buf = MmGetSystemAddressForMdl(Irp->MdlAddress); + AfdInfo->BufferArray[0].len = MmGetMdlByteCount(Irp->MdlAddress); + + /* Store the struct where AFD expects */ + Irp->Tail.Overlay.DriverContext[0] = AfdInfo; + + /* Don't copy anything out */ + Irp->Tail.Overlay.DriverContext[1] = NULL; + + /* We're using a placeholder buffer that we allocated */ + if (LockMode != NULL) + { + *LockMode = KernelMode; + } + } + else return NULL; break; default: ASSERT(FALSE); return NULL; - } - - /* The mapped address goes in index 1 */ - Irp->Tail.Overlay.DriverContext[1] = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - if (!Irp->Tail.Overlay.DriverContext[1]) - { - AFD_DbgPrint(MIN_TRACE,("Failed to get mapped address\n")); - MmUnlockPages(Irp->MdlAddress); - IoFreeMdl( Irp->MdlAddress ); - Irp->MdlAddress = NULL; - return NULL; - } - - /* The allocated address goes in index 0 */ - Irp->Tail.Overlay.DriverContext[0] = ExAllocatePool(NonPagedPool, MmGetMdlByteCount(Irp->MdlAddress)); - if (!Irp->Tail.Overlay.DriverContext[0]) - { - AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); - MmUnlockPages(Irp->MdlAddress); - IoFreeMdl( Irp->MdlAddress ); - Irp->MdlAddress = NULL; - return NULL; - } - - RtlCopyMemory(Irp->Tail.Overlay.DriverContext[0], - Irp->Tail.Overlay.DriverContext[1], - MmGetMdlByteCount(Irp->MdlAddress)); - - /* If we don't want a copy back, we zero the mapped address pointer */ - if (!Output) - { - Irp->Tail.Overlay.DriverContext[1] = NULL; } return GetLockedData(Irp, IrpSp); @@ -145,7 +194,8 @@ PAFD_WSABUF LockBuffers( PAFD_WSABUF Buf, UINT Count, PVOID AddressBuf, PINT AddressLen, - BOOLEAN Write, BOOLEAN LockAddress ) { + BOOLEAN Write, BOOLEAN LockAddress, + KPROCESSOR_MODE LockMode) { UINT i; /* Copy the buffer array so we don't lose it */ UINT Lock = LockAddress ? 2 : 0; @@ -200,7 +250,7 @@ if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); _SEH2_TRY { - MmProbeAndLockPages( MapBuf[i].Mdl, UserMode, + MmProbeAndLockPages( MapBuf[i].Mdl, LockMode, Write ? IoModifyAccess : IoReadAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { LockFailed = TRUE; Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -72,7 +72,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectOptions = LockRequest(Irp, IrpSp, FALSE); + PVOID DisconnectOptions = LockRequest(Irp, IrpSp, FALSE, NULL); UINT DisconnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -108,7 +108,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); + PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -172,7 +172,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectData = LockRequest(Irp, IrpSp, FALSE); + PVOID DisconnectData = LockRequest(Irp, IrpSp, FALSE, NULL); UINT DisconnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -208,7 +208,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectDataSize = LockRequest(Irp, IrpSp, FALSE); + PUINT DisconnectDataSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -244,7 +244,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PULONG HandleFlags = LockRequest(Irp, IrpSp, TRUE); + PULONG HandleFlags = LockRequest(Irp, IrpSp, TRUE, NULL); PAFD_TDI_HANDLE_DATA HandleData = Irp->UserBuffer; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -680,7 +680,7 @@ if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); - if (!(DisReq = LockRequest(Irp, IrpSp, FALSE))) + if (!(DisReq = LockRequest(Irp, IrpSp, FALSE, NULL))) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -431,6 +431,7 @@ UINT TotalBytesCopied = 0; PAFD_STORED_DATAGRAM DatagramRecv; PLIST_ENTRY ListEntry; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -447,7 +448,7 @@ Irp, 0 ); } - if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); @@ -456,7 +457,7 @@ RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, NULL, NULL, - TRUE, FALSE ); + TRUE, FALSE, LockMode ); if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -699,6 +700,7 @@ PAFD_RECV_INFO_UDP RecvReq; PLIST_ENTRY ListEntry; PAFD_STORED_DATAGRAM DatagramRecv; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -719,7 +721,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); @@ -728,7 +730,7 @@ RecvReq->BufferCount, RecvReq->Address, RecvReq->AddressLength, - TRUE, TRUE ); + TRUE, TRUE, LockMode ); if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete(FCB, STATUS_ACCESS_VIOLATION, Irp, 0); Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -259,7 +259,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; NTSTATUS Status = STATUS_NO_MEMORY; PAFD_EVENT_SELECT_INFO EventSelectInfo = - (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp, FALSE ); + (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp, FALSE, NULL ); PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) { @@ -319,7 +319,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_ENUM_NETWORK_EVENTS_INFO EnumReq = - (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE ); + (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE, NULL ); PAFD_FCB FCB = FileObject->FsContext; PKEVENT UserEvent; NTSTATUS Status; 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] Tue Sep 4 03:01:15 2012 @@ -327,6 +327,7 @@ PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; UINT TotalBytesCopied = 0, i, SpaceAvail = 0, BytesCopied, SendLength; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -347,14 +348,14 @@ 0 ); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); /* Must lock buffers before handing off user data */ SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -416,14 +417,14 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0 ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -556,6 +557,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO_UDP SendReq; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -577,7 +579,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); if (FCB->State == SOCKET_STATE_CREATED) @@ -602,7 +604,7 @@ SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -298,7 +298,8 @@ PAFD_WSABUF LockBuffers( PAFD_WSABUF Buf, UINT Count, PVOID AddressBuf, PINT AddressLen, - BOOLEAN Write, BOOLEAN LockAddress ); + BOOLEAN Write, BOOLEAN LockAddress, + KPROCESSOR_MODE LockMode ); VOID UnlockBuffers( PAFD_WSABUF Buf, UINT Count, BOOL Address ); BOOLEAN SocketAcquireStateLock( PAFD_FCB FCB ); NTSTATUS NTAPI UnlockAndMaybeComplete @@ -308,7 +309,7 @@ NTSTATUS LostSocket( PIRP Irp ); PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); VOID UnlockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ); +PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output, KPROCESSOR_MODE *LockMode ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); PVOID GetLockedData( PIRP Irp, PIO_STACK_LOCATION IrpSp ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function );

12 years

[jimtabor] 57232: [WineTests] - Sync to 1.5.12.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 4 02:13:48 2012 New Revision: 57232 URL: http://svn.reactos.org/svn/reactos?rev=57232&view=rev Log: [WineTests] - Sync to 1.5.12. Modified: trunk/rostests/winetests/user32/clipboard.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/scroll.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboar… ============================================================================== --- trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -66,6 +66,7 @@ ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + todo_wine ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dce.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dce.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -406,6 +406,56 @@ "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); } +/* test ScrollWindow with window DCs */ +static void test_scroll_window(void) +{ + PAINTSTRUCT ps; + HDC hdc; + RECT clip, rect; + + /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ + + UpdateWindow( hwnd_owndc ); + SetRect( &clip, 25, 25, 50, 50 ); + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 2, 3, NULL ); + SetViewportOrgEx( hdc, 30, 20, NULL ); + + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= -5 && rect.top >= 5 && rect.right <= 20 && rect.bottom <= 30, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 1, 1, NULL ); + SetViewportOrgEx( hdc, 0, 0, NULL ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); +} + static void test_invisible_create(void) { HWND hwnd_owndc = CreateWindowA("owndc_class", NULL, WS_OVERLAPPED, @@ -559,6 +609,7 @@ test_parameters(); test_dc_visrgn(); test_begin_paint(); + test_scroll_window(); test_invisible_create(); test_dc_layout(); Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1924,7 +1924,7 @@ ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); ret = DdeUninitialize(dde_inst2); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); /* NULL pSrc */ @@ -2037,7 +2037,7 @@ ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ret = DdeUninitialize(dde_inst); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); } static void test_DdeCreateStringHandle(void) @@ -2459,7 +2459,6 @@ size = DdeQueryStringA(server_pid, hsz1, str, MAX_PATH, CP_WINANSI); ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", test_topic, str, msg_index); - ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -39,12 +39,14 @@ static struct edit_notify notifications; static BOOL (WINAPI *pEndMenu) (void); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); + pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2134,6 +2136,7 @@ static int got_en_setfocus = 0; static int got_wm_capturechanged = 0; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2156,7 +2159,50 @@ return DefWindowProcA(hWnd, msg, wParam, lParam); } -static void test_contextmenu_focus(void) +static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_ENTERIDLE: { + MENUBARINFO mbi; + BOOL ret; + HWND ctx_menu = (HWND)lParam; + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(mbi.fFocused, "mbi.fFocused = FALSE\n"); + } + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); + } + + pEndMenu(); + break; + } + } + return p_edit_proc(hWnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) { HWND hwndMain, hwndEdit; @@ -2171,14 +2217,16 @@ assert(hwndEdit); SetFocus(NULL); - SetCapture(hwndMain); - SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - ok(got_en_setfocus, "edit box didn't get focused\n"); - ok(got_wm_capturechanged, "main window capture did not change\n"); + + if (pGetMenuBarInfo) + { + p_edit_proc = (void*)SetWindowLongPtr(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + } DestroyWindow (hwndEdit); DestroyWindow (hwndMain); @@ -2516,7 +2564,7 @@ test_fontsize(); test_dialogmode(); if (pEndMenu) - test_contextmenu_focus(); + test_contextmenu(); else win_skip("EndMenu is not available\n"); Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… ============================================================================== --- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1335,7 +1335,6 @@ ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); - /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */ strcpy(pathBuffer, "*"); @@ -1412,6 +1411,8 @@ } } + DeleteFileA( "wtest1.tmp.c" ); + /* Now test DlgDirSelectEx() in abnormal operation */ /* Fill list with bogus entries, that look somewhat valid */ SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); @@ -1472,9 +1473,29 @@ ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); } } + + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + DestroyWindow(hWnd); - - DeleteFileA( "wtest1.tmp.c" ); } START_TEST(listbox) Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -38,6 +38,7 @@ static ATOM atomMenuCheckClass; static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pEndMenu) (void); @@ -52,6 +53,7 @@ trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetMenuInfo) + GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) GET_PROC(EndMenu) @@ -116,6 +118,7 @@ /* globals to communicate between test and wndproc */ static BOOL bMenuVisible; +static INT popmenu; static BOOL got_input; static HMENU hMenus[4]; @@ -267,6 +270,134 @@ atomMenuCheckClass = RegisterClass(&wc); } +static void test_getmenubarinfo(void) +{ + BOOL ret; + HMENU hmenu; + MENUBARINFO mbi; + RECT rcw, rci; + HWND hwnd; + INT err; + + if (!pGetMenuBarInfo) { + win_skip("GetMenuBarInfo is not available\n"); + return; + } + + mbi.cbSize = sizeof(MENUBARINFO); + + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_SYSMENU | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + /* no menu: getmenubarinfo should fail */ + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should not have been successful\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* create menubar, no items yet */ + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(NULL, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err==ERROR_INVALID_MENU_HANDLE || broken(err==0xdeadbeef) /* NT, W2K, XP */, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, -1, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + mbi.cbSize = 1000; + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + mbi.cbSize = sizeof(MENUBARINFO); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, 123, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + ok(mbi.rcBar.left == 0 && mbi.rcBar.top == 0 && + mbi.rcBar.bottom == 0 && mbi.rcBar.right == 0, + "rcBar: Expected 0,0-0,0, got: %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", + mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: Got %d instead of 0.\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: Got %d instead of 0.\n", mbi.fFocused); + + /* add some items */ + ret = AppendMenu(hmenu, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenu(hmenu, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 200, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* get info for the whole menu */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + /* calculate menu rectangle, from window rectangle and the position of the first item */ + ret = GetWindowRect(hwnd, &rcw); + ok(ret, "GetWindowRect failed.\n"); + ret = GetMenuItemRect(hwnd, hmenu, 0, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + todo_wine ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rcw.right - rci.left + rcw.left, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rcw.right - rci.left + rcw.left, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + /* get info for item nr.2 */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 2, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rci.right, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + DestroyWindow(hwnd); +} + /* demonstrates that windows locks the menu object so that it is still valid * even after a client calls DestroyMenu on it */ static void test_menu_locked_by_window(void) @@ -2030,9 +2161,12 @@ case WM_ENTERMENULOOP: bMenuVisible = TRUE; break; + case WM_INITMENUPOPUP: + case WM_UNINITMENUPOPUP: case WM_EXITMENULOOP: - bMenuVisible = FALSE; + case WM_MENUSELECT: break; + case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_MOUSEMOVE: @@ -2046,6 +2180,59 @@ default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); } + + if(pGetMenuBarInfo) + { + MENUBARINFO mbi; + HMENU hmenu; + UINT state; + BOOL br; + + mbi.cbSize = sizeof(MENUBARINFO); + + /* get info for the menu */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 0, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + hmenu = GetMenu(hWnd); + ok(!mbi.hwndMenu, "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected NULL\n", + msg, mbi.hwndMenu); + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "msg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!bMenuVisible == !mbi.fFocused, "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", + msg, mbi.fFocused != 0); + + /* get info for the menu's first item */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 1, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + state = GetMenuState(hmenu, 0, MF_BYPOSITION); + if (pGetMenuInfo) /* Skip on NT */ + { + /* Native returns handle to destroyed window */ + if (msg==WM_UNINITMENUPOPUP && popmenu==1) + todo_wine ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + else + ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + } + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "nsg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!(bMenuVisible && (state & MF_HILITE)) == !mbi.fFocused, + "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", msg, mbi.fFocused != 0); + } + + if (msg == WM_EXITMENULOOP) + bMenuVisible = FALSE; + else if (msg == WM_INITMENUPOPUP) + popmenu++; + else if (msg == WM_UNINITMENUPOPUP) + popmenu--; return 0; } @@ -3317,6 +3504,7 @@ test_menu_locked_by_window(); test_subpopup_locked_by_menu(); test_menu_ownerdraw(); + test_getmenubarinfo(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo(); Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… ============================================================================== --- trunk/rostests/winetests/user32/monitor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/monitor.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -177,7 +177,7 @@ dm.dmDriverExtra = 1; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); memset(&dmW, 0, sizeof(dmW)); @@ -201,7 +201,7 @@ if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); } Modified: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… ============================================================================== --- trunk/rostests/winetests/user32/scroll.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/scroll.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -375,7 +375,7 @@ ret = EnableScrollBar( hwnd, SB_HORZ, ESB_ENABLE_BOTH); ok( !ret, "Horizontal window scroll bar was not enabled\n"); DestroyWindow( hwnd); - /* finally, check if adding a WS_[HV]SColl style of a window makes the scroll info + /* finally, check if adding a WS_[HV]SCROLL style of a window makes the scroll info * available */ if( style & (WS_HSCROLL | WS_VSCROLL)) return;/* only test if not yet set */ /* Start with a clean window */ Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1172,7 +1172,7 @@ ok(!ret, "third call to SetShellWindow(hwnd1)\n"); */ SetWindowLong(hwnd1, GWL_EXSTYLE, GetWindowLong(hwnd1,GWL_EXSTYLE)|WS_EX_TOPMOST); - ret = GetWindowLong(hwnd1,GWL_EXSTYLE)&WS_EX_TOPMOST? TRUE: FALSE; + ret = (GetWindowLong(hwnd1,GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; ok(!ret, "SetWindowExStyle(hwnd1, WS_EX_TOPMOST)\n"); ret = DestroyWindow(hwnd1); @@ -2157,6 +2157,14 @@ DestroyWindow(hwnd_grandchild); DestroyWindow(hwnd_child); DestroyWindow(hwnd_child2); + + hwnd_child = create_tool_window(WS_CHILD|WS_POPUP|WS_SYSMENU, hwnd2); + ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError()); + ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + ok(ret, "Got %d\n", ret); + flush_events( TRUE ); + todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + DestroyWindow(hwnd_child); } static void test_SetMenu(HWND parent) @@ -6680,7 +6688,7 @@ { HWND hwnd; FLASHWINFO finfo; - BOOL ret; + BOOL prev, ret; if (!pFlashWindowEx) { @@ -6749,8 +6757,7 @@ "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pFlashWindowEx(&finfo); - ok(ret, "previous window state should be active\n"); + prev = pFlashWindowEx(&finfo); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd); @@ -6762,7 +6769,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); todo_wine - ok(!ret, "previous window state should not be active\n"); + ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); } Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… ============================================================================== --- trunk/rostests/winetests/user32/winstation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/winstation.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -371,6 +371,110 @@ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); } +/* Miscellaneous tests */ + +static void test_getuserobjectinformation(void) +{ + HDESK desk; + WCHAR bufferW[20]; + char buffer[20]; + WCHAR foobarTestW[] = {'f','o','o','b','a','r','T','e','s','t',0}; + WCHAR DesktopW[] = {'D','e','s','k','t','o','p',0}; + DWORD size; + BOOL ret; + + desk = CreateDesktop("foobarTest", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(desk != 0, "open foobarTest desktop failed\n"); + + strcpy(buffer, "blahblah"); + + /** Tests for UOI_NAME **/ + + /* Get size, test size and return value/error code */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_NAME, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ + + /* Get string */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_NAME, buffer, sizeof(buffer), &size); + + ok(ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(strcmp(buffer, "foobarTest") == 0, "Buffer is set to '%s'\n", buffer); + ok(size == 11, "size is set to %d\n", size); /* 11 bytes in 'foobarTest\0' */ + + /* Get size, test size and return value/error code (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_NAME, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + + /* Get string (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_NAME, bufferW, sizeof(bufferW), &size); + + ok(ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); + ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + + /** Tests for UOI_TYPE **/ + + /* Get size, test size and return value/error code */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_TYPE, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ + + /* Get string */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_TYPE, buffer, sizeof(buffer), &size); + + ok(ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(strcmp(buffer, "Desktop") == 0, "Buffer is set to '%s'\n", buffer); + ok(size == 8, "size is set to %d\n", size); /* 8 bytes in 'Desktop\0' */ + + /* Get size, test size and return value/error code (Unicode) */ + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetUserObjectInformationW(desk, UOI_TYPE, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + + /* Get string (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_TYPE, bufferW, sizeof(bufferW), &size); + + ok(ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(lstrcmpW(bufferW, DesktopW) == 0, "Buffer is not set to 'Desktop'\n"); + ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + + ok(CloseDesktop(desk), "CloseDesktop failed\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -386,4 +490,5 @@ test_enumstations(); test_enumdesktops(); test_handles(); -} + test_getuserobjectinformation(); +}

12 years

[cgutman] 57231: [NTOSKRNL] - Print a warning in several cases where a wait may fail in an unexpected way

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 3 22:19:05 2012 New Revision: 57231 URL: http://svn.reactos.org/svn/reactos?rev=57231&view=rev Log: [NTOSKRNL] - Print a warning in several cases where a wait may fail in an unexpected way Modified: trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Mon Sep 3 22:19:05 2012 @@ -165,6 +165,7 @@ { /* Fail, handle is invalid */ Status = STATUS_INVALID_HANDLE; + DPRINT1("Invalid handle passed to NtWaitForMultipleObjects\n"); goto Quickie; } @@ -174,6 +175,7 @@ { /* Unlock the entry and fail */ ExUnlockHandleTableEntry(HandleTable, HandleEntry); + DPRINT1("Handle does not have SYNCHRONIZE access\n"); Status = STATUS_ACCESS_DENIED; goto Quickie; } @@ -228,6 +230,7 @@ { /* Fail */ Status = STATUS_INVALID_PARAMETER_MIX; + DPRINT1("Passed a duplicate object to NtWaitForMultipleObjects\n"); goto Quickie; } } @@ -417,6 +420,10 @@ /* Dereference the Object */ ObDereferenceObject(Object); } + else + { + DPRINT1("Failed to reference the handle with status 0x%x\n", Status); + } /* Return the status */ return Status;

12 years

[cgutman] 57230: [MSAFD] - Fix access rights on socket events

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 3 22:00:16 2012 New Revision: 57230 URL: http://svn.reactos.org/svn/reactos?rev=57230&view=rev Log: [MSAFD] - Fix access rights on socket events Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/sndrcv.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] Mon Sep 3 22:00:16 2012 @@ -409,7 +409,7 @@ /* Create the Wait Event */ Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -615,7 +615,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -737,7 +737,7 @@ return 0; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -863,7 +863,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1062,7 +1062,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1447,7 +1447,7 @@ int SocketDataLength; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1682,7 +1682,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1764,7 +1764,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1867,7 +1867,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2443,7 +2443,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2510,7 +2510,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2592,7 +2592,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Sep 3 22:00:16 2012 @@ -27,7 +27,7 @@ BOOLEAN BlockMode; HANDLE SockEvent; - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) return -1; @@ -146,7 +146,7 @@ AFD_DbgPrint(MID_TRACE,("Called (lpNetworkEvents %x)\n", lpNetworkEvents)); - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) { 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] Mon Sep 3 22:00:16 2012 @@ -123,7 +123,7 @@ return SOCKET_ERROR; } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -292,7 +292,7 @@ lpErrno); } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -442,7 +442,7 @@ return SOCKET_ERROR; } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -616,7 +616,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); if (!NT_SUCCESS(Status))

12 years

[ion] 57229: [NTOSKRNL]: Fix a stupid bug in MiProtectVirtualMemory which was causing empty PTEs whose protection was being set to remain zero PTEs, instead of demand-zero PTEs, but still acquire a...

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 3 16:29:31 2012 New Revision: 57229 URL: http://svn.reactos.org/svn/reactos?rev=57229&view=rev Log: [NTOSKRNL]: Fix a stupid bug in MiProtectVirtualMemory which was causing empty PTEs whose protection was being set to remain zero PTEs, instead of demand-zero PTEs, but still acquire a page table reference. When they were later touched in the page fault code, and made into demand-zero PTEs, they'd get referenced again, thus Aleksey hacked away all the referencing code to work around this (causing PDEs to disappear...) [NTOSKRNL]: Restore the page table reference counting mechanism, and put it in a macro to be cleaner. Also use macros for testing PD boundaries, instead of math-by-hand. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Sep 3 16:29:31 2012 @@ -1619,6 +1619,41 @@ } } +FORCEINLINE +VOID +MiIncrementPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + *RefCount += 1; + ASSERT(*RefCount <= PTE_PER_PAGE); +} + +FORCEINLINE +VOID +MiDecrementPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + *RefCount -= 1; + ASSERT(*RefCount < PTE_PER_PAGE); +} + +FORCEINLINE +USHORT +MiQueryPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + return *RefCount; +} + BOOLEAN NTAPI MmArmInitSystem( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Sep 3 16:29:31 2012 @@ -1684,8 +1684,7 @@ if (Address <= MM_HIGHEST_USER_ADDRESS) { /* Add an additional page table reference */ - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + MiIncrementPageTableReferences(Address); } /* Did we get a prototype PTE back? */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Sep 3 16:29:31 2012 @@ -1821,7 +1821,6 @@ PMMPDE PointerPde; PMMPFN Pfn1; ULONG ProtectionMask, QuotaCharge = 0; - PUSHORT UsedPageTableEntries; PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); @@ -1914,9 +1913,7 @@ // This used to be a zero PTE and it no longer is, so we must add a // reference to the pagetable. // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); // // Create the demand-zero prototype PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Sep 3 16:29:31 2012 @@ -589,10 +589,8 @@ TempPte = *PointerPte; if (TempPte.u.Long) { - DPRINT("Decrement used PTEs by address: %lx\n", Va); - (*UsedPageTableEntries)--; + *UsedPageTableEntries -= 1; ASSERT((*UsedPageTableEntries) < PTE_COUNT); - DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); /* Check if the PTE is actually mapped in */ if (TempPte.u.Long & 0xFFFFFC01) @@ -653,14 +651,10 @@ /* The PDE should still be valid at this point */ ASSERT(PointerPde->u.Hard.Valid == 1); - DPRINT("Should check if handles for: %p are zero (PDE: %lx)\n", Va, PointerPde->u.Hard.PageFrameNumber); - if (!(*UsedPageTableEntries)) - { - DPRINT("They are!\n"); + if (*UsedPageTableEntries == 0) + { if (PointerPde->u.Long != 0) { - DPRINT("PDE active: %lx in %16s\n", PointerPde->u.Hard.PageFrameNumber, CurrentProcess->ImageFileName); - /* Delete the PTE proper */ MiDeletePte(PointerPde, MiPteToAddress(PointerPde), @@ -1880,7 +1874,6 @@ ULONG_PTR StartingAddress, EndingAddress; PMMPTE PointerPde, PointerPte, LastPte; MMPTE PteContents; - //PUSHORT UsedPageTableEntries; PMMPFN Pfn1; ULONG ProtectionMask, OldProtect; BOOLEAN Committed; @@ -2050,24 +2043,23 @@ while (PointerPte <= LastPte) { /* Check if we've crossed a PDE boundary and make the new PDE valid too */ - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { PointerPde = MiAddressToPte(PointerPte); MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); } - /* Capture the PTE and see what we're dealing with */ + /* Capture the PTE and check if it was empty */ PteContents = *PointerPte; if (PteContents.u.Long == 0) { /* This used to be a zero PTE and it no longer is, so we must add a reference to the pagetable. */ - //UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - //(*UsedPageTableEntries)++; - //ASSERT((*UsedPageTableEntries) <= PTE_COUNT); - DPRINT1("HACK: Not increasing UsedPageTableEntries count!\n"); - } - else if (PteContents.u.Hard.Valid == 1) + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); + } + + /* Check what kind of PTE we are dealing with */ + if (PteContents.u.Hard.Valid == 1) { /* Get the PFN entry */ Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(&PteContents)); @@ -2080,8 +2072,11 @@ (NewAccessProtection & PAGE_GUARD)) { /* The page should be in the WS and we should make it transition now */ - UNIMPLEMENTED; - //continue; + DPRINT1("Making valid page invalid is not yet supported!\n"); + Status = STATUS_NOT_IMPLEMENTED; + /* Unlock the working set */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + goto FailPath; } /* Write the protection mask and write it with a TLB flush */ @@ -2270,7 +2265,6 @@ ULONG PteCount = 0; PMMPFN Pfn1; MMPTE PteContents; - PUSHORT UsedPageTableEntries; PETHREAD CurrentThread = PsGetCurrentThread(); // @@ -2292,7 +2286,7 @@ // // Check if we've crossed a PDE boundary // - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { // // Get the new PDE and flush the valid PTEs we had built up until @@ -2383,9 +2377,7 @@ // This used to be a zero PTE and it no longer is, so we must add a // reference to the pagetable. // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(StartingAddress)]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(StartingAddress); // // Next, we account for decommitted PTEs and make the PTE as such @@ -3648,7 +3640,6 @@ PMEMORY_AREA MemoryArea; PFN_NUMBER PageCount; PMMVAD Vad, FoundVad; - PUSHORT UsedPageTableEntries; NTSTATUS Status; PMMSUPPORT AddressSpace; PVOID PBaseAddress; @@ -4268,7 +4259,7 @@ // // Have we crossed into a new page table? // - if (!(((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1))) + if (MiIsPteOnPdeBoundary(PointerPte)) { // // Get the PDE and now make it valid too @@ -4286,9 +4277,7 @@ // First increment the count of pages in the page table for this // process // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); // // And now write the invalid demand-zero PTE as requested

12 years

[ion] 57228: [NTOSKRNL]: Implement correct locking and unlocking of the working set, one of the biggest blunders in ARM3 so far. [NTOSKRNL]: Implement MiDereferenceControlArea to avoid leaking CAs ...

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 3 06:23:31 2012 New Revision: 57228 URL: http://svn.reactos.org/svn/reactos?rev=57228&view=rev Log: [NTOSKRNL]: Implement correct locking and unlocking of the working set, one of the biggest blunders in ARM3 so far. [NTOSKRNL]: Implement MiDereferenceControlArea to avoid leaking CAs in failure cases. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Sep 3 06:23:31 2012 @@ -1718,17 +1718,13 @@ MmLockAddressSpace(PMMSUPPORT AddressSpace) { KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); - //ASSERT(Thread->OwnsProcessAddressSpaceExclusive == 0); - //Thread->OwnsProcessAddressSpaceExclusive = TRUE; } FORCEINLINE VOID MmUnlockAddressSpace(PMMSUPPORT AddressSpace) { - //ASSERT(Thread->OwnsProcessAddressSpaceExclusive == 1); KeReleaseGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); - //Thread->OwnsProcessAddressSpaceExclusive = 0; } FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Sep 3 06:23:31 2012 @@ -1041,6 +1041,14 @@ MI_WS_OWNER(IN PEPROCESS Process) { /* Check if this process is the owner, and that the thread owns the WS */ + if (PsGetCurrentThread()->OwnsProcessWorkingSetExclusive == 0) + { + DPRINT1("Thread: %p is not an owner\n", PsGetCurrentThread()); + } + if (KeGetCurrentThread()->ApcState.Process != &Process->Pcb) + { + DPRINT1("Current thread %p is attached to another process %p\n", PsGetCurrentThread(), Process); + } return ((KeGetCurrentThread()->ApcState.Process == &Process->Pcb) && ((PsGetCurrentThread()->OwnsProcessWorkingSetExclusive) || (PsGetCurrentThread()->OwnsProcessWorkingSetShared))); @@ -1083,6 +1091,13 @@ IN PFN_NUMBER PageFrameIndex ); +FORCEINLINE +BOOLEAN +MI_IS_WS_UNSAFE(IN PEPROCESS Process) +{ + return (Process->Vm.Flags.AcquiredUnsafe == TRUE); +} + // // Locks the working set for the given process // @@ -1099,12 +1114,57 @@ KeEnterGuardedRegion(); ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); - /* FIXME: Actually lock it (we can't because Vm is used by MAREAs) */ - - /* FIXME: This also can't be checked because Vm is used by MAREAs) */ - //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); - - /* Okay, now we can own it exclusively */ + /* Lock the working set */ + ExAcquirePushLockExclusive(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + Thread->OwnsProcessWorkingSetExclusive = TRUE; +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetShared(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Shouldn't already be owning the process working set */ + ASSERT(Thread->OwnsProcessWorkingSetShared == FALSE); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + + /* Block APCs, make sure that still nothing is already held */ + KeEnterGuardedRegion(); + ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); + + /* Lock the working set */ + ExAcquirePushLockShared(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + ASSERT(Thread->OwnsProcessWorkingSetShared == FALSE); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + Thread->OwnsProcessWorkingSetShared = TRUE; +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetUnsafe(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Shouldn't already be owning the process working set */ + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + + /* APCs must be blocked, make sure that still nothing is already held */ + ASSERT(KeAreAllApcsDisabled() == TRUE); + ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); + + /* Lock the working set */ + ExAcquirePushLockExclusive(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + Process->Vm.Flags.AcquiredUnsafe = 1; + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); Thread->OwnsProcessWorkingSetExclusive = TRUE; } @@ -1116,19 +1176,43 @@ MiUnlockProcessWorkingSet(IN PEPROCESS Process, IN PETHREAD Thread) { - /* Make sure this process really is owner, and it was a safe acquisition */ + /* Make sure we are the owner of a safe acquisition */ ASSERT(MI_WS_OWNER(Process)); - /* This can't be checked because Vm is used by MAREAs) */ - //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); + ASSERT(!MI_IS_WS_UNSAFE(Process)); /* The thread doesn't own it anymore */ ASSERT(Thread->OwnsProcessWorkingSetExclusive == TRUE); Thread->OwnsProcessWorkingSetExclusive = FALSE; - /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ - - /* Unblock APCs */ + /* Release the lock and re-enable APCs */ + ExReleasePushLockExclusive(&Process->Vm.WorkingSetMutex); KeLeaveGuardedRegion(); +} + +// +// Unlocks the working set for the given process +// +FORCEINLINE +VOID +MiUnlockProcessWorkingSetUnsafe(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Make sure we are the owner of an unsafe acquisition */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + ASSERT(MI_WS_OWNER(Process)); + ASSERT(MI_IS_WS_UNSAFE(Process)); + + /* No longer unsafe */ + Process->Vm.Flags.AcquiredUnsafe = 0; + + /* The thread doesn't own it anymore */ + ASSERT(Thread->OwnsProcessWorkingSetExclusive == TRUE); + Thread->OwnsProcessWorkingSetExclusive = FALSE; + + /* Release the lock but don't touch APC state */ + ExReleasePushLockExclusive(&Process->Vm.WorkingSetMutex); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } // @@ -1148,7 +1232,8 @@ /* Thread shouldn't already be owning something */ ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); - /* FIXME: Actually lock it (we can't because Vm is used by MAREAs) */ + /* Lock this working set */ + ExAcquirePushLockExclusive(&WorkingSet->WorkingSetMutex); /* Which working set is this? */ if (WorkingSet == &MmSystemCacheWs) @@ -1208,10 +1293,66 @@ Thread->OwnsProcessWorkingSetExclusive = FALSE; } - /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ + /* Release the working set lock */ + ExReleasePushLockExclusive(&WorkingSet->WorkingSetMutex); /* Unblock APCs */ KeLeaveGuardedRegion(); +} + +FORCEINLINE +VOID +MiUnlockProcessWorkingSetForFault(IN PEPROCESS Process, + IN PETHREAD Thread, + IN BOOLEAN Safe, + IN BOOLEAN Shared) +{ + ASSERT(MI_WS_OWNER(Process)); + + /* Check if the current owner is unsafe */ + if (MI_IS_WS_UNSAFE(Process)) + { + /* Release unsafely */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + Safe = FALSE; + Shared = FALSE; + } + else if (Thread->OwnsProcessWorkingSetExclusive == 1) + { + /* Owner is safe and exclusive, release normally */ + MiUnlockProcessWorkingSet(Process, Thread); + Safe = TRUE; + Shared = FALSE; + } + else + { + /* Owner is shared (implies safe), release normally */ + ASSERT(FALSE); + Safe = TRUE; + Shared = TRUE; + } +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetForFault(IN PEPROCESS Process, + IN PETHREAD Thread, + IN BOOLEAN Safe, + IN BOOLEAN Shared) +{ + ASSERT(Shared == FALSE); + + /* Check if this was a safe lock or not */ + if (Safe) + { + /* Reacquire safely */ + MiLockProcessWorkingSet(Process, Thread); + } + else + { + /* Reacquire unsafely */ + MiLockProcessWorkingSetUnsafe(Process, Thread); + } } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Sep 3 06:23:31 2012 @@ -135,7 +135,7 @@ Status = STATUS_SUCCESS; /* Pretend as if we own the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Insert the VAD */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); @@ -147,7 +147,7 @@ MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Release the address space lock */ KeReleaseGuardedMutex(&Process->AddressCreationLock); @@ -195,7 +195,7 @@ ASSERT(Vad->u2.VadFlags2.MultipleSecured == FALSE); /* Lock the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Remove this VAD from the tree */ ASSERT(VadTree->NumberGenericTableElements >= 1); @@ -205,7 +205,7 @@ MiDeleteVirtualAddresses((ULONG_PTR)Teb, TebEnd, NULL); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Remove the VAD */ ExFreePool(Vad); @@ -1338,9 +1338,11 @@ /* Lock the process address space from changes */ MmLockAddressSpace(&Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* VM is deleted now */ Process->VmDeleted = TRUE; + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Enumerate the VADs */ VadTree = &Process->VadRoot; @@ -1350,7 +1352,7 @@ Vad = (PMMVAD)VadTree->BalancedRoot.RightChild; /* Lock the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Remove this VAD from the tree */ ASSERT(VadTree->NumberGenericTableElements >= 1); @@ -1373,7 +1375,7 @@ Vad); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); } /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ @@ -1388,8 +1390,16 @@ ExFreePool(Vad); } + /* Lock the working set */ + MiLockProcessWorkingSetUnsafe(Process, Thread); + ASSERT(Process->CloneRoot == NULL); + ASSERT(Process->PhysicalVadRoot == NULL); + /* Delete the shared user data section */ MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); + + /* Release the working set */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Release the address space */ MmUnlockAddressSpace(&Process->Vm); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Sep 3 06:23:31 2012 @@ -84,22 +84,22 @@ ULONG MmCompatibleProtectionMask[8] = { PAGE_NOACCESS, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, - + PAGE_NOACCESS | PAGE_EXECUTE, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | PAGE_EXECUTE_READ, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE | PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_WRITECOPY }; @@ -713,11 +713,29 @@ VOID NTAPI +MiDereferenceControlArea(IN PCONTROL_AREA ControlArea) +{ + KIRQL OldIrql; + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Drop reference counts */ + ControlArea->NumberOfMappedViews--; + ControlArea->NumberOfUserReferences--; + + /* Check if it's time to delete the CA. This releases the lock */ + MiCheckControlArea(ControlArea, OldIrql); +} + +VOID +NTAPI MiRemoveMappedView(IN PEPROCESS CurrentProcess, IN PMMVAD Vad) { KIRQL OldIrql; PCONTROL_AREA ControlArea; + PETHREAD CurrentThread = PsGetCurrentThread(); /* Get the control area */ ControlArea = Vad->ControlArea; @@ -734,7 +752,7 @@ Vad); /* Release the working set */ - MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + MiUnlockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -760,6 +778,8 @@ PVOID DbgBase = NULL; SIZE_T RegionSize; NTSTATUS Status; + PETHREAD CurrentThread = PsGetCurrentThread(); + PEPROCESS CurrentProcess = PsGetCurrentProcess(); PAGED_CODE(); /* Check for Mm Region */ @@ -771,7 +791,7 @@ } /* Check if we should attach to the process */ - if (PsGetCurrentProcess() != Process) + if (CurrentProcess != Process) { /* The process is different, do an attach */ KeStackAttachProcess(&Process->Pcb, &ApcState); @@ -837,13 +857,13 @@ /* FIXME: Remove VAD charges */ /* Lock the working set */ - MiLockWorkingSet(PsGetCurrentThread(), &Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); /* Remove the VAD */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); - /* Remove the PTEs for this view */ + /* Remove the PTEs for this view, which also releases the working set lock */ MiRemoveMappedView(Process, Vad); /* FIXME: Remove commitment */ @@ -1205,7 +1225,8 @@ &Process->VadRoot)) { DPRINT1("Conflict with SEC_BASED or manually based section!\n"); - return STATUS_CONFLICTING_ADDRESSES; // FIXME: CA Leak + MiDereferenceControlArea(ControlArea); + return STATUS_CONFLICTING_ADDRESSES; } } @@ -1213,7 +1234,11 @@ /* FIXME: we are allocating a LONG VAD for ReactOS compatibility only */ ASSERT((AllocationType & MEM_RESERVE) == 0); /* ARM3 does not support this */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); - if (!Vad) return STATUS_INSUFFICIENT_RESOURCES; /* FIXME: CA Leak */ + if (!Vad) + { + MiDereferenceControlArea(ControlArea); + return STATUS_INSUFFICIENT_RESOURCES; + } RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); Vad->u4.Banked = (PVOID)0xDEADBABE; @@ -1244,13 +1269,13 @@ Status = STATUS_SUCCESS; /* Pretend as if we own the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Insert the VAD */ MiInsertVad((PMMVAD)Vad, Process); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Windows stores this for accounting purposes, do so as well */ if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; @@ -1797,7 +1822,7 @@ PMMPFN Pfn1; ULONG ProtectionMask, QuotaCharge = 0; PUSHORT UsedPageTableEntries; - //PETHREAD Thread = PsGetCurrentThread(); + PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); // @@ -1829,7 +1854,7 @@ // // Get the PTE and PDE for the address, as well as the final PTE // - //MiLockProcessWorkingSet(Thread, Process); + MiLockProcessWorkingSetUnsafe(Process, Thread); PointerPde = MiAddressToPde(StartingAddress); PointerPte = MiAddressToPte(StartingAddress); LastPte = MiAddressToPte(EndingAddress); @@ -1943,7 +1968,7 @@ // // Unlock the working set and update quota charges if needed, then return // - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); if ((QuotaCharge > 0) && (!DontCharge)) { FoundVad->u.VadFlags.CommitCharge -= QuotaCharge; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Sep 3 06:23:31 2012 @@ -205,7 +205,7 @@ IN PEPROCESS CurrentProcess) { NTSTATUS Status; - BOOLEAN WsWasLocked = FALSE, LockChange = FALSE; + BOOLEAN WsShared = FALSE, WsSafe = FALSE, LockChange = FALSE; PETHREAD CurrentThread = PsGetCurrentThread(); /* Must be a non-pool page table, since those are double-mapped already */ @@ -219,13 +219,11 @@ /* Check if the page table is valid */ while (!MmIsAddressValid(PageTableVirtualAddress)) { - /* Check if the WS is locked */ - if (CurrentThread->OwnsProcessWorkingSetExclusive) - { - /* Unlock the working set and remember it was locked */ - MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); - WsWasLocked = TRUE; - } + /* Release the working set lock */ + MiUnlockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + WsSafe, + WsShared); /* Fault it in */ Status = MmAccessFault(FALSE, PageTableVirtualAddress, KernelMode, NULL); @@ -240,7 +238,10 @@ } /* Lock the working set again */ - if (WsWasLocked) MiLockProcessWorkingSet(CurrentProcess, CurrentThread); + MiLockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + WsSafe, + WsShared); /* This flag will be useful later when we do better locking */ LockChange = TRUE; @@ -1884,8 +1885,9 @@ ULONG ProtectionMask, OldProtect; BOOLEAN Committed; NTSTATUS Status = STATUS_SUCCESS; - - /* Calcualte base address for the VAD */ + PETHREAD Thread = PsGetCurrentThread(); + + /* Calculate base address for the VAD */ StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1)); @@ -1896,7 +1898,7 @@ DPRINT1("Invalid protection mask\n"); return STATUS_INVALID_PAGE_PROTECTION; } - + /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) @@ -2006,7 +2008,8 @@ goto FailPath; } - //MiLockProcessWorkingSet(Thread, Process); + /* Lock the working set */ + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Check if all pages in this range are committed */ Committed = MiIsEntireRangeCommitted(StartingAddress, @@ -2018,7 +2021,7 @@ /* Fail */ DPRINT1("The entire range is not committed\n"); Status = STATUS_NOT_COMMITTED; - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); goto FailPath; } @@ -2105,7 +2108,7 @@ } /* Unlock the working set */ - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); } /* Unlock the address space */ @@ -2278,7 +2281,7 @@ PointerPde = MiAddressToPde(StartingAddress); PointerPte = MiAddressToPte(StartingAddress); if (Vad->u.VadFlags.MemCommit) CommitPte = MiAddressToPte(Vad->EndingVpn << PAGE_SHIFT); - MiLockWorkingSet(CurrentThread, &Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make the PDE valid, and now loop through each page's worth of data @@ -2403,7 +2406,7 @@ // release the working set and return the commit reduction accounting. // if (PteCount) MiProcessValidPteList(ValidPteList, PteCount); - MiUnlockWorkingSet(CurrentThread, &Process->Vm); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); return CommitReduction; } @@ -3992,10 +3995,10 @@ // // Lock the working set and insert the VAD into the process VAD tree // - MiLockProcessWorkingSet(Process, CurrentThread); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); Vad->ControlArea = NULL; // For Memory-Area hack MiInsertVad(Vad, Process); - MiUnlockProcessWorkingSet(Process, CurrentThread); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); // // Update the virtual size of the process, and if this is now the highest @@ -4254,7 +4257,7 @@ // // Lock the working set while we play with user pages and page tables // - //MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make the current page table valid, and then loop each page within it @@ -4335,7 +4338,7 @@ // the target process if it was not the current process. Also dereference the // target process if this wasn't the case. // - //MiUnlockProcessWorkingSet(Process, CurrentThread); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); Status = STATUS_SUCCESS; FailPath: MmUnlockAddressSpace(AddressSpace); @@ -4584,7 +4587,7 @@ // // Finally lock the working set and remove the VAD from the VAD tree // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -4614,7 +4617,7 @@ // the code path above when the caller sets a zero region size // and the whole VAD is destroyed // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -4653,7 +4656,7 @@ // and then change the ending address of the VAD to be a bit // smaller. // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); CommitReduction = MiCalculatePageCommitment(StartingAddress, EndingAddress, Vad, @@ -4695,7 +4698,7 @@ // around with process pages. // MiDeleteVirtualAddresses(StartingAddress, EndingAddress, NULL); - MiUnlockWorkingSet(CurrentThread, AddressSpace); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); Status = STATUS_SUCCESS; FinalPath:

12 years

[ion] 57227: [NTOSKRNL]: Make executive init functions fail if something didn't work, intstead of silently failing. [NTOSKRNL]: Fix Win32k object initialization, fixes boot.

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 3 01:12:58 2012 New Revision: 57227 URL: http://svn.reactos.org/svn/reactos?rev=57227&view=rev Log: [NTOSKRNL]: Make executive init functions fail if something didn't work, intstead of silently failing. [NTOSKRNL]: Fix Win32k object initialization, fixes boot. Modified: trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -37,13 +37,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeEventImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Event Object Type\n"); /* Create the Event Object Type */ @@ -55,7 +56,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -31,13 +31,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeEventPairImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Event Pair Object Type\n"); /* Create the Event Pair Object Type */ @@ -50,7 +51,9 @@ ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=572… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -662,32 +662,68 @@ ExpInitializePushLocks(); /* Initialize events and event pairs */ - ExpInitializeEventImplementation(); - ExpInitializeEventPairImplementation(); + if (ExpInitializeEventImplementation() == FALSE) + { + DPRINT1("Executive: Event initialization failed\n"); + return FALSE; + } + if (ExpInitializeEventPairImplementation() == FALSE) + { + DPRINT1("Executive: Event Pair initialization failed\n"); + return FALSE; + } /* Initialize mutants */ - ExpInitializeMutantImplementation(); + if (ExpInitializeMutantImplementation() == FALSE) + { + DPRINT1("Executive: Mutant initialization failed\n"); + return FALSE; + } /* Initialize callbacks */ - ExpInitializeCallbacks(); - + if (ExpInitializeCallbacks() == FALSE) + { + DPRINT1("Executive: Callback initialization failed\n"); + return FALSE; + } + /* Initialize semaphores */ - ExpInitializeSemaphoreImplementation(); - + if (ExpInitializeSemaphoreImplementation() == FALSE) + { + DPRINT1("Executive: Semaphore initialization failed\n"); + return FALSE; + } + /* Initialize timers */ - ExpInitializeTimerImplementation(); - + if (ExpInitializeTimerImplementation() == FALSE) + { + DPRINT1("Executive: Timer initialization failed\n"); + return FALSE; + } + /* Initialize profiling */ - ExpInitializeProfileImplementation(); - + if (ExpInitializeProfileImplementation() == FALSE) + { + DPRINT1("Executive: Profile initialization failed\n"); + return FALSE; + } + /* Initialize UUIDs */ ExpInitUuids(); /* Initialize keyed events */ - ExpInitializeKeyedEventImplementation(); - + if (ExpInitializeKeyedEventImplementation() == FALSE) + { + DPRINT1("Executive: Keyed event initialization failed\n"); + return FALSE; + } + /* Initialize Win32K */ - ExpWin32kInit(); + if (ExpWin32kInit() == FALSE) + { + DPRINT1("Executive: Win32 initialization failed\n"); + return FALSE; + } return TRUE; } Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -32,7 +32,7 @@ _In_ ACCESS_MASK AccessMask, _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG Flags); - + #define KeGetCurrentProcess() ((PKPROCESS)PsGetCurrentProcess()) /* GLOBALS *******************************************************************/ @@ -51,7 +51,8 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN +INIT_FUNCTION NTAPI ExpInitializeKeyedEventImplementation(VOID) { @@ -74,7 +75,7 @@ &ObjectTypeInitializer, NULL, &ExKeyedEventObjectType); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) return FALSE; /* Create the out of memory event for critical sections */ InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, NULL, NULL); @@ -92,11 +93,10 @@ (PVOID*)&ExpCritSecOutOfMemoryEvent, NULL); ZwClose(EventHandle); - } - else - { - DPRINT1("Failed to create keyed event: %lx\n", Status); - } + return TRUE; + } + + return FALSE; } VOID Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -50,13 +50,14 @@ FALSE); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeMutantImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Mutant Object Type\n"); /* Create the Event Pair Object Type */ @@ -68,7 +69,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -61,13 +61,14 @@ if (Profile->Process) ObDereferenceObject(Profile->Process); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeProfileImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Profile Object Type\n"); /* Initialize the Mutex to lock the States */ @@ -83,7 +84,9 @@ ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -37,13 +37,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeSemaphoreImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Semaphore Object Type\n"); /* Create the Event Pair Object Type */ @@ -55,7 +56,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -216,13 +216,14 @@ ObDereferenceObjectEx(Timer, DerefsToDo); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeTimerImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; /* Create the Timer Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); @@ -234,11 +235,13 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = TIMER_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = ExpDeleteTimer; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); + if (!NT_SUCCESS(Status)) return FALSE; /* Initialize the Wait List and Lock */ KeInitializeSpinLock(&ExpWakeListLock); InitializeListHead(&ExpWakeList); + return TRUE; } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -133,13 +133,14 @@ ExpDesktopObjectDelete(&Parameters); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpWin32kInit(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Win32 Object Types\n"); /* Create the window station Object Type */ @@ -151,16 +152,17 @@ ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; - ObjectTypeInitializer.MaintainHandleCount = TRUE; ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | OBJ_PERMANENT | OBJ_EXCLUSIVE; - ObCreateObjectType(&Name, - &ObjectTypeInitializer, - NULL, - &ExWindowStationObjectType); - + ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_REQUIRED; + Status = ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExWindowStationObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; @@ -171,6 +173,9 @@ &ObjectTypeInitializer, NULL, &ExDesktopObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + + return TRUE; } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -140,7 +140,7 @@ /* INITIALIZATION FUNCTIONS *************************************************/ -VOID +BOOLEAN NTAPI ExpWin32kInit(VOID); @@ -202,31 +202,31 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); -VOID +BOOLEAN NTAPI ExpInitializeEventImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeKeyedEventImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeEventPairImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeSemaphoreImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeMutantImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeTimerImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeProfileImplementation(VOID);

12 years

[ion] 57226: [NTOSKRNL]: Fixed keyed event initialization.

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 3 00:33:05 2012 New Revision: 57226 URL: http://svn.reactos.org/svn/reactos?rev=57226&view=rev Log: [NTOSKRNL]: Fixed keyed event initialization. Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Mon Sep 3 00:33:05 2012 @@ -25,11 +25,14 @@ } HashTable[NUM_KEY_HASH_BUCKETS]; } EX_KEYED_EVENT, *PEX_KEYED_EVENT; -VOID -NTAPI -ExpInitializeKeyedEvent( - _Out_ PEX_KEYED_EVENT KeyedEvent); - +NTSTATUS +NTAPI +ZwCreateKeyedEvent( + _Out_ PHANDLE OutHandle, + _In_ ACCESS_MASK AccessMask, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags); + #define KeGetCurrentProcess() ((PKPROCESS)PsGetCurrentProcess()) /* GLOBALS *******************************************************************/ @@ -46,7 +49,6 @@ EVENT_ALL_ACCESS }; - /* FUNCTIONS *****************************************************************/ VOID @@ -55,49 +57,46 @@ { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer = {0}; UNICODE_STRING TypeName = RTL_CONSTANT_STRING(L"KeyedEvent"); - NTSTATUS Status; + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\KernelObjects\\CritSecOutOfMemoryEvent"); + NTSTATUS Status; + HANDLE EventHandle; + OBJECT_ATTRIBUTES ObjectAttributes; /* Set up the object type initializer */ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; - //ObjectTypeInitializer.DeleteProcedure = ???; - //ObjectTypeInitializer.OkayToCloseProcedure = ???; + ObjectTypeInitializer.UseDefaultObject = TRUE; /* Create the keyed event object type */ Status = ObCreateObjectType(&TypeName, &ObjectTypeInitializer, NULL, &ExKeyedEventObjectType); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - // FIXME - KeBugCheck(0); - } - - /* Create the global keyed event for critical sections on low memory */ - Status = ObCreateObject(KernelMode, - ExKeyedEventObjectType, - NULL, - UserMode, - NULL, - sizeof(EX_KEYED_EVENT), - 0, - 0, - (PVOID*)&ExpCritSecOutOfMemoryEvent); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - // FIXME - KeBugCheck(0); - } - - /* Initalize the keyed event */ - ExpInitializeKeyedEvent(ExpCritSecOutOfMemoryEvent); + if (!NT_SUCCESS(Status)) return; + + /* Create the out of memory event for critical sections */ + InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, NULL, NULL); + Status = ZwCreateKeyedEvent(&EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + 0); + if (NT_SUCCESS(Status)) + { + /* Take a reference so we can get rid of the handle */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_ALL_ACCESS, + ExKeyedEventObjectType, + KernelMode, + (PVOID*)&ExpCritSecOutOfMemoryEvent, + NULL); + ZwClose(EventHandle); + } + else + { + DPRINT1("Failed to create keyed event: %lx\n", Status); + } } VOID

12 years

[ion] 57225: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixe...

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 22:06:42 2012 New Revision: 57225 URL: http://svn.reactos.org/svn/reactos?rev=57225&view=rev Log: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixes countless subtle bugs in applications/drivers that were non-obvious before, especially now that Device names are case insensitive, or that asking for certain GENERIC rights translates correctly. Thank you thfabba (Thomas Fabber) for one of the most useful, yet ignored, tests in our suite. Hope this makes it up to you. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/lpctypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,10 +82,10 @@ // // Callback Object Access Mask // -#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) -#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) -#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) -#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#define CALLBACK_MODIFY_STATE 0x0001 +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + CALLBACK_MODIFY_STATE) // // Event Object Access Masks Modified: trunk/reactos/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpctypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -44,7 +44,9 @@ // Port Object Access Masks // #define PORT_CONNECT 0x1 -#define PORT_ALL_ACCESS 0x1 +#define PORT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + PORT_CONNECT) // // Port Object Flags Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -415,6 +415,21 @@ PMMPTE PrototypePte; MMPTE ThePtes[1]; } SEGMENT, *PSEGMENT; + +typedef struct _MAPPED_FILE_SEGMENT +{ + struct _CONTROL_AREA *ControlArea; + ULONG TotalNumberOfPtes; + ULONG NonExtendedPtes; + ULONG Spare0; + UINT64 SizeOfSegment; + MMPTE SegmentPteTemplate; + SIZE_T NumberOfCommittedPages; + PMMEXTEND_INFO ExtendInfo; + SEGMENT_FLAGS SegmentFlags; + PVOID BasedAddress; + struct _MSUBSECTION *LastSubsectionHint; +} MAPPED_FILE_SEGMENT, *PMAPPED_FILE_SEGMENT; // // Event Counter Structure Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -866,6 +866,7 @@ ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_EXCLUSIVE | OBJ_PERMANENT; /* Create it */ return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType); 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] Sun Sep 2 22:06:42 2012 @@ -1495,7 +1495,7 @@ ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject; ObCreateObjectType(&Name, Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -17,9 +17,9 @@ /* Mapping for Callback Object */ GENERIC_MAPPING ExpCallbackMapping = { - CALLBACK_READ, - CALLBACK_WRITE, - CALLBACK_EXECUTE, + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE | CALLBACK_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, CALLBACK_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,10 +23,11 @@ GENERIC_MAPPING ExpEventMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, - EVENT_ALL_ACCESS}; + STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + EVENT_ALL_ACCESS +}; static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { @@ -53,6 +54,7 @@ ObjectTypeInitializer.GenericMapping = ExpEventMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); } Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,8 +23,8 @@ GENERIC_MAPPING ExEventPairMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_READ | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, EVENT_PAIR_ALL_ACCESS }; @@ -49,6 +49,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); } Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=572… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -664,14 +664,13 @@ /* Initialize events and event pairs */ ExpInitializeEventImplementation(); ExpInitializeEventPairImplementation(); - ExpInitializeKeyedEventImplementation(); - + + /* Initialize mutants */ + ExpInitializeMutantImplementation(); + /* Initialize callbacks */ ExpInitializeCallbacks(); - /* Initialize mutants */ - ExpInitializeMutantImplementation(); - /* Initialize semaphores */ ExpInitializeSemaphoreImplementation(); @@ -683,6 +682,9 @@ /* Initialize UUIDs */ ExpInitUuids(); + + /* Initialize keyed events */ + ExpInitializeKeyedEventImplementation(); /* Initialize Win32K */ ExpWin32kInit(); Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -42,7 +42,7 @@ { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_EXECUTE, EVENT_ALL_ACCESS }; @@ -60,7 +60,8 @@ /* Set up the object type initializer */ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; //ObjectTypeInitializer.DeleteProcedure = ???; //ObjectTypeInitializer.OkayToCloseProcedure = ???; Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@ GENERIC_MAPPING ExpMutantMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | MUTANT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, MUTANT_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,6 +82,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); } Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@ GENERIC_MAPPING ExSemaphoreMapping = { - STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, SEMAPHORE_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -151,6 +151,11 @@ ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; + ObjectTypeInitializer.MaintainHandleCount = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | + OBJ_PERMANENT | + OBJ_EXCLUSIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -19,9 +19,9 @@ GENERIC_MAPPING IopCompletionMapping = { - STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, - STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, IO_COMPLETION_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -273,6 +273,7 @@ ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.CaseInsensitive = TRUE; if (!NT_SUCCESS(ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -14,17 +14,17 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE LpcPortObjectType; +POBJECT_TYPE LpcPortObjectType, LpcWaitablePortObjectType; ULONG LpcpMaxMessageSize; PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; KGUARDED_MUTEX LpcpLock; ULONG LpcpTraceLevel = 0; ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1; -static GENERIC_MAPPING LpcpPortMapping = +static GENERIC_MAPPING LpcpPortMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + READ_CONTROL | PORT_CONNECT, + DELETE | PORT_CONNECT, 0, PORT_ALL_ACCESS }; @@ -46,18 +46,29 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Port"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultPagedPoolCharge = FIELD_OFFSET(LPCP_PORT_OBJECT, WaitEvent); ObjectTypeInitializer.GenericMapping = LpcpPortMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_VALID_ATTRIBUTES & ~OBJ_CASE_INSENSITIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); + + RtlInitUnicodeString(&Name, L"WaitablePort"); + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DefaultNonPagedPoolCharge += sizeof(LPCP_PORT_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = 0; + ObjectTypeInitializer.UseDefaultObject = FALSE; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &LpcWaitablePortObjectType); /* Allocate the LPC lookaside list */ LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -2766,6 +2766,7 @@ ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); MmCreatePhysicalMemorySection(); Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -202,6 +202,7 @@ /* Create the Directory Type */ RtlInitUnicodeString(&Name, L"Directory"); + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.CaseInsensitive = TRUE; ObjectTypeInitializer.MaintainTypeList = FALSE; @@ -209,6 +210,7 @@ ObjectTypeInitializer.DeleteProcedure = NULL; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); + ObDirectoryType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Create 'symbolic link' object type */ RtlInitUnicodeString(&Name, L"SymbolicLink"); @@ -218,6 +220,7 @@ ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); + ObSymbolicLinkType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Phase 0 initialization complete */ ObpInitializationPhase++; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -1027,11 +1027,11 @@ POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; - CHAR Tag[4]; OBP_LOOKUP_CONTEXT Context; PWCHAR p; ULONG i; UNICODE_STRING ObjectName; + ANSI_STRING AnsiName; POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Verify parameters */ @@ -1136,12 +1136,22 @@ } else { - /* Set Tag */ - Tag[0] = (CHAR)TypeName->Buffer[0]; - Tag[1] = (CHAR)TypeName->Buffer[1]; - Tag[2] = (CHAR)TypeName->Buffer[2]; - Tag[3] = (CHAR)TypeName->Buffer[3]; - LocalObjectType->Key = *(PULONG)Tag; + /* Convert the tag to ASCII */ + Status = RtlUnicodeStringToAnsiString(&AnsiName, TypeName, TRUE); + if (NT_SUCCESS(Status)) + { + /* For every missing character, use a space */ + for (i = 3; i >= AnsiName.Length; i--) AnsiName.Buffer[i] = ' '; + + /* Set the key and free the converted name */ + LocalObjectType->Key = *(PULONG)AnsiName.Buffer; + ExFreePool(AnsiName.Buffer); + } + else + { + /* Just copy the characters */ + LocalObjectType->Key = *(PULONG)TypeName->Buffer; + } } /* Set up the type information */ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -40,9 +40,13 @@ GENERIC_MAPPING PspJobMapping = { STANDARD_RIGHTS_READ | JOB_OBJECT_QUERY, - STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE | JOB_OBJECT_SET_SECURITY_ATTRIBUTES, + + STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | + JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - STANDARD_RIGHTS_ALL | JOB_OBJECT_ALL_ACCESS + + STANDARD_RIGHTS_ALL | THREAD_ALL_ACCESS // bug fixed only in vista }; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -500,8 +500,7 @@ /* Initialize Object Initializer */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | - OBJ_PERMANENT | + ObjectTypeInitializer.InvalidAttributes = OBJ_PERMANENT | OBJ_EXCLUSIVE | OBJ_OPENIF; ObjectTypeInitializer.PoolType = NonPagedPool; @@ -529,6 +528,7 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EJOB); ObjectTypeInitializer.GenericMapping = PspJobMapping; + ObjectTypeInitializer.InvalidAttributes = 0; ObjectTypeInitializer.ValidAccessMask = JOB_OBJECT_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteJob; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsJobType);

12 years

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 September 2012