Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[gadamopoulos] 61655: [uxtheme] - Halfplement DrawNCPreview. Everyone is welcome to improve it
by gadamopoulos＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: gadamopoulos Date: Fri Jan 17 18:39:40 2014 New Revision: 61655 URL: http://svn.reactos.org/svn/reactos?rev=61655&view=rev Log: [uxtheme] - Halfplement DrawNCPreview. Everyone is welcome to improve it Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/system.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:39:40 2014 @@ -619,7 +619,7 @@ } static void -ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBuffering) { if(!(pcontext->wi.dwStyle & WS_VISIBLE)) return; @@ -632,9 +632,11 @@ if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) { - ThemeStartBufferedPaint(pcontext, prcCurrent->right, pcontext->CaptionHeight); + if (bDoDoubleBuffering) + ThemeStartBufferedPaint(pcontext, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawCaption(pcontext, prcCurrent); - ThemeEndBufferedPaint(pcontext, 0, 0, prcCurrent->right, pcontext->CaptionHeight); + if (bDoDoubleBuffering) + ThemeEndBufferedPaint(pcontext, 0, 0, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawBorders(pcontext, prcCurrent); } else @@ -667,7 +669,7 @@ rcCurrent = context.wi.rcWindow; OffsetRect( &rcCurrent, -context.wi.rcWindow.left, -context.wi.rcWindow.top); - ThemePaintWindow(&context, &rcCurrent); + ThemePaintWindow(&context, &rcCurrent, TRUE); ThemeCleanupDrawContext(&context); return 0; @@ -1125,3 +1127,70 @@ return DefWndProc(hWnd, Msg, wParam, lParam); } } + +HRESULT WINAPI DrawNCPreview(HDC hDC, + DWORD DNCP_Flag, + LPRECT prcPreview, + LPCWSTR pszThemeFileName, + LPCWSTR pszColorName, + LPCWSTR pszSizeName, + PNONCLIENTMETRICSW pncMetrics, + COLORREF* lpaRgbValues) +{ + WNDCLASSEXW DummyPreviwWindowClass; + HWND hwndDummy; + HRESULT hres; + HTHEMEFILE hThemeFile; + DRAW_CONTEXT context; + RECT rcCurrent; + + /* FIXME: We also need to implement drawing the rest of the preview windows + * 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)) + return E_FAIL; + + hwndDummy = CreateWindowExW(0, L"DummyPreviwWindowClass", L"Active window", WS_OVERLAPPEDWINDOW,30,30,300,150,0,0,hDllInst,NULL); + if (!hwndDummy) + return E_FAIL; + + hres = OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, &hThemeFile,0); + if (FAILED(hres)) + return hres; + + /* Initialize the special draw context for the preview */ + context.hDC = hDC; + context.hWnd = hwndDummy; + context.theme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"WINDOW", 0); + if (!context.theme) + return E_FAIL; + context.scrolltheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"SCROLLBAR", 0); + if (!context.theme) + return E_FAIL; + context.Active = TRUE; + if (!GetWindowInfo(hwndDummy, &context.wi)) + return E_FAIL; + context.wi.dwStyle |= WS_VISIBLE; + context.CaptionHeight = context.wi.cyWindowBorders; + context.CaptionHeight += GetSystemMetrics(context.wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); + context.hRgn = CreateRectRgnIndirect(&context.wi.rcWindow); + + /* Paint the window on the preview hDC */ + rcCurrent = context.wi.rcWindow; + ThemePaintWindow(&context, &rcCurrent, FALSE); + context.hDC = NULL; + ThemeCleanupDrawContext(&context); + + /* Cleanup */ + DestroyWindow(hwndDummy); + UnregisterClassW(L"DummyPreviwWindowClass", hDllInst); + + return S_OK; +} Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Fri Jan 17 18:39:40 2014 @@ -1345,16 +1345,3 @@ MSSTYLES_CloseThemeFile(pt); return S_OK; } - -HRESULT WINAPI DrawNCPreview(HDC hDC, - DWORD DNCP_Flag, - LPRECT prcPreview, - LPCWSTR pszThemeFileName, - LPCWSTR pszColorName, - LPCWSTR pszSizeName, - PNONCLIENTMETRICSW pncMetrics, - COLORREF* lpaRgbValues) -{ - return E_NOTIMPL; -} -

1 0

[gadamopoulos] 61654: [uxtheme] - Greatly reduce needless repaints in the non client area but remembering the last hittest of the mouse events to redraw it only when it is needed - Do not reset the...
by gadamopoulos＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: gadamopoulos Date: Fri Jan 17 17:52:58 2014 New Revision: 61654 URL: http://svn.reactos.org/svn/reactos?rev=61654&view=rev Log: [uxtheme] - Greatly reduce needless repaints in the non client area but remembering the last hittest of the mouse events to redraw it only when it is needed - Do not reset the theme region every time we move a window, also make sure we try to set a theme region only when it is needed - Do not use OpenThemeData but use MSSTYLES_OpenThemeClass directly - Do not reload the active theme every time we get a WM_THEMECHANGED message, make sure to see if the active theme was already loaded before trying to load it again - See CORE-7775 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxthemep.h 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 17:52:58 2014 @@ -155,9 +155,8 @@ GetWindowInfo(hWnd, &pcontext->wi); pcontext->hWnd = hWnd; pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); - pcontext->hPrevTheme = GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); - pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW"); - pcontext->scrolltheme = OpenThemeData(pcontext->hWnd, L"SCROLLBAR"); + pcontext->theme = MSSTYLES_OpenThemeClass(ActiveThemeFile, NULL, L"WINDOW"); + pcontext->scrolltheme = MSSTYLES_OpenThemeClass(ActiveThemeFile, NULL, L"SCROLLBAR"); pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; pcontext->CaptionHeight += GetSystemMetrics(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); @@ -178,8 +177,6 @@ CloseThemeData (pcontext->theme); CloseThemeData (pcontext->scrolltheme); - - SetPropW(pcontext->hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), pcontext->hPrevTheme); if(pcontext->hRgn != NULL) { @@ -289,10 +286,7 @@ { RECT rcCurrent; - /* Check if the window has caption buttons */ - if (!((pcontext->wi.dwStyle & WS_CAPTION) && (pcontext->wi.dwStyle & WS_SYSMENU))) - return ; - + /* Calculate the area of the caption */ rcCurrent.top = rcCurrent.left = 0; rcCurrent.right = pcontext->wi.rcWindow.right - pcontext->wi.rcWindow.left; rcCurrent.bottom = pcontext->CaptionHeight; @@ -336,7 +330,7 @@ /* Draw the caption background*/ rcPart = *prcCurrent; - rcPart.bottom = pcontext->CaptionHeight; + rcPart.bottom = rcPart.top + pcontext->CaptionHeight; prcCurrent->top = rcPart.bottom; DrawThemeBackground(pcontext->theme, pcontext->hDC,iPart,iState,&rcPart,NULL); @@ -400,7 +394,7 @@ /* Draw the left border */ rcPart = *prcCurrent; - rcPart.right = pcontext->wi.cxWindowBorders ; + rcPart.right = rcPart.left + pcontext->wi.cxWindowBorders ; prcCurrent->left = rcPart.right; DrawThemeBackground(pcontext->theme, pcontext->hDC,WP_FRAMELEFT, iState, &rcPart, NULL); @@ -684,28 +678,56 @@ { DRAW_CONTEXT context; TRACKMOUSEEVENT tme; - + DWORD style; + PWND_CONTEXT pcontext; + + /* First of all check if we have something to do here */ + style = GetWindowLongW(hWnd, GWL_STYLE); + if((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) + return 0; + + /* Get theme data for this window */ + pcontext = ThemeGetWndContext(hWnd); + if (pcontext == NULL) + return 0; + + /* Begin tracking in the non client area if we are not tracking yet */ tme.cbSize = sizeof(TRACKMOUSEEVENT); tme.dwFlags = TME_QUERY; tme.hwndTrack = hWnd; TrackMouseEvent(&tme); - if (tme.dwFlags != (TME_LEAVE | TME_NONCLIENT)) + if (tme.dwFlags != (TME_LEAVE | TME_NONCLIENT)) { tme.hwndTrack = hWnd; tme.dwFlags = TME_LEAVE | TME_NONCLIENT; TrackMouseEvent(&tme); } + /* Dont do any drawing if the hit test wasn't changed */ + if (ht == pcontext->lastHitTest) + return 0; + ThemeInitDrawContext(&context, hWnd, 0); - ThemeDrawCaptionButtons(&context, ht, 0); - - if(context.wi.dwStyle & WS_HSCROLL) - ThemeDrawScrollBar(&context, SB_HORZ , ht == HTHSCROLL ? pt : NULL); - - if(context.wi.dwStyle & WS_VSCROLL) - ThemeDrawScrollBar(&context, SB_VERT, ht == HTVSCROLL ? pt : NULL); - + if (context.wi.dwStyle & WS_SYSMENU) + { + if (HT_ISBUTTON(ht) || HT_ISBUTTON(pcontext->lastHitTest)) + ThemeDrawCaptionButtons(&context, ht, 0); + } + + if (context.wi.dwStyle & WS_HSCROLL) + { + if (ht == HTHSCROLL || pcontext->lastHitTest == HTHSCROLL) + ThemeDrawScrollBar(&context, SB_HORZ , ht == HTHSCROLL ? pt : NULL); + } + + if (context.wi.dwStyle & WS_VSCROLL) + { + if (ht == HTVSCROLL || pcontext->lastHitTest == HTVSCROLL) + ThemeDrawScrollBar(&context, SB_VERT, ht == HTVSCROLL ? pt : NULL); + } ThemeCleanupDrawContext(&context); + + pcontext->lastHitTest = ht; return 0; } @@ -714,17 +736,32 @@ ThemeHandleNcMouseLeave(HWND hWnd) { DRAW_CONTEXT context; + DWORD style; + PWND_CONTEXT pWndContext; + + /* First of all check if we have something to do here */ + style = GetWindowLongW(hWnd, GWL_STYLE); + if((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) + return 0; + + /* Get theme data for this window */ + pWndContext = ThemeGetWndContext(hWnd); + if (pWndContext == NULL) + return 0; ThemeInitDrawContext(&context, hWnd, 0); - ThemeDrawCaptionButtons(&context, 0, 0); - - if(context.wi.dwStyle & WS_HSCROLL) - ThemeDrawScrollBar(&context, SB_HORZ, NULL); - - if(context.wi.dwStyle & WS_VSCROLL) + if (context.wi.dwStyle & WS_SYSMENU && HT_ISBUTTON(pWndContext->lastHitTest)) + ThemeDrawCaptionButtons(&context, 0, 0); + + if (context.wi.dwStyle & WS_HSCROLL && pWndContext->lastHitTest == HTHSCROLL) + ThemeDrawScrollBar(&context, SB_HORZ, NULL); + + if (context.wi.dwStyle & WS_VSCROLL && pWndContext->lastHitTest == HTVSCROLL) ThemeDrawScrollBar(&context, SB_VERT, NULL); ThemeCleanupDrawContext(&context); + + pWndContext->lastHitTest = HTNOWHERE; return 0; } @@ -733,17 +770,19 @@ ThemeHandleButton(HWND hWnd, WPARAM wParam) { MSG Msg; - BOOL Pressed = TRUE; // , OldState; + BOOL Pressed = TRUE; WPARAM SCMsg, ht; ULONG Style; DRAW_CONTEXT context; + PWND_CONTEXT pWndContext; Style = GetWindowLongW(hWnd, GWL_STYLE); + if (!((Style & WS_CAPTION) && (Style & WS_SYSMENU))) + return ; + switch (wParam) { case HTCLOSE: - if (!(Style & WS_SYSMENU)) - return; SCMsg = SC_CLOSE; break; case HTMINBUTTON: @@ -760,8 +799,14 @@ return; } + /* Get theme data for this window */ + pWndContext = ThemeGetWndContext(hWnd); + if (pWndContext == NULL) + return; + ThemeInitDrawContext(&context, hWnd, 0); ThemeDrawCaptionButtons(&context, 0, wParam); + pWndContext->lastHitTest = wParam; SetCapture(hWnd); @@ -776,14 +821,19 @@ if (Msg.message != WM_MOUSEMOVE) continue; - //OldState = Pressed; ht = SendMessage(hWnd, WM_NCHITTEST, 0, MAKELPARAM(Msg.pt.x, Msg.pt.y)); Pressed = (ht == wParam); - ThemeDrawCaptionButtons(&context, 0, Pressed ? wParam: 0); - } - - ThemeDrawCaptionButtons(&context, 0, 0); + /* Only draw the buttons if the hit test changed */ + if (ht != pWndContext->lastHitTest && + (HT_ISBUTTON(ht) || HT_ISBUTTON(pWndContext->lastHitTest))) + { + ThemeDrawCaptionButtons(&context, 0, Pressed ? wParam: 0); + pWndContext->lastHitTest = ht; + } + } + + ThemeDrawCaptionButtons(&context, ht, 0); ThemeCleanupDrawContext(&context); ReleaseCapture(); Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Fri Jan 17 17:52:58 2014 @@ -50,7 +50,7 @@ static ATOM atSubIdList; ATOM atWndContrext; -static PTHEME_FILE ActiveThemeFile; +PTHEME_FILE ActiveThemeFile; /***********************************************************************/ @@ -136,6 +136,39 @@ MSSTYLES_ParseThemeIni(ActiveThemeFile); } return S_OK; +} + +static BOOL bIsThemeActive(LPCWSTR pszTheme, LPCWSTR pszColor, LPCWSTR pszSize) +{ + if (ActiveThemeFile == NULL) + return FALSE; + + if (wcscmp(pszTheme, ActiveThemeFile->szThemeFile) != 0) + return FALSE; + + if (!pszColor[0]) + { + if (ActiveThemeFile->pszAvailColors != ActiveThemeFile->pszSelectedColor) + return FALSE; + } + else + { + if (wcscmp(pszColor, ActiveThemeFile->pszSelectedColor) != 0) + return FALSE; + } + + if (!pszSize[0]) + { + if (ActiveThemeFile->pszAvailSizes != ActiveThemeFile->pszSelectedSize) + return FALSE; + } + else + { + if (wcscmp(pszSize, ActiveThemeFile->pszSelectedSize) != 0) + return FALSE; + } + + return TRUE; } /*********************************************************************** @@ -186,7 +219,14 @@ bThemeActive = FALSE; } - if(bThemeActive) { + if(bThemeActive) + { + if( bIsThemeActive(szCurrentTheme, szCurrentColor, szCurrentSize) ) + { + TRACE("Tried to load active theme again\n"); + return; + } + /* Make sure the theme requested is actually valid */ hr = MSSTYLES_OpenThemeFile(szCurrentTheme, szCurrentColor[0]?szCurrentColor:NULL, @@ -471,6 +511,8 @@ WCHAR tmp[2]; HRESULT hr; + TRACE("UXTHEME_ApplyTheme\n"); + if (tf && !ActiveThemeFile) { UXTHEME_BackupSystemMetrics(); @@ -562,7 +604,7 @@ WCHAR tmp[10]; DWORD buffsize; - TRACE("\n"); + TRACE("IsThemeActive\n"); SetLastError(ERROR_SUCCESS); if (ActiveThemeFile) Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri Jan 17 17:52:58 2014 @@ -83,7 +83,7 @@ return TRUE; } -void SetThemeRegion(HWND hWnd, PWND_CONTEXT pcontext) +void SetThemeRegion(HWND hWnd) { HTHEME hTheme; RECT rcWindow; @@ -91,24 +91,10 @@ int CaptionHeight, iPart; WINDOWINFO wi; - if(!IsAppThemed()) - { - if(pcontext->HasThemeRgn) - { - pcontext->HasThemeRgn = FALSE; - user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); - } - return; - } + TRACE("SetThemeRegion %d\n", hWnd); wi.cbSize = sizeof(wi); - GetWindowInfo(hWnd, &wi); - - if((wi.dwStyle & WS_CAPTION)!=WS_CAPTION) - { - return; - } /* Get the caption part id */ if (wi.dwExStyle & WS_EX_TOOLWINDOW) @@ -118,8 +104,6 @@ else iPart = WP_CAPTION; - pcontext->HasThemeRgn = TRUE; - CaptionHeight = wi.cyWindowBorders; CaptionHeight += GetSystemMetrics(wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); @@ -129,10 +113,8 @@ rcWindow.top = 0; rcWindow.left = 0; - hTheme = OpenThemeData (hWnd, L"WINDOW"); - + hTheme = MSSTYLES_OpenThemeClass(ActiveThemeFile, NULL, L"WINDOW"); GetThemeBackgroundRegion(hTheme, 0, iPart, FS_ACTIVE, &rcWindow, &hrgn); - CloseThemeData(hTheme); GetWindowRect(hWnd, &rcWindow); @@ -149,21 +131,51 @@ user32ApiHook.SetWindowRgn(hWnd, hrgn, TRUE); } -int OnPostWinPosChanged(HWND hWnd) -{ - PWND_CONTEXT pcontext = ThemeGetWndContext(hWnd); - - if(pcontext && - pcontext->HasAppDefinedRgn == FALSE && - pcontext->UpdatingRgn == FALSE) - { - pcontext->UpdatingRgn = TRUE; - SetThemeRegion(hWnd, pcontext); - pcontext = ThemeGetWndContext(hWnd); - pcontext->UpdatingRgn = FALSE; - } - return 0; -} +int OnPostWinPosChanged(HWND hWnd, WINDOWPOS* pWinPos) +{ + PWND_CONTEXT pcontext; + DWORD style; + + /* We only proceed to change the window shape if it has a caption */ + style = GetWindowLongW(hWnd, GWL_STYLE); + if((style & WS_CAPTION)!=WS_CAPTION) + return 0; + + /* Get theme data for this window */ + pcontext = ThemeGetWndContext(hWnd); + if (pcontext == NULL) + return 0; + + /* Do not change the region of the window if its size wasn't changed */ + if ((pWinPos->flags & SWP_NOSIZE) != 0 && pcontext->DirtyThemeRegion == FALSE) + return 0; + + /* We don't touch the shape of the window if the application sets it on its own */ + if (pcontext->HasAppDefinedRgn == TRUE) + return 0; + + /* Calling SetWindowRgn will call SetWindowPos again so we need to avoid this recursion */ + if (pcontext->UpdatingRgn == TRUE) + return 0; + + if(!IsAppThemed()) + { + if(pcontext->HasThemeRgn) + { + pcontext->HasThemeRgn = FALSE; + user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); + } + return 0; + } + + pcontext->DirtyThemeRegion = FALSE; + pcontext->HasThemeRgn = TRUE; + pcontext->UpdatingRgn = TRUE; + SetThemeRegion(hWnd); + pcontext->UpdatingRgn = FALSE; + + return 0; + } /********************************************************************** * Hook Functions @@ -172,7 +184,7 @@ static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsThemeActive()) + if(!IsAppThemed()) { return user32ApiHook.DefWindowProcW(hWnd, Msg, @@ -190,7 +202,7 @@ static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsThemeActive()) + if(!IsAppThemed()) { return user32ApiHook.DefWindowProcA(hWnd, Msg, @@ -211,8 +223,15 @@ switch(Msg) { case WM_THEMECHANGED: - UXTHEME_LoadTheme(TRUE); - return 0; + if (GetAncestor(hWnd, GA_PARENT) == GetDesktopWindow()) + UXTHEME_LoadTheme(TRUE); + case WM_NCCREATE: + { + PWND_CONTEXT pcontext = ThemeGetWndContext(hWnd); + if (pcontext == NULL) + return 0; + pcontext->DirtyThemeRegion = TRUE; + } } return 0; @@ -226,7 +245,7 @@ { case WM_WINDOWPOSCHANGED: { - return OnPostWinPosChanged(hWnd); + return OnPostWinPosChanged(hWnd, (WINDOWPOS*)lParam); } case WM_DESTROY: { Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Fri Jan 17 17:52:58 2014 @@ -8,6 +8,7 @@ #include <windowsx.h> #include <undocuser.h> #include <uxtheme.h> +#include <uxundoc.h> #include <vfwmsgs.h> #include <tmschema.h> @@ -111,14 +112,17 @@ BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); - +/* The window context stores data for the window needed through the life of the window */ typedef struct _WND_CONTEXT { + UINT lastHitTest; BOOL HasAppDefinedRgn; BOOL HasThemeRgn; BOOL UpdatingRgn; + BOOL DirtyThemeRegion; } WND_CONTEXT, *PWND_CONTEXT; +/* The draw context stores data that are needed by the drawing operations in the non client area of the window */ typedef struct _DRAW_CONTEXT { HWND hWnd; @@ -168,6 +172,8 @@ SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ }; +#define HT_ISBUTTON(ht) ((ht) == HTMINBUTTON || (ht) == HTMAXBUTTON || (ht) == HTCLOSE || (ht) == HTHELP) + #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ @@ -208,6 +214,7 @@ extern ATOM atWindowTheme; extern ATOM atWndContrext; extern BOOL gbThemeHooksActive; +extern PTHEME_FILE ActiveThemeFile; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad);

1 0

[tfaber] 61653: [MSCONFIG] - Fix memory/handle leak in failure case of GetServices. Patch by Christoph von Wittich - Fix service handle failure checks - Remove unnecessary casts
by tfaber＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tfaber Date: Fri Jan 17 16:16:04 2014 New Revision: 61653 URL: http://svn.reactos.org/svn/reactos?rev=61653&view=rev Log: [MSCONFIG] - Fix memory/handle leak in failure case of GetServices. Patch by Christoph von Wittich - Fix service handle failure checks - Remove unnecessary casts Modified: trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] Fri Jan 17 16:16:04 2014 @@ -99,7 +99,7 @@ ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; ScHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); - if (ScHandle != INVALID_HANDLE_VALUE) + if (ScHandle != NULL) { if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, 0, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) { @@ -107,7 +107,7 @@ if (GetLastError() == ERROR_MORE_DATA) { /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + pServiceStatus = HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (!pServiceStatus) return; @@ -145,16 +145,21 @@ BytesNeeded = 0; hService = OpenService(ScHandle, pServiceStatus[Index].lpServiceName, SC_MANAGER_CONNECT); - if (hService != INVALID_HANDLE_VALUE) + if (hService != NULL) { /* check if service is required by the system*/ if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)NULL, 0, &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - pServiceFailureActions = (LPSERVICE_FAILURE_ACTIONS) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + pServiceFailureActions = HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceFailureActions == NULL) + { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; + } if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, BytesNeeded, &BytesNeeded)) { @@ -196,7 +201,7 @@ { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + pServiceConfig = HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceConfig == NULL) { HeapFree(GetProcessHeap(), 0, pServiceStatus); @@ -238,7 +243,7 @@ dwLen = GetFileVersionInfoSize(FileName, &dwHandle); if (dwLen) { - lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); + lpData = HeapAlloc(GetProcessHeap(), 0, dwLen); if (lpData == NULL) { HeapFree(GetProcessHeap(), 0, pServiceStatus); Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Fri Jan 17 16:16:04 2014 @@ -93,7 +93,7 @@ { dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; - Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); + Data = HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); if (Data == NULL) break; @@ -160,7 +160,7 @@ { dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; - Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); + Data = HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); if (Data == NULL) break; retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength);

1 0

[tfaber] 61652: [CABMAN] - Fix a memory leak
by tfaber＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tfaber Date: Fri Jan 17 16:07:32 2014 New Revision: 61652 URL: http://svn.reactos.org/svn/reactos?rev=61652&view=rev Log: [CABMAN] - Fix a memory leak Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Fri Jan 17 16:07:32 2014 @@ -634,22 +634,26 @@ { FILEHANDLE FileHandle; ULONG BytesRead; - -#if defined(_WIN32) - FileHandle = CreateFile(ConvertPath(FileName, true), // Open this file + char* ConvertedFileName; + + ConvertedFileName = ConvertPath(FileName, true); +#if defined(_WIN32) + FileHandle = CreateFile(ConvertedFileName, // Open this file GENERIC_READ, // Open for reading FILE_SHARE_READ, // Share for reading NULL, // No security OPEN_EXISTING, // Existing file only FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template + free(ConvertedFileName); if (FileHandle == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; } #else /* !_WIN32 */ - FileHandle = fopen(ConvertPath(FileName, true), "rb"); + FileHandle = fopen(ConvertedFileName, "rb"); + free(ConvertedFileName); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n"));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs