Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[hpoussin] 27366: Replace tabs by spaces. No code change
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Tue Jul 3 02:39:11 2007 New Revision: 27366 URL: http://svn.reactos.org/svn/reactos?rev=27366&view=rev Log: Replace tabs by spaces. No code change Modified: trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Tue Jul 3 02:39:11 2007 @@ -123,15 +123,15 @@ /* Create '\Security' directory */ RtlInitUnicodeString(&Name, - L"\\Security"); + L"\\Security"); InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - 0, - NULL); + &Name, + OBJ_PERMANENT, + 0, + NULL); Status = ZwCreateDirectoryObject(&DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create 'Security' directory!\n"); @@ -140,17 +140,17 @@ /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ RtlInitUnicodeString(&Name, - L"\\LSA_AUTHENTICATION_INITALIZED"); + L"\\LSA_AUTHENTICATION_INITALIZED"); InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - DirectoryHandle, - SePublicDefaultSd); + &Name, + OBJ_PERMANENT, + DirectoryHandle, + SePublicDefaultSd); Status = ZwCreateEvent(&EventHandle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - FALSE); + EVENT_ALL_ACCESS, + &ObjectAttributes, + SynchronizationEvent, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create 'LSA_AUTHENTICATION_INITALIZED' event!\n"); @@ -271,170 +271,170 @@ /* 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); - } + { + 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); - } + { + 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); - } + { + 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); - } + { + 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)); - } + { + 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)); - } + { + 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)); - } + { + 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)); - } + { + 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); + sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + + DaclLength + SaclLength); if (NewSd == NULL) - { - ObDereferenceObject(Object); - return STATUS_INSUFFICIENT_RESOURCES; - } + { + ObDereferenceObject(Object); + return STATUS_INSUFFICIENT_RESOURCES; + } RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); + 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; - } + { + 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; - } + { + 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; - } + { + 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; - } + { + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += SaclLength; + } /* Add the new SD */ Status = ObpAddSecurityDescriptor(NewSd, - &Header->SecurityDescriptor); + &Header->SecurityDescriptor); if (NT_SUCCESS(Status)) - { - /* Remove the old security descriptor */ - ObpRemoveSecurityDescriptor(ObjectSd); - } + { + /* Remove the old security descriptor */ + ObpRemoveSecurityDescriptor(ObjectSd); + } else - { - /* Restore the old security descriptor */ - Header->SecurityDescriptor = ObjectSd; - } + { + /* Restore the old security descriptor */ + Header->SecurityDescriptor = ObjectSd; + } ExFreePool(NewSd); } @@ -449,7 +449,7 @@ { /* Assign the security descriptor to the object header */ Status = ObpAddSecurityDescriptor(SecurityDescriptor, - &Header->SecurityDescriptor); + &Header->SecurityDescriptor); } @@ -571,14 +571,14 @@ */ NTSTATUS STDCALL SeAssignSecurityEx(IN PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL, - IN PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL, - OUT PSECURITY_DESCRIPTOR *NewDescriptor, - IN GUID *ObjectType OPTIONAL, - IN BOOLEAN IsDirectoryObject, - IN ULONG AutoInheritFlags, - IN PSECURITY_SUBJECT_CONTEXT SubjectContext, - IN PGENERIC_MAPPING GenericMapping, - IN POOL_TYPE PoolType) + IN PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN GUID *ObjectType OPTIONAL, + IN BOOLEAN IsDirectoryObject, + IN ULONG AutoInheritFlags, + IN PSECURITY_SUBJECT_CONTEXT SubjectContext, + IN PGENERIC_MAPPING GenericMapping, + IN POOL_TYPE PoolType) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -601,12 +601,12 @@ */ NTSTATUS STDCALL SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL, - PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL, - PSECURITY_DESCRIPTOR *NewDescriptor, - BOOLEAN IsDirectoryObject, - PSECURITY_SUBJECT_CONTEXT SubjectContext, - PGENERIC_MAPPING GenericMapping, - POOL_TYPE PoolType) + PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL, + PSECURITY_DESCRIPTOR *NewDescriptor, + BOOLEAN IsDirectoryObject, + PSECURITY_SUBJECT_CONTEXT SubjectContext, + PGENERIC_MAPPING GenericMapping, + POOL_TYPE PoolType) { PISECURITY_DESCRIPTOR ParentDescriptor = _ParentDescriptor; PISECURITY_DESCRIPTOR ExplicitDescriptor = _ExplicitDescriptor; @@ -646,23 +646,23 @@ Owner = ExplicitDescriptor->Owner; if (ExplicitDescriptor->Control & SE_SELF_RELATIVE) - { - Owner = (PSID)(((ULONG_PTR)Owner) + (ULONG_PTR)ExplicitDescriptor); - - } + { + Owner = (PSID)(((ULONG_PTR)Owner) + (ULONG_PTR)ExplicitDescriptor); + + } } else { if (Token != NULL) - { - DPRINT("Use token owner sid!\n"); - Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; - } + { + DPRINT("Use token owner sid!\n"); + Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; + } else - { - DPRINT("Use default owner sid!\n"); - Owner = SeLocalSystemSid; - } + { + DPRINT("Use default owner sid!\n"); + Owner = SeLocalSystemSid; + } Control |= SE_OWNER_DEFAULTED; } @@ -676,22 +676,22 @@ DPRINT("Use explicit group sid!\n"); Group = ExplicitDescriptor->Group; if (ExplicitDescriptor->Control & SE_SELF_RELATIVE) - { - Group = (PSID)(((ULONG_PTR)Group) + (ULONG_PTR)ExplicitDescriptor); - } + { + Group = (PSID)(((ULONG_PTR)Group) + (ULONG_PTR)ExplicitDescriptor); + } } else { if (Token != NULL) - { - DPRINT("Use token group sid!\n"); - Group = Token->PrimaryGroup; - } + { + DPRINT("Use token group sid!\n"); + Group = Token->PrimaryGroup; + } else - { - DPRINT("Use default group sid!\n"); - Group = SeLocalSystemSid; - } + { + DPRINT("Use default group sid!\n"); + Group = SeLocalSystemSid; + } Control |= SE_OWNER_DEFAULTED; } @@ -707,22 +707,22 @@ DPRINT("Use explicit DACL!\n"); Dacl = ExplicitDescriptor->Dacl; if (Dacl != NULL && (ExplicitDescriptor->Control & SE_SELF_RELATIVE)) - { - Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ExplicitDescriptor); - } + { + Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ExplicitDescriptor); + } Control |= SE_DACL_PRESENT; } else if (ParentDescriptor != NULL && - (ParentDescriptor->Control & SE_DACL_PRESENT)) + (ParentDescriptor->Control & SE_DACL_PRESENT)) { DPRINT("Use parent DACL!\n"); /* FIXME: Inherit */ Dacl = ParentDescriptor->Dacl; if (Dacl != NULL && (ParentDescriptor->Control & SE_SELF_RELATIVE)) - { - Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ParentDescriptor); - } + { + Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ParentDescriptor); + } Control |= (SE_DACL_PRESENT | SE_DACL_DEFAULTED); } else if (Token != NULL && Token->DefaultDacl != NULL) @@ -750,22 +750,22 @@ DPRINT("Use explicit SACL!\n"); Sacl = ExplicitDescriptor->Sacl; if (Sacl != NULL && (ExplicitDescriptor->Control & SE_SELF_RELATIVE)) - { - Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ExplicitDescriptor); - } + { + Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ExplicitDescriptor); + } Control |= SE_SACL_PRESENT; } else if (ParentDescriptor != NULL && - (ParentDescriptor->Control & SE_SACL_PRESENT)) + (ParentDescriptor->Control & SE_SACL_PRESENT)) { DPRINT("Use parent SACL!\n"); /* FIXME: Inherit */ Sacl = ParentDescriptor->Sacl; if (Sacl != NULL && (ParentDescriptor->Control & SE_SELF_RELATIVE)) - { - Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ParentDescriptor); - } + { + Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ParentDescriptor); + } Control |= (SE_SACL_PRESENT | SE_SACL_DEFAULTED); } @@ -777,14 +777,14 @@ OwnerLength + GroupLength + DaclLength + SaclLength; DPRINT("L: sizeof(SECURITY_DESCRIPTOR) %d OwnerLength %d GroupLength %d DaclLength %d SaclLength %d\n", - sizeof(SECURITY_DESCRIPTOR), - OwnerLength, - GroupLength, - DaclLength, - SaclLength); + sizeof(SECURITY_DESCRIPTOR), + OwnerLength, + GroupLength, + DaclLength, + SaclLength); Descriptor = ExAllocatePool(PagedPool, - Length); + Length); if (Descriptor == NULL) { DPRINT1("ExAlloctePool() failed\n"); @@ -794,7 +794,7 @@ RtlZeroMemory( Descriptor, Length ); RtlCreateSecurityDescriptor(Descriptor, - SECURITY_DESCRIPTOR_REVISION); + SECURITY_DESCRIPTOR_REVISION); Descriptor->Control = (USHORT)Control | SE_SELF_RELATIVE; @@ -803,8 +803,8 @@ if (SaclLength != 0) { RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); + Sacl, + SaclLength); Descriptor->Sacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += SaclLength; } @@ -812,8 +812,8 @@ if (DaclLength != 0) { RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); + Dacl, + DaclLength); Descriptor->Dacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += DaclLength; } @@ -821,8 +821,8 @@ if (OwnerLength != 0) { RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); + Owner, + OwnerLength); Descriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += OwnerLength; DPRINT("Owner of %x at %x\n", Descriptor, Descriptor->Owner); @@ -852,7 +852,7 @@ static BOOLEAN SepSidInToken(PACCESS_TOKEN _Token, - PSID Sid) + PSID Sid) { ULONG i; PTOKEN Token = (PTOKEN)_Token; @@ -901,15 +901,15 @@ */ BOOLEAN STDCALL SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, - IN BOOLEAN SubjectContextLocked, - IN ACCESS_MASK DesiredAccess, - IN ACCESS_MASK PreviouslyGrantedAccess, - OUT PPRIVILEGE_SET* Privileges, - IN PGENERIC_MAPPING GenericMapping, - IN KPROCESSOR_MODE AccessMode, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus) + IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, + IN BOOLEAN SubjectContextLocked, + IN ACCESS_MASK DesiredAccess, + IN ACCESS_MASK PreviouslyGrantedAccess, + OUT PPRIVILEGE_SET* Privileges, + IN PGENERIC_MAPPING GenericMapping, + IN KPROCESSOR_MODE AccessMode, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus) { LUID_AND_ATTRIBUTES Privilege; ACCESS_MASK CurrentAccess, AccessMask; @@ -994,19 +994,19 @@ Token = SubjectSecurityContext->ClientToken ? - SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; + SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; /* Get the DACL */ Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, - &Present, - &Dacl, - &Defaulted); + &Present, + &Dacl, + &Defaulted); if (!NT_SUCCESS(Status)) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *AccessStatus = Status; return FALSE; @@ -1016,9 +1016,9 @@ if (Present == TRUE && Dacl == NULL) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *GrantedAccess = DesiredAccess; *AccessStatus = STATUS_SUCCESS; @@ -1032,36 +1032,36 @@ Privilege.Attributes = SE_PRIVILEGE_ENABLED; if (SepPrivilegeCheck(Token, - &Privilege, - 1, - PRIVILEGE_SET_ALL_NECESSARY, - AccessMode)) + &Privilege, + 1, + PRIVILEGE_SET_ALL_NECESSARY, + AccessMode)) { CurrentAccess |= WRITE_OWNER; if (DesiredAccess == CurrentAccess) - { - if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } - - *GrantedAccess = CurrentAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } + { + if (SubjectContextLocked == FALSE) + { + SeUnlockSubjectContext(SubjectSecurityContext); + } + + *GrantedAccess = CurrentAccess; + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } } /* RULE 3: Check whether the token is the owner */ Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, - &Sid, - &Defaulted); + &Sid, + &Defaulted); if (!NT_SUCCESS(Status)) { DPRINT1("RtlGetOwnerSecurityDescriptor() failed (Status %lx)\n", Status); if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *AccessStatus = Status; return FALSE; @@ -1071,25 +1071,25 @@ { CurrentAccess |= (READ_CONTROL | WRITE_DAC); if (DesiredAccess == CurrentAccess) - { - if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } - - *GrantedAccess = CurrentAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } + { + if (SubjectContextLocked == FALSE) + { + SeUnlockSubjectContext(SubjectSecurityContext); + } + + *GrantedAccess = CurrentAccess; + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } } /* Fail if DACL is absent */ if (Present == FALSE) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; @@ -1172,13 +1172,13 @@ NTSTATUS STDCALL NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - OUT PPRIVILEGE_SET PrivilegeSet, - OUT PULONG ReturnLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus) + IN HANDLE TokenHandle, + IN ACCESS_MASK DesiredAccess, + IN PGENERIC_MAPPING GenericMapping, + OUT PPRIVILEGE_SET PrivilegeSet, + OUT PULONG ReturnLength, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus) { SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; KPROCESSOR_MODE PreviousMode; @@ -1198,11 +1198,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - TOKEN_QUERY, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference token (Status %lx)\n", Status); @@ -1232,15 +1232,15 @@ SeLockSubjectContext(&SubjectSecurityContext); if (SeAccessCheck(SecurityDescriptor, - &SubjectSecurityContext, - TRUE, - DesiredAccess, - 0, - &PrivilegeSet, - GenericMapping, - PreviousMode, - GrantedAccess, - AccessStatus)) + &SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &PrivilegeSet, + GenericMapping, + PreviousMode, + GrantedAccess, + AccessStatus)) { Status = *AccessStatus; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Tue Jul 3 02:39:11 2007 @@ -26,9 +26,9 @@ ERESOURCE SepTokenLock; static GENERIC_MAPPING SepTokenMapping = {TOKEN_READ, - TOKEN_WRITE, - TOKEN_EXECUTE, - TOKEN_ALL_ACCESS}; + TOKEN_WRITE, + TOKEN_EXECUTE, + TOKEN_ALL_ACCESS}; static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { @@ -133,7 +133,7 @@ static ULONG RtlLengthSidAndAttributes(ULONG Count, - PSID_AND_ATTRIBUTES Src) + PSID_AND_ATTRIBUTES Src) { ULONG i; ULONG uLength; @@ -151,8 +151,8 @@ NTSTATUS NTAPI SepFindPrimaryGroupAndDefaultOwner(PTOKEN Token, - PSID PrimaryGroup, - PSID DefaultOwner) + PSID PrimaryGroup, + PSID DefaultOwner) { ULONG i; @@ -167,15 +167,15 @@ for (i = 0; i < Token->UserAndGroupCount; i++) { if (DefaultOwner && - RtlEqualSid(Token->UserAndGroups[i].Sid, DefaultOwner)) - { - Token->DefaultOwnerIndex = i; - } + RtlEqualSid(Token->UserAndGroups[i].Sid, DefaultOwner)) + { + Token->DefaultOwnerIndex = i; + } if (RtlEqualSid(Token->UserAndGroups[i].Sid, PrimaryGroup)) - { - Token->PrimaryGroup = Token->UserAndGroups[i].Sid; - } + { + Token->PrimaryGroup = Token->UserAndGroups[i].Sid; + } } if (Token->DefaultOwnerIndex == Token->UserAndGroupCount) @@ -195,12 +195,12 @@ NTSTATUS STDCALL SepDuplicateToken(PTOKEN Token, - POBJECT_ATTRIBUTES ObjectAttributes, - BOOLEAN EffectiveOnly, - TOKEN_TYPE TokenType, - SECURITY_IMPERSONATION_LEVEL Level, - KPROCESSOR_MODE PreviousMode, - PTOKEN* NewAccessToken) + POBJECT_ATTRIBUTES ObjectAttributes, + BOOLEAN EffectiveOnly, + TOKEN_TYPE TokenType, + SECURITY_IMPERSONATION_LEVEL Level, + KPROCESSOR_MODE PreviousMode, + PTOKEN* NewAccessToken) { ULONG uLength; ULONG i; @@ -211,14 +211,14 @@ PAGED_CODE(); Status = ObCreateObject(PreviousMode, - SepTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObCreateObject() failed (Status %lx)\n"); @@ -249,8 +249,8 @@ AccessToken->TokenSource.SourceIdentifier.LowPart = Token->TokenSource.SourceIdentifier.LowPart; AccessToken->TokenSource.SourceIdentifier.HighPart = Token->TokenSource.SourceIdentifier.HighPart; memcpy(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); + Token->TokenSource.SourceName, + sizeof(Token->TokenSource.SourceName)); AccessToken->ExpirationTime.QuadPart = Token->ExpirationTime.QuadPart; AccessToken->UserAndGroupCount = Token->UserAndGroupCount; AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; @@ -261,24 +261,24 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'u')); + uLength, + TAG('T', 'O', 'K', 'u')); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - uLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &uLength); + Token->UserAndGroups, + uLength, + AccessToken->UserAndGroups, + EndMem, + &EndMem, + &uLength); if (NT_SUCCESS(Status)) { Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - Token->PrimaryGroup, - 0); + AccessToken, + Token->PrimaryGroup, + 0); } if (NT_SUCCESS(Status)) @@ -287,32 +287,32 @@ uLength = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uLength, + TAG('T', 'O', 'K', 'p')); for (i = 0; i < AccessToken->PrivilegeCount; i++) - { - RtlCopyLuid(&AccessToken->Privileges[i].Luid, - &Token->Privileges[i].Luid); - AccessToken->Privileges[i].Attributes = - Token->Privileges[i].Attributes; - } + { + RtlCopyLuid(&AccessToken->Privileges[i].Luid, + &Token->Privileges[i].Luid); + AccessToken->Privileges[i].Attributes = + Token->Privileges[i].Attributes; + } if ( Token->DefaultDacl ) - { - AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); - memcpy(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } + { + AccessToken->DefaultDacl = + (PACL) ExAllocatePoolWithTag(PagedPool, + Token->DefaultDacl->AclSize, + TAG('T', 'O', 'K', 'd')); + memcpy(AccessToken->DefaultDacl, + Token->DefaultDacl, + Token->DefaultDacl->AclSize); + } else - { - AccessToken->DefaultDacl = 0; - } + { + AccessToken->DefaultDacl = 0; + } } if ( NT_SUCCESS(Status) ) @@ -404,20 +404,20 @@ NTSTATUS STDCALL SeAppendPrivileges( - PACCESS_STATE AccessState, - PPRIVILEGE_SET Privileges - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PACCESS_STATE AccessState, + PPRIVILEGE_SET Privileges + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS STDCALL SeCopyClientToken(PACCESS_TOKEN Token, SECURITY_IMPERSONATION_LEVEL Level, - KPROCESSOR_MODE PreviousMode, - PACCESS_TOKEN* NewToken) + KPROCESSOR_MODE PreviousMode, + PACCESS_TOKEN* NewToken) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -425,17 +425,17 @@ PAGED_CODE(); InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); + NULL, + 0, + NULL, + NULL); Status = SepDuplicateToken(Token, - &ObjectAttributes, - FALSE, - TokenImpersonation, - Level, - PreviousMode, - (PTOKEN*)NewToken); + &ObjectAttributes, + FALSE, + TokenImpersonation, + Level, + PreviousMode, + (PTOKEN*)NewToken); return(Status); } @@ -523,14 +523,14 @@ NTSTATUS STDCALL SeCreateClientSecurityFromSubjectContext( - IN PSECURITY_SUBJECT_CONTEXT SubjectContext, - IN PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - IN BOOLEAN ServerIsRemote, - OUT PSECURITY_CLIENT_CONTEXT ClientContext - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSECURITY_SUBJECT_CONTEXT SubjectContext, + IN PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + IN BOOLEAN ServerIsRemote, + OUT PSECURITY_CLIENT_CONTEXT ClientContext + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -539,16 +539,16 @@ NTSTATUS STDCALL SeFilterToken( - IN PACCESS_TOKEN ExistingToken, - IN ULONG Flags, - IN PTOKEN_GROUPS SidsToDisable OPTIONAL, - IN PTOKEN_PRIVILEGES PrivilegesToDelete OPTIONAL, - IN PTOKEN_GROUPS RestrictedSids OPTIONAL, - OUT PACCESS_TOKEN * FilteredToken - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PACCESS_TOKEN ExistingToken, + IN ULONG Flags, + IN PTOKEN_GROUPS SidsToDisable OPTIONAL, + IN PTOKEN_PRIVILEGES PrivilegesToDelete OPTIONAL, + IN PTOKEN_GROUPS RestrictedSids OPTIONAL, + OUT PACCESS_TOKEN * FilteredToken + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -557,10 +557,10 @@ VOID STDCALL SeFreePrivileges( - IN PPRIVILEGE_SET Privileges - ) -{ - UNIMPLEMENTED; + IN PPRIVILEGE_SET Privileges + ) +{ + UNIMPLEMENTED; } @@ -570,12 +570,12 @@ NTSTATUS STDCALL SeImpersonateClientEx( - IN PSECURITY_CLIENT_CONTEXT ClientContext, - IN PETHREAD ServerThread OPTIONAL - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSECURITY_CLIENT_CONTEXT ClientContext, + IN PETHREAD ServerThread OPTIONAL + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -583,7 +583,7 @@ */ VOID STDCALL SeImpersonateClient(IN PSECURITY_CLIENT_CONTEXT ClientContext, - IN PETHREAD ServerThread OPTIONAL) + IN PETHREAD ServerThread OPTIONAL) { UCHAR b; @@ -602,10 +602,10 @@ ServerThread = PsGetCurrentThread(); } PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - 1, - b, - ClientContext->SecurityQos.ImpersonationLevel); + ClientContext->ClientToken, + 1, + b, + ClientContext->SecurityQos.ImpersonationLevel); } @@ -658,10 +658,10 @@ */ NTSTATUS STDCALL NtQueryInformationToken(IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength, - OUT PULONG ReturnLength) + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID TokenInformation, + IN ULONG TokenInformationLength, + OUT PULONG ReturnLength) { union { @@ -693,11 +693,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { switch (TokenInformationClass) @@ -783,7 +783,7 @@ } _SEH_END; - break; + break; } case TokenPrivileges: @@ -1114,9 +1114,9 @@ } case TokenGroupsAndPrivileges: - DPRINT1("NtQueryInformationToken(TokenGroupsAndPrivileges) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("NtQueryInformationToken(TokenGroupsAndPrivileges) not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; case TokenRestrictedSids: { @@ -1160,13 +1160,13 @@ } _SEH_END; - break; + break; } case TokenSandBoxInert: - DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; case TokenSessionId: { @@ -1200,9 +1200,9 @@ } default: - DPRINT1("NtQueryInformationToken(%d) invalid information class\n", TokenInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; + DPRINT1("NtQueryInformationToken(%d) invalid information class\n", TokenInformationClass); + Status = STATUS_INVALID_INFO_CLASS; + break; } ObDereferenceObject(Token); @@ -1217,13 +1217,13 @@ NTSTATUS STDCALL SeQueryInformationToken( - IN PACCESS_TOKEN Token, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID *TokenInformation - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PACCESS_TOKEN Token, + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID *TokenInformation + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -1232,9 +1232,9 @@ NTSTATUS STDCALL SeQuerySessionIdToken( - IN PACCESS_TOKEN Token, - IN PULONG pSessionId - ) + IN PACCESS_TOKEN Token, + IN PULONG pSessionId + ) { *pSessionId = ((PTOKEN)Token)->SessionId; return STATUS_SUCCESS; @@ -1248,9 +1248,9 @@ NTSTATUS STDCALL NtSetInformationToken(IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength) + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID TokenInformation, + IN ULONG TokenInformationLength) { PTOKEN Token; KPROCESSOR_MODE PreviousMode; @@ -1281,11 +1281,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - NeededAccess, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + NeededAccess, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { switch (TokenInformationClass) @@ -1539,11 +1539,11 @@ } Status = ObReferenceObjectByHandle(ExistingTokenHandle, - TOKEN_DUPLICATE, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_DUPLICATE, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { Status = SepDuplicateToken(Token, @@ -1551,19 +1551,19 @@ EffectiveOnly, TokenType, (QoSPresent ? CapturedSecurityQualityOfService->ImpersonationLevel : SecurityAnonymous), - PreviousMode, - &NewToken); + PreviousMode, + &NewToken); ObDereferenceObject(Token); if (NT_SUCCESS(Status)) { Status = ObInsertObject((PVOID)NewToken, - NULL, - DesiredAccess, - 0, - NULL, - &hToken); + NULL, + DesiredAccess, + 0, + NULL, + &hToken); if (NT_SUCCESS(Status)) { @@ -1590,15 +1590,15 @@ VOID SepAdjustGroups(PACCESS_TOKEN Token, - ULONG a, - BOOLEAN ResetToDefault, - PSID_AND_ATTRIBUTES Groups, - ULONG b, - KPROCESSOR_MODE PreviousMode, - ULONG c, - PULONG d, - PULONG e, - PULONG f) + ULONG a, + BOOLEAN ResetToDefault, + PSID_AND_ATTRIBUTES Groups, + ULONG b, + KPROCESSOR_MODE PreviousMode, + ULONG c, + PULONG d, + PULONG e, + PULONG f) { UNIMPLEMENTED; } @@ -1606,11 +1606,11 @@ NTSTATUS STDCALL NtAdjustGroupsToken(IN HANDLE TokenHandle, - IN BOOLEAN ResetToDefault, - IN PTOKEN_GROUPS NewState, - IN ULONG BufferLength, - OUT PTOKEN_GROUPS PreviousState OPTIONAL, - OUT PULONG ReturnLength) + IN BOOLEAN ResetToDefault, + IN PTOKEN_GROUPS NewState, + IN ULONG BufferLength, + OUT PTOKEN_GROUPS PreviousState OPTIONAL, + OUT PULONG ReturnLength) { #if 0 NTSTATUS Status; @@ -1622,23 +1622,23 @@ PAGED_CODE(); Status = ObReferenceObjectByHandle(TokenHandle, - ?, - SepTokenObjectType, - UserMode, - (PVOID*)&Token, - NULL); + ?, + SepTokenObjectType, + UserMode, + (PVOID*)&Token, + NULL); SepAdjustGroups(Token, - 0, - ResetToDefault, - NewState->Groups, - ?, - PreviousState, - 0, - &a, - &b, - &c); + 0, + ResetToDefault, + NewState->Groups, + ?, + PreviousState, + 0, + &a, + &b, + &c); #else UNIMPLEMENTED; return(STATUS_NOT_IMPLEMENTED); @@ -1649,14 +1649,14 @@ #if 0 NTSTATUS SepAdjustPrivileges(PACCESS_TOKEN Token, - ULONG a, - KPROCESSOR_MODE PreviousMode, - ULONG PrivilegeCount, - PLUID_AND_ATTRIBUTES Privileges, - PTOKEN_PRIVILEGES* PreviousState, - PULONG b, - PULONG c, - PULONG d) + ULONG a, + KPROCESSOR_MODE PreviousMode, + ULONG PrivilegeCount, + PLUID_AND_ATTRIBUTES Privileges, + PTOKEN_PRIVILEGES* PreviousState, + PULONG b, + PULONG c, + PULONG d) { ULONG i; @@ -1665,24 +1665,24 @@ if (Token->PrivilegeCount > 0) { for (i = 0; i < Token->PrivilegeCount; i++) - { - if (PreviousMode != KernelMode) - { - if (Token->Privileges[i]->Attributes & SE_PRIVILEGE_ENABLED == 0) - { - if (a != 0) - { - if (PreviousState != NULL) - { - memcpy(&PreviousState[i], - &Token->Privileges[i], - sizeof(LUID_AND_ATTRIBUTES)); - } - Token->Privileges[i].Attributes &= (~SE_PRIVILEGE_ENABLED); - } - } - } - } + { + if (PreviousMode != KernelMode) + { + if (Token->Privileges[i]->Attributes & SE_PRIVILEGE_ENABLED == 0) + { + if (a != 0) + { + if (PreviousState != NULL) + { + memcpy(&PreviousState[i], + &Token->Privileges[i], + sizeof(LUID_AND_ATTRIBUTES)); + } + Token->Privileges[i].Attributes &= (~SE_PRIVILEGE_ENABLED); + } + } + } + } } if (PreviousMode != KernelMode) @@ -1692,8 +1692,8 @@ else { if (PrivilegeCount <= ?) - { - } + { + } } if ( } @@ -1705,11 +1705,11 @@ */ NTSTATUS STDCALL NtAdjustPrivilegesToken (IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, - OUT PULONG ReturnLength OPTIONAL) + IN BOOLEAN DisableAllPrivileges, + IN PTOKEN_PRIVILEGES NewState, + IN ULONG BufferLength, + OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, + OUT PULONG ReturnLength OPTIONAL) { // PLUID_AND_ATTRIBUTES Privileges; KPROCESSOR_MODE PreviousMode; @@ -1734,41 +1734,41 @@ // PrivilegeCount = NewState->PrivilegeCount; PreviousMode = KeGetPreviousMode (); // SeCaptureLuidAndAttributesArray(NewState->Privileges, -// PrivilegeCount, -// PreviousMode, -// NULL, -// 0, -// NonPagedPool, -// 1, -// &Privileges, -// &Length); +// PrivilegeCount, +// PreviousMode, +// NULL, +// 0, +// NonPagedPool, +// 1, +// &Privileges, +// &Length); Status = ObReferenceObjectByHandle (TokenHandle, - TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1 ("Failed to reference token (Status %lx)\n", Status); // SeReleaseLuidAndAttributesArray(Privileges, -// PreviousMode, -// 0); +// PreviousMode, +// 0); return Status; } #if 0 SepAdjustPrivileges(Token, - 0, - PreviousMode, - PrivilegeCount, - Privileges, - PreviousState, - &a, - &b, - &c); + 0, + PreviousMode, + PrivilegeCount, + Privileges, + PreviousState, + &a, + &b, + &c); #endif PrivilegeCount = (BufferLength - FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges)) / @@ -1781,14 +1781,14 @@ if (DisableAllPrivileges == TRUE) { for (i = 0; i < Token->PrivilegeCount; i++) - { - if (Token->Privileges[i].Attributes != 0) - { - DPRINT ("Attributes differ\n"); - - /* Save current privilege */ - if (PreviousState != NULL) - { + { + if (Token->Privileges[i].Attributes != 0) + { + DPRINT ("Attributes differ\n"); + + /* Save current privilege */ + if (PreviousState != NULL) + { if (k < PrivilegeCount) { PreviousState->PrivilegeCount++; @@ -1803,37 +1803,37 @@ */ } k++; - } - - /* Update current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - } - } + } + + /* Update current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + } + } Status = STATUS_SUCCESS; } else { Count = 0; for (i = 0; i < Token->PrivilegeCount; i++) - { - for (j = 0; j < NewState->PrivilegeCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == NewState->Privileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == NewState->Privileges[j].Luid.HighPart) - { - DPRINT ("Found privilege\n"); - - if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED)) - { - DPRINT ("Attributes differ\n"); - DPRINT ("Current attributes %lx desired attributes %lx\n", - Token->Privileges[i].Attributes, - NewState->Privileges[j].Attributes); - - /* Save current privilege */ - if (PreviousState != NULL) - { + { + for (j = 0; j < NewState->PrivilegeCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == NewState->Privileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == NewState->Privileges[j].Luid.HighPart) + { + DPRINT ("Found privilege\n"); + + if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != + (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED)) + { + DPRINT ("Attributes differ\n"); + DPRINT ("Current attributes %lx desired attributes %lx\n", + Token->Privileges[i].Attributes, + NewState->Privileges[j].Attributes); + + /* Save current privilege */ + if (PreviousState != NULL) + { if (k < PrivilegeCount) { PreviousState->PrivilegeCount++; @@ -1848,33 +1848,33 @@ */ } k++; - } - - /* Update current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - Token->Privileges[i].Attributes |= - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED); - DPRINT ("New attributes %lx\n", - Token->Privileges[i].Attributes); - } + } + + /* Update current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + Token->Privileges[i].Attributes |= + (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED); + DPRINT ("New attributes %lx\n", + Token->Privileges[i].Attributes); + } Count++; - } - } - } + } + } + } Status = Count < NewState->PrivilegeCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; } if (ReturnLength != NULL) { *ReturnLength = sizeof(TOKEN_PRIVILEGES) + - (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); + (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); } ObDereferenceObject (Token); // SeReleaseLuidAndAttributesArray(Privileges, -// PreviousMode, -// 0); +// PreviousMode, +// 0); DPRINT ("NtAdjustPrivilegesToken() done\n"); @@ -1926,14 +1926,14 @@ * Initialize the token */ Status = ObCreateObject(KernelMode, - SepTokenObjectType, - NULL, - KernelMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + NULL, + KernelMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { return NULL; @@ -1978,8 +1978,8 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'u')); + uSize, + TAG('T', 'O', 'K', 'u')); SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; i = 0; @@ -2009,9 +2009,9 @@ uSize = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uSize, + TAG('T', 'O', 'K', 'p')); i = 0; AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED; @@ -2089,8 +2089,8 @@ uSize = (uSize & (~3)) + 8; AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'd')); + uSize, + TAG('T', 'O', 'K', 'd')); Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION); if ( NT_SUCCESS(Status) ) { @@ -2114,18 +2114,18 @@ NTSTATUS STDCALL NtCreateToken(OUT PHANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN TOKEN_TYPE TokenType, - IN PLUID AuthenticationId, - IN PLARGE_INTEGER ExpirationTime, - IN PTOKEN_USER TokenUser, - IN PTOKEN_GROUPS TokenGroups, - IN PTOKEN_PRIVILEGES TokenPrivileges, - IN PTOKEN_OWNER TokenOwner, - IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, - IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, - IN PTOKEN_SOURCE TokenSource) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN TOKEN_TYPE TokenType, + IN PLUID AuthenticationId, + IN PLARGE_INTEGER ExpirationTime, + IN PTOKEN_USER TokenUser, + IN PTOKEN_GROUPS TokenGroups, + IN PTOKEN_PRIVILEGES TokenPrivileges, + IN PTOKEN_OWNER TokenOwner, + IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, + IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, + IN PTOKEN_SOURCE TokenSource) { HANDLE hToken; PTOKEN AccessToken; @@ -2201,14 +2201,14 @@ return(Status); Status = ObCreateObject(PreviousMode, - SepTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObCreateObject() failed (Status %lx)\n"); @@ -2218,10 +2218,10 @@ AccessToken->TokenLock = &SepTokenLock; RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, - &TokenSource->SourceIdentifier); + &TokenSource->SourceIdentifier); memcpy(AccessToken->TokenSource.SourceName, - TokenSource->SourceName, - sizeof(TokenSource->SourceName)); + TokenSource->SourceName, + sizeof(TokenSource->SourceName)); RtlCopyLuid(&AccessToken->TokenId, &TokenId); RtlCopyLuid(&AccessToken->AuthenticationId, AuthenticationId); @@ -2250,44 +2250,44 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'u')); + uLength, + TAG('T', 'O', 'K', 'u')); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; Status = RtlCopySidAndAttributesArray(1, - &TokenUser->User, - uLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &uLength); + &TokenUser->User, + uLength, + AccessToken->UserAndGroups, + EndMem, + &EndMem, + &uLength); if (NT_SUCCESS(Status)) { Status = RtlCopySidAndAttributesArray(TokenGroups->GroupCount, - TokenGroups->Groups, - uLength, - &AccessToken->UserAndGroups[1], - EndMem, - &EndMem, - &uLength); + TokenGroups->Groups, + uLength, + &AccessToken->UserAndGroups[1], + EndMem, + &EndMem, + &uLength); } if (NT_SUCCESS(Status)) { Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - TokenPrimaryGroup->PrimaryGroup, - TokenOwner->Owner); + AccessToken, + TokenPrimaryGroup->PrimaryGroup, + TokenOwner->Owner); } if (NT_SUCCESS(Status)) { uLength = TokenPrivileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uLength, + TAG('T', 'O', 'K', 'p')); if (PreviousMode != KernelMode) { @@ -2314,20 +2314,20 @@ if (NT_SUCCESS(Status)) { AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - TokenDefaultDacl->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + (PACL) ExAllocatePoolWithTag(PagedPool, + TokenDefaultDacl->DefaultDacl->AclSize, + TAG('T', 'O', 'K', 'd')); memcpy(AccessToken->DefaultDacl, - TokenDefaultDacl->DefaultDacl, - TokenDefaultDacl->DefaultDacl->AclSize); + TokenDefaultDacl->DefaultDacl, + TokenDefaultDacl->DefaultDacl->AclSize); } Status = ObInsertObject ((PVOID)AccessToken, - NULL, - DesiredAccess, - 0, - NULL, - &hToken); + NULL, + DesiredAccess, + 0, + NULL, + &hToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObInsertObject() failed (Status %lx)\n", Status); @@ -2355,7 +2355,7 @@ */ NTSTATUS STDCALL SeQueryAuthenticationIdToken(IN PACCESS_TOKEN Token, - OUT PLUID LogonId) + OUT PLUID LogonId) { PAGED_CODE(); @@ -2396,8 +2396,8 @@ BOOLEAN STDCALL SeTokenIsAdmin( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_WRITE_RESTRICTED) != 0; @@ -2409,8 +2409,8 @@ BOOLEAN STDCALL SeTokenIsRestricted( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_IS_RESTRICTED) != 0; @@ -2422,8 +2422,8 @@ BOOLEAN STDCALL SeTokenIsWriteRestricted( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_HAS_RESTORE_PRIVILEGE) != 0; @@ -2436,11 +2436,11 @@ NTSTATUS STDCALL NtImpersonateAnonymousToken( - IN HANDLE Thread - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN HANDLE Thread + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }

1 0

[hpoussin] 27365: Fix indentation (no code change)
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Tue Jul 3 02:31:30 2007 New Revision: 27365 URL: http://svn.reactos.org/svn/reactos?rev=27365&view=rev Log: Fix indentation (no code change) Modified: trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c Tue Jul 3 02:31:30 2007 @@ -19,20 +19,20 @@ */ BOOL STDCALL AdjustTokenGroups (HANDLE TokenHandle, - BOOL ResetToDefault, - PTOKEN_GROUPS NewState, - DWORD BufferLength, - PTOKEN_GROUPS PreviousState, - PDWORD ReturnLength) + BOOL ResetToDefault, + PTOKEN_GROUPS NewState, + DWORD BufferLength, + PTOKEN_GROUPS PreviousState, + PDWORD ReturnLength) { NTSTATUS Status; Status = NtAdjustGroupsToken (TokenHandle, - ResetToDefault, - NewState, - BufferLength, - PreviousState, - (PULONG)ReturnLength); + ResetToDefault, + NewState, + BufferLength, + PreviousState, + (PULONG)ReturnLength); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -48,20 +48,20 @@ */ BOOL STDCALL AdjustTokenPrivileges (HANDLE TokenHandle, - BOOL DisableAllPrivileges, - PTOKEN_PRIVILEGES NewState, - DWORD BufferLength, - PTOKEN_PRIVILEGES PreviousState, - PDWORD ReturnLength) + BOOL DisableAllPrivileges, + PTOKEN_PRIVILEGES NewState, + DWORD BufferLength, + PTOKEN_PRIVILEGES PreviousState, + PDWORD ReturnLength) { NTSTATUS Status; Status = NtAdjustPrivilegesToken (TokenHandle, - DisableAllPrivileges, - NewState, - BufferLength, - PreviousState, - (PULONG)ReturnLength); + DisableAllPrivileges, + NewState, + BufferLength, + PreviousState, + (PULONG)ReturnLength); if (STATUS_NOT_ALL_ASSIGNED == Status) { SetLastError(ERROR_NOT_ALL_ASSIGNED); @@ -83,18 +83,18 @@ */ BOOL STDCALL GetTokenInformation (HANDLE TokenHandle, - TOKEN_INFORMATION_CLASS TokenInformationClass, - LPVOID TokenInformation, - DWORD TokenInformationLength, - PDWORD ReturnLength) + TOKEN_INFORMATION_CLASS TokenInformationClass, + LPVOID TokenInformation, + DWORD TokenInformationLength, + PDWORD ReturnLength) { NTSTATUS Status; Status = NtQueryInformationToken (TokenHandle, - TokenInformationClass, - TokenInformation, - TokenInformationLength, - (PULONG)ReturnLength); + TokenInformationClass, + TokenInformation, + TokenInformationLength, + (PULONG)ReturnLength); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -110,16 +110,16 @@ */ BOOL STDCALL SetTokenInformation (HANDLE TokenHandle, - TOKEN_INFORMATION_CLASS TokenInformationClass, - LPVOID TokenInformation, - DWORD TokenInformationLength) + TOKEN_INFORMATION_CLASS TokenInformationClass, + LPVOID TokenInformation, + DWORD TokenInformationLength) { NTSTATUS Status; Status = NtSetInformationToken (TokenHandle, - TokenInformationClass, - TokenInformation, - TokenInformationLength); + TokenInformationClass, + TokenInformation, + TokenInformationLength); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -135,25 +135,25 @@ */ BOOL STDCALL AccessCheck (PSECURITY_DESCRIPTOR pSecurityDescriptor, - HANDLE ClientToken, - DWORD DesiredAccess, - PGENERIC_MAPPING GenericMapping, - PPRIVILEGE_SET PrivilegeSet, - LPDWORD PrivilegeSetLength, - LPDWORD GrantedAccess, - LPBOOL AccessStatus) + HANDLE ClientToken, + DWORD DesiredAccess, + PGENERIC_MAPPING GenericMapping, + PPRIVILEGE_SET PrivilegeSet, + LPDWORD PrivilegeSetLength, + LPDWORD GrantedAccess, + LPBOOL AccessStatus) { NTSTATUS Status; NTSTATUS AccessStat; Status = NtAccessCheck (pSecurityDescriptor, - ClientToken, - DesiredAccess, - GenericMapping, - PrivilegeSet, - (PULONG)PrivilegeSetLength, - (PACCESS_MASK)GrantedAccess, - &AccessStat); + ClientToken, + DesiredAccess, + GenericMapping, + PrivilegeSet, + (PULONG)PrivilegeSetLength, + (PACCESS_MASK)GrantedAccess, + &AccessStat); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -178,14 +178,14 @@ */ BOOL STDCALL OpenProcessToken (HANDLE ProcessHandle, - DWORD DesiredAccess, - PHANDLE TokenHandle) + DWORD DesiredAccess, + PHANDLE TokenHandle) { NTSTATUS Status; Status = NtOpenProcessToken (ProcessHandle, - DesiredAccess, - TokenHandle); + DesiredAccess, + TokenHandle); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -201,16 +201,16 @@ */ BOOL STDCALL OpenThreadToken (HANDLE ThreadHandle, - DWORD DesiredAccess, - BOOL OpenAsSelf, - PHANDLE TokenHandle) + DWORD DesiredAccess, + BOOL OpenAsSelf, + PHANDLE TokenHandle) { NTSTATUS Status; Status = NtOpenThreadToken (ThreadHandle, - DesiredAccess, - OpenAsSelf, - TokenHandle); + DesiredAccess, + OpenAsSelf, + TokenHandle); if (!NT_SUCCESS(Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -234,9 +234,9 @@ hThread = ((ThreadHandle != NULL) ? *ThreadHandle : NtCurrentThread()); Status = NtSetInformationThread (hThread, - ThreadImpersonationToken, - &TokenHandle, - sizeof(HANDLE)); + ThreadImpersonationToken, + &TokenHandle, + sizeof(HANDLE)); if (!NT_SUCCESS(Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -287,11 +287,11 @@ ObjectAttributes.SecurityQualityOfService = &Sqos; Status = NtDuplicateToken (ExistingTokenHandle, - dwDesiredAccess, - &ObjectAttributes, - FALSE, - TokenType, - DuplicateTokenHandle); + dwDesiredAccess, + &ObjectAttributes, + FALSE, + TokenType, + DuplicateTokenHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status));

1 0

[greatlrd] 27364: experiment code adding DirectX opengl warper that using opengl lcd driver. it is Parallels modify source code of wine d3d for it. can not be compile in ReactX branch yet.
by greatlrd＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: greatlrd Date: Mon Jul 2 23:47:58 2007 New Revision: 27364 URL: http://svn.reactos.org/svn/reactos?rev=27364&view=rev Log: experiment code adding DirectX opengl warper that using opengl lcd driver. it is Parallels modify source code of wine d3d for it. can not be compile in ReactX branch yet. Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/0README (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/ANNOUNCE (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/AUTHORS (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/COPYING.LIB (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/LICENSE (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/LICENSE.OLD (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/README (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/VERSION (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D.dsw (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/bin/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/basetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/cubetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.def (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8_main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8_private.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/directx.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/indexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/pixelshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/resource.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/stateblock.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/swapchain.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/d3d8_main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/d3d8_test.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/tests.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/visual.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/volume.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/version.rc (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexdeclaration.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/volume.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/volumetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/basetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/cubetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.def (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9_main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9_private.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/directx.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/indexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/pixelshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/query.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/resource.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/stateblock.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/swapchain.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/d3d9_test.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/query.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/shader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/stateblock.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/testlist.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/vertexdeclaration.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/visual.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/volume.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/version.rc (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexdeclaration.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/volume.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/volumetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/clipper.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddcomimpl.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/palette.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/regsvr.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface_thunks.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/d3d.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/ddraw_test.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/ddrawmodes.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/dsurface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/refcount.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/tests.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/visual.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/utils.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/version.rc (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex_private.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/regsvr.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/version.rc (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/arb_program_shader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/baseshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/basetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/context.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/cubetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/device.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/directx.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/drawprim.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/glsl_shader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/indexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/palette.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pglmini.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pglmini.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pixelshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/query.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/resource.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/state.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/stateblock.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/surface.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/surface_gdi.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/swapchain.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/texture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/utils.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexbuffer.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexdeclaration.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexshader.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/volume.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/volumetexture.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.dsp (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_main.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_private.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_private_types.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/config.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/dciddi.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/ddrawi.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/debug.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/exception.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/list.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/port.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/test.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/unicode.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wine_common_ver.rc (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_caps.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_gl.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_interface.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_types.h (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/wine/ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/wine/debug.c (with props) branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/wine/wine.dsp (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/0README URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/AUTHORS URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/COPYING.LIB URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/LICENSE URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/LICENSE.OLD URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/README URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/VERSION URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/WineD3D.dsw URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/basetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/resource.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/d3d8_test.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/tests.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/visual.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/tests/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/version.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/d3d9_test.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/query.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/visual.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/tests/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/version.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddcomimpl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface_thunks.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/ddraw_test.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/ddrawmodes.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/dsurface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/refcount.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/tests.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/tests/visual.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/version.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/version.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pglmini.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pglmini.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d_private_types.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/ddrawi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/debug.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/exception.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/list.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wine_common_ver.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_caps.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/include/wine/wined3d_types.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/wine/debug.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… Added: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/libs/wine/wine.dsp URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…

1 0

[hpoussin] 27363: Clean up options between files
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Mon Jul 2 22:24:43 2007 New Revision: 27363 URL: http://svn.reactos.org/svn/reactos?rev=27363&view=rev Log: Clean up options between files Modified: trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Mon Jul 2 22:24:43 2007 @@ -1116,6 +1116,7 @@ *SrcName = '\0'; *DstName = '\0'; + *Options = '\0'; // source file i = CurrentChar;

1 0

[hpoussin] 27362: Fix paths to some files
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Mon Jul 2 22:24:01 2007 New Revision: 27362 URL: http://svn.reactos.org/svn/reactos?rev=27362&view=rev Log: Fix paths to some files Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jul 2 22:24:01 2007 @@ -230,7 +230,7 @@ dll\win32\vdmdbg\vdmdbg.dll 1 dll\win32\wininet\wininet.dll 1 dll\win32\winmm\winmm.dll 1 -dll\win32\winmm\wavemap\msacm32.drv 1 +dll\win32\winmm\wavemap\msacm32.drv 1 optional dll\win32\winspool\winspool.drv 1 dll\win32\wintrust\wintrust.dll 1 dll\win32\wldap32\wldap32.dll 1 @@ -245,12 +245,10 @@ drivers\base\bootvid\bootvid.dll 1 drivers\base\beep\beep.sys 2 drivers\base\null\null.sys 2 -drivers\base\serial\serial.sys 2 drivers\bus\acpi\acpi.sys 2 drivers\bus\isapnp\isapnp.sys 2 drivers\bus\pci\pci.sys 2 -drivers\bus\serenum\serenum.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 drivers\filesystems\msfs\msfs.sys 2 @@ -268,13 +266,16 @@ drivers\network\dd\ne2000\ne2000.sys 2 drivers\network\dd\pcnet\pcnet.sys 2 +drivers\serial\serenum\serenum.sys 2 +drivers\serial\serial\serial.sys 2 + drivers\storage\ide\pciide\pciide.sys 2 drivers\storage\ide\pciidex\pciidex.sys 2 -;drivers\usb\miniport\usbohci\usbohci.sys 2 -;drivers\usb\miniport\usbuhci\usbuhci.sys 2 -;drivers\usb\usbhub\usbhub.sys 2 -;drivers\usb\usbport\usbport.sys 2 +;drivers\usb\miniport\usbohci\usbohci.sys 2 +;drivers\usb\miniport\usbuhci\usbuhci.sys 2 +;drivers\usb\usbhub\usbhub.sys 2 +;drivers\usb\usbport\usbport.sys 2 drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1

1 0

[hpoussin] 27361: Support idl files Handle autosync of .ocx libraries Delete unused files in destination folder
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Mon Jul 2 18:11:21 2007 New Revision: 27361 URL: http://svn.reactos.org/svn/reactos?rev=27361&view=rev Log: Support idl files Handle autosync of .ocx libraries Delete unused files in destination folder Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=27361&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Mon Jul 2 18:11:21 2007 @@ -1,6 +1,6 @@ @ECHO OFF -REM Copyright (C) 2006 Hervé Poussineau (hpoussin(a)reactos.org) +REM Copyright (C) 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) SET WINE_TMPFILE1=tmpfile1.wine @@ -58,9 +58,19 @@ GOTO :createrbuildnext ) +SET WINE_MODULE_NAME=%2 +IF "%WINE_MODULE_NAME:~-4%" == ".ocx" ( + SET WINE_MODULE_NAME=%WINE_MODULE_NAME:~0,-4% + SET WINE_MODULE_TYPE=win32ocx + SET WINE_INSTALL_NAME=%2 +) ELSE ( + SET WINE_MODULE_TYPE=win32dll + SET WINE_INSTALL_NAME=%2.dll +) + SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. SET WINE_UPPER=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. -SET WINE_LINE=%2 +SET WINE_LINE=%WINE_MODULE_NAME% SET WINE_UPPERCASE= FOR /L %%i IN (0, 1, 13) DO ( FOR /L %%j IN (0, 1, 37) DO ( @@ -79,7 +89,7 @@ >NUL COPY /Y wine\dlls\%2\makefile.in %WINE_TMPFILE1% -ECHO ^<module name="%2" type="win32dll" baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" installbase="system32" installname="%2.dll" allowwarnings="true"^> +ECHO ^<module name="%WINE_MODULE_NAME%" type="%WINE_MODULE_TYPE%" baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" installbase="system32" installname="%WINE_INSTALL_NAME%" allowwarnings="true"^> IF "%WINE_HAS_DLLINSTALL%" == "1" ( IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( ECHO ^<autoregister infsection="OleControlDlls" type="Both" /^> @@ -92,7 +102,7 @@ ) ) ECHO ^<importlibrary definition="%2.spec.def" /^> -ECHO ^<include base="%2"^>.^</include^> +ECHO ^<include base="%WINE_MODULE_NAME%"^>.^</include^> ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> ECHO ^<define name="__REACTOS__" /^> ECHO ^<define name="__WINESRC__" /^> @@ -105,8 +115,12 @@ SET WINE_END_PREC_LINE= SET WINE_VARTYPE=0 SET WINE_HAS_NTDLL= +SET WINE_HAS_IDL= FOR /F "eol=# delims=" %%l IN (%WINE_TMPFILE1%) DO ( CALL :internal_analyseline %%l +) +IF NOT "%WINE_HAS_IDL%" == "" ( + ECHO ^<include base="%WINE_MODULE_NAME%" root="intermediate"^>.^</include^> ) ECHO ^<file^>%2.spec^</file^> ECHO ^</module^> @@ -158,23 +172,25 @@ SET WINE_FILES_DELETED= FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( IF "%%f" == ".cvsignore" ( - svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + svn.exe delete --force "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL + DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL ) ELSE IF "%%f" == "Makefile.in" ( - svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + svn.exe delete --force "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL + DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL ) ELSE IF NOT EXIST "wine\dlls\%2\%%f" ( SET WINE_FILE=%%f IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL IF ERRORLEVEL 2 GOTO :helpsvn - IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" + IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" RD /S /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f ) ) ELSE ( svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL IF ERRORLEVEL 2 GOTO :helpsvn svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%%f" >NUL 2>NUL + SET >NUL ) ) IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" ( @@ -188,7 +204,7 @@ POPD IF ERRORLEVEL 1 ( ECHO Error when executing patch.exe. Try to download the lastest version at - ECHO http://unxutils.sourceforge.net/ + ECHO http://gnuwin32.sourceforge.net/packages/patch.htm GOTO :eof ) FOR %%f IN (%WINE_FILES_DELETED%) DO ( @@ -208,6 +224,7 @@ :make SETLOCAL ENABLEEXTENSIONS +SETLOCAL ENABLEDELAYEDEXPANSION IF "%3" == "" GOTO help IF NOT EXIST "%2\ReactOS.rbuild" ( ECHO %2\ReactOS.rbuild doesn't exit. @@ -218,7 +235,11 @@ :make_filllist SHIFT IF "%2" == "" GOTO make_doit -SET WINE_LIST=%WINE_LIST% %2 +SET WINE_MODULE_NAME=%2 +IF "%WINE_MODULE_NAME:~-4%" == ".ocx" ( + SET WINE_MODULE_NAME=%WINE_MODULE_NAME:~0,-4% +) +SET WINE_LIST=%WINE_LIST% %WINE_MODULE_NAME% GOTO make_filllist :make_doit PUSHD "%WINE_ROS_DIR%" @@ -241,12 +262,12 @@ IF ERRORLEVEL 1 GOTO :eof FOR %%m IN (%WINE_LIST%) DO ( >wine\dlls\%%m\%%m.rbuild CALL :createrbuild createrbuild %%m - >NUL CALL :link link "%WINE_ROS_DIR%" %%m -) -CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% + >NUL CALL :link link %WINE_ROS_DIR% %%m +) +CALL :merge merge %WINE_ROS_DIR% %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof -IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" -CALL :make make "%WINE_ROS_DIR%" %WINE_LIST% +IF EXIST %WINE_ROS_DIR%\makefile.auto DEL %WINE_ROS_DIR%\makefile.auto +CALL :make make %WINE_ROS_DIR% %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof ECHO Compilation successful. You should try to run ReactOS to see if ECHO no visible regressions appeared before committing the changes. @@ -282,6 +303,9 @@ SET WINE_VARTYPE=1 ) ELSE IF "%1" == "RC_SRCS" ( SET WINE_VARTYPE=1 + ) ELSE IF "%1" == "IDL_H_SRCS" ( + SET WINE_VARTYPE=1 + SET WINE_HAS_IDL=1 ) ELSE IF "%1" == "IMPORTS" ( SET WINE_VARTYPE=2 ) ELSE IF "%1" == "DELAYIMPORTS" (

1 0

[hpoussin] 27360: Fix some prototypes
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Mon Jul 2 17:40:06 2007 New Revision: 27360 URL: http://svn.reactos.org/svn/reactos?rev=27360&view=rev Log: Fix some prototypes Modified: trunk/reactos/dll/win32/version/info.c trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/winver.h trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/info.c?r… ============================================================================== --- trunk/reactos/dll/win32/version/info.c (original) +++ trunk/reactos/dll/win32/version/info.c Mon Jul 2 17:40:06 2007 @@ -764,7 +764,7 @@ /*********************************************************************** * VerQueryValueA [VERSION.@] */ -BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, +BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const char rootA[] = "\\"; @@ -814,7 +814,7 @@ /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, +BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const WCHAR rootW[] = { '\\', 0 }; Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h (original) +++ trunk/reactos/include/psdk/basetsd.h Mon Jul 2 17:40:06 2007 @@ -26,6 +26,7 @@ #define ADDRESS_TAG_BIT 0x80000000UL #define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) ) #define HandleToLong( h ) ((LONG)(LONG_PTR) (h) ) +#define ULongToHandle( h) ((HANDLE)(ULONG_PTR) (h)) #define LongToHandle( h) ((HANDLE)(LONG_PTR) (h)) #define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) ) #define PtrToLong( p ) ((LONG)(LONG_PTR) (p) ) @@ -77,6 +78,8 @@ { return((unsigned long) h ); } inline long HandleToLong( const void* h ) { return((long) h ); } +inline void* ULongToHandle( const long h ) + { return((void*) (UINT_PTR) h ); } inline void* LongToHandle( const long h ) { return((void*) (INT_PTR) h ); } inline unsigned long PtrToUlong( const void* p) Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h (original) +++ trunk/reactos/include/psdk/commctrl.h Mon Jul 2 17:40:06 2007 @@ -715,7 +715,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR); LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); -int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int); +int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int); /* Header control */ Modified: trunk/reactos/include/psdk/winver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winver.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winver.h (original) +++ trunk/reactos/include/psdk/winver.h Mon Jul 2 17:40:06 2007 @@ -108,8 +108,8 @@ BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID); DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -BOOL WINAPI VerQueryValueA(const LPVOID,LPCSTR,LPVOID*,PUINT); -BOOL WINAPI VerQueryValueW(const LPVOID,LPCWSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); #ifdef UNICODE #define VerFindFile VerFindFileW #define VerQueryValue VerQueryValueW Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Mon Jul 2 17:40:06 2007 @@ -10,6 +10,7 @@ #define strlenW(s) wcslen((const wchar_t *)(s)) #define strcpyW(d,s) wcscpy((wchar_t *)(d),(const wchar_t *)(s)) #define strcatW(d,s) wcscat((wchar_t *)(d),(const wchar_t *)(s)) +#define strcspnW(d,s) wcscspn((wchar_t *)(d),(const wchar_t *)(s)) #define strstrW(d,s) wcsstr((const wchar_t *)(d),(const wchar_t *)(s)) #define strtolW(s,e,b) wcstol((const wchar_t *)(s),(wchar_t **)(e),(b)) #define strchrW(s,c) wcschr((const wchar_t *)(s),(wchar_t)(c))

1 0

[winesync] 27359: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: winesync Date: Mon Jul 2 16:07:09 2007 New Revision: 27359 URL: http://svn.reactos.org/svn/reactos?rev=27359&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comcat/comcat.rbuild (contents, props changed) trunk/reactos/dll/win32/comcat/comcat.spec (props changed) trunk/reactos/dll/win32/comcat/comcat_main.c (props changed) trunk/reactos/dll/win32/comcat/comcat_private.h (props changed) trunk/reactos/dll/win32/comcat/factory.c (props changed) trunk/reactos/dll/win32/comcat/information.c (props changed) trunk/reactos/dll/win32/comcat/manager.c (props changed) trunk/reactos/dll/win32/comcat/register.c (props changed) trunk/reactos/dll/win32/comcat/regsvr.c (props changed) trunk/reactos/dll/win32/comcat/version.rc (props changed) Modified: trunk/reactos/dll/win32/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat.rb… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat.rbuild (original) +++ trunk/reactos/dll/win32/comcat/comcat.rbuild Mon Jul 2 16:07:09 2007 @@ -1,26 +1,27 @@ -<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> - <importlibrary definition="comcat.spec.def" /> - <include base="comcat">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>user32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> - <library>ole32</library> - <library>uuid</library> - <file>comcat_main.c</file> - <file>factory.c</file> - <file>information.c</file> - <file>manager.c</file> - <file>register.c</file> - <file>regsvr.c</file> - <file>comcat.spec</file> -</module> +<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="comcat.spec.def" /> + <include base="comcat">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> + <file>comcat_main.c</file> + <file>factory.c</file> + <file>information.c</file> + <file>manager.c</file> + <file>register.c</file> + <file>regsvr.c</file> + <file>version.rc</file> + <file>comcat.spec</file> +</module> Propchange: trunk/reactos/dll/win32/comcat/comcat.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/comcat.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/comcat_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/comcat_private.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/factory.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/information.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/manager.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/register.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/comcat/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 27358: Update README file about Wine shared DLLs
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Mon Jul 2 16:06:25 2007 New Revision: 27358 URL: http://svn.reactos.org/svn/reactos?rev=27358&view=rev Log: Update README file about Wine shared DLLs Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Jul 2 16:06:25 2007 @@ -10,20 +10,14 @@ If you find that a function in ReactOS that is not implemented properly and is based on WINE sources, check the latest Winehq CVS and see if it has been fixed there. If so, please submit a patch to -ros-dev(a)reactos.com. Otherwise please send a patch to both -wine-patches(a)winehq.com and ros-dev(a)reactos.com +ros-dev(a)reactos.org. Otherwise please send a patch to both +wine-patches(a)winehq.com and ros-dev(a)reactos.org -When porting a dll from WINE to ReactOS please take a look at how -comctl32 has been imported. We start by creating a makefile that has -a target defined like so: +When porting a new DLL from Wine to ReactOS, please do the following steps +- Create a new directory in dll/win32/ of the same name as the new Wine DLL +- Add a new entry in dll/win32/win32.rbuild +- Follow the guide "Update process for autosync DLLs" at the bottom of this file -TARGET_TYPE = winedll - -This will cause the reactos build system to look for a file called -makefile.ros-template. This file contains all of the information needed -for the ReactOS build system to make use of the WINE Makefile.in. -This will allow you to use the WINE tools and librarys with very little -work to import a new dll. The following build tools are shared with Wine. @@ -41,6 +35,7 @@ reactos/dll/win32/avifil32 # Autosync reactos/dll/win32/cabinet # Autosync reactos/dll/win32/clusapi # Autosync +reactos/dll/win32/comcat # Autosync reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Autosync @@ -54,11 +49,11 @@ reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync -reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/mpr # Autosync -reactos/dll/win32/msacm # Out of sync +reactos/dll/win32/msacm32 # Out of sync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync +reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync @@ -79,7 +74,7 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 -reactos/dll/win32/twain # Out of sync +reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Synced to Wine-0_9_10 reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Synced at 20060509 @@ -149,33 +144,29 @@ reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) reactos/dll/win32/user32/windows/winpos.c # Forked -Update process for shared DLLs +Update process for autosync DLLs -- Cd to the parent directory of your top-level "reactos" directory -- Check out the Wine release: "cvs -d :pserver:cvs@cvs.winehq.com:2401/home/wine co wine -r Wine-20050211" -- Create "vendor" directory (as a sibling of your top-level "reactos" directory) -- Cd to the vendor dir and check out the current vendor drop: - "svn co svn://svn.reactos.org/reactos/vendor/wine". -- For each component shared with Wine (e.g. cabinet): - "del vendor\wine\dlls\cabinet\current\*" - "copy wine\dlls\cabinet vendor\wine\dlls\cabinet\current" - "del vendor\wine\dlls\cabinet\current\.cvsignore" - Check svn status, svn add/delete files as needed - Tag new Wine release "svn copy vendor\wine\dlls\cabinet\current vendor\wine\dlls\cabinet\Wine-20050211" -- Commit the vendor drop: svn commit vendor\wine -m "Wine-20050211 vendor drop" -- Determine the revision number of the last Wine tag by looking at http://svn.reactos.ru/svn/reactos/tags/ - and finding the last Wine-yyyymmdd-sync tag, e.g. Wine-20050111-sync had rev 13007 -- For each component shared with Wine (e.g. cabinet): -- "cd reactos\lib\cabinet" -- Check for changes in the ReactOS tree: "svn diff -r 13007" (13007 is the revno of the previous sync). - If any changes are found, see if they're present in the Wine code. If not, submit to WineHQ - if apropriate. -- Merge in Wine changes: - "svn merge svn://svn.reactos.org/vendor/wine/dlls/cabinet/Wine-20050111 - svn://svn.reactos.org/vendor/wine/dlls/cabinet/current" -- Fix any merge conflicts -- Build and test (building will sometimes require adjusting header files) -- Check which files were changed: "svn status" -- For each of the changed files, get the WineHQ CVS log. Copy author and CVS commit message into a - commit log -- Commit changed files "svn commit" using generated commit log as commit message +*** This process can only be done on Microsoft Windows *** +- Download wineimport.cmd at svn://svn.reactos.org/reactos/trunk/tools/ +- Download cvs command line program and be sure to put it in your path + (available at http://ftp.gnu.org/non-gnu/cvs/binary/stable/x86-woe/ ) +- Download svn command line program and be sure to put it in your path + (available at http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 ) +- Download patch command line program and be sure to put it in your path + (available at http://gnuwin32.sourceforge.net/packages/patch.htm ) +- Optionally, download junction.exe and put it in your path + (available at http://www.sysinternals.com/Utilities/Junction.html ) +- Cd to the directory containing wineimport.cmd +- Run + "wineimport.cmd fullprocessing {path_to_your_rectos_directory} {name_of_the_wine_dll}" +- In case of error, you can + 1) add missing definitions to ReactOS headers + 2) fix {name_of_the_wine_dll}_ros.diff patch file, by removing outdated changes + 3) or modify Wine code, by adding a {name_of_the_wine_dll}_ros.diff patch, + which will be applied after Wine source checkout + DO NOT DIRECTLY MODIFY WINE SOURCE CODE +- Once Wine DLL compiles, install and run ReactOS and search for regressions +- In case of regression, you can + 1) Fix ReactOS code (not in the shared DLL) + 2) or update the {name_of_the_wine_dll}_ros.diff patch file +- Commit your changes with the "Autosyncing with Wine HEAD" commit message

1 0

[cwittich] 27357: add comcat.dll to build
by cwittich＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: cwittich Date: Mon Jul 2 05:47:50 2007 New Revision: 27357 URL: http://svn.reactos.org/svn/reactos?rev=27357&view=rev Log: add comcat.dll to build Added: trunk/reactos/dll/win32/comcat/comcat.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jul 2 05:47:50 2007 @@ -152,6 +152,7 @@ dll\win32\cfgmgr32\cfgmgr32.dll 1 dll\win32\clusapi\clusapi.dll 1 dll\win32\console\console.dll 1 +dll\win32\comcat\comcat.dll 1 dll\win32\comctl32\comctl32.dll 1 dll\win32\comdlg32\comdlg32.dll 1 dll\win32\crtdll\crtdll.dll 1 Added: trunk/reactos/dll/win32/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat.rb… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat.rbuild (added) +++ trunk/reactos/dll/win32/comcat/comcat.rbuild Mon Jul 2 05:47:50 2007 @@ -1,0 +1,26 @@ +<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="comcat.spec.def" /> + <include base="comcat">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <library>ole32</library> + <library>uuid</library> + <file>comcat_main.c</file> + <file>factory.c</file> + <file>information.c</file> + <file>manager.c</file> + <file>register.c</file> + <file>regsvr.c</file> + <file>comcat.spec</file> +</module> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Jul 2 05:47:50 2007 @@ -37,6 +37,9 @@ <directory name="console"> <xi:include href="console/console.rbuild" /> </directory> +<directory name="comcat"> + <xi:include href="comcat/comcat.rbuild" /> +</directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.rbuild" /> </directory>

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 July 2007