Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 13254: Rollback last change, since we found out that IoCreateFile can accept
by gvg＠svn.reactos.com 24 Jan '05

24 Jan '05

Rollback last change, since we found out that IoCreateFile can accept usermode parameters too Modified: trunk/reactos/ntoskrnl/include/internal/safe.h Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/mailslot.c Modified: trunk/reactos/ntoskrnl/io/npipe.c Modified: trunk/reactos/ntoskrnl/rtl/capture.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/safe.h --- trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-24 21:05:37 UTC (rev 13253) +++ trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-24 21:21:17 UTC (rev 13254) @@ -21,28 +21,4 @@ IN KPROCESSOR_MODE CurrentMode, IN BOOLEAN CaptureIfKernel); -NTSTATUS -RtlCaptureSecurityDescriptor(OUT PSECURITY_DESCRIPTOR Dest, - IN KPROCESSOR_MODE PreviousMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - IN PSECURITY_DESCRIPTOR UnsafeSrc); - -VOID -RtlReleaseCapturedSecurityDescriptor(IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, - IN KPROCESSOR_MODE CurrentMode, - IN BOOLEAN CaptureIfKernel); - -NTSTATUS -RtlCaptureObjectAttributes(OUT POBJECT_ATTRIBUTES Dest, - IN KPROCESSOR_MODE CurrentMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - IN POBJECT_ATTRIBUTES UnsafeSrc); - -VOID -RtlReleaseCapturedObjectAttributes(IN POBJECT_ATTRIBUTES CapturedObjectAttributes, - IN KPROCESSOR_MODE CurrentMode, - IN BOOLEAN CaptureIfKernel); - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_SAFE_H */ +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_SAFE_Hb */ _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-24 21:05:37 UTC (rev 13253) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-24 21:21:17 UTC (rev 13254) @@ -17,7 +17,7 @@ /* GLOBALS *******************************************************************/ -#define TAG_IO_CREATE TAG('I', 'O', 'C', 'R') +#define TAG_FILE_NAME TAG('F', 'N', 'A', 'M') /* FUNCTIONS *************************************************************/ @@ -357,7 +357,7 @@ PreviousMode = ExGetPreviousMode(); - Status = ObCreateObject(KernelMode, + Status = ObCreateObject(PreviousMode, IoFileObjectType, ObjectAttributes, PreviousMode, @@ -533,132 +533,32 @@ * @implemented */ NTSTATUS STDCALL -NtCreateFile(PHANDLE FileHandleUnsafe, +NtCreateFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributesUnsafe, - PIO_STATUS_BLOCK IoStatusBlockUnsafe, - PLARGE_INTEGER AllocateSizeUnsafe, + POBJECT_ATTRIBUTES ObjectAttributes, + PIO_STATUS_BLOCK IoStatusBlock, + PLARGE_INTEGER AllocateSize, ULONG FileAttributes, ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, - PVOID EaBufferUnsafe, + PVOID EaBuffer, ULONG EaLength) { - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - LARGE_INTEGER AllocateSize; - PVOID EaBuffer; - - PreviousMode = ExGetPreviousMode(); - if (KernelMode == PreviousMode) - { - return IoCreateFile(FileHandleUnsafe, - DesiredAccess, - ObjectAttributesUnsafe, - IoStatusBlockUnsafe, - AllocateSizeUnsafe, - FileAttributes, - ShareAccess, - CreateDisposition, - CreateOptions, - EaBufferUnsafe, - EaLength, - CreateFileTypeNone, - NULL, - 0); - } - - Status = RtlCaptureObjectAttributes(&ObjectAttributes, - PreviousMode, - PagedPool, - FALSE, - ObjectAttributesUnsafe); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (0 != EaLength) - { - EaBuffer = ExAllocatePoolWithTag(PagedPool, EaLength, TAG_IO_CREATE); - if (NULL == EaBuffer) - { - RtlReleaseCapturedObjectAttributes(&ObjectAttributes, - PreviousMode, - FALSE); - return STATUS_NO_MEMORY; - } - } - - _SEH_TRY - { - if (NULL != AllocateSizeUnsafe) - { - ProbeForRead(AllocateSizeUnsafe, - sizeof(LARGE_INTEGER), - sizeof(ULONG)); - AllocateSize = *AllocateSizeUnsafe; - } - if (0 != EaLength) - { - ProbeForRead(EaBufferUnsafe, - EaLength, - sizeof(UCHAR)); - RtlCopyMemory(EaBuffer, EaBufferUnsafe, EaLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (! NT_SUCCESS(Status)) - { - return Status; - } - - Status = IoCreateFile(&FileHandle, - DesiredAccess, - &ObjectAttributes, - &IoStatusBlock, - (NULL == AllocateSizeUnsafe ? NULL : &AllocateSize), - FileAttributes, - ShareAccess, - CreateDisposition, - CreateOptions, - (0 == EaLength ? NULL : EaBuffer), - EaLength, - CreateFileTypeNone, - NULL, - 0); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - _SEH_TRY - { - ProbeForWrite(FileHandleUnsafe, - sizeof(HANDLE), - sizeof(ULONG)); - *FileHandleUnsafe = FileHandle; - ProbeForWrite(IoStatusBlockUnsafe, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - *IoStatusBlockUnsafe = IoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + AllocateSize, + FileAttributes, + ShareAccess, + CreateDisposition, + CreateOptions, + EaBuffer, + EaLength, + CreateFileTypeNone, + NULL, + 0); } @@ -698,90 +598,27 @@ * @implemented */ NTSTATUS STDCALL -NtOpenFile(PHANDLE FileHandleUnsafe, +NtOpenFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributesUnsafe, - PIO_STATUS_BLOCK IoStatusBlockUnsafe, + POBJECT_ATTRIBUTES ObjectAttributes, + PIO_STATUS_BLOCK IoStatusBlock, ULONG ShareAccess, ULONG OpenOptions) { - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - - PreviousMode = ExGetPreviousMode(); - if (KernelMode == PreviousMode) - { - return IoCreateFile(FileHandleUnsafe, - DesiredAccess, - ObjectAttributesUnsafe, - IoStatusBlockUnsafe, - NULL, - 0, - ShareAccess, - FILE_OPEN, - OpenOptions, - NULL, - 0, - CreateFileTypeNone, - NULL, - 0); - } - - Status = RtlCaptureObjectAttributes(&ObjectAttributes, - PreviousMode, - PagedPool, - FALSE, - ObjectAttributesUnsafe); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! NT_SUCCESS(Status)) - { - return Status; - } - - Status = IoCreateFile(&FileHandle, - DesiredAccess, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - ShareAccess, - FILE_OPEN, - OpenOptions, - NULL, - 0, - CreateFileTypeNone, - NULL, - 0); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - _SEH_TRY - { - ProbeForWrite(FileHandleUnsafe, - sizeof(HANDLE), - sizeof(ULONG)); - *FileHandleUnsafe = FileHandle; - ProbeForWrite(IoStatusBlockUnsafe, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - *IoStatusBlockUnsafe = IoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + NULL, + 0, + ShareAccess, + FILE_OPEN, + OpenOptions, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/mailslot.c --- trunk/reactos/ntoskrnl/io/mailslot.c 2005-01-24 21:05:37 UTC (rev 13253) +++ trunk/reactos/ntoskrnl/io/mailslot.c 2005-01-24 21:21:17 UTC (rev 13254) @@ -18,21 +18,16 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL -NtCreateMailslotFile(OUT PHANDLE FileHandleUnsafe, +NtCreateMailslotFile(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributesUnsafe, - OUT PIO_STATUS_BLOCK IoStatusBlockUnsafe, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CreateOptions, IN ULONG MailslotQuota, IN ULONG MaxMessageSize, - IN PLARGE_INTEGER TimeOutUnsafe) + IN PLARGE_INTEGER TimeOut) { MAILSLOT_CREATE_PARAMETERS Buffer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -41,103 +36,32 @@ ASSERT_IRQL(PASSIVE_LEVEL); - if (TimeOutUnsafe != NULL) + if (TimeOut != NULL) { - if (UserMode == PreviousMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForRead(TimeOutUnsafe, - sizeof(LARGE_INTEGER), - sizeof(LARGE_INTEGER)); - Buffer.ReadTimeout.QuadPart = TimeOutUnsafe->QuadPart; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - Buffer.ReadTimeout.QuadPart = TimeOutUnsafe->QuadPart; - } - Buffer.TimeoutSpecified = TRUE; + Buffer.ReadTimeout.QuadPart = TimeOut->QuadPart; + Buffer.TimeoutSpecified = TRUE; } else { - Buffer.TimeoutSpecified = FALSE; + Buffer.TimeoutSpecified = FALSE; } Buffer.MailslotQuota = MailslotQuota; Buffer.MaximumMessageSize = MaxMessageSize; - PreviousMode = ExGetPreviousMode(); - if (KernelMode == PreviousMode) - { - return IoCreateFile(FileHandleUnsafe, - DesiredAccess, - ObjectAttributesUnsafe, - IoStatusBlockUnsafe, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - CreateOptions, - NULL, - 0, - CreateFileTypeMailslot, - (PVOID)&Buffer, - 0); - } - - Status = RtlCaptureObjectAttributes(&ObjectAttributes, - PreviousMode, - PagedPool, - FALSE, - ObjectAttributesUnsafe); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - Status = IoCreateFile(&FileHandle, - DesiredAccess, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - CreateOptions, - NULL, - 0, - CreateFileTypeMailslot, - (PVOID)&Buffer, - 0); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - _SEH_TRY - { - ProbeForWrite(FileHandleUnsafe, - sizeof(HANDLE), - sizeof(ULONG)); - *FileHandleUnsafe = FileHandle; - ProbeForWrite(IoStatusBlockUnsafe, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - *IoStatusBlockUnsafe = IoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + CreateOptions, + NULL, + 0, + CreateFileTypeMailslot, + (PVOID)&Buffer, + 0); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/npipe.c --- trunk/reactos/ntoskrnl/io/npipe.c 2005-01-24 21:05:37 UTC (rev 13253) +++ trunk/reactos/ntoskrnl/io/npipe.c 2005-01-24 21:21:17 UTC (rev 13254) @@ -17,10 +17,10 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL -NtCreateNamedPipeFile(PHANDLE FileHandleUnsafe, +NtCreateNamedPipeFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributesUnsafe, - PIO_STATUS_BLOCK IoStatusBlockUnsafe, + POBJECT_ATTRIBUTES ObjectAttributes, + PIO_STATUS_BLOCK IoStatusBlock, ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, @@ -30,14 +30,9 @@ ULONG MaximumInstances, ULONG InboundQuota, ULONG OutboundQuota, - PLARGE_INTEGER DefaultTimeoutUnsafe) + PLARGE_INTEGER DefaultTimeout) { NAMED_PIPE_CREATE_PARAMETERS Buffer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -46,28 +41,9 @@ ASSERT_IRQL(PASSIVE_LEVEL); - if (DefaultTimeoutUnsafe != NULL) + if (DefaultTimeout != NULL) { - if (UserMode == PreviousMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForRead(DefaultTimeoutUnsafe, - sizeof(LARGE_INTEGER), - sizeof(LARGE_INTEGER)); - Buffer.DefaultTimeout.QuadPart = DefaultTimeoutUnsafe->QuadPart; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - Buffer.DefaultTimeout.QuadPart = DefaultTimeoutUnsafe->QuadPart; - } + Buffer.DefaultTimeout.QuadPart = DefaultTimeout->QuadPart; Buffer.TimeoutSpecified = TRUE; } else @@ -81,72 +57,20 @@ Buffer.InboundQuota = InboundQuota; Buffer.OutboundQuota = OutboundQuota; - PreviousMode = ExGetPreviousMode(); - if (KernelMode == PreviousMode) - { - return IoCreateFile(FileHandleUnsafe, - DesiredAccess, - ObjectAttributesUnsafe, - IoStatusBlockUnsafe, - NULL, - FILE_ATTRIBUTE_NORMAL, - ShareAccess, - CreateDisposition, - CreateOptions, - NULL, - 0, - CreateFileTypeNamedPipe, - (PVOID)&Buffer, - 0); - } - - Status = RtlCaptureObjectAttributes(&ObjectAttributes, - PreviousMode, - PagedPool, - FALSE, - ObjectAttributesUnsafe); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - Status = IoCreateFile(&FileHandle, - DesiredAccess, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - ShareAccess, - CreateDisposition, - CreateOptions, - NULL, - 0, - CreateFileTypeNamedPipe, - (PVOID)&Buffer, - 0); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - _SEH_TRY - { - ProbeForWrite(FileHandleUnsafe, - sizeof(HANDLE), - sizeof(ULONG)); - *FileHandleUnsafe = FileHandle; - ProbeForWrite(IoStatusBlockUnsafe, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - *IoStatusBlockUnsafe = IoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + ShareAccess, + CreateDisposition, + CreateOptions, + NULL, + 0, + CreateFileTypeNamedPipe, + (PVOID)&Buffer, + 0); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/rtl/capture.c --- trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-24 21:05:37 UTC (rev 13253) +++ trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-24 21:21:17 UTC (rev 13254) @@ -32,8 +32,6 @@ #define NDEBUG #include <internal/debug.h> -#define TAG_CAPT TAG('C', 'A', 'P', 'T') - /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -97,7 +95,7 @@ if(Src.Length > 0) { Dest->MaximumLength = Src.Length + sizeof(WCHAR); - Dest->Buffer = ExAllocatePoolWithTag(PoolType, Dest->MaximumLength, TAG_CAPT); + Dest->Buffer = ExAllocatePool(PoolType, Dest->MaximumLength); if (Dest->Buffer == NULL) { Dest->Length = Dest->MaximumLength = 0; @@ -166,7 +164,7 @@ */ Dest->Length = Src->Length; Dest->MaximumLength = Src->MaximumLength; - Dest->Buffer = ExAllocatePoolWithTag(NonPagedPool, Dest->MaximumLength, TAG_CAPT); + Dest->Buffer = ExAllocatePool(NonPagedPool, Dest->MaximumLength); if (Dest->Buffer == NULL) { return(Status); @@ -185,478 +183,6 @@ return(STATUS_SUCCESS); } -static NTSTATUS -CaptureSID(OUT PSID *Dest, - IN KPROCESSOR_MODE PreviousMode, - IN POOL_TYPE PoolType, - IN PSID UnsafeSrc) -{ - SID Src; - ULONG Length; - NTSTATUS Status = STATUS_SUCCESS; - - ASSERT(Dest != NULL); - - if(UserMode == PreviousMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - sizeof(SID), - sizeof(ULONG)); - RtlCopyMemory(&Src, UnsafeSrc, sizeof(SID)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - /* capture even though it is considered to be valid */ - RtlCopyMemory(&Src, UnsafeSrc, sizeof(SID)); - } - - if(SID_REVISION != Src.Revision) - { - return STATUS_INVALID_PARAMETER; - } - - Length = RtlLengthSid(&Src); - *Dest = ExAllocatePoolWithTag(PoolType, Length, TAG_CAPT); - if(NULL == *Dest) - { - return STATUS_NO_MEMORY; - } - - if(UserMode == PreviousMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - Length, - sizeof(ULONG)); - RtlCopyMemory(*Dest, UnsafeSrc, Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - RtlCopyMemory(*Dest, UnsafeSrc, Length); - } - - return Status; -} - -static NTSTATUS -CaptureACL(OUT PACL *Dest, - IN KPROCESSOR_MODE PreviousMode, - IN POOL_TYPE PoolType, - IN PACL UnsafeSrc) -{ - ACL Src; - ULONG Length; - NTSTATUS Status = STATUS_SUCCESS; - - ASSERT(Dest != NULL); - - if(UserMode == PreviousMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - sizeof(ACL), - sizeof(ULONG)); - RtlCopyMemory(&Src, UnsafeSrc, sizeof(ACL)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - /* capture even though it is considered to be valid */ - RtlCopyMemory(&Src, UnsafeSrc, sizeof(ACL)); - } - - if(Src.AclRevision < MIN_ACL_REVISION || MAX_ACL_REVISION < Src.AclRevision) - { - return STATUS_INVALID_PARAMETER; - } - - Length = Src.AclSize; - *Dest = ExAllocatePoolWithTag(PoolType, Length, TAG_CAPT); - if(NULL == *Dest) - { - return STATUS_NO_MEMORY; - } - - if(UserMode == PreviousMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - Length, - sizeof(ULONG)); - RtlCopyMemory(*Dest, UnsafeSrc, Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - RtlCopyMemory(*Dest, UnsafeSrc, Length); - } - - return Status; -} - -NTSTATUS -RtlCaptureSecurityDescriptor(OUT PSECURITY_DESCRIPTOR Dest, - IN KPROCESSOR_MODE PreviousMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - IN PSECURITY_DESCRIPTOR UnsafeSrc) -{ - SECURITY_DESCRIPTOR Src; - NTSTATUS Status = STATUS_SUCCESS; - - ASSERT(Dest != NULL); - - /* - * Copy the object attributes to kernel space. - */ - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - sizeof(SECURITY_DESCRIPTOR), - sizeof(ULONG)); - Src = *UnsafeSrc; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else if(!CaptureIfKernel) - { - /* just copy the structure, the pointers are considered valid */ - *Dest = *UnsafeSrc; - return STATUS_SUCCESS; - } - else - { - /* capture the object attributes even though it is considered to be valid */ - Src = *UnsafeSrc; - } - - if(SECURITY_DESCRIPTOR_REVISION1 != Src.Revision) - { - return STATUS_INVALID_PARAMETER; - } - - Dest->Revision = Src.Revision; - Dest->Sbz1 = Src.Sbz1; - Dest->Control = Src.Control; - Status = CaptureSID(&Dest->Owner, PreviousMode, PoolType, Src.Owner); - if(!NT_SUCCESS(Status)) - { - return Status; - } - Status = CaptureSID(&Dest->Group, PreviousMode, PoolType, Src.Group); - if(!NT_SUCCESS(Status)) - { - if(NULL != Dest->Owner) - { - ExFreePool(Dest->Owner); - } - return Status; - } - Status = CaptureACL(&Dest->Sacl, PreviousMode, PoolType, Src.Sacl); - if(!NT_SUCCESS(Status)) - { - if(NULL != Dest->Group) - { - ExFreePool(Dest->Group); - } - if(NULL != Dest->Owner) - { - ExFreePool(Dest->Owner); - } - return Status; - } - Status = CaptureACL(&Dest->Dacl, PreviousMode, PoolType, Src.Dacl); - if(!NT_SUCCESS(Status)) - { - if(NULL != Dest->Sacl) - { - ExFreePool(Dest->Sacl); - } - if(NULL != Dest->Group) - { - ExFreePool(Dest->Group); - } - if(NULL != Dest->Owner) - { - ExFreePool(Dest->Owner); - } - return Status; - } - - return Status; -} - -VOID -RtlReleaseCapturedSecurityDescriptor(IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, - IN KPROCESSOR_MODE PreviousMode, - IN BOOLEAN CaptureIfKernel) -{ - ASSERT(SECURITY_DESCRIPTOR_REVISION1 == CapturedSecurityDescriptor->Revision); - - if(PreviousMode == KernelMode && !CaptureIfKernel) - { - return; - } - - if(NULL != CapturedSecurityDescriptor->Dacl) - { - ExFreePool(CapturedSecurityDescriptor->Dacl); - } - if(NULL != CapturedSecurityDescriptor->Sacl) - { - ExFreePool(CapturedSecurityDescriptor->Sacl); - } - if(NULL != CapturedSecurityDescriptor->Group) - { - ExFreePool(CapturedSecurityDescriptor->Group); - } - if(NULL != CapturedSecurityDescriptor->Owner) - { - ExFreePool(CapturedSecurityDescriptor->Owner); - } -} - -NTSTATUS -RtlCaptureObjectAttributes(OUT POBJECT_ATTRIBUTES Dest, - IN KPROCESSOR_MODE PreviousMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - IN POBJECT_ATTRIBUTES UnsafeSrc) -{ - OBJECT_ATTRIBUTES Src; - NTSTATUS Status = STATUS_SUCCESS; - - ASSERT(Dest != NULL); - - /* - * Copy the object attributes to kernel space. - */ - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForRead(UnsafeSrc, - sizeof(OBJECT_ATTRIBUTES), - sizeof(ULONG)); - Src = *UnsafeSrc; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else if(!CaptureIfKernel) - { - /* just copy the structure, the pointers are considered valid */ - *Dest = *UnsafeSrc; - return STATUS_SUCCESS; - } - else - { - /* capture the object attributes even though it is considered to be valid */ - Src = *UnsafeSrc; - } - - if(Src.Length < sizeof(OBJECT_ATTRIBUTES) || NULL == Src.ObjectName) - { - return STATUS_INVALID_PARAMETER; - } - - Dest->Length = sizeof(OBJECT_ATTRIBUTES); - Dest->RootDirectory = Src.RootDirectory; [truncated at 1000 lines; 130 more skipped]

1 0

[mf] 13253: fix typo and update CVS->Subversion
by mf＠svn.reactos.com 24 Jan '05

24 Jan '05

fix typo and update CVS->Subversion Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt _____ Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt --- trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-01-24 19:42:54 UTC (rev 13252) +++ trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-01-24 21:05:37 UTC (rev 13253) @@ -1,6 +1,6 @@ -0You will find only major changes in this file. +You will find only major changes in this file. Small bug fixes and developments steps are not listet here. -If you search for more information, look into the CVS repository. +If you search for more information, look into the Subversion repository. 14.10.2002 m. fuchs Korrektur der Anpassungen durch Übernahme in wine: Anzeige der Verzeichnisnamen in Tree Pane m. fuchs Wieder-Anpassung an natives Übersetzen unter WIN32 mit VC++

1 0

[gvg] 13252: IoCreateFile should be passed kernelmode parameters.
by gvg＠svn.reactos.com 24 Jan '05

24 Jan '05

IoCreateFile should be passed kernelmode parameters. Modified: trunk/reactos/ntoskrnl/include/internal/safe.h Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/mailslot.c Modified: trunk/reactos/ntoskrnl/io/npipe.c Modified: trunk/reactos/ntoskrnl/rtl/capture.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/safe.h --- trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-24 19:32:40 UTC (rev 13251) +++ trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-24 19:42:54 UTC (rev 13252) @@ -21,4 +21,28 @@ IN KPROCESSOR_MODE CurrentMode, IN BOOLEAN CaptureIfKernel); -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_SAFE_Hb */ +NTSTATUS +RtlCaptureSecurityDescriptor(OUT PSECURITY_DESCRIPTOR Dest, + IN KPROCESSOR_MODE PreviousMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + IN PSECURITY_DESCRIPTOR UnsafeSrc); + +VOID +RtlReleaseCapturedSecurityDescriptor(IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernel); + +NTSTATUS +RtlCaptureObjectAttributes(OUT POBJECT_ATTRIBUTES Dest, + IN KPROCESSOR_MODE CurrentMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + IN POBJECT_ATTRIBUTES UnsafeSrc); + +VOID +RtlReleaseCapturedObjectAttributes(IN POBJECT_ATTRIBUTES CapturedObjectAttributes, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernel); + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_SAFE_H */ _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-24 19:32:40 UTC (rev 13251) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-24 19:42:54 UTC (rev 13252) @@ -17,7 +17,7 @@ /* GLOBALS *******************************************************************/ -#define TAG_FILE_NAME TAG('F', 'N', 'A', 'M') +#define TAG_IO_CREATE TAG('I', 'O', 'C', 'R') /* FUNCTIONS *************************************************************/ @@ -357,7 +357,7 @@ PreviousMode = ExGetPreviousMode(); - Status = ObCreateObject(PreviousMode, + Status = ObCreateObject(KernelMode, IoFileObjectType, ObjectAttributes, PreviousMode, @@ -533,32 +533,132 @@ * @implemented */ NTSTATUS STDCALL -NtCreateFile(PHANDLE FileHandle, +NtCreateFile(PHANDLE FileHandleUnsafe, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - PLARGE_INTEGER AllocateSize, + POBJECT_ATTRIBUTES ObjectAttributesUnsafe, + PIO_STATUS_BLOCK IoStatusBlockUnsafe, + PLARGE_INTEGER AllocateSizeUnsafe, ULONG FileAttributes, ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, - PVOID EaBuffer, + PVOID EaBufferUnsafe, ULONG EaLength) { - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - AllocateSize, - FileAttributes, - ShareAccess, - CreateDisposition, - CreateOptions, - EaBuffer, - EaLength, - CreateFileTypeNone, - NULL, - 0); + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + LARGE_INTEGER AllocateSize; + PVOID EaBuffer; + + PreviousMode = ExGetPreviousMode(); + if (KernelMode == PreviousMode) + { + return IoCreateFile(FileHandleUnsafe, + DesiredAccess, + ObjectAttributesUnsafe, + IoStatusBlockUnsafe, + AllocateSizeUnsafe, + FileAttributes, + ShareAccess, + CreateDisposition, + CreateOptions, + EaBufferUnsafe, + EaLength, + CreateFileTypeNone, + NULL, + 0); + } + + Status = RtlCaptureObjectAttributes(&ObjectAttributes, + PreviousMode, + PagedPool, + FALSE, + ObjectAttributesUnsafe); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + if (0 != EaLength) + { + EaBuffer = ExAllocatePoolWithTag(PagedPool, EaLength, TAG_IO_CREATE); + if (NULL == EaBuffer) + { + RtlReleaseCapturedObjectAttributes(&ObjectAttributes, + PreviousMode, + FALSE); + return STATUS_NO_MEMORY; + } + } + + _SEH_TRY + { + if (NULL != AllocateSizeUnsafe) + { + ProbeForRead(AllocateSizeUnsafe, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + AllocateSize = *AllocateSizeUnsafe; + } + if (0 != EaLength) + { + ProbeForRead(EaBufferUnsafe, + EaLength, + sizeof(UCHAR)); + RtlCopyMemory(EaBuffer, EaBufferUnsafe, EaLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (! NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateFile(&FileHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + (NULL == AllocateSizeUnsafe ? NULL : &AllocateSize), + FileAttributes, + ShareAccess, + CreateDisposition, + CreateOptions, + (0 == EaLength ? NULL : EaBuffer), + EaLength, + CreateFileTypeNone, + NULL, + 0); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + ProbeForWrite(FileHandleUnsafe, + sizeof(HANDLE), + sizeof(ULONG)); + *FileHandleUnsafe = FileHandle; + ProbeForWrite(IoStatusBlockUnsafe, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + *IoStatusBlockUnsafe = IoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } @@ -598,27 +698,90 @@ * @implemented */ NTSTATUS STDCALL -NtOpenFile(PHANDLE FileHandle, +NtOpenFile(PHANDLE FileHandleUnsafe, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, + POBJECT_ATTRIBUTES ObjectAttributesUnsafe, + PIO_STATUS_BLOCK IoStatusBlockUnsafe, ULONG ShareAccess, ULONG OpenOptions) { - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - NULL, - 0, - ShareAccess, - FILE_OPEN, - OpenOptions, - NULL, - 0, - CreateFileTypeNone, - NULL, - 0); + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + + PreviousMode = ExGetPreviousMode(); + if (KernelMode == PreviousMode) + { + return IoCreateFile(FileHandleUnsafe, + DesiredAccess, + ObjectAttributesUnsafe, + IoStatusBlockUnsafe, + NULL, + 0, + ShareAccess, + FILE_OPEN, + OpenOptions, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); + } + + Status = RtlCaptureObjectAttributes(&ObjectAttributes, + PreviousMode, + PagedPool, + FALSE, + ObjectAttributesUnsafe); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + if (! NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateFile(&FileHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + ShareAccess, + FILE_OPEN, + OpenOptions, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + ProbeForWrite(FileHandleUnsafe, + sizeof(HANDLE), + sizeof(ULONG)); + *FileHandleUnsafe = FileHandle; + ProbeForWrite(IoStatusBlockUnsafe, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + *IoStatusBlockUnsafe = IoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/mailslot.c --- trunk/reactos/ntoskrnl/io/mailslot.c 2005-01-24 19:32:40 UTC (rev 13251) +++ trunk/reactos/ntoskrnl/io/mailslot.c 2005-01-24 19:42:54 UTC (rev 13252) @@ -18,16 +18,21 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL -NtCreateMailslotFile(OUT PHANDLE FileHandle, +NtCreateMailslotFile(OUT PHANDLE FileHandleUnsafe, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, + IN POBJECT_ATTRIBUTES ObjectAttributesUnsafe, + OUT PIO_STATUS_BLOCK IoStatusBlockUnsafe, IN ULONG CreateOptions, IN ULONG MailslotQuota, IN ULONG MaxMessageSize, - IN PLARGE_INTEGER TimeOut) + IN PLARGE_INTEGER TimeOutUnsafe) { MAILSLOT_CREATE_PARAMETERS Buffer; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -36,32 +41,103 @@ ASSERT_IRQL(PASSIVE_LEVEL); - if (TimeOut != NULL) + if (TimeOutUnsafe != NULL) { - Buffer.ReadTimeout.QuadPart = TimeOut->QuadPart; - Buffer.TimeoutSpecified = TRUE; + if (UserMode == PreviousMode) + { + Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForRead(TimeOutUnsafe, + sizeof(LARGE_INTEGER), + sizeof(LARGE_INTEGER)); + Buffer.ReadTimeout.QuadPart = TimeOutUnsafe->QuadPart; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + Buffer.ReadTimeout.QuadPart = TimeOutUnsafe->QuadPart; + } + Buffer.TimeoutSpecified = TRUE; } else { - Buffer.TimeoutSpecified = FALSE; + Buffer.TimeoutSpecified = FALSE; } Buffer.MailslotQuota = MailslotQuota; Buffer.MaximumMessageSize = MaxMessageSize; - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - CreateOptions, - NULL, - 0, - CreateFileTypeMailslot, - (PVOID)&Buffer, - 0); + PreviousMode = ExGetPreviousMode(); + if (KernelMode == PreviousMode) + { + return IoCreateFile(FileHandleUnsafe, + DesiredAccess, + ObjectAttributesUnsafe, + IoStatusBlockUnsafe, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + CreateOptions, + NULL, + 0, + CreateFileTypeMailslot, + (PVOID)&Buffer, + 0); + } + + Status = RtlCaptureObjectAttributes(&ObjectAttributes, + PreviousMode, + PagedPool, + FALSE, + ObjectAttributesUnsafe); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateFile(&FileHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + CreateOptions, + NULL, + 0, + CreateFileTypeMailslot, + (PVOID)&Buffer, + 0); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + ProbeForWrite(FileHandleUnsafe, + sizeof(HANDLE), + sizeof(ULONG)); + *FileHandleUnsafe = FileHandle; + ProbeForWrite(IoStatusBlockUnsafe, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + *IoStatusBlockUnsafe = IoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/io/npipe.c --- trunk/reactos/ntoskrnl/io/npipe.c 2005-01-24 19:32:40 UTC (rev 13251) +++ trunk/reactos/ntoskrnl/io/npipe.c 2005-01-24 19:42:54 UTC (rev 13252) @@ -17,10 +17,10 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL -NtCreateNamedPipeFile(PHANDLE FileHandle, +NtCreateNamedPipeFile(PHANDLE FileHandleUnsafe, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, + POBJECT_ATTRIBUTES ObjectAttributesUnsafe, + PIO_STATUS_BLOCK IoStatusBlockUnsafe, ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, @@ -30,9 +30,14 @@ ULONG MaximumInstances, ULONG InboundQuota, ULONG OutboundQuota, - PLARGE_INTEGER DefaultTimeout) + PLARGE_INTEGER DefaultTimeoutUnsafe) { NAMED_PIPE_CREATE_PARAMETERS Buffer; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -41,9 +46,28 @@ ASSERT_IRQL(PASSIVE_LEVEL); - if (DefaultTimeout != NULL) + if (DefaultTimeoutUnsafe != NULL) { - Buffer.DefaultTimeout.QuadPart = DefaultTimeout->QuadPart; + if (UserMode == PreviousMode) + { + Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForRead(DefaultTimeoutUnsafe, + sizeof(LARGE_INTEGER), + sizeof(LARGE_INTEGER)); + Buffer.DefaultTimeout.QuadPart = DefaultTimeoutUnsafe->QuadPart; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + Buffer.DefaultTimeout.QuadPart = DefaultTimeoutUnsafe->QuadPart; + } Buffer.TimeoutSpecified = TRUE; } else @@ -57,20 +81,72 @@ Buffer.InboundQuota = InboundQuota; Buffer.OutboundQuota = OutboundQuota; - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - ShareAccess, - CreateDisposition, - CreateOptions, - NULL, - 0, - CreateFileTypeNamedPipe, - (PVOID)&Buffer, - 0); + PreviousMode = ExGetPreviousMode(); + if (KernelMode == PreviousMode) + { + return IoCreateFile(FileHandleUnsafe, + DesiredAccess, + ObjectAttributesUnsafe, + IoStatusBlockUnsafe, + NULL, + FILE_ATTRIBUTE_NORMAL, + ShareAccess, + CreateDisposition, + CreateOptions, + NULL, + 0, + CreateFileTypeNamedPipe, + (PVOID)&Buffer, + 0); + } + + Status = RtlCaptureObjectAttributes(&ObjectAttributes, + PreviousMode, + PagedPool, + FALSE, + ObjectAttributesUnsafe); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateFile(&FileHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + ShareAccess, + CreateDisposition, + CreateOptions, + NULL, + 0, + CreateFileTypeNamedPipe, + (PVOID)&Buffer, + 0); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + ProbeForWrite(FileHandleUnsafe, + sizeof(HANDLE), + sizeof(ULONG)); + *FileHandleUnsafe = FileHandle; + ProbeForWrite(IoStatusBlockUnsafe, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + *IoStatusBlockUnsafe = IoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/rtl/capture.c --- trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-24 19:32:40 UTC (rev 13251) +++ trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-24 19:42:54 UTC (rev 13252) @@ -32,6 +32,8 @@ #define NDEBUG #include <internal/debug.h> +#define TAG_CAPT TAG('C', 'A', 'P', 'T') + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -95,7 +97,7 @@ if(Src.Length > 0) { Dest->MaximumLength = Src.Length + sizeof(WCHAR); - Dest->Buffer = ExAllocatePool(PoolType, Dest->MaximumLength); + Dest->Buffer = ExAllocatePoolWithTag(PoolType, Dest->MaximumLength, TAG_CAPT); if (Dest->Buffer == NULL) { Dest->Length = Dest->MaximumLength = 0; @@ -164,7 +166,7 @@ */ Dest->Length = Src->Length; Dest->MaximumLength = Src->MaximumLength; - Dest->Buffer = ExAllocatePool(NonPagedPool, Dest->MaximumLength); + Dest->Buffer = ExAllocatePoolWithTag(NonPagedPool, Dest->MaximumLength, TAG_CAPT); if (Dest->Buffer == NULL) { return(Status); @@ -183,6 +185,478 @@ return(STATUS_SUCCESS); } +static NTSTATUS +CaptureSID(OUT PSID *Dest, + IN KPROCESSOR_MODE PreviousMode, + IN POOL_TYPE PoolType, + IN PSID UnsafeSrc) +{ + SID Src; + ULONG Length; + NTSTATUS Status = STATUS_SUCCESS; + + ASSERT(Dest != NULL); + + if(UserMode == PreviousMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + sizeof(SID), + sizeof(ULONG)); + RtlCopyMemory(&Src, UnsafeSrc, sizeof(SID)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + /* capture even though it is considered to be valid */ + RtlCopyMemory(&Src, UnsafeSrc, sizeof(SID)); + } + + if(SID_REVISION != Src.Revision) + { + return STATUS_INVALID_PARAMETER; + } + + Length = RtlLengthSid(&Src); + *Dest = ExAllocatePoolWithTag(PoolType, Length, TAG_CAPT); + if(NULL == *Dest) + { + return STATUS_NO_MEMORY; + } + + if(UserMode == PreviousMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + Length, + sizeof(ULONG)); + RtlCopyMemory(*Dest, UnsafeSrc, Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + RtlCopyMemory(*Dest, UnsafeSrc, Length); + } + + return Status; +} + +static NTSTATUS +CaptureACL(OUT PACL *Dest, + IN KPROCESSOR_MODE PreviousMode, + IN POOL_TYPE PoolType, + IN PACL UnsafeSrc) +{ + ACL Src; + ULONG Length; + NTSTATUS Status = STATUS_SUCCESS; + + ASSERT(Dest != NULL); + + if(UserMode == PreviousMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + sizeof(ACL), + sizeof(ULONG)); + RtlCopyMemory(&Src, UnsafeSrc, sizeof(ACL)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + /* capture even though it is considered to be valid */ + RtlCopyMemory(&Src, UnsafeSrc, sizeof(ACL)); + } + + if(Src.AclRevision < MIN_ACL_REVISION || MAX_ACL_REVISION < Src.AclRevision) + { + return STATUS_INVALID_PARAMETER; + } + + Length = Src.AclSize; + *Dest = ExAllocatePoolWithTag(PoolType, Length, TAG_CAPT); + if(NULL == *Dest) + { + return STATUS_NO_MEMORY; + } + + if(UserMode == PreviousMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + Length, + sizeof(ULONG)); + RtlCopyMemory(*Dest, UnsafeSrc, Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + RtlCopyMemory(*Dest, UnsafeSrc, Length); + } + + return Status; +} + +NTSTATUS +RtlCaptureSecurityDescriptor(OUT PSECURITY_DESCRIPTOR Dest, + IN KPROCESSOR_MODE PreviousMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + IN PSECURITY_DESCRIPTOR UnsafeSrc) +{ + SECURITY_DESCRIPTOR Src; + NTSTATUS Status = STATUS_SUCCESS; + + ASSERT(Dest != NULL); + + /* + * Copy the object attributes to kernel space. + */ + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + sizeof(SECURITY_DESCRIPTOR), + sizeof(ULONG)); + Src = *UnsafeSrc; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else if(!CaptureIfKernel) + { + /* just copy the structure, the pointers are considered valid */ + *Dest = *UnsafeSrc; + return STATUS_SUCCESS; + } + else + { + /* capture the object attributes even though it is considered to be valid */ + Src = *UnsafeSrc; + } + + if(SECURITY_DESCRIPTOR_REVISION1 != Src.Revision) + { + return STATUS_INVALID_PARAMETER; + } + + Dest->Revision = Src.Revision; + Dest->Sbz1 = Src.Sbz1; + Dest->Control = Src.Control; + Status = CaptureSID(&Dest->Owner, PreviousMode, PoolType, Src.Owner); + if(!NT_SUCCESS(Status)) + { + return Status; + } + Status = CaptureSID(&Dest->Group, PreviousMode, PoolType, Src.Group); + if(!NT_SUCCESS(Status)) + { + if(NULL != Dest->Owner) + { + ExFreePool(Dest->Owner); + } + return Status; + } + Status = CaptureACL(&Dest->Sacl, PreviousMode, PoolType, Src.Sacl); + if(!NT_SUCCESS(Status)) + { + if(NULL != Dest->Group) + { + ExFreePool(Dest->Group); + } + if(NULL != Dest->Owner) + { + ExFreePool(Dest->Owner); + } + return Status; + } + Status = CaptureACL(&Dest->Dacl, PreviousMode, PoolType, Src.Dacl); + if(!NT_SUCCESS(Status)) + { + if(NULL != Dest->Sacl) + { + ExFreePool(Dest->Sacl); + } + if(NULL != Dest->Group) + { + ExFreePool(Dest->Group); + } + if(NULL != Dest->Owner) + { + ExFreePool(Dest->Owner); + } + return Status; + } + + return Status; +} + +VOID +RtlReleaseCapturedSecurityDescriptor(IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN CaptureIfKernel) +{ + ASSERT(SECURITY_DESCRIPTOR_REVISION1 == CapturedSecurityDescriptor->Revision); + + if(PreviousMode == KernelMode && !CaptureIfKernel) + { + return; + } + + if(NULL != CapturedSecurityDescriptor->Dacl) + { + ExFreePool(CapturedSecurityDescriptor->Dacl); + } + if(NULL != CapturedSecurityDescriptor->Sacl) + { + ExFreePool(CapturedSecurityDescriptor->Sacl); + } + if(NULL != CapturedSecurityDescriptor->Group) + { + ExFreePool(CapturedSecurityDescriptor->Group); + } + if(NULL != CapturedSecurityDescriptor->Owner) + { + ExFreePool(CapturedSecurityDescriptor->Owner); + } +} + +NTSTATUS +RtlCaptureObjectAttributes(OUT POBJECT_ATTRIBUTES Dest, + IN KPROCESSOR_MODE PreviousMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + IN POBJECT_ATTRIBUTES UnsafeSrc) +{ + OBJECT_ATTRIBUTES Src; + NTSTATUS Status = STATUS_SUCCESS; + + ASSERT(Dest != NULL); + + /* + * Copy the object attributes to kernel space. + */ + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForRead(UnsafeSrc, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + Src = *UnsafeSrc; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else if(!CaptureIfKernel) + { + /* just copy the structure, the pointers are considered valid */ + *Dest = *UnsafeSrc; + return STATUS_SUCCESS; + } + else + { + /* capture the object attributes even though it is considered to be valid */ + Src = *UnsafeSrc; + } + + if(Src.Length < sizeof(OBJECT_ATTRIBUTES) || NULL == Src.ObjectName) + { + return STATUS_INVALID_PARAMETER; + } + + Dest->Length = sizeof(OBJECT_ATTRIBUTES); + Dest->RootDirectory = Src.RootDirectory; [truncated at 1000 lines; 130 more skipped]

1 0

[gvg] 13251: Check error code before it is possibly clobbered. Spotted by w3seek.
by gvg＠svn.reactos.com 24 Jan '05

24 Jan '05

Check error code before it is possibly clobbered. Spotted by w3seek. Modified: trunk/reactos/apps/utils/shutdown/shutdown.c _____ Modified: trunk/reactos/apps/utils/shutdown/shutdown.c --- trunk/reactos/apps/utils/shutdown/shutdown.c 2005-01-24 18:47:52 UTC (rev 13250) +++ trunk/reactos/apps/utils/shutdown/shutdown.c 2005-01-24 19:32:40 UTC (rev 13251) @@ -146,7 +146,6 @@ if (! AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0) || ERROR_SUCCESS != GetLastError()) { - CloseHandle(hToken); if (ERROR_NOT_ALL_ASSIGNED == GetLastError()) { _ftprintf(stderr, _T("You are not authorized to shutdown the system\n")); @@ -155,6 +154,7 @@ { _ftprintf(stderr, _T("AdjustTokenPrivileges failed with error %d\n"), (int) GetLastError()); } + CloseHandle(hToken); exit(1); } CloseHandle(hToken);

1 0

[chorns] 13250: Add missing file
by chorns＠svn.reactos.com 24 Jan '05

24 Jan '05

Add missing file Added: branches/xmlbuildsystem/reactos/lib/shell32/authors.c Property changes on: branches/xmlbuildsystem/reactos/lib/shell32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros authors.c *.spec.def *.stubs.c + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/authors.c --- branches/xmlbuildsystem/reactos/lib/shell32/authors.c 2005-01-24 16:58:53 UTC (rev 13249) +++ branches/xmlbuildsystem/reactos/lib/shell32/authors.c 2005-01-24 18:47:52 UTC (rev 13250) @@ -0,0 +1 @@ +const char * const SHELL_Authors[] = { "Copyright 1993-2005 WINE team", "Copyright 1998-2005 ReactOS Team", 0 };

1 0

[arty] 13249: Minor fix to ICMP receive.
by arty＠svn.reactos.com 24 Jan '05

24 Jan '05

Minor fix to ICMP receive. Modified: trunk/reactos/drivers/lib/ip/network/ip.c _____ Modified: trunk/reactos/drivers/lib/ip/network/ip.c --- trunk/reactos/drivers/lib/ip/network/ip.c 2005-01-24 14:17:30 UTC (rev 13248) +++ trunk/reactos/drivers/lib/ip/network/ip.c 2005-01-24 16:58:53 UTC (rev 13249) @@ -152,6 +152,10 @@ /* Call the appropriate protocol handler */ (*ProtocolTable[Protocol])(Interface, IPPacket); + /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also + * must be handled here. */ + if( Protocol == IPPROTO_ICMP ) + ICMPReceive( Interface, IPPacket ); } @@ -401,9 +405,6 @@ for (i = 0; i < IP_PROTOCOL_TABLE_SIZE; i++) IPRegisterProtocol(i, DefaultProtocolHandler); - /* Register network level protocol receive handlers */ - IPRegisterProtocol(IPPROTO_ICMP, ICMPReceive); - /* Initialize NTE list and protecting lock */ InitializeListHead(&NetTableListHead); TcpipInitializeSpinLock(&NetTableListLock);

1 0

[ekohl] 13248: Implement DuplicateString and QueryRegistryValue.
by ekohl＠svn.reactos.com 24 Jan '05

24 Jan '05

Implement DuplicateString and QueryRegistryValue. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-01-24 11:53:36 UTC (rev 13247) +++ trunk/reactos/include/wine/setupapi.h 2005-01-24 14:17:30 UTC (rev 13248) @@ -613,11 +613,12 @@ #define SPDRP_MAXIMUM_PROPERTY 0x00000023 -VOID WINAPI MyFree( LPVOID lpMem ); -LPVOID WINAPI MyMalloc( DWORD dwSize ); -LPVOID WINAPI MyRealloc( LPVOID lpSrc, DWORD dwSize ); +LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc); +VOID WINAPI MyFree(LPVOID lpMem); +LPVOID WINAPI MyMalloc(DWORD dwSize); +LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize); -LONG WINAPI QueryRegistryValue( HKEY, LPCWSTR, LPBYTE *, LPDWORD, LPDWORD ); +LONG WINAPI QueryRegistryValue(HKEY, LPCWSTR, LPBYTE *, LPDWORD, LPDWORD); void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show ); void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ); _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-01-24 11:53:36 UTC (rev 13247) +++ trunk/reactos/lib/setupapi/misc.c 2005-01-24 14:17:30 UTC (rev 13248) @@ -91,3 +91,82 @@ return HeapReAlloc(GetProcessHeap(), 0, lpSrc, dwSize); } + + +/********************************************************************** **** + * DuplicateString [SETUPAPI.@] + * + * Duplicates a unicode string. + * + * PARAMS + * lpSrc [I] pointer to the unicode string that will be duplicated + * + * RETURNS + * Success: pointer to the duplicated unicode string + * Failure: NULL + * + * NOTES + * Call MyFree() to release the duplicated string. + */ + +LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc) +{ + LPWSTR lpDst; + + lpDst = MyMalloc((lstrlenW(lpSrc) + 1) * sizeof(WCHAR)); + if (lpDst == NULL) + return NULL; + + wcscpy(lpDst, lpSrc); + + return lpDst; +} + + +/********************************************************************** **** + * QueryRegistryValue [SETUPAPI.@] + * + * Retrieves value data from the registry and allocates memory for the + * value data. + * + * PARAMS + * hKey [I] Handle of the key to query + * lpValueName [I] Name of value under hkey to query + * lpData [O] Destination for the values contents, + * lpType [O] Destination for the value type + * lpcbData [O] Destination for the size of data + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Otherwise + * + * NOTES + * Use MyFree to release the lpData buffer. + */ + +LONG WINAPI QueryRegistryValue(HKEY hKey, + LPCWSTR lpValueName, + LPBYTE *lpData, + LPDWORD lpType, + LPDWORD lpcbData) +{ + LONG lError; + + /* Get required buffer size */ + *lpcbData = 0; + lError = RegQueryValueExW(hKey, lpValueName, 0, lpType, NULL, lpcbData); + if (lError != ERROR_SUCCESS) + return lError; + + /* Allocate buffer */ + *lpData = MyMalloc(*lpcbData); + if (*lpData == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + /* Query registry value */ + lError = RegQueryValueExW(hKey, lpValueName, 0, lpType, *lpData, lpcbData); + if (lError != ERROR_SUCCESS) + MyFree(*lpData); + + return lError; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-01-24 11:53:36 UTC (rev 13247) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-01-24 14:17:30 UTC (rev 13248) @@ -21,7 +21,7 @@ @ stub DelimStringToMultiSz @ stub DestroyTextFileReadBuffer @ stub DoesUserHavePrivilege -@ stub DuplicateString +@ stdcall DuplicateString(wstr) @ stub EnablePrivilege @ stub ExtensionPropSheetPageProc @ stub FileExists @@ -46,7 +46,7 @@ @ stub OpenAndMapFileForRead @ stub OutOfMemory @ stub QueryMultiSzValueToArray -@ stub QueryRegistryValue +@ stdcall QueryRegistryValue(long wstr ptr ptr ptr) @ stub ReadAsciiOrUnicodeTextFile @ stub RegistryDelnode @ stub RetreiveFileSecurity

1 0

[gvg] 13227: Keep usermode stack 4-byte aligned
by gvg＠svn.reactos.com 24 Jan '05

24 Jan '05

Keep usermode stack 4-byte aligned Modified: trunk/reactos/ntoskrnl/ps/w32call.c _____ Modified: trunk/reactos/ntoskrnl/ps/w32call.c --- trunk/reactos/ntoskrnl/ps/w32call.c 2005-01-23 18:18:08 UTC (rev 13226) +++ trunk/reactos/ntoskrnl/ps/w32call.c 2005-01-23 20:48:19 UTC (rev 13227) @@ -292,7 +292,8 @@ memcpy((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA), Thread->Tcb.TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(DWORD))); NewFrame = (PKTRAP_FRAME)((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); - NewFrame->Esp -= (ArgumentLength + (4 * sizeof(ULONG))); + /* We need the stack pointer to remain 4-byte aligned */ + NewFrame->Esp -= (((ArgumentLength + 3) & (~ 0x3)) + (4 * sizeof(ULONG))); NewFrame->Eip = (ULONG)LdrpGetSystemDllCallbackDispatcher(); UserEsp = (PULONG)NewFrame->Esp; UserEsp[0] = 0; /* Return address. */

2 1

[ekohl] 13247: MyMalloc must not zero the memory.
by ekohl＠svn.reactos.com 24 Jan '05

24 Jan '05

MyMalloc must not zero the memory. Modified: trunk/reactos/lib/setupapi/misc.c _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-01-24 09:41:00 UTC (rev 13246) +++ trunk/reactos/lib/setupapi/misc.c 2005-01-24 11:53:36 UTC (rev 13247) @@ -61,7 +61,7 @@ LPVOID WINAPI MyMalloc(DWORD dwSize) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); + return HeapAlloc(GetProcessHeap(), 0, dwSize); }

1 0

[gvg] 13246: tinus <o112w8r02@sneakemail.com>
by gvg＠svn.reactos.com 24 Jan '05

24 Jan '05

tinus <o112w8r02(a)sneakemail.com> Don't allow selecting disabled menu items Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-01-24 09:33:21 UTC (rev 13245) +++ trunk/reactos/lib/user32/windows/menu.c 2005-01-24 09:41:00 UTC (rev 13246) @@ -1884,46 +1884,56 @@ { INT i; ROSMENUITEMINFO ItemInfo; + INT OrigPos; DPRINT("hwnd=%x menu=%x off=0x%04x\n", WndOwner, MenuInfo, Offset); + /* Prevent looping */ + if (0 == MenuInfo->MenuItemCount || 0 == Offset) + return; + else if (Offset < -1) + Offset = -1; + else if (Offset > 1) + Offset = 1; + MenuInitRosMenuItemInfo(&ItemInfo); - if (NO_SELECTED_ITEM != MenuInfo->FocusedItem) + + OrigPos = MenuInfo->FocusedItem; + if (OrigPos == NO_SELECTED_ITEM) /* NO_SELECTED_ITEM is not -1 ! */ { - if (1 == MenuInfo->MenuItemCount) + OrigPos = 0; + i = -1; + } + else + { + i = MenuInfo->FocusedItem; + } + + do + { + /* Step */ + i += Offset; + /* Clip and wrap around */ + if (i < 0) { - MenuCleanupRosMenuItemInfo(&ItemInfo); - return; + i = MenuInfo->MenuItemCount - 1; } - else + else if (i >= MenuInfo->MenuItemCount) { - for (i = MenuInfo->FocusedItem + Offset; - 0 <= i && i < MenuInfo->MenuItemCount; - i += Offset) - { - if (MenuGetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo) && - 0 == (ItemInfo.fType & MF_SEPARATOR)) - { - MenuSelectItem(WndOwner, MenuInfo, i, TRUE, NULL); - MenuCleanupRosMenuItemInfo(&ItemInfo); - return; - } - } + i = 0; } - } - - for (i = (0 < Offset) ? 0 : MenuInfo->MenuItemCount - 1; - 0 <= i && i < MenuInfo->MenuItemCount; i += Offset) - { + /* If this is a good candidate; */ if (MenuGetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo) && - 0 == (ItemInfo.fType & MF_SEPARATOR)) + 0 == (ItemInfo.fType & MF_SEPARATOR) && + 0 == (ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED)) ) { MenuSelectItem(WndOwner, MenuInfo, i, TRUE, NULL); MenuCleanupRosMenuItemInfo(&ItemInfo); return; } - } + } while (i != OrigPos); + /* Not found */ MenuCleanupRosMenuItemInfo(&ItemInfo); } @@ -2276,15 +2286,19 @@ return FALSE; } - if (MenuInfo.FocusedItem != Index) - { - MenuSwitchTracking(Mt, &MenuInfo, Index); - } + if (!(Item.fType & MF_SEPARATOR) && + !(Item.fState & (MFS_DISABLED | MFS_GRAYED)) ) + { + if (MenuInfo.FocusedItem != Index) + { + MenuSwitchTracking(Mt, &MenuInfo, Index); + } - /* If the popup menu is not already "popped" */ - if (0 == (Item.fState & MF_MOUSESELECT)) - { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + /* If the popup menu is not already "popped" */ + if (0 == (Item.fState & MF_MOUSESELECT)) + { + Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + } } MenuCleanupRosMenuItemInfo(&Item); @@ -2422,6 +2436,7 @@ { UINT Index; ROSMENUINFO MenuInfo; + ROSMENUITEMINFO ItemInfo; if (NULL != PtMenu) { @@ -2454,8 +2469,15 @@ } else if (MenuInfo.FocusedItem != Index) { - MenuSwitchTracking(Mt, &MenuInfo, Index); - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + MenuInitRosMenuItemInfo(&ItemInfo); + if (MenuGetRosMenuItemInfo(MenuInfo.Self, Index, &ItemInfo) && + !(ItemInfo.fType & MF_SEPARATOR) && + !(ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED)) ) + { + MenuSwitchTracking(Mt, &MenuInfo, Index); + Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + } + MenuCleanupRosMenuItemInfo(&ItemInfo); } return TRUE; @@ -4026,9 +4048,9 @@ BOOL res = FALSE; mi.hbmpItem = (HBITMAP)0; - // while we could just pass 'lpmii' to win32k, we make a copy so that - // if a bad user passes bad data, we crash his process instead of the - // entire kernel + /* while we could just pass 'lpmii' to win32k, we make a copy so that + if a bad user passes bad data, we crash his process instead of the + entire kernel */ if((lpmii->cbSize == sizeof(MENUITEMINFOW)) || (lpmii->cbSize == sizeof(MENUITEMINFOW) - sizeof(HBITMAP)))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs