Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[fireball] 32799: The default object security method should not directly call Se* routines on the Security Descriptors, since they belong to the object manger security descriptor cache, and they need to be referenced and dereferenced in order to make sure they don't disappear from beneath the caller. Additionally, the code for the "Set" operation should actually go in SeSetSecurityDescriptorInfo API, which was unimplemented. By simply copying the code over, this API is now implemented, and the r

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 31 15:07:02 2008 New Revision: 32799 URL: http://svn.reactos.org/svn/reactos?rev=32799&view=rev Log: The default object security method should not directly call Se* routines on the Security Descriptors, since they belong to the object manger security descriptor cache, and they need to be referenced and dereferenced in order to make sure they don't disappear from beneath the caller. Additionally, the code for the "Set" operation should actually go in SeSetSecurityDescriptorInfo API, which was unimplemented. By simply copying the code over, this API is now implemented, and the routine works as expected. Also, the default method was not handling "delete" requests, but was ignoring them, resulting in memory leaks and never-dereferenced descriptors. Thanks to Alex for finding these bugs. Alex also says SeSetSecurityDescriptorInfo should call the Rtl package (RtlSetObjectSecurity) but we don't implement those functions yet. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -374,12 +374,6 @@ OUT PSECURITY_DESCRIPTOR *DestinationSD ); -NTSTATUS -NTAPI -ObpRemoveSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor -); - PSECURITY_DESCRIPTOR NTAPI ObpReferenceCachedSecurityDescriptor( @@ -436,6 +430,44 @@ IN BOOLEAN LockHeld, IN KPROCESSOR_MODE AccessMode, OUT PNTSTATUS AccessStatus +); + +// +// Default Object Security Callback Routines +// +NTSTATUS +NTAPI +ObAssignObjectSecurityDescriptor( + IN PVOID Object, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN POOL_TYPE PoolType +); + +NTSTATUS +NTAPI +ObDeassignSecurity( + IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor +); + +NTSTATUS +NTAPI +ObQuerySecurityDescriptorInfo( + IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG Length, + IN PSECURITY_DESCRIPTOR *OutputSecurityDescriptor +); + +NTSTATUS +NTAPI +ObSetSecurityDescriptorInfo( + IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping ); // Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -14,6 +14,157 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +ObAssignObjectSecurityDescriptor(IN PVOID Object, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN POOL_TYPE PoolType) +{ + POBJECT_HEADER ObjectHeader; + NTSTATUS Status; + PSECURITY_DESCRIPTOR NewSd; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + if (!SecurityDescriptor) + { + /* Nothing to assign */ + ObjectHeader->SecurityDescriptor = NULL; + return STATUS_SUCCESS; + } + + /* Add it to our internal cache */ + Status = ObpAddSecurityDescriptor(SecurityDescriptor, &NewSd); + if (NT_SUCCESS(Status)) + { + /* Free the old copy */ + ExFreePool(SecurityDescriptor); + + /* Set the new pointer */ + ASSERT(NewSd); + ObjectHeader->SecurityDescriptor = NewSd; + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +ObDeassignSecurity(IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) +{ + /* Dereference it */ + ObpDereferenceCachedSecurityDescriptor(*SecurityDescriptor); + + /* Don't free again later */ + *SecurityDescriptor = NULL; + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ObQuerySecurityDescriptorInfo(IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG Length, + IN PSECURITY_DESCRIPTOR *OutputSecurityDescriptor) +{ + POBJECT_HEADER ObjectHeader; + NTSTATUS Status; + PSECURITY_DESCRIPTOR ObjectSd; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Get the SD */ + ObjectSd = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); + + /* Query the information */ + Status = SeQuerySecurityDescriptorInfo(SecurityInformation, + SecurityDescriptor, + Length, + &ObjectSd); + + /* Check if we have an object SD and dereference it, if so */ + if (ObjectSd) ObpDereferenceCachedSecurityDescriptor(ObjectSd); + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +ObSetSecurityDescriptorInfo(IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + NTSTATUS Status; + POBJECT_HEADER ObjectHeader; + PSECURITY_DESCRIPTOR OldDescriptor, NewDescriptor, CachedDescriptor; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + while (TRUE) + { + /* Reference the old descriptor */ + OldDescriptor = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); + NewDescriptor = OldDescriptor; + + /* Set the SD information */ + Status = SeSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + &NewDescriptor, + PoolType, + GenericMapping); + if (NT_SUCCESS(Status)) + { + /* Now add this to the cache */ + Status = ObpAddSecurityDescriptor(NewDescriptor, &CachedDescriptor); + + /* Let go of our uncached copy */ + ExFreePool(NewDescriptor); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Dereference the old one */ + ASSERT(OldDescriptor == ObjectHeader->SecurityDescriptor); + + /* Now set this as the new descriptor */ + ObjectHeader->SecurityDescriptor = CachedDescriptor; + + /* And dereference the old one */ + ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + else + { + /* We failed, dereference the old one */ + ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + } + else + { + /* We failed, dereference the old one */ + if (OldDescriptor) ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + } + + /* Return status */ + return Status; +} BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=32799… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -882,18 +882,190 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL SeSetSecurityDescriptorInfo(IN PVOID Object OPTIONAL, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, - IN POOL_TYPE PoolType, - IN PGENERIC_MAPPING GenericMapping) + IN PSECURITY_INFORMATION _SecurityInformation, + IN PSECURITY_DESCRIPTOR _SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PISECURITY_DESCRIPTOR ObjectSd; + PISECURITY_DESCRIPTOR NewSd; + PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; + PSID Owner = 0; + PSID Group = 0; + PACL Dacl = 0; + PACL Sacl = 0; + ULONG OwnerLength = 0; + ULONG GroupLength = 0; + ULONG DaclLength = 0; + ULONG SaclLength = 0; + ULONG Control = 0; + ULONG_PTR Current; + SECURITY_INFORMATION SecurityInformation; + + + ObjectSd = *ObjectsSecurityDescriptor; + SecurityInformation = *_SecurityInformation; + + /* Get owner and owner size */ + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Owner != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + + (ULONG_PTR)SecurityDescriptor); + else + Owner = (PSID)SecurityDescriptor->Owner; + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); + } + else + { + if (ObjectSd->Owner != NULL) + { + Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); + } + + /* Get group and group size */ + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Group != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + + (ULONG_PTR)SecurityDescriptor); + else + Group = (PSID)SecurityDescriptor->Group; + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); + } + else + { + if (ObjectSd->Group != NULL) + { + Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); + } + + /* Get DACL and DACL size */ + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && + (SecurityDescriptor->Dacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + + (ULONG_PTR)SecurityDescriptor); + else + Dacl = (PACL)SecurityDescriptor->Dacl; + + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_DACL_PRESENT) && + (ObjectSd->Dacl != NULL)) + { + Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + + /* Get SACL and SACL size */ + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && + (SecurityDescriptor->Sacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + + (ULONG_PTR)SecurityDescriptor); + else + Sacl = (PACL)SecurityDescriptor->Sacl; + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_SACL_PRESENT) && + (ObjectSd->Sacl != NULL)) + { + Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + + NewSd = ExAllocatePool(NonPagedPool, + sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + + DaclLength + SaclLength); + if (NewSd == NULL) + { + ObDereferenceObject(Object); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCreateSecurityDescriptor(NewSd, + SECURITY_DESCRIPTOR_REVISION1); + /* We always build a self-relative descriptor */ + NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; + + Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); + + if (OwnerLength != 0) + { + RtlCopyMemory((PVOID)Current, + Owner, + OwnerLength); + NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); + Current += OwnerLength; + } + + if (GroupLength != 0) + { + RtlCopyMemory((PVOID)Current, + Group, + GroupLength); + NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); + Current += GroupLength; + } + + if (DaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Dacl, + DaclLength); + NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += DaclLength; + } + + if (SaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += SaclLength; + } + + *ObjectsSecurityDescriptor = NewSd; + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=32… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -233,222 +233,63 @@ } NTSTATUS -STDCALL -SeDefaultObjectMethod(PVOID Object, - SECURITY_OPERATION_CODE OperationType, - PSECURITY_INFORMATION _SecurityInformation, - PSECURITY_DESCRIPTOR _SecurityDescriptor, - PULONG ReturnLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping) -{ - PISECURITY_DESCRIPTOR ObjectSd; - PISECURITY_DESCRIPTOR NewSd; - PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; - POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Object); - PSID Owner = 0; - PSID Group = 0; - PACL Dacl = 0; - PACL Sacl = 0; - ULONG OwnerLength = 0; - ULONG GroupLength = 0; - ULONG DaclLength = 0; - ULONG SaclLength = 0; - ULONG Control = 0; - ULONG_PTR Current; - NTSTATUS Status; - SECURITY_INFORMATION SecurityInformation; - - if (OperationType == SetSecurityDescriptor) - { - ObjectSd = Header->SecurityDescriptor; - SecurityInformation = *_SecurityInformation; - - /* Get owner and owner size */ - if (SecurityInformation & OWNER_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Owner != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + - (ULONG_PTR)SecurityDescriptor); - else - Owner = (PSID)SecurityDescriptor->Owner; - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); - } - else - { - if (ObjectSd->Owner != NULL) - { - Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); - } - - /* Get group and group size */ - if (SecurityInformation & GROUP_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Group != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + - (ULONG_PTR)SecurityDescriptor); - else - Group = (PSID)SecurityDescriptor->Group; - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); - } - else - { - if (ObjectSd->Group != NULL) - { - Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); - } - - /* Get DACL and DACL size */ - if (SecurityInformation & DACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - (SecurityDescriptor->Dacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + - (ULONG_PTR)SecurityDescriptor); - else - Dacl = (PACL)SecurityDescriptor->Dacl; - - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_DACL_PRESENT) && - (ObjectSd->Dacl != NULL)) - { - Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - - /* Get SACL and SACL size */ - if (SecurityInformation & SACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - (SecurityDescriptor->Sacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + - (ULONG_PTR)SecurityDescriptor); - else - Sacl = (PACL)SecurityDescriptor->Sacl; - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_SACL_PRESENT) && - (ObjectSd->Sacl != NULL)) - { - Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - - NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + - DaclLength + SaclLength); - if (NewSd == NULL) - { - ObDereferenceObject(Object); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); - /* We always build a self-relative descriptor */ - NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; - - Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); - - if (OwnerLength != 0) - { - RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); - NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); - Current += OwnerLength; - } - - if (GroupLength != 0) - { - RtlCopyMemory((PVOID)Current, - Group, - GroupLength); - NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); - Current += GroupLength; - } - - if (DaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); - NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += DaclLength; - } - - if (SaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); - NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += SaclLength; - } - - /* Add the new SD */ - Status = ObpAddSecurityDescriptor(NewSd, - &Header->SecurityDescriptor); - if (NT_SUCCESS(Status)) - { - /* Remove the old security descriptor */ - ObpRemoveSecurityDescriptor(ObjectSd); - } - else - { - /* Restore the old security descriptor */ - Header->SecurityDescriptor = ObjectSd; - } - - ExFreePool(NewSd); - } - else if (OperationType == QuerySecurityDescriptor) - { - Status = SeQuerySecurityDescriptorInfo(_SecurityInformation, +NTAPI +SeDefaultObjectMethod(IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG ReturnLength OPTIONAL, + IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + PAGED_CODE(); + + /* Select the operation type */ + switch (OperationType) + { + /* Setting a new descriptor */ + case SetSecurityDescriptor: + + /* Sanity check */ + ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); + + /* Set the information */ + return ObSetSecurityDescriptorInfo(Object, + SecurityInformation, SecurityDescriptor, - ReturnLength, - &Header->SecurityDescriptor); - } - else if (OperationType == AssignSecurityDescriptor) - { - /* Assign the security descriptor to the object header */ - Status = ObpAddSecurityDescriptor(SecurityDescriptor, - &Header->SecurityDescriptor); - } - - + OldSecurityDescriptor, + PoolType, + GenericMapping); + + case QuerySecurityDescriptor: + + /* Query the information */ + return ObQuerySecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + ReturnLength, + OldSecurityDescriptor); + + case DeleteSecurityDescriptor: + + /* De-assign it */ + return ObDeassignSecurity(OldSecurityDescriptor); + + case AssignSecurityDescriptor: + + /* Assign it */ + ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); + return STATUS_SUCCESS; + + default: + + /* Bug check */ + KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); + } + + /* Should never reach here */ + ASSERT(FALSE); return STATUS_SUCCESS; }

16 years, 6 months

[fireball] 32798: - Fix PARTITION_STYLE enum to include PARTITION_STYLE_RAW. - Add a few storage-related IOCTLs and GUIDs definitions.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 31 13:22:46 2008 New Revision: 32798 URL: http://svn.reactos.org/svn/reactos?rev=32798&view=rev Log: - Fix PARTITION_STYLE enum to include PARTITION_STYLE_RAW. - Add a few storage-related IOCTLs and GUIDs definitions. Modified: trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -173,6 +173,8 @@ #define SMART_SEND_DRIVE_COMMAND \ CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_UPDATE_PROPERTIES \ + CTL_CODE(IOCTL_DISK_BASE, 0x50, METHOD_BUFFERED, FILE_ANY_ACCESS) #define PARTITION_ENTRY_UNUSED 0x00 #define PARTITION_FAT_12 0x01 Modified: trunk/reactos/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddstor.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -84,6 +84,12 @@ #define IOCTL_STORAGE_RESERVE \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_SET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + #define IOCTL_STORAGE_RESET_BUS \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -121,6 +127,21 @@ DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT, 0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); +DEFINE_GUID(GUID_DEVINTERFACE_HIDDEN_VOLUME, + 0x7f108a28L, 0x9833, 0x4b3b, 0xb7, 0x80, 0x2c, 0x6b, 0x5f, 0xa5, 0xc0, 0x62); + +/* Aliases for storage guids */ +#define DiskClassGuid GUID_DEVINTERFACE_DISK +#define CdRomClassGuid GUID_DEVINTERFACE_CDROM +#define PartitionClassGuid GUID_DEVINTERFACE_PARTITION +#define TapeClassGuid GUID_DEVINTERFACE_TAPE +#define WriteOnceDiskClassGuid GUID_DEVINTERFACE_WRITEONCEDISK +#define VolumeClassGuid GUID_DEVINTERFACE_VOLUME +#define MediumChangerClassGuid GUID_DEVINTERFACE_MEDIUMCHANGER +#define FloppyClassGuid GUID_DEVINTERFACE_FLOPPY +#define CdChangerClassGuid GUID_DEVINTERFACE_CDCHANGER +#define StoragePortClassGuid GUID_DEVINTERFACE_STORAGEPORT +#define HiddenVolumeClassGuid GUID_DEVINTERFACE_HIDDEN_VOLUME typedef enum _STORAGE_MEDIA_TYPE { DDS_4mm = 0x20, Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -5262,7 +5262,8 @@ */ typedef enum _PARTITION_STYLE { PARTITION_STYLE_MBR, - PARTITION_STYLE_GPT + PARTITION_STYLE_GPT, + PARTITION_STYLE_RAW } PARTITION_STYLE; typedef struct _CREATE_DISK_MBR {

16 years, 6 months

[cfinck] 32797: - Check the revision to build and cancel if it's older than 30846. The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846. - Remove some cleaning steps, which are not needed, if we build r30846 or later.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Mar 31 11:44:48 2008 New Revision: 32797 URL: http://svn.reactos.org/svn/reactos?rev=32797&view=rev Log: - Check the revision to build and cancel if it's older than 30846. The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846. - Remove some cleaning steps, which are not needed, if we build r30846 or later. Added: trunk/tools/buildbot/scripts/Linux/checkrev (with props) Modified: trunk/tools/buildbot/scripts/Linux/build.32 trunk/tools/buildbot/scripts/Linux/build.64 trunk/tools/buildbot/scripts/Linux/makeclean trunk/tools/buildbot/scripts/Linux/uploadiso Modified: trunk/tools/buildbot/scripts/Linux/build.32 URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -3,6 +3,8 @@ TIME="$(dirname $0)/time" $TIME bash -c "( + source "checkrev" + export CCACHE_DIR=/opt/buildbot/ccache export CCACHE_PATH=/usr/local/rosbe/bin:$PATH export CCACHE_HARDLINK=1 Modified: trunk/tools/buildbot/scripts/Linux/build.64 URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -3,6 +3,8 @@ TIME="$(dirname $0)/time" $TIME bash -c "( + source "checkrev" + export CCACHE_DIR=/opt/buildbot/ccache export CCACHE_PATH=/usr/local/rosbe/bin:$PATH export CCACHE_HARDLINK=1 Added: trunk/tools/buildbot/scripts/Linux/checkrev URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/check… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/checkrev (added) +++ trunk/tools/buildbot/scripts/Linux/checkrev [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -1,0 +1,8 @@ +#!/bin/bash + +LIMIT=30846 + +if [ $REV -lt $LIMIT ]; then + echo "* This Buildslave cannot build revisions older than $LIMIT" + exit 1 +fi Propchange: trunk/tools/buildbot/scripts/Linux/checkrev ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/buildbot/scripts/Linux/makeclean URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/makec… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -6,6 +6,12 @@ OUTPUT=${ROS_OUTPUT:=output-i386} $TIME bash -c "( + echo -e '\n* Getting revision number...' + export REV=$(svnversion .) + echo -e "* Revision $REV.\n" + + source "checkrev" + echo -e '\n* Cleaning...' if [ -f makefile.auto ]; then @@ -17,11 +23,10 @@ rm -rf $OBJ echo ' * output-i386' rm -rf $OUTPUT + echo ' * reactos' + rm -rf "reactos." echo ' * CD images' rm -f *.iso - - echo -e '\n* Deleting unversioned files from the source...' - ../../svn-clean --exclude '^.buildbot-sourcedata' if [ $# -eq 1 ]; then echo -e '\n* Recreating config.rbuild...' @@ -30,9 +35,5 @@ fi fi - echo -e '\n* Compiling tools...' - ../../build clean - echo -e '* Done compiling tools.' - exit 0 )" Modified: trunk/tools/buildbot/scripts/Linux/uploadiso URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/uploa… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -1,4 +1,6 @@ #!/bin/bash + +source "checkrev" KEY=../../fezile.cute.se.key SSHUSER=rosbuild @@ -22,10 +24,6 @@ echo "* There are no ISO files to process." exit 2 fi - -echo "* Getting revision number..." -REV=$(svnversion .) -echo -e "* Revision $REV.\n" BOOT=bootcd-$REV-$1 LIVE=livecd-$REV-$1

16 years, 6 months

[fireball] 32796: - Fix a typo in the debug message.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 31 10:58:59 2008 New Revision: 32796 URL: http://svn.reactos.org/svn/reactos?rev=32796&view=rev Log: - Fix a typo in the debug message. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Mar 31 10:58:59 2008 @@ -886,7 +886,7 @@ NTSTATUS Status; UNICODE_STRING DriverName; - DPRINT("IopInitializeBootDrivers()"); + DPRINT("IopInitializeBootDrivers()\n"); /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode);

16 years, 6 months

[cfinck] 32795: First detect the mouse and then the keyboard as it was done in the old i8042prt driver. If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. All known keyboard and mouse detection problems should be fixed now! :-) See issue #2790 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Mar 31 10:52:30 2008 New Revision: 32795 URL: http://svn.reactos.org/svn/reactos?rev=32795&view=rev Log: First detect the mouse and then the keyboard as it was done in the old i8042prt driver. If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. All known keyboard and mouse detection problems should be fixed now! :-) See issue #2790 for more details. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Mon Mar 31 10:52:30 2008 @@ -413,11 +413,14 @@ WARN_(I8042PRT, "i8042BasicDetect() failed with status 0x%08lx\n", Status); return STATUS_UNSUCCESSFUL; } + + /* First detect the mouse and then the keyboard! + If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. */ + TRACE_(I8042PRT, "Detecting mouse\n"); + i8042DetectMouse(DeviceExtension); + TRACE_(I8042PRT, "Detecting keyboard\n"); i8042DetectKeyboard(DeviceExtension); - - TRACE_(I8042PRT, "Detecting mouse\n"); - i8042DetectMouse(DeviceExtension); INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO");

16 years, 6 months

[gedmurphy] 32794: missed a few bits in cleanup

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Mar 31 10:00:12 2008 New Revision: 32794 URL: http://svn.reactos.org/svn/reactos?rev=32794&view=rev Log: missed a few bits in cleanup Modified: trunk/rosapps/skel_service/ServiceMain.c Modified: trunk/rosapps/skel_service/ServiceMain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/skel_service/ServiceMain.c… ============================================================================== --- trunk/rosapps/skel_service/ServiceMain.c [iso-8859-1] (original) +++ trunk/rosapps/skel_service/ServiceMain.c [iso-8859-1] Mon Mar 31 10:00:12 2008 @@ -37,7 +37,7 @@ /*******************************************/ -VOID +static VOID UpdateStatus(PSERVICEINFO pServInfo, DWORD NewStatus, DWORD Check) @@ -61,7 +61,7 @@ return; } -INT +static BOOL CreateServiceThread(PSERVICEINFO pServInfo) { HANDLE hThread; @@ -81,6 +81,7 @@ if (!hThread) { LogEvent(_T("Failed to start service thread"), GetLastError(), 101, LOG_ALL); + return FALSE; } UpdateStatus(pServInfo, 0, 1); @@ -93,7 +94,7 @@ if (hThread) CloseHandle(hThread); - return 0; + return TRUE; } @@ -139,8 +140,6 @@ LogEvent(_T("ERROR: Bad control code"), 0, 0, LOG_FILE); break; } - - return; } @@ -166,7 +165,7 @@ UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); - if (CreateServiceThread(&servInfo) != 0) + if (!CreateServiceThread(&servInfo)) { servInfo.servStatus.dwServiceSpecificExitCode = 1; UpdateStatus(&servInfo, SERVICE_STOPPED, 0); @@ -177,8 +176,6 @@ UpdateStatus(&servInfo, SERVICE_STOPPED, 0); LogEvent(_T("Leaving ServiceMain"), 0, 0, LOG_FILE); - - return; }

16 years, 6 months

[gedmurphy] 32793: I wrote a quick skeleton service this morning, thought it might be useful to someone.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Mar 31 09:41:06 2008 New Revision: 32793 URL: http://svn.reactos.org/svn/reactos?rev=32793&view=rev Log: I wrote a quick skeleton service this morning, thought it might be useful to someone. Added: trunk/rosapps/skel_service/ trunk/rosapps/skel_service/ServiceMain.c (with props) trunk/rosapps/skel_service/log.c (with props) trunk/rosapps/skel_service/myservice.h (with props) Added: trunk/rosapps/skel_service/ServiceMain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/skel_service/ServiceMain.c… ============================================================================== --- trunk/rosapps/skel_service/ServiceMain.c (added) +++ trunk/rosapps/skel_service/ServiceMain.c [iso-8859-1] Mon Mar 31 09:41:06 2008 @@ -1,0 +1,199 @@ +/* + * PROJECT: ReactOS services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: skeleton service + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "myservice.h" + +volatile BOOL bShutDown = FALSE; +volatile BOOL bPause = FALSE; + +LPTSTR ServiceName = _T("skel_service"); + +typedef struct _ServiceInfo +{ + SERVICE_STATUS servStatus; + SERVICE_STATUS_HANDLE hStatus; +} SERVICEINFO, *PSERVICEINFO; + +/********* To be moved to new file **********/ +typedef struct _ServiceData +{ + INT val1; + INT val2; +} SERVICEDATA, *PSERVICEDATA; + +DWORD WINAPI ThreadProc(LPVOID lpParam) +{ + while (!bShutDown) + Sleep(1000); + + return 0; +} +/*******************************************/ + + +VOID +UpdateStatus(PSERVICEINFO pServInfo, + DWORD NewStatus, + DWORD Check) +{ + TCHAR szSet[50]; + + if (Check > 0) + pServInfo->servStatus.dwCheckPoint += Check; + else + pServInfo->servStatus.dwCheckPoint = Check; + + if (NewStatus > 0) + pServInfo->servStatus.dwCurrentState = NewStatus; + + _sntprintf(szSet, 49, _T("Setting service to 0x%lu, CheckPoint %lu"), NewStatus, pServInfo->servStatus.dwCheckPoint); + LogEvent(szSet, 0, 0, LOG_FILE); + + if (!SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus)) + LogEvent(_T("Cannot set service status"), GetLastError(), 0, LOG_ALL); + + return; +} + +INT +CreateServiceThread(PSERVICEINFO pServInfo) +{ + HANDLE hThread; + PSERVICEDATA servData; + + UpdateStatus(pServInfo, 0, 1); + + LogEvent(_T("Creating service thread"), 0, 0, LOG_FILE); + + hThread = CreateThread(NULL, + 0, + ThreadProc, + &servData, + 0, + NULL); + + if (!hThread) + { + LogEvent(_T("Failed to start service thread"), GetLastError(), 101, LOG_ALL); + } + + UpdateStatus(pServInfo, 0, 1); + + LogEvent(_T("setting service status to running"), 0, 0, LOG_FILE); + UpdateStatus(pServInfo, SERVICE_RUNNING, 0); + + WaitForSingleObject(hThread, INFINITE); + + if (hThread) + CloseHandle(hThread); + + return 0; +} + + +VOID WINAPI +ServerCtrlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) + +{ + PSERVICEINFO pServInfo = (PSERVICEINFO)lpContext; + + switch (dwControl) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + LogEvent(_T("\nSetting the service to SERVICE_STOP_PENDING"), 0, 0, LOG_FILE); + InterlockedExchange((LONG *)&bShutDown, TRUE); + pServInfo->servStatus.dwWin32ExitCode = 0; + pServInfo->servStatus.dwWaitHint = 0; + UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); + break; + + case SERVICE_CONTROL_PAUSE: + LogEvent(_T("Setting the service to SERVICE_PAUSED"), 0, 0, LOG_FILE); + InterlockedExchange((LONG *)&bPause, TRUE); + UpdateStatus(pServInfo, SERVICE_PAUSED, 0); + break; + + case SERVICE_CONTROL_CONTINUE: + LogEvent(_T("Setting the service to SERVICE_RUNNING"), 0, 0, LOG_FILE); + InterlockedExchange((LONG *)&bPause, FALSE); + UpdateStatus(pServInfo, SERVICE_RUNNING, 0); + break; + + case SERVICE_CONTROL_INTERROGATE: + break; + + default: + if (dwControl > 127 && dwControl < 256) /* user defined */ + LogEvent(_T("User defined control code"), 0, 0, LOG_FILE); + else + LogEvent(_T("ERROR: Bad control code"), 0, 0, LOG_FILE); + break; + } + + return; +} + + +VOID WINAPI +ServiceMain(DWORD argc, LPTSTR argv[]) +{ + SERVICEINFO servInfo; + + LogEvent(_T("Entering ServiceMain"), 0, 0, LOG_FILE); + + servInfo.servStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + servInfo.servStatus.dwCurrentState = SERVICE_STOPPED; + servInfo.servStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; + servInfo.servStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + servInfo.servStatus.dwServiceSpecificExitCode = 0; + servInfo.servStatus.dwCheckPoint = 0; + servInfo.servStatus.dwWaitHint = 1000; + + LogEvent(_T("Registering service control handler"), 0, 0, LOG_FILE); + servInfo.hStatus = RegisterServiceCtrlHandlerEx(ServiceName, ServerCtrlHandler, &servInfo); + if (!servInfo.hStatus) + LogEvent(_T("Failed to register service"), GetLastError(), 100, LOG_ALL); + + UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); + + if (CreateServiceThread(&servInfo) != 0) + { + servInfo.servStatus.dwServiceSpecificExitCode = 1; + UpdateStatus(&servInfo, SERVICE_STOPPED, 0); + return; + } + + LogEvent(_T("Service thread shut down. Set SERVICE_STOPPED status"), 0, 0, LOG_FILE); + UpdateStatus(&servInfo, SERVICE_STOPPED, 0); + + LogEvent(_T("Leaving ServiceMain"), 0, 0, LOG_FILE); + + return; +} + + +int _tmain(int argc, LPTSTR argv[]) +{ + SERVICE_TABLE_ENTRY ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL } + }; + + InitLogging(); + + if (!StartServiceCtrlDispatcher(ServiceTable)) + LogEvent(_T("failed to start the service control dispatcher"), GetLastError(), 101, LOG_ALL); + + return 0; +} Propchange: trunk/rosapps/skel_service/ServiceMain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/skel_service/log.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/skel_service/log.c?rev=327… ============================================================================== --- trunk/rosapps/skel_service/log.c (added) +++ trunk/rosapps/skel_service/log.c [iso-8859-1] Mon Mar 31 09:41:06 2008 @@ -1,0 +1,194 @@ +/* + * PROJECT: ReactOS services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: skeleton service + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "myservice.h" + +static LPTSTR lpEventSource = _T("Skeleton service"); +static LPTSTR lpLogFileName = _T("C:\\skel_service.log"); +static HANDLE hLogFile; + +// needs work +static VOID +LogToEventLog(LPCTSTR lpMsg, + DWORD errNum, + DWORD exitCode, + UINT flags) +{ + HANDLE hEventLog; + + hEventLog = RegisterEventSource(NULL, lpEventSource); + if (hEventLog) + { + ReportEvent(hEventLog, + (flags & LOG_ERROR) ? EVENTLOG_ERROR_TYPE : EVENTLOG_SUCCESS, + 0, + 0, + NULL, + 1, + 0, + &lpMsg, + NULL); + + CloseEventLog(hEventLog); + } +} + +static BOOL +OpenLogFile() +{ + hLogFile = CreateFile(lpLogFileName, + GENERIC_WRITE, + 0, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hLogFile == INVALID_HANDLE_VALUE) + return FALSE; + + return TRUE; +} + +static BOOL +LogToFile(LPCTSTR lpMsg, + DWORD errNum, + DWORD exitCode, + UINT flags) +{ + LPTSTR lpFullMsg = NULL; + DWORD msgLen; + + if (!OpenLogFile()) + return FALSE; + + msgLen = _tcslen(lpMsg) + 1; + + if (flags & LOG_ERROR) + { + LPVOID lpSysMsg; + DWORD eMsgLen; + + eMsgLen = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errNum, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpSysMsg, + 0, + NULL); + + msgLen = msgLen + eMsgLen + 26; + + lpFullMsg = HeapAlloc(GetProcessHeap(), + 0, + msgLen * sizeof(TCHAR)); + if (lpFullMsg) + { + _sntprintf(lpFullMsg, + msgLen, + _T("%s %s ErrNum = %lu ExitCode = %lu\r\n"), + lpMsg, + lpSysMsg, + errNum, + exitCode); + } + + LocalFree(lpSysMsg); + + } + else + { + msgLen += 2; + + lpFullMsg = HeapAlloc(GetProcessHeap(), + 0, + msgLen * sizeof(TCHAR)); + if (lpFullMsg) + { + _sntprintf(lpFullMsg, + msgLen, + _T("%s\r\n"), + lpMsg); + } + } + + if (lpFullMsg) + { + DWORD bytesWritten; + + SetFilePointer(hLogFile, 0, NULL, FILE_END); + + WriteFile(hLogFile, + lpFullMsg, + msgLen * sizeof(TCHAR), + &bytesWritten, + NULL); + if (bytesWritten == 0) + { + LogToEventLog(_T("Failed to write to log file"), + GetLastError(), + 0, + LOG_EVENTLOG | LOG_ERROR); + } + + HeapFree(GetProcessHeap(), + 0, + lpFullMsg); + } + + CloseHandle(hLogFile); + + if (exitCode > 0) + ExitProcess(exitCode); +} + + +VOID +LogEvent(LPCTSTR lpMsg, + DWORD errNum, + DWORD exitCode, + UINT flags) +{ +#ifdef DEBUG + if (flags & LOG_FILE) + LogToFile(lpMsg, errNum, exitCode, flags); +#endif + if (flags & LOG_EVENTLOG) + LogToEventLog(lpMsg, errNum, exitCode, flags); +} + + +VOID +InitLogging() +{ + WCHAR wcBom = 0xFEFF; + + DeleteFile(lpLogFileName); + +#ifdef _UNICODE + if (OpenLogFile()) + { + DWORD bytesWritten; + + WriteFile(hLogFile, + &wcBom, + sizeof(WCHAR), + &bytesWritten, + NULL); + if (bytesWritten == 0) + { + LogToEventLog(_T("Failed to write to log file"), + GetLastError(), + 0, + LOG_EVENTLOG | LOG_ERROR); + } + + CloseHandle(hLogFile); + } +#endif +} Propchange: trunk/rosapps/skel_service/log.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/skel_service/myservice.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/skel_service/myservice.h?r… ============================================================================== --- trunk/rosapps/skel_service/myservice.h (added) +++ trunk/rosapps/skel_service/myservice.h [iso-8859-1] Mon Mar 31 09:41:06 2008 @@ -1,0 +1,21 @@ +#include <windows.h> +#include <tchar.h> + +#define DEBUG 1 + +#define LOG_FILE 1 +#define LOG_EVENTLOG 2 +#define LOG_ERROR 4 +#define LOG_ALL (LOG_FILE | LOG_EVENTLOG | LOG_ERROR) + +extern volatile BOOL bShutDown; +extern volatile BOOL bPause; + +VOID +LogEvent(LPCTSTR lpMsg, + DWORD errNum, + DWORD exitCode, + UINT flags); + +VOID +InitLogging(); Propchange: trunk/rosapps/skel_service/myservice.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 6 months

[tkreuzer] 32792: fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 31 08:44:38 2008 New Revision: 32792 URL: http://svn.reactos.org/svn/reactos?rev=32792&view=rev Log: fix a typo Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon Mar 31 08:44:38 2008 @@ -94,7 +94,7 @@ {0, 0, TAG_META, NULL}, /* 15 META, unused */ {0, 0, TAG_EFSTATE, NULL}, /* 16 EFSTATE, unused */ {0, 0, TAG_BMFD, NULL}, /* 17 BMFD, unused */ - {0, 0, TAG_TTFD, NULL}, /* 18 VTFD, unused */ + {0, 0, TAG_VTFD, NULL}, /* 18 VTFD, unused */ {0, 0, TAG_TTFD, NULL}, /* 19 TTFD, unused */ {0, 0, TAG_RC, NULL}, /* 1a RC, unused */ {0, 0, TAG_TEMP, NULL}, /* 1b TEMP, unused */

16 years, 6 months

[tkreuzer] 32791: - give the fontview class an EXTLOGFONT to set the font, fixes display of wrong font style. - add font size 8

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 31 07:48:40 2008 New Revision: 32791 URL: http://svn.reactos.org/svn/reactos?rev=32791&view=rev Log: - give the fontview class an EXTLOGFONT to set the font, fixes display of wrong font style. - add font size 8 Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=327… ============================================================================== --- trunk/rosapps/fontview/display.c [iso-8859-1] (original) +++ trunk/rosapps/fontview/display.c [iso-8859-1] Mon Mar 31 07:48:40 2008 @@ -140,7 +140,7 @@ } static LRESULT -Display_SetTypeFace(HWND hwnd, LPARAM lParam) +Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont) { DISPLAYDATA* pData; TEXTMETRIC tm; @@ -148,19 +148,19 @@ RECT rect; SCROLLINFO si; int i; + LOGFONTW logfont; /* Set the new type face name */ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, (WCHAR*)lParam); + snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, pExtLogFont->elfFullName); /* Create the new fonts */ hDC = GetDC(hwnd); DeleteObject(pData->hCharSetFont); - pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), - 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); + + logfont = pExtLogFont->elfLogFont; + logfont.lfHeight = -MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72); + pData->hCharSetFont = CreateFontIndirectW(&logfont); /* Get font format */ // FIXME: Get the real font format (OpenType?) @@ -174,11 +174,8 @@ for (i = 0; i < MAX_SIZES; i++) { DeleteObject(pData->hFonts[i]); - pData->hFonts[i] = CreateFontW(-MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), - 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); + logfont.lfHeight = -MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72); + pData->hFonts[i] = CreateFontIndirectW(&logfont); } /* Calculate new page dimensions */ @@ -216,8 +213,13 @@ Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; - const int nSizes[MAX_SIZES] = {12, 18, 24, 36, 48, 60, 72}; + const int nSizes[MAX_SIZES] = {8, 12, 18, 24, 36, 48, 60, 72}; int i; + EXTLOGFONTW ExtLogFont = {{50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"}, + L"Ms Shell Dlg"}; /* Create data structure */ pData = malloc(sizeof(DISPLAYDATA)); @@ -231,18 +233,13 @@ pData->nSizes[i] = nSizes[i]; } - pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); - - pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); + pData->hCaptionFont = CreateFontIndirectW(&ExtLogFont.elfLogFont); + ExtLogFont.elfLogFont.lfHeight = 12; + pData->hSizeFont = CreateFontIndirectW(&ExtLogFont.elfLogFont); Display_SetString(hwnd, (LPARAM)L"Jackdaws love my big sphinx of quartz. 1234567890"); - Display_SetTypeFace(hwnd, (LPARAM)L"Ms Shell Dlg"); + + Display_SetTypeFace(hwnd, &ExtLogFont); return 0; } @@ -398,7 +395,7 @@ return Display_OnVScroll(hwnd, wParam); case FVM_SETTYPEFACE: - return Display_SetTypeFace(hwnd, lParam); + return Display_SetTypeFace(hwnd, (PEXTLOGFONTW)lParam); case FVM_SETSTRING: return Display_SetString(hwnd, lParam); Modified: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=327… ============================================================================== --- trunk/rosapps/fontview/display.h [iso-8859-1] (original) +++ trunk/rosapps/fontview/display.h [iso-8859-1] Mon Mar 31 07:48:40 2008 @@ -8,7 +8,7 @@ /* Size restrictions */ #define MAX_STRING 100 #define MAX_FORMAT 20 -#define MAX_SIZES 7 +#define MAX_SIZES 8 extern const WCHAR g_szFontDisplayClassName[]; Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=32… ============================================================================== --- trunk/rosapps/fontview/fontview.c [iso-8859-1] (original) +++ trunk/rosapps/fontview/fontview.c [iso-8859-1] Mon Mar 31 07:48:40 2008 @@ -23,8 +23,7 @@ #include "fontview.h" HINSTANCE g_hInstance; -WCHAR g_szTypeFaceName[LF_FULLFACESIZE]; -LOGFONTW g_LogFontW; +EXTLOGFONTW g_ExtLogFontW; static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; @@ -117,15 +116,15 @@ PGFRI GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); /* Get the font name */ - dwSize = sizeof(g_szTypeFaceName); - if (!GetFontResourceInfoW(argv[1], &dwSize, g_szTypeFaceName, 1)) + dwSize = sizeof(g_ExtLogFontW.elfFullName); + if (!GetFontResourceInfoW(argv[1], &dwSize, g_ExtLogFontW.elfFullName, 1)) { ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); return -1; } dwSize = sizeof(LOGFONTW); - if (!GetFontResourceInfoW(argv[1], &dwSize, &g_LogFontW, 2)) + if (!GetFontResourceInfoW(argv[1], &dwSize, &g_ExtLogFontW.elfLogFont, 2)) { ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); return -1; @@ -162,7 +161,7 @@ hMainWnd = CreateWindowExW( 0, /* Extended possibilites for variation */ g_szFontViewClassName, /* Classname */ - g_szTypeFaceName, /* Title Text */ + g_ExtLogFontW.elfFullName,/* Title Text */ WS_OVERLAPPEDWINDOW, /* default window */ CW_USEDEFAULT, /* Windows decides the position */ CW_USEDEFAULT, /* where the window ends up on the screen */ @@ -215,7 +214,7 @@ SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); /* Init the display window with the font name */ - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFontW.lfFaceName); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_ExtLogFontW); ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */

16 years, 6 months

[cfinck] 32790: - Remove much deprecated code for the mouse initialization (had been imported from the ancient psaux.sys driver, which was removed in _r14938_) Do a much simpler initialization instead: * The "Get ID" command was used for detecting whether a mouse is present. But it just handled normal mice, IntelliMice and IntelliMice Explorer, although there can be many more possible values for other mice. (see for example http://www.win.tue.nl/~aeb/linux/kbd/scancodes-13.html#mcf2). Also this

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Mar 31 07:40:31 2008 New Revision: 32790 URL: http://svn.reactos.org/svn/reactos?rev=32790&view=rev Log: - Remove much deprecated code for the mouse initialization (had been imported from the ancient psaux.sys driver, which was removed in _r14938_) Do a much simpler initialization instead: * The "Get ID" command was used for detecting whether a mouse is present. But it just handled normal mice, IntelliMice and IntelliMice Explorer, although there can be many more possible values for other mice. (see for example http://www.win.tue.nl/~aeb/linux/kbd/scancodes-13.html#mcf2). Also this command isn't available on all systems. Furthermore we already do a MOUSE_LINE_TEST in i8042BasicDetect, which is the more reliable method to test whether a mouse is plugged in. Therefore this "Get ID" command can be simply removed. * The whole mouse initialization process now boils down to enabling the mouse itself and in the controller * All in all, some more mice should be detected now. - Give i8042IsrWritePort a boolean return value and pass the results of the i8042Write calls - Replace two i8042Write calls for writing to the mouse by one i8042IsrWritePort call where possible - Remove the unused KBD_LINE_TEST define This change was tested under QEMU, VMware and on one real system. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/input/i8042prt/readwrite.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Mon Mar 31 07:40:31 2008 @@ -224,7 +224,7 @@ #define KBD_READ_MODE 0x20 #define KBD_WRITE_MODE 0x60 -#define KBD_LINE_TEST 0xAB +#define MOUSE_ENAB 0xA8 #define MOUSE_LINE_TEST 0xA9 #define CTRL_SELF_TEST 0xAA #define CTRL_WRITE_MOUSE 0xD4 @@ -277,7 +277,7 @@ * Mouse commands * --------------------------------------------------*/ -#define MOU_CMD_GET_ID 0xF2 +#define MOU_ENAB 0xF4 #define MOU_CMD_RESET 0xFF /*----------------------------------------------------- @@ -389,7 +389,7 @@ i8042Flush( IN PPORT_DEVICE_EXTENSION DeviceExtension); -VOID +BOOLEAN i8042IsrWritePort( IN PPORT_DEVICE_EXTENSION DeviceExtension, IN UCHAR Value, Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Mon Mar 31 07:40:31 2008 @@ -7,6 +7,7 @@ Copyright Jason Filby (jasonfilby(a)yahoo.com) Copyright Martijn Vernooij (o112w8r02(a)sneakemail.com) Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + Copyright 2008 Colin Finck (mail(a)colinfinck.de) */ /* INCLUDES ****************************************************************/ @@ -211,8 +212,6 @@ (DeviceExtension->MouseButtonState & ~Mask) | (NewButtonData & Mask); } -static NTSTATUS OldInitialization(PPORT_DEVICE_EXTENSION); /* FIXME */ - /* Does lastest initializations for the mouse. This method * is called just before connecting the interrupt. */ @@ -220,13 +219,34 @@ i8042MouInitialize( IN PI8042_MOUSE_EXTENSION DeviceExtension) { - PPORT_DEVICE_EXTENSION PortDeviceExtension; - - PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension; - -/* FIXME */ OldInitialization(PortDeviceExtension); - - return STATUS_SUCCESS; + NTSTATUS Status; + UCHAR Value; + + /* Enable the PS/2 mouse port */ + i8042Write(DeviceExtension->Common.PortDeviceExtension, DeviceExtension->Common.PortDeviceExtension->ControlPort, MOUSE_ENAB); + + /* Enable the mouse */ + if(!i8042IsrWritePort(DeviceExtension->Common.PortDeviceExtension, MOU_ENAB, CTRL_WRITE_MOUSE)) + { + WARN_(I8042PRT, "Failed to enable mouse!\n"); + return STATUS_IO_DEVICE_ERROR; + } + + Status = i8042ReadDataWait(DeviceExtension->Common.PortDeviceExtension, &Value); + if (!NT_SUCCESS(Status)) + { + WARN_(I8042PRT, "Failed to read the response of MOU_ENAB, status 0x%08lx\n", Status); + return Status; + } + + if(Value == MOUSE_ACK) + { + INFO_(I8042PRT, "Mouse was enabled successfully!\n"); + return STATUS_SUCCESS; + } + + WARN_(I8042PRT, "Got 0x%02x instead of 0xFA\n", Value); + return STATUS_IO_DEVICE_ERROR; } static VOID NTAPI @@ -875,182 +895,3 @@ return TRUE; } - -/**************************************************************************************** - * WARNING: the mouse initialization code has been taken from old ReactOS mouse driver, * - * named psaux.sys, which has been deleted in revision 14938. * - * Coding style and structures are not exactly the same as in the other parts of the * - * i8042prt driver, but code is supposed to work. * - ****************************************************************************************/ - -#define CONTROLLER_COMMAND_MOUSE_ENABLE 0xA8 -#define PSMOUSE_CMD_ENABLE 0x00f4 -#define PSMOUSE_CMD_GETID (0x0200 | MOU_CMD_GET_ID) -#define PSMOUSE_CMD_RESET_BAT (0x0200 | MOU_CMD_RESET) -#define PSMOUSE_RET_ACK MOUSE_ACK -#define PSMOUSE_RET_NAK MOUSE_NACK - -typedef struct _I8042_MOUSE_EXTENSION_OLD -{ - PPORT_DEVICE_EXTENSION PortDeviceExtension; - UCHAR pkt[8]; - UCHAR ack; - ULONG RepliesExpected; -} I8042_MOUSE_EXTENSION_OLD, *PI8042_MOUSE_EXTENSION_OLD; - -/* Sends a byte to the mouse */ -static INT SendByte( - IN PI8042_MOUSE_EXTENSION_OLD DeviceExtension, - IN UCHAR byte) -{ - INT timeout = 100; /* 100 msec */ - UCHAR scancode; - LARGE_INTEGER Millisecond_Timeout; - - Millisecond_Timeout.QuadPart = -10000L; - - DeviceExtension->ack = 0; - - i8042IsrWritePort(DeviceExtension->PortDeviceExtension, byte, CTRL_WRITE_MOUSE); - while ((DeviceExtension->ack == 0) && timeout--) - { - if (i8042ReadKeyboardData(DeviceExtension->PortDeviceExtension, &scancode)) - { - switch(scancode) - { - case PSMOUSE_RET_ACK: - DeviceExtension->ack = 1; - break; - case PSMOUSE_RET_NAK: - DeviceExtension->ack = -1; - break; - default: - DeviceExtension->ack = 1; /* Workaround for mice which don't ACK the Get ID command */ - if (DeviceExtension->RepliesExpected) - DeviceExtension->pkt[--DeviceExtension->RepliesExpected] = scancode; - break; - } - return (INT)(-(DeviceExtension->ack <= 0)); - } - KeDelayExecutionThread(KernelMode, FALSE, &Millisecond_Timeout); - } - return (INT)(-(DeviceExtension->ack <= 0)); -} - -/* Send a PS/2 command to the mouse. */ -static INT SendCommand( - IN PI8042_MOUSE_EXTENSION_OLD DeviceExtension, - IN PUCHAR param, - IN INT command) -{ - LARGE_INTEGER Millisecond_Timeout; - UCHAR scancode; - INT timeout = 500; /* 500 msec */ - UCHAR send = (command >> 12) & 0xf; - UCHAR receive = (command >> 8) & 0xf; - UCHAR i; - - Millisecond_Timeout.QuadPart = -10000L; - - DeviceExtension->RepliesExpected = receive; - if (command == PSMOUSE_CMD_RESET_BAT) - timeout = 2000; /* 2 sec */ - - if (command & 0xff) - if (SendByte(DeviceExtension, command & 0xff)) - return (INT)(DeviceExtension->RepliesExpected = 0) - 1; - - for (i = 0; i < send; i++) - if (SendByte(DeviceExtension, param[i])) - return (INT)(DeviceExtension->RepliesExpected = 0) - 1; - - while (DeviceExtension->RepliesExpected && timeout--) - { - if (DeviceExtension->RepliesExpected == 1 && command == PSMOUSE_CMD_RESET_BAT) - timeout = 100; - - if (DeviceExtension->RepliesExpected == 1 && command == PSMOUSE_CMD_GETID && - DeviceExtension->pkt[1] != 0xab && DeviceExtension->pkt[1] != 0xac) - { - DeviceExtension->RepliesExpected = 0; - break; - } - - if (i8042ReadKeyboardData(DeviceExtension->PortDeviceExtension, &scancode)) - { - DeviceExtension->pkt[--DeviceExtension->RepliesExpected] = scancode; - } - - KeDelayExecutionThread (KernelMode, FALSE, &Millisecond_Timeout); - } - - for (i = 0; i < receive; i++) - param[i] = DeviceExtension->pkt[(receive - 1) - i]; - - if (DeviceExtension->RepliesExpected) - return (int)(DeviceExtension->RepliesExpected = 0) - 1; - - return 0; -} - -/* Detect if mouse is just a standard ps/2 mouse */ -static BOOLEAN TestMouse( - IN PI8042_MOUSE_EXTENSION_OLD DeviceExtension) -{ - UCHAR param[4]; - - param[0] = param[1] = 0xa5; - - /* - * First, we check if it's a mouse. It should send 0x00 or 0x03 - * in case of an IntelliMouse in 4-byte mode or 0x04 for IM Explorer. - */ - if(SendCommand(DeviceExtension, param, PSMOUSE_CMD_GETID)) - return -1; - - if(param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04) - return -1; - - /* - * Then we reset and disable the mouse so that it doesn't generate events. - */ - - return TRUE; -} - -/* Initialize the PS/2 mouse support */ -static BOOLEAN SetupMouse( - IN PI8042_MOUSE_EXTENSION_OLD DeviceExtension) -{ - LARGE_INTEGER Millisecond_Timeout; - - Millisecond_Timeout.QuadPart = -10000L; - - /* setup */ - DeviceExtension->RepliesExpected = 0; - DeviceExtension->ack = 0; - - /* Enable the PS/2 mouse port */ - i8042Write(DeviceExtension->PortDeviceExtension, DeviceExtension->PortDeviceExtension->ControlPort, CONTROLLER_COMMAND_MOUSE_ENABLE); - - if (TestMouse(DeviceExtension)) - { - TRACE_(I8042PRT, "Detected Mouse\n"); - - if (SendCommand(DeviceExtension, NULL, PSMOUSE_CMD_ENABLE)) - WARN_(I8042PRT, "Failed to enable mouse!\n"); - } - - return TRUE; -} - -static NTSTATUS OldInitialization( - IN PPORT_DEVICE_EXTENSION PortDeviceExtension) -{ - I8042_MOUSE_EXTENSION_OLD DeviceExtension; - - RtlZeroMemory(&DeviceExtension, sizeof(I8042_MOUSE_EXTENSION_OLD)); - DeviceExtension.PortDeviceExtension = PortDeviceExtension; - SetupMouse(&DeviceExtension); - return STATUS_SUCCESS; -} Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Mon Mar 31 07:40:31 2008 @@ -179,8 +179,7 @@ i8042Flush(DeviceExtension); - if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_WRITE_MOUSE) - ||!i8042Write(DeviceExtension, DeviceExtension->DataPort, MOU_CMD_RESET)) + if(!i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE)) { WARN_(I8042PRT, "Failed to write reset command to mouse\n"); goto failure; @@ -383,10 +382,7 @@ KIRQL Irql; Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt); - - i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_WRITE_MOUSE); - i8042Write(DeviceExtension, DeviceExtension->DataPort, MOU_CMD_RESET); - + i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE); KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql); } Modified: trunk/reactos/drivers/input/i8042prt/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/rea… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/readwrite.c [iso-8859-1] Mon Mar 31 07:40:31 2008 @@ -34,7 +34,7 @@ } } -VOID +BOOLEAN i8042IsrWritePort( IN PPORT_DEVICE_EXTENSION DeviceExtension, IN UCHAR Value, @@ -42,9 +42,9 @@ { if (SelectCmd) if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, SelectCmd)) - return; - - i8042Write(DeviceExtension, DeviceExtension->DataPort, Value); + return FALSE; + + return i8042Write(DeviceExtension, DeviceExtension->DataPort, Value); } /*

16 years, 6 months

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 March 2008