Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[tkreuzer] 61665: [FRAMEBUF] Fix MSVC warnings
by tkreuzer＠svn.reactos.org 18 Jan '14

18 Jan '14

Author: tkreuzer Date: Sat Jan 18 00:40:22 2014 New Revision: 61665 URL: http://svn.reactos.org/svn/reactos?rev=61665&view=rev Log: [FRAMEBUF] Fix MSVC warnings Modified: trunk/reactos/win32ss/drivers/displays/framebuf/screen.c Modified: trunk/reactos/win32ss/drivers/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/screen.c [iso-8859-1] Sat Jan 18 00:40:22 2014 @@ -190,7 +190,7 @@ ppdev->ScreenWidth = SelectedMode->VisScreenWidth; ppdev->ScreenHeight = SelectedMode->VisScreenHeight; ppdev->ScreenDelta = SelectedMode->ScreenStride; - ppdev->BitsPerPixel = SelectedMode->BitsPerPlane * SelectedMode->NumberOfPlanes; + ppdev->BitsPerPixel = (UCHAR)(SelectedMode->BitsPerPlane * SelectedMode->NumberOfPlanes); ppdev->MemWidth = SelectedMode->VideoMemoryBitmapWidth; ppdev->MemHeight = SelectedMode->VideoMemoryBitmapHeight; @@ -316,7 +316,7 @@ pDevInfo->flGraphicsCaps |= GCAPS_PALMANAGED; pDevInfo->iDitherFormat = BMF_8BPP; /* Assuming palette is orthogonal - all colors are same size. */ - ppdev->PaletteShift = 8 - pGdiInfo->ulDACRed; + ppdev->PaletteShift = (UCHAR)(8 - pGdiInfo->ulDACRed); } else {

1 0

[tkreuzer] 61664: [DXAPI] Remove unnecessary forwards in spec file
by tkreuzer＠svn.reactos.org 18 Jan '14

18 Jan '14

Author: tkreuzer Date: Sat Jan 18 00:39:29 2014 New Revision: 61664 URL: http://svn.reactos.org/svn/reactos?rev=61664&view=rev Log: [DXAPI] Remove unnecessary forwards in spec file Modified: trunk/reactos/win32ss/reactx/dxapi/dxapi.spec Modified: trunk/reactos/win32ss/reactx/dxapi/dxapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxapi/dxapi… ============================================================================== --- trunk/reactos/win32ss/reactx/dxapi/dxapi.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxapi/dxapi.spec [iso-8859-1] Sat Jan 18 00:39:29 2014 @@ -1,7 +1,7 @@ -@ stdcall _DxApi@20(long ptr long ptr long) DxApi -@ stdcall _DxApiGetVersion@0() DxApiGetVersion -@ stdcall _DxApiInitialize@32(ptr ptr ptr ptr ptr ptr ptr ptr) DxApiInitialize -@ stdcall _DxAutoflipUpdate@20(ptr ptr ptr ptr ptr) DxAutoflipUpdate -@ stdcall _DxEnableIRQ@8(ptr ptr) DxEnableIRQ -@ stdcall _DxLoseObject@8(ptr ptr) DxLoseObject -@ stdcall _DxUpdateCapture@12(ptr ptr ptr) DxUpdateCapture +@ stdcall _DxApi@20(long ptr long ptr long) +@ stdcall _DxApiGetVersion@0() +@ stdcall _DxApiInitialize@32(ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall _DxAutoflipUpdate@20(ptr ptr ptr ptr ptr) +@ stdcall _DxEnableIRQ@8(ptr ptr) +@ stdcall _DxLoseObject@8(ptr ptr) +@ stdcall _DxUpdateCapture@12(ptr ptr ptr)

1 0

[tkreuzer] 61663: [NTOSKRNL] Slightly improve SeCaptureSidAndAttributesArray
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 23:13:38 2014 New Revision: 61663 URL: http://svn.reactos.org/svn/reactos?rev=61663&view=rev Log: [NTOSKRNL] Slightly improve SeCaptureSidAndAttributesArray Modified: trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=6166… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Fri Jan 17 23:13:38 2014 @@ -503,9 +503,6 @@ } else { - /* First copy the source array */ - RtlCopyMemory(SidAndAttributes, SrcSidAndAttributes, ArraySize); - /* The rest of the data starts after the array */ CurrentDest = (PUCHAR)SidAndAttributes; CurrentDest += ALIGN_UP_BY(ArraySize, sizeof(ULONG)); @@ -516,6 +513,9 @@ /* Get the SID and it's length */ Sid = SrcSidAndAttributes[i].Sid; SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + + /* Copy attributes */ + SidAndAttributes[i].Attributes = SrcSidAndAttributes[i].Attributes; /* Copy the SID to the current destination address */ SidAndAttributes[i].Sid = (PSID)CurrentDest;

1 0

[tkreuzer] 61662: [NTOSKRNL] Fix the s*** out of SepCreateToken and NtCreateToken: respect optional arguments, do not access usermode memory without SEH, instead properly capture them, don't alloca...
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 22:11:10 2014 New Revision: 61662 URL: http://svn.reactos.org/svn/reactos?rev=61662&view=rev Log: [NTOSKRNL] Fix the s*** out of SepCreateToken and NtCreateToken: respect optional arguments, do not access usermode memory without SEH, instead properly capture them, don't allocate 0 bytes from the pool, better argument verification. The function isn't perfect yet, but better and more secure. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Fri Jan 17 22:11:10 2014 @@ -738,6 +738,7 @@ for (i = 0; i < GroupCount; i++) uLength += RtlLengthSid(Groups[i].Sid); + // FIXME: should use the object itself AccessToken->UserAndGroups = ExAllocatePoolWithTag(PagedPool, uLength, TAG_TOKEN_USERS); @@ -775,7 +776,9 @@ if (!NT_SUCCESS(Status)) goto done; + // FIXME: should use the object itself uLength = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + if (uLength == 0) uLength = sizeof(PVOID); AccessToken->Privileges = ExAllocatePoolWithTag(PagedPool, uLength, TAG_TOKEN_PRIVILAGES); @@ -812,18 +815,26 @@ /* Update privilege flags */ SepUpdatePrivilegeFlagsToken(AccessToken); - AccessToken->DefaultDacl = ExAllocatePoolWithTag(PagedPool, - DefaultDacl->AclSize, - TAG_TOKEN_ACL); - if (AccessToken->DefaultDacl == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(AccessToken->DefaultDacl, - DefaultDacl, - DefaultDacl->AclSize); + if (DefaultDacl != NULL) + { + // FIXME: should use the object itself + AccessToken->DefaultDacl = ExAllocatePoolWithTag(PagedPool, + DefaultDacl->AclSize, + TAG_TOKEN_ACL); + if (AccessToken->DefaultDacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RtlCopyMemory(AccessToken->DefaultDacl, + DefaultDacl, + DefaultDacl->AclSize); + } + else + { + AccessToken->DefaultDacl = NULL; + } if (!SystemToken) { @@ -2376,24 +2387,37 @@ NTSTATUS NTAPI -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) +NtCreateToken( + _Out_ PHANDLE TokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ 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_opt_ PTOKEN_OWNER TokenOwner, + _In_ PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, + _In_opt_ PTOKEN_DEFAULT_DACL TokenDefaultDacl, + _In_ PTOKEN_SOURCE TokenSource) { HANDLE hToken; KPROCESSOR_MODE PreviousMode; - ULONG nTokenPrivileges = 0; + ULONG PrivilegeCount, GroupCount; + PSID OwnerSid, PrimaryGroupSid; + PACL DefaultDacl; LARGE_INTEGER LocalExpirationTime = {{0, 0}}; + LUID LocalAuthenticationId; + TOKEN_SOURCE LocalTokenSource; + SECURITY_QUALITY_OF_SERVICE LocalSecurityQos; + PLUID_AND_ATTRIBUTES CapturedPrivileges = NULL; + PSID_AND_ATTRIBUTES CapturedUser = NULL; + PSID_AND_ATTRIBUTES CapturedGroups = NULL; + PSID CapturedOwnerSid = NULL; + PSID CapturedPrimaryGroupSid = NULL; + PACL CapturedDefaultDacl = NULL; + ULONG PrivilegesLength, UserLength, GroupsLength; NTSTATUS Status; PAGED_CODE(); @@ -2405,64 +2429,197 @@ _SEH2_TRY { ProbeForWriteHandle(TokenHandle); + + if (ObjectAttributes != NULL) + { + ProbeForRead(ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + LocalSecurityQos = *(SECURITY_QUALITY_OF_SERVICE*)ObjectAttributes->SecurityQualityOfService; + } + ProbeForRead(AuthenticationId, sizeof(LUID), sizeof(ULONG)); + LocalAuthenticationId = *AuthenticationId; + LocalExpirationTime = ProbeForReadLargeInteger(ExpirationTime); + ProbeForRead(TokenUser, sizeof(TOKEN_USER), sizeof(ULONG)); + ProbeForRead(TokenGroups, sizeof(TOKEN_GROUPS), sizeof(ULONG)); + GroupCount = TokenGroups->GroupCount; + ProbeForRead(TokenPrivileges, sizeof(TOKEN_PRIVILEGES), sizeof(ULONG)); - ProbeForRead(TokenOwner, - sizeof(TOKEN_OWNER), - sizeof(ULONG)); + PrivilegeCount = TokenPrivileges->PrivilegeCount; + + if (TokenOwner != NULL) + { + ProbeForRead(TokenOwner, + sizeof(TOKEN_OWNER), + sizeof(ULONG)); + OwnerSid = TokenOwner->Owner; + } + else + { + OwnerSid = NULL; + } + ProbeForRead(TokenPrimaryGroup, sizeof(TOKEN_PRIMARY_GROUP), sizeof(ULONG)); - ProbeForRead(TokenDefaultDacl, - sizeof(TOKEN_DEFAULT_DACL), - sizeof(ULONG)); + PrimaryGroupSid = TokenPrimaryGroup->PrimaryGroup; + + if (TokenDefaultDacl != NULL) + { + ProbeForRead(TokenDefaultDacl, + sizeof(TOKEN_DEFAULT_DACL), + sizeof(ULONG)); + DefaultDacl = TokenDefaultDacl->DefaultDacl; + } + else + { + DefaultDacl = NULL; + } + ProbeForRead(TokenSource, sizeof(TOKEN_SOURCE), sizeof(ULONG)); - nTokenPrivileges = TokenPrivileges->PrivilegeCount; + LocalTokenSource = *TokenSource; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + return _SEH2_GetExceptionCode(); } _SEH2_END; } else { - nTokenPrivileges = TokenPrivileges->PrivilegeCount; + if (ObjectAttributes != NULL) + LocalSecurityQos = *(SECURITY_QUALITY_OF_SERVICE*)ObjectAttributes->SecurityQualityOfService; + LocalAuthenticationId = *AuthenticationId; LocalExpirationTime = *ExpirationTime; - } - + GroupCount = TokenGroups->GroupCount; + PrivilegeCount = TokenPrivileges->PrivilegeCount; + OwnerSid = TokenOwner ? TokenOwner->Owner : NULL; + PrimaryGroupSid = TokenPrimaryGroup->PrimaryGroup; + DefaultDacl = TokenDefaultDacl ? TokenDefaultDacl->DefaultDacl : NULL; + LocalTokenSource = *TokenSource; + } + + /* Check token type */ + if ((TokenType < TokenPrimary) || + (TokenType > TokenImpersonation)) + { + return STATUS_BAD_TOKEN_TYPE; + } + + /* Capture the user SID and attributes */ + Status = SeCaptureSidAndAttributesArray(&TokenUser->User, + 1, + PreviousMode, + NULL, + 0, + PagedPool, + FALSE, + &CapturedUser, + &UserLength); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Capture the groups SID and attributes array */ + Status = SeCaptureSidAndAttributesArray(&TokenGroups->Groups[0], + GroupCount, + PreviousMode, + NULL, + 0, + PagedPool, + FALSE, + &CapturedGroups, + &GroupsLength); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Capture privileges */ + Status = SeCaptureLuidAndAttributesArray(&TokenPrivileges->Privileges[0], + PrivilegeCount, + PreviousMode, + NULL, + 0, + PagedPool, + FALSE, + &CapturedPrivileges, + &PrivilegesLength); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Capture the token owner SID */ + if (TokenOwner != NULL) + { + Status = SepCaptureSid(OwnerSid, + PreviousMode, + PagedPool, + FALSE, + &CapturedOwnerSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + } + + /* Capture the token primary group SID */ + Status = SepCaptureSid(PrimaryGroupSid, + PreviousMode, + PagedPool, + FALSE, + &CapturedPrimaryGroupSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Capture DefaultDacl */ + if (DefaultDacl != NULL) + { + Status = SepCaptureAcl(DefaultDacl, + PreviousMode, + NonPagedPool, + FALSE, + &CapturedDefaultDacl); + } + + /* Call the internal function */ Status = SepCreateToken(&hToken, PreviousMode, DesiredAccess, ObjectAttributes, TokenType, - ((PSECURITY_QUALITY_OF_SERVICE)(ObjectAttributes->SecurityQualityOfService))->ImpersonationLevel, - AuthenticationId, + LocalSecurityQos.ImpersonationLevel, + &LocalAuthenticationId, &LocalExpirationTime, - &TokenUser->User, - TokenGroups->GroupCount, - TokenGroups->Groups, + CapturedUser, + GroupCount, + CapturedGroups, 0, // FIXME: Should capture - nTokenPrivileges, - TokenPrivileges->Privileges, - TokenOwner->Owner, - TokenPrimaryGroup->PrimaryGroup, - TokenDefaultDacl->DefaultDacl, - TokenSource, + PrivilegeCount, + CapturedPrivileges, + CapturedOwnerSid, + CapturedPrimaryGroupSid, + CapturedDefaultDacl, + &LocalTokenSource, FALSE); if (NT_SUCCESS(Status)) { @@ -2476,6 +2633,16 @@ } _SEH2_END; } + +Cleanup: + + /* Release what we captured */ + SeReleaseSidAndAttributesArray(CapturedUser, PreviousMode, FALSE); + SeReleaseSidAndAttributesArray(CapturedGroups, PreviousMode, FALSE); + SeReleaseLuidAndAttributesArray(CapturedPrivileges, PreviousMode, FALSE); + SepReleaseSid(CapturedOwnerSid, PreviousMode, FALSE); + SepReleaseSid(CapturedPrimaryGroupSid, PreviousMode, FALSE); + SepReleaseAcl(CapturedDefaultDacl, PreviousMode, FALSE); return Status; }

1 0

[tkreuzer] 61661: [NTOSKRNL] Implement SeCaptureSidAndAttributesArray and SeReleaseSidAndAttributesArray (not used yet, but very soon)
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 21:58:28 2014 New Revision: 61661 URL: http://svn.reactos.org/svn/reactos?rev=61661&view=rev Log: [NTOSKRNL] Implement SeCaptureSidAndAttributesArray and SeReleaseSidAndAttributesArray (not used yet, but very soon) Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Fri Jan 17 21:58:28 2014 @@ -444,6 +444,26 @@ NTSTATUS NTAPI +SeCaptureSidAndAttributesArray( + _In_ PSID_AND_ATTRIBUTES SrcSidAndAttributes, + _In_ ULONG AttributeCount, + _In_ KPROCESSOR_MODE PreviousMode, + _In_opt_ PVOID AllocatedMem, + _In_ ULONG AllocatedLength, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSID_AND_ATTRIBUTES *CapturedSidAndAttributes, + _Out_ PULONG ResultLength); + +VOID +NTAPI +SeReleaseSidAndAttributesArray( + _In_ _Post_invalid_ PSID_AND_ATTRIBUTES CapturedSidAndAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel); + +NTSTATUS +NTAPI SepCaptureAcl( IN PACL InputAcl, IN KPROCESSOR_MODE AccessMode, Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=6166… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Fri Jan 17 21:58:28 2014 @@ -12,6 +12,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define TAG_SID_AND_ATTRIBUTES 'aSeS' #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, SepInitSecurityIDs) @@ -340,4 +342,222 @@ } } +NTSTATUS +NTAPI +SeCaptureSidAndAttributesArray( + _In_ PSID_AND_ATTRIBUTES SrcSidAndAttributes, + _In_ ULONG AttributeCount, + _In_ KPROCESSOR_MODE PreviousMode, + _In_opt_ PVOID AllocatedMem, + _In_ ULONG AllocatedLength, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSID_AND_ATTRIBUTES *CapturedSidAndAttributes, + _Out_ PULONG ResultLength) +{ + ULONG ArraySize, RequiredLength, SidLength, i; + PSID_AND_ATTRIBUTES SidAndAttributes; + PUCHAR CurrentDest; + PISID Sid; + NTSTATUS Status; + PAGED_CODE(); + + *CapturedSidAndAttributes = NULL; + *ResultLength = 0; + + if (AttributeCount == 0) + { + return STATUS_SUCCESS; + } + + if (AttributeCount > 0x1000) + { + return STATUS_INVALID_PARAMETER; + } + + if ((PreviousMode == KernelMode) && !CaptureIfKernel) + { + *CapturedSidAndAttributes = SrcSidAndAttributes; + return STATUS_SUCCESS; + } + + ArraySize = AttributeCount * sizeof(SID_AND_ATTRIBUTES); + RequiredLength = ALIGN_UP_BY(ArraySize, sizeof(ULONG)); + + /* Check for user mode data */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* First probe the whole array */ + ProbeForRead(SrcSidAndAttributes, ArraySize, sizeof(ULONG)); + + /* Loop the array elements */ + for (i = 0; i < AttributeCount; i++) + { + /* Get the SID and probe the minimal structure */ + Sid = SrcSidAndAttributes[i].Sid; + ProbeForRead(Sid, sizeof(*Sid), sizeof(ULONG)); + + /* Verify that the SID is valid */ + if (((Sid->Revision & 0xF) != SID_REVISION) || + (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) + { + return STATUS_INVALID_SID; + } + + /* Calculate the SID length and probe the full SID */ + SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + ProbeForRead(Sid, SidLength, sizeof(ULONG)); + + /* Add the aligned length to the required length */ + RequiredLength += ALIGN_UP_BY(SidLength, sizeof(ULONG)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + /* Loop the array elements */ + for (i = 0; i < AttributeCount; i++) + { + /* Get the SID and it's length */ + Sid = SrcSidAndAttributes[i].Sid; + SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + + /* Add the aligned length to the required length */ + RequiredLength += ALIGN_UP_BY(SidLength, sizeof(ULONG)); + } + } + + /* Assume success */ + Status = STATUS_SUCCESS; + *ResultLength = RequiredLength; + + /* Check if we have no buffer */ + if (AllocatedMem == NULL) + { + /* Allocate a new buffer */ + SidAndAttributes = ExAllocatePoolWithTag(PoolType, + RequiredLength, + TAG_SID_AND_ATTRIBUTES); + if (SidAndAttributes == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + } + /* Otherwise check if the buffer is large enough */ + else if (AllocatedLength >= RequiredLength) + { + /* Buffer is large enough, use it */ + SidAndAttributes = AllocatedMem; + } + else + { + /* Buffer is too small, fail */ + return STATUS_BUFFER_TOO_SMALL; + } + + *CapturedSidAndAttributes = SidAndAttributes; + + /* Check again for user mode */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* The rest of the data starts after the array */ + CurrentDest = (PUCHAR)SidAndAttributes; + CurrentDest += ALIGN_UP_BY(ArraySize, sizeof(ULONG)); + + /* Loop the array elements */ + for (i = 0; i < AttributeCount; i++) + { + /* Get the SID and it's length */ + Sid = SrcSidAndAttributes[i].Sid; + SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + + /* Copy attributes */ + SidAndAttributes[i].Attributes = SrcSidAndAttributes[i].Attributes; + + /* Copy the SID to the current destination address */ + SidAndAttributes[i].Sid = (PSID)CurrentDest; + RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); + + /* Sanity checks */ + NT_ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); + NT_ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); + + /* Update the current destination address */ + CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + /* First copy the source array */ + RtlCopyMemory(SidAndAttributes, SrcSidAndAttributes, ArraySize); + + /* The rest of the data starts after the array */ + CurrentDest = (PUCHAR)SidAndAttributes; + CurrentDest += ALIGN_UP_BY(ArraySize, sizeof(ULONG)); + + /* Loop the array elements */ + for (i = 0; i < AttributeCount; i++) + { + /* Get the SID and it's length */ + Sid = SrcSidAndAttributes[i].Sid; + SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + + /* Copy the SID to the current destination address */ + SidAndAttributes[i].Sid = (PSID)CurrentDest; + RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); + + /* Update the current destination address */ + CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); + } + } + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Check if we allocated a new array */ + if (SidAndAttributes != AllocatedMem) + { + /* Free the array */ + ExFreePoolWithTag(SidAndAttributes, TAG_SID_AND_ATTRIBUTES); + } + + /* Set returned address to NULL */ + *CapturedSidAndAttributes = NULL ; + } + + return Status; +} + +VOID +NTAPI +SeReleaseSidAndAttributesArray( + _In_ _Post_invalid_ PSID_AND_ATTRIBUTES CapturedSidAndAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel) +{ + PAGED_CODE(); + + if ((CapturedSidAndAttributes != NULL) && + ((AccessMode != KernelMode) || CaptureIfKernel)) + { + ExFreePoolWithTag(CapturedSidAndAttributes, TAG_SID_AND_ATTRIBUTES); + } +} + + /* EOF */

1 0

[tkreuzer] 61660: [NTOSKRNL] Fix indentation in MmFreeMemoryArea and add a DPRINT in MmCreateMemoryArea
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 21:51:39 2014 New Revision: 61660 URL: http://svn.reactos.org/svn/reactos?rev=61660&view=rev Log: [NTOSKRNL] Fix indentation in MmFreeMemoryArea and add a DPRINT in MmCreateMemoryArea Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Jan 17 21:51:39 2014 @@ -828,9 +828,9 @@ Address < (ULONG_PTR)EndAddress; Address += PAGE_SIZE) { - BOOLEAN Dirty = FALSE; - SWAPENTRY SwapEntry = 0; - PFN_NUMBER Page = 0; + BOOLEAN Dirty = FALSE; + SWAPENTRY SwapEntry = 0; + PFN_NUMBER Page = 0; if (MmIsPageSwapEntry(Process, (PVOID)Address)) { @@ -1058,7 +1058,11 @@ TAG_MAREA); } - if (!MemoryArea) return STATUS_NO_MEMORY; + if (!MemoryArea) + { + DPRINT1("Not enough memory.\n"); + return STATUS_NO_MEMORY; + } RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type;

1 0

[tkreuzer] 61659: [NTOSKRNL] Lookup new Ldr entries in IopInitializeBuiltinDriver (we used the old ones from the loader block, that are not valid anymore after the drivers have been relocated!)
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 21:49:43 2014 New Revision: 61659 URL: http://svn.reactos.org/svn/reactos?rev=61659&view=rev Log: [NTOSKRNL] Lookup new Ldr entries in IopInitializeBuiltinDriver (we used the old ones from the loader block, that are not valid anymore after the drivers have been relocated!) Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Jan 17 21:49:43 2014 @@ -818,14 +818,16 @@ NTSTATUS NTAPI INIT_FUNCTION -IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) { PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; NTSTATUS Status; PWCHAR FileNameWithoutPath; LPWSTR FileExtension; - PUNICODE_STRING ModuleName = &LdrEntry->BaseDllName; + PUNICODE_STRING ModuleName = &BootLdrEntry->BaseDllName; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry; UNICODE_STRING ServiceName; /* @@ -868,6 +870,22 @@ DPRINT1("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return(Status); } + + /* Lookup the new Ldr entry in PsLoadedModuleList */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(ModuleName, &LdrEntry->BaseDllName, TRUE)) + { + break; + } + + NextEntry = NextEntry->Flink; + } + NT_ASSERT(NextEntry != &PsLoadedModuleList); /* * Initialize the driver

1 0

[tkreuzer] 61658: [NTOSKRNL] Implement querying class data in CmpQueryKeyData
by tkreuzer＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tkreuzer Date: Fri Jan 17 21:45:53 2014 New Revision: 61658 URL: http://svn.reactos.org/svn/reactos?rev=61658&view=rev Log: [NTOSKRNL] Implement querying class data in CmpQueryKeyData Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Fri Jan 17 21:45:53 2014 @@ -380,9 +380,10 @@ IN OUT PULONG ResultLength) { NTSTATUS Status; - ULONG Size, SizeLeft, MinimumSize; + ULONG Size, SizeLeft, MinimumSize, Offset; PKEY_INFORMATION Info = (PKEY_INFORMATION)KeyInformation; USHORT NameLength; + PVOID ClassData; /* Check if the value is compressed */ if (Node->Flags & KEY_COMP_NAME) @@ -516,8 +517,36 @@ /* Check if the node has a class */ if (Node->ClassLength > 0) { - /* It does. We don't support these yet */ - ASSERTMSG("Classes not supported\n", FALSE); + /* Set the class offset */ + Offset = FIELD_OFFSET(KEY_NODE_INFORMATION, Name) + NameLength; + Offset = ALIGN_UP_BY(Offset, sizeof(ULONG)); + Info->KeyNodeInformation.ClassOffset = Offset; + + /* Get the class data */ + ClassData = HvGetCell(Hive, Node->Class); + if (ClassData == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Check if we can copy anything */ + if (Length > Offset) + { + /* Copy the class data */ + RtlCopyMemory((PUCHAR)Info + Offset, + ClassData, + min(Node->ClassLength, Length - Offset)); + } + + /* Check if the buffer was large enough */ + if (Length < Offset + Node->ClassLength) + { + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Release the class cell */ + HvReleaseCell(Hive, Node->Class); } else { @@ -563,13 +592,37 @@ /* Check if we have a class */ if (Node->ClassLength > 0) { - /* We do, but we currently don't support this */ - ASSERTMSG("Classes not supported\n", FALSE); + /* Set the class offset */ + Offset = FIELD_OFFSET(KEY_FULL_INFORMATION, Class); + Info->KeyFullInformation.ClassOffset = Offset; + + /* Get the class data */ + ClassData = HvGetCell(Hive, Node->Class); + if (ClassData == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Copy the class data */ + NT_ASSERT(Length > Offset); + RtlCopyMemory(Info->KeyFullInformation.Class, + ClassData, + min(Node->ClassLength, Length - Offset)); + + /* Check if the buffer was large enough */ + if (Length < Offset + Node->ClassLength) + { + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Release the class cell */ + HvReleaseCell(Hive, Node->Class); } else { /* We don't have a class, so set offset to -1, not 0! */ - Info->KeyNodeInformation.ClassOffset = 0xFFFFFFFF; + Info->KeyFullInformation.ClassOffset = 0xFFFFFFFF; } break;

1 0

[cwittich] 61657: [mmc] Change "Strg" to "Ctrl" for non german languages See issue #7782 for more details.
by cwittich＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: cwittich Date: Fri Jan 17 20:09:27 2014 New Revision: 61657 URL: http://svn.reactos.org/svn/reactos?rev=61657&view=rev Log: [mmc] Change "Strg" to "Ctrl" for non german languages See issue #7782 for more details. Modified: trunk/reactos/base/applications/mmc/lang/bg-BG.rc trunk/reactos/base/applications/mmc/lang/ca-ES.rc trunk/reactos/base/applications/mmc/lang/cs-CZ.rc trunk/reactos/base/applications/mmc/lang/el-GR.rc trunk/reactos/base/applications/mmc/lang/en-US.rc trunk/reactos/base/applications/mmc/lang/es-ES.rc trunk/reactos/base/applications/mmc/lang/fr-FR.rc trunk/reactos/base/applications/mmc/lang/he-IL.rc trunk/reactos/base/applications/mmc/lang/it-IT.rc trunk/reactos/base/applications/mmc/lang/ko-KR.rc trunk/reactos/base/applications/mmc/lang/lt-LT.rc trunk/reactos/base/applications/mmc/lang/no-NO.rc trunk/reactos/base/applications/mmc/lang/pl-PL.rc trunk/reactos/base/applications/mmc/lang/pt-BR.rc trunk/reactos/base/applications/mmc/lang/ro-RO.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/sk-SK.rc trunk/reactos/base/applications/mmc/lang/sq-AL.rc trunk/reactos/base/applications/mmc/lang/sv-SE.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/uk-UA.rc trunk/reactos/base/applications/mmc/lang/zh-CN.rc trunk/reactos/base/applications/mmc/lang/zh-TW.rc Modified: trunk/reactos/base/applications/mmc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&Fitxer" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&Fitxer" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -9,7 +9,7 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT END @@ -23,7 +23,7 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&ÎÏÏÎµÎ¯Î¿" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Î&Î¾Î¿Î´Î¿Ï\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&ÎÏÏÎµÎ¯Î¿" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Î&Î¾Î¿Î´Î¿Ï\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -9,7 +9,7 @@ BEGIN POPUP "&Archivo" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT END @@ -23,7 +23,7 @@ BEGIN POPUP "&Archivo" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&×§×××¥" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&××¦×××\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&×§×××¥" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&××¦×××\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -6,7 +6,7 @@ BEGIN POPUP "íì¼(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ì¢ë£(&E)\tAlt+F4", IDM_FILE_EXIT END @@ -20,7 +20,7 @@ BEGIN POPUP "íì¼(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ì¢ë£(&E)\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -6,7 +6,7 @@ BEGIN POPUP "&Byla" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT END @@ -20,7 +20,7 @@ BEGIN POPUP "&Byla" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -11,7 +11,7 @@ BEGIN POPUP "Pl&ik" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT END @@ -25,7 +25,7 @@ BEGIN POPUP "Pl&ik" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -4,7 +4,7 @@ BEGIN POPUP "&Arquivo" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT END @@ -18,7 +18,7 @@ BEGIN POPUP "&Arquivo" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -11,7 +11,7 @@ BEGIN POPUP "&FiÈier" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END @@ -25,7 +25,7 @@ BEGIN POPUP "&FiÈier" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -6,7 +6,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END @@ -20,7 +20,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -12,7 +12,7 @@ BEGIN POPUP "&SÃºbor" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT END @@ -26,7 +26,7 @@ BEGIN POPUP "&SÃºbor" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/sq-AL.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -8,7 +8,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "I Ri\tStrg+N", IDM_FILE_NEW + MENUITEM "I Ri\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "D&il\tAlt+F4", IDM_FILE_EXIT END @@ -22,7 +22,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "I Ri\tStrg+N", IDM_FILE_NEW + MENUITEM "I Ri\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "D&il\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -6,7 +6,7 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT END @@ -20,7 +20,7 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -6,7 +6,7 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tStrg+N", IDM_FILE_NEW + MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT END @@ -20,7 +20,7 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni\tStrg+N", IDM_FILE_NEW + MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -12,7 +12,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", IDM_FILE_EXIT END @@ -26,7 +26,7 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -12,7 +12,7 @@ BEGIN POPUP "æ¡£æ¡(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT END @@ -26,7 +26,7 @@ BEGIN POPUP "æ¡£æ¡(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/applications/mmc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] Fri Jan 17 20:09:27 2014 @@ -12,7 +12,7 @@ BEGIN POPUP "æªæ¡(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT END @@ -26,7 +26,7 @@ BEGIN POPUP "æªæ¡(&F)" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "New\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT END

1 0

[gadamopoulos] 61656: - fix some typos
by gadamopoulos＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: gadamopoulos Date: Fri Jan 17 18:45:59 2014 New Revision: 61656 URL: http://svn.reactos.org/svn/reactos?rev=61656&view=rev Log: - fix some typos Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Fri Jan 17 18:45:59 2014 @@ -1137,7 +1137,7 @@ PNONCLIENTMETRICSW pncMetrics, COLORREF* lpaRgbValues) { - WNDCLASSEXW DummyPreviwWindowClass; + WNDCLASSEXW DummyPreviewWindowClass; HWND hwndDummy; HRESULT hres; HTHEMEFILE hThemeFile; @@ -1148,16 +1148,16 @@ * and make use of the ncmetrics and colors passed as parameters */ /* Create a dummy window that will be used to trick the paint funtions */ - memset(&DummyPreviwWindowClass, 0, sizeof(DummyPreviwWindowClass)); - DummyPreviwWindowClass.cbSize = sizeof(DummyPreviwWindowClass); - DummyPreviwWindowClass.lpszClassName = L"DummyPreviwWindowClass"; - DummyPreviwWindowClass.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - DummyPreviwWindowClass.hInstance = hDllInst; - DummyPreviwWindowClass.lpfnWndProc = DefWindowProcW; - if (!RegisterClassExW(&DummyPreviwWindowClass)) + memset(&DummyPreviewWindowClass, 0, sizeof(DummyPreviewWindowClass)); + DummyPreviewWindowClass.cbSize = sizeof(DummyPreviewWindowClass); + DummyPreviewWindowClass.lpszClassName = L"DummyPreviewWindowClass"; + DummyPreviewWindowClass.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + DummyPreviewWindowClass.hInstance = hDllInst; + DummyPreviewWindowClass.lpfnWndProc = DefWindowProcW; + if (!RegisterClassExW(&DummyPreviewWindowClass)) return E_FAIL; - hwndDummy = CreateWindowExW(0, L"DummyPreviwWindowClass", L"Active window", WS_OVERLAPPEDWINDOW,30,30,300,150,0,0,hDllInst,NULL); + hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", L"Active window", WS_OVERLAPPEDWINDOW,30,30,300,150,0,0,hDllInst,NULL); if (!hwndDummy) return E_FAIL; @@ -1190,7 +1190,7 @@ /* Cleanup */ DestroyWindow(hwndDummy); - UnregisterClassW(L"DummyPreviwWindowClass", hDllInst); + UnregisterClassW(L"DummyPreviewWindowClass", hDllInst); return S_OK; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
43
Older →

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 January 2014