Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NTOS:CM] CmpCmdHiveOpen(): Resolve FileAttributes->RootDirectory when a hive file name is provided relative to it.
by Hermès Bélusca-Maïto 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e6bc236a11de9c62d64c… commit 0e6bc236a11de9c62d64cc8f02473162c208cc44 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 22 00:39:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 22 00:39:50 2018 +0200 [NTOS:CM] CmpCmdHiveOpen(): Resolve FileAttributes->RootDirectory when a hive file name is provided relative to it. Fixes registry hive loading. CORE-13448 --- ntoskrnl/config/cmhvlist.c | 3 +- ntoskrnl/config/cmlazy.c | 97 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/config/cmhvlist.c b/ntoskrnl/config/cmhvlist.c index 0428ed7c8c..25f8414052 100644 --- a/ntoskrnl/config/cmhvlist.c +++ b/ntoskrnl/config/cmhvlist.c @@ -136,7 +136,8 @@ CmpAddToHiveFileList(IN PCMHIVE Hive) PWCHAR FilePath; UCHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; ULONG Length = sizeof(Buffer); - POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; + POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)Buffer; + HivePath.Buffer = NULL; /* Create or open the hive list key */ diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index cd643452c2..0b19924216 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -274,13 +274,97 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, OUT PCMHIVE *NewHive, IN ULONG CheckFlags) { - PUNICODE_STRING FileName; NTSTATUS Status; + UNICODE_STRING FileName; + PWCHAR FilePath; + UCHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + ULONG Length = sizeof(Buffer); + POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)Buffer; + PAGED_CODE(); + if (FileAttributes->RootDirectory) + { + /* + * Validity check: The ObjectName is relative to RootDirectory, + * therefore it must not start with a path separator. + */ + if (FileAttributes->ObjectName && FileAttributes->ObjectName->Buffer && + FileAttributes->ObjectName->Length >= sizeof(WCHAR) && + *FileAttributes->ObjectName->Buffer == OBJ_NAME_PATH_SEPARATOR) + { + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Try to get the value */ + Status = ZwQueryObject(FileAttributes->RootDirectory, + ObjectNameInformation, + FileNameInfo, + Length, + &Length); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): Root directory handle object name query failed, Status = 0x%08lx\n", Status); + return Status; + } + + /* Null-terminate and add the length of the terminator */ + Length -= sizeof(OBJECT_NAME_INFORMATION); + FilePath = FileNameInfo->Name.Buffer; + FilePath[Length / sizeof(WCHAR)] = UNICODE_NULL; + Length += sizeof(UNICODE_NULL); + + /* Compute the size of the full path; Length already counts the terminating NULL */ + Length = Length + sizeof(WCHAR) + FileAttributes->ObjectName->Length; + if (Length > MAXUSHORT) + { + /* Name size too long, bail out */ + return STATUS_OBJECT_PATH_INVALID; + } + + /* Build the full path */ + RtlInitEmptyUnicodeString(&FileName, NULL, 0); + FileName.Buffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!FileName.Buffer) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): Unable to allocate memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + FileName.MaximumLength = Length; + RtlCopyUnicodeString(&FileName, &FileNameInfo->Name); + + /* + * Append a path terminator if needed (we have already accounted + * for a possible extra one when allocating the buffer). + */ + if (/* FileAttributes->ObjectName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR && */ // We excluded ObjectName starting with a path separator above. + FileName.Length > 0 && FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] != OBJ_NAME_PATH_SEPARATOR) + { + /* ObjectName does not start with '\' and PathBuffer does not end with '\' */ + FileName.Buffer[FileName.Length / sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + FileName.Length += sizeof(WCHAR); + FileName.Buffer[FileName.Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* Append the object name */ + Status = RtlAppendUnicodeStringToString(&FileName, FileAttributes->ObjectName); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): RtlAppendUnicodeStringToString() failed, Status = 0x%08lx\n", Status); + ExFreePoolWithTag(FileName.Buffer, TAG_CM); + return Status; + } + } + else + { + FileName = *FileAttributes->ObjectName; + } + /* Open the file in the current security context */ - FileName = FileAttributes->ObjectName; - Status = CmpInitHiveFromFile(FileName, + Status = CmpInitHiveFromFile(&FileName, 0, NewHive, Allocate, @@ -298,7 +382,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, if (NT_SUCCESS(Status)) { /* Now try again */ - Status = CmpInitHiveFromFile(FileName, + Status = CmpInitHiveFromFile(&FileName, 0, NewHive, Allocate, @@ -309,6 +393,11 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, } } + if (FileAttributes->RootDirectory) + { + ExFreePoolWithTag(FileName.Buffer, TAG_CM); + } + /* Return status of open attempt */ return Status; }

1 0

02/02: [NTDLL_APITEST] Re-enable the part of the NtLoad/UnloadKey test related to force-unload a hive with opened sub-key handles.
by Hermès Bélusca-Maïto 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76e269823724a4c70aeba… commit 76e269823724a4c70aeba235711a8eaed1e2d03d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 21 23:09:32 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 22 00:05:21 2018 +0200 [NTDLL_APITEST] Re-enable the part of the NtLoad/UnloadKey test related to force-unload a hive with opened sub-key handles. Effectively reverts b17ce9c8 (r75138). CORE-13448 --- modules/rostests/apitests/ntdll/NtLoadUnloadKey.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c index ac4ec3493e..eb5a8c462e 100644 --- a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c +++ b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c @@ -520,8 +520,6 @@ START_TEST(NtLoadUnloadKey) Status = NtFlushKey(KeyHandle); ok_ntstatus(Status, STATUS_SUCCESS); -#if 0 // Currently, leads to memory corruption !!!!! - /* Force-unmount the hive, with the handle key still opened */ Status = DisconnectRegistry(NULL, RegistryHives[0].RegMountPoint, REG_FORCE_UNLOAD); DPRINT1("Force-unmounting '%S' %s\n", RegistryHives[0].RegMountPoint, NT_SUCCESS(Status) ? "succeeded" : "failed"); @@ -535,8 +533,6 @@ START_TEST(NtLoadUnloadKey) ok_ntstatus(Status, STATUS_KEY_DELETED); } -#endif - /* The key handle should not be valid anymore */ Status = NtDeleteKey(KeyHandle); ok_ntstatus(Status, STATUS_SUCCESS);

1 0

01/02: [NTOS:CM] Implement more support for force-unloading registry hives. CORE-13448 CORE-10705
by Hermès Bélusca-Maïto 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d61c00c2522f900259330… commit d61c00c2522f9002593303c684b1d716f1875da6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 21 23:08:51 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 22 00:05:13 2018 +0200 [NTOS:CM] Implement more support for force-unloading registry hives. CORE-13448 CORE-10705 --- ntoskrnl/config/cmapi.c | 67 +++++++++++++++++++++++++++++++++++++----- ntoskrnl/config/ntapi.c | 4 +-- ntoskrnl/include/internal/cm.h | 5 ++-- 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 3b476d8c8e..84e0f11b91 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -2221,7 +2221,7 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, { if (Flags != REG_FORCE_UNLOAD) { - if (CmCountOpenSubKeys(Kcb, FALSE) != 0) + if (CmpEnumerateOpenSubKeys(Kcb, FALSE, FALSE) != 0) { /* There are open subkeys but we don't force hive unloading, fail */ Hive->HiveFlags &= ~HIVE_IS_UNLOADING; @@ -2230,7 +2230,13 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, } else { - DPRINT1("CmUnloadKey: Force unloading is UNIMPLEMENTED, expect dangling KCBs problems!\n"); + DPRINT1("CmUnloadKey: Force unloading is HALF-IMPLEMENTED, expect dangling KCBs problems!\n"); + if (CmpEnumerateOpenSubKeys(Kcb, TRUE, TRUE) != 0) + { + /* There are open subkeys that we cannot force to unload, fail */ + Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + return STATUS_CANNOT_DELETE; + } } } @@ -2247,6 +2253,10 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, return STATUS_INSUFFICIENT_RESOURCES; } + /* Flush any notifications if we force hive unloading */ + if (Flags == REG_FORCE_UNLOAD) + CmpFlushNotifiesOnKeyBodyList(Kcb, TRUE); // Lock is already held + /* Clean up information we have on the subkey */ CmpCleanUpSubKeyInfo(Kcb->ParentKcb); @@ -2272,6 +2282,10 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, /* Remove the hive from the hive file list */ CmpRemoveFromHiveFileList(CmHive); +/** + ** NOTE: + ** The following code is mostly equivalent to what we "call" CmpDestroyHive() + **/ /* Destroy the security descriptor cache */ CmpDestroySecurityCache(CmHive); @@ -2296,8 +2310,10 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, ULONG NTAPI -CmCountOpenSubKeys(IN PCM_KEY_CONTROL_BLOCK RootKcb, - IN BOOLEAN RemoveEmptyCacheEntries) +CmpEnumerateOpenSubKeys( + IN PCM_KEY_CONTROL_BLOCK RootKcb, + IN BOOLEAN RemoveEmptyCacheEntries, + IN BOOLEAN DereferenceOpenedEntries) { PCM_KEY_HASH Entry; PCM_KEY_CONTROL_BLOCK CachedKcb; @@ -2306,9 +2322,9 @@ CmCountOpenSubKeys(IN PCM_KEY_CONTROL_BLOCK RootKcb, ULONG i, j; ULONG SubKeys = 0; - DPRINT("CmCountOpenSubKeys() called\n"); + DPRINT("CmpEnumerateOpenSubKeys() called\n"); - /* The root key is the only referenced key. There are no refereced sub keys. */ + /* The root key is the only referenced key. There are no referenced sub keys. */ if (RootKcb->RefCount == 1) { DPRINT("Open sub keys: 0\n"); @@ -2347,10 +2363,43 @@ CmCountOpenSubKeys(IN PCM_KEY_CONTROL_BLOCK RootKcb, if (CachedKcb->RefCount > 0) { + DPRINT1("Found a sub key pointing to '%.*s', RefCount = %u\n", + CachedKcb->NameBlock->NameLength, CachedKcb->NameBlock->Name, + CachedKcb->RefCount); + + /* If we dereference opened KCBs, don't touch read-only keys */ + if (DereferenceOpenedEntries && + !(CachedKcb->ExtFlags & CM_KCB_READ_ONLY_KEY)) + { + /* Registry needs to be locked down */ + CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); + + /* Flush any notifications */ + CmpFlushNotifiesOnKeyBodyList(CachedKcb, TRUE); // Lock is already held + + /* Clean up information we have on the subkey */ + CmpCleanUpSubKeyInfo(CachedKcb->ParentKcb); + + /* Get and cache the next cache entry */ + // Entry = Entry->NextHash; + Entry = CachedKcb->NextHash; + + /* Set the KCB in delete mode and remove it */ + CachedKcb->Delete = TRUE; + CmpRemoveKeyControlBlock(CachedKcb); + + /* Clear the cell */ + CachedKcb->KeyCell = HCELL_NIL; + + /* Restart with the next cache entry */ + continue; + } + /* Else, the key cannot be dereferenced, and we count it as in use */ + /* Count the current hash entry if it is in use */ SubKeys++; } - else if ((CachedKcb->RefCount == 0) && (RemoveEmptyCacheEntries != FALSE)) + else if ((CachedKcb->RefCount == 0) && RemoveEmptyCacheEntries) { /* Remove the current key from the delayed close list */ CmpRemoveFromDelayedClose(CachedKcb); @@ -2370,7 +2419,9 @@ CmCountOpenSubKeys(IN PCM_KEY_CONTROL_BLOCK RootKcb, } } - DPRINT("Open sub keys: %u\n", SubKeys); + if (SubKeys > 0) + DPRINT1("Open sub keys: %u\n", SubKeys); + return SubKeys; } diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 7a5376f02c..5be3a279d8 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -1542,8 +1542,8 @@ NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, } /* Call the internal API */ - *HandleCount = CmCountOpenSubKeys(KeyBody->KeyControlBlock, - FALSE); + *HandleCount = CmpEnumerateOpenSubKeys(KeyBody->KeyControlBlock, + FALSE, FALSE); /* Unlock the registry */ CmpUnlockRegistry(); diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index a3f801df1f..12ccb1c8bb 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -1357,9 +1357,10 @@ CmUnloadKey( ULONG NTAPI -CmCountOpenSubKeys( +CmpEnumerateOpenSubKeys( IN PCM_KEY_CONTROL_BLOCK RootKcb, - IN BOOLEAN RemoveEmptyCacheEntries + IN BOOLEAN RemoveEmptyCacheEntries, + IN BOOLEAN DereferenceOpenedEntries ); HCELL_INDEX

1 0

01/01: [NTOS:CM] Add extra validation for the information class parameter in NtEnumerateValueKey().
by Hermès Bélusca-Maïto 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16752875db9487a82b04a… commit 16752875db9487a82b04a1170ba714f955c38979 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 21 18:12:08 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 21 18:12:08 2018 +0200 [NTOS:CM] Add extra validation for the information class parameter in NtEnumerateValueKey(). --- ntoskrnl/config/ntapi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 02ec9b1234..7a5376f02c 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -551,14 +551,18 @@ NtEnumerateValueKey(IN HANDLE KeyHandle, PCM_KEY_BODY KeyObject; REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + DPRINT("NtEnumerateValueKey() KH 0x%p, Index 0x%x, KVIC %d, Length %lu\n", KeyHandle, Index, KeyValueInformationClass, Length); /* Reject classes we don't know about */ - if ((KeyValueInformationClass != KeyValueBasicInformation) && - (KeyValueInformationClass != KeyValueFullInformation) && - (KeyValueInformationClass != KeyValuePartialInformation)) + if ((KeyValueInformationClass != KeyValueBasicInformation) && + (KeyValueInformationClass != KeyValueFullInformation) && + (KeyValueInformationClass != KeyValuePartialInformation) && + (KeyValueInformationClass != KeyValueFullInformationAlign64) && + (KeyValueInformationClass != KeyValuePartialInformationAlign64)) { /* Fail */ return STATUS_INVALID_PARAMETER;

1 0

01/01: [NTOS:CM] Improve the capture of user-mode parameters.
by Hermès Bélusca-Maïto 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49e08b23ce7ef90463ea0… commit 49e08b23ce7ef90463ea05f377651027ed2a8b3b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 21 15:42:13 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 21 17:11:50 2018 +0200 [NTOS:CM] Improve the capture of user-mode parameters. - Improve the capture of OBJECT_ATTRIBUTES parameters that are passed (by pointer) to the Cm* helper functions, and the capture of UNICODE_STRINGs. - Correctly differentiate user-mode vs. kernel-mode root directory handles (in OBJECT_ATTRIBUTES): note that most of the Cm* APIs expect their parameters to be kernel-mode (pointers, handles...). CORE-13448 --- ntoskrnl/config/ntapi.c | 564 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 476 insertions(+), 88 deletions(-) diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 2aa6f47cb1..02ec9b1234 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -17,6 +17,222 @@ BOOLEAN CmBootAcceptFirstTime = TRUE; BOOLEAN CmFirstTime = TRUE; extern ULONG InitSafeBootMode; + +/* PRIVATE FUNCTIONS *********************************************************/ + +/* + * Adapted from ntoskrnl/include/internal/ob_x.h:ObpReleaseObjectCreateInformation() + */ +VOID +ReleaseCapturedObjectAttributes( + _In_ POBJECT_ATTRIBUTES CapturedObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode) +{ + /* Check if we have a security descriptor */ + if (CapturedObjectAttributes->SecurityDescriptor) + { + /* Release it */ + SeReleaseSecurityDescriptor(CapturedObjectAttributes->SecurityDescriptor, + AccessMode, + TRUE); + CapturedObjectAttributes->SecurityDescriptor = NULL; + } + + /* Check if we have an object name */ + if (CapturedObjectAttributes->ObjectName) + { + /* Release it */ + ReleaseCapturedUnicodeString(CapturedObjectAttributes->ObjectName, AccessMode); + } +} + +/* + * Adapted from ntoskrnl/ob/oblife.c:ObpCaptureObjectCreateInformation() + */ +NTSTATUS +ProbeAndCaptureObjectAttributes( + _Out_ POBJECT_ATTRIBUTES CapturedObjectAttributes, + _Out_ PUNICODE_STRING ObjectName, + _In_ KPROCESSOR_MODE AccessMode, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN CaptureSecurity) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSECURITY_DESCRIPTOR SecurityDescriptor; + // PSECURITY_QUALITY_OF_SERVICE SecurityQos; + PUNICODE_STRING LocalObjectName = NULL; + + /* Zero out the Capture Data */ + RtlZeroMemory(CapturedObjectAttributes, sizeof(*CapturedObjectAttributes)); + + /* SEH everything here for protection */ + _SEH2_TRY + { + /* Check if we got attributes */ + if (ObjectAttributes) + { + /* Check if we're in user mode */ + if (AccessMode != KernelMode) + { + /* Probe the attributes */ + ProbeForRead(ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + } + + /* Validate the Size and Attributes */ + if ((ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) || + (ObjectAttributes->Attributes & ~OBJ_VALID_KERNEL_ATTRIBUTES)) // Understood as all the possible valid attributes + { + /* Invalid combination, fail */ + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + + /* Set some Create Info and do not allow user-mode kernel handles */ + CapturedObjectAttributes->Length = sizeof(OBJECT_ATTRIBUTES); + CapturedObjectAttributes->RootDirectory = ObjectAttributes->RootDirectory; + CapturedObjectAttributes->Attributes = ObpValidateAttributes(ObjectAttributes->Attributes, AccessMode); + LocalObjectName = ObjectAttributes->ObjectName; + SecurityDescriptor = ObjectAttributes->SecurityDescriptor; + // SecurityQos = ObjectAttributes->SecurityQualityOfService; + + /* Check if we have a security descriptor */ + if (CaptureSecurity && SecurityDescriptor) + { + /* + * Capture it. + * Note: This has an implicit memory barrier due + * to the function call, so cleanup is safe here. + */ + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + AccessMode, + NonPagedPool, + TRUE, + &CapturedObjectAttributes-> + SecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + /* Capture failed, quit */ + CapturedObjectAttributes->SecurityDescriptor = NULL; + _SEH2_YIELD(return Status); + } + } + else + { + CapturedObjectAttributes->SecurityDescriptor = NULL; + } + +#if 0 +// We don't use the QoS! + + /* Check if we have QoS */ + if (SecurityQos) + { + /* Check if we came from user mode */ + if (AccessMode != KernelMode) + { + /* Validate the QoS */ + ProbeForRead(SecurityQos, + sizeof(SECURITY_QUALITY_OF_SERVICE), + sizeof(ULONG)); + } + + /* Save Info */ + CapturedObjectAttributes->SecurityQualityOfService = *SecurityQos; + CapturedObjectAttributes->SecurityQos = + &CapturedObjectAttributes->SecurityQualityOfService; + } +#else + CapturedObjectAttributes->SecurityQualityOfService = NULL; +#endif + } + else + { + /* We don't have a name */ + LocalObjectName = NULL; + } + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + /* Cleanup and return the exception code */ + ReleaseCapturedObjectAttributes(CapturedObjectAttributes, AccessMode); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Now check if the Object Attributes had an Object Name */ + if (LocalObjectName) + { + Status = ProbeAndCaptureUnicodeString(ObjectName, AccessMode, LocalObjectName); + } + else + { + /* Clear the string */ + RtlInitEmptyUnicodeString(ObjectName, NULL, 0); + + /* It cannot have specified a Root Directory */ + if (CapturedObjectAttributes->RootDirectory) + { + Status = STATUS_OBJECT_NAME_INVALID; + } + } + + /* Set the caputured object attributes name pointer to the one the user gave to us */ + CapturedObjectAttributes->ObjectName = ObjectName; + + /* Cleanup if we failed */ + if (!NT_SUCCESS(Status)) + { + ReleaseCapturedObjectAttributes(CapturedObjectAttributes, AccessMode); + } + + /* Return status to caller */ + return Status; +} + +static +NTSTATUS +CmpConvertHandleToKernelHandle( + _In_ HANDLE SourceHandle, + _In_opt_ POBJECT_TYPE ObjectType, + _In_ ACCESS_MASK DesiredAccess, + _In_ KPROCESSOR_MODE AccessMode, + _Out_ PHANDLE KernelHandle) +{ + NTSTATUS Status; + PVOID Object; + + *KernelHandle = NULL; + + /* NULL handle is valid */ + if (SourceHandle == NULL) + return STATUS_SUCCESS; + + /* Get the object pointer */ + Status = ObReferenceObjectByHandle(SourceHandle, + DesiredAccess, + ObjectType, + AccessMode, + &Object, + NULL); + if (!NT_SUCCESS(Status)) + return Status; + + /* Create a kernel handle from the pointer */ + Status = ObOpenObjectByPointer(Object, + OBJ_KERNEL_HANDLE, + NULL, + DesiredAccess, + ObjectType, + KernelMode, + KernelHandle); + + /* Dereference the object */ + ObDereferenceObject(Object); + return Status; +} + + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -231,7 +447,7 @@ NtDeleteKey(IN HANDLE KeyHandle) CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); } - /* Dereference the object */ + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; } @@ -402,6 +618,7 @@ NtEnumerateValueKey(IN HANDLE KeyHandle, CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); } + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; } @@ -527,12 +744,12 @@ NtQueryValueKey(IN HANDLE KeyHandle, IN ULONG Length, OUT PULONG ResultLength) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PCM_KEY_BODY KeyObject; REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - UNICODE_STRING ValueNameCopy = *ValueName; + UNICODE_STRING ValueNameCopy; PAGED_CODE(); @@ -557,7 +774,8 @@ NtQueryValueKey(IN HANDLE KeyHandle, PreviousMode, (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; if (PreviousMode != KernelMode) { @@ -577,22 +795,25 @@ NtQueryValueKey(IN HANDLE KeyHandle, _SEH2_END; } + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&ValueNameCopy, PreviousMode, ValueName); + if (!NT_SUCCESS(Status)) + goto Quit; + /* Make sure the name is aligned properly */ if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) { /* It isn't, so we'll fail */ - ObDereferenceObject(KeyObject); - return STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto Quit; } - else + + /* Ignore any null characters at the end */ + while ((ValueNameCopy.Length) && + !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) { - /* Ignore any null characters at the end */ - while ((ValueNameCopy.Length) && - !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) - { - /* Skip it */ - ValueNameCopy.Length -= sizeof(WCHAR); - } + /* Skip it */ + ValueNameCopy.Length -= sizeof(WCHAR); } /* Setup the callback */ @@ -620,6 +841,10 @@ NtQueryValueKey(IN HANDLE KeyHandle, CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); } +Quit: + if (ValueNameCopy.Buffer) + ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; @@ -635,16 +860,26 @@ NtSetValueKey(IN HANDLE KeyHandle, IN ULONG DataSize) { NTSTATUS Status = STATUS_SUCCESS; - PCM_KEY_BODY KeyObject = NULL; + KPROCESSOR_MODE PreviousMode; + PCM_KEY_BODY KeyObject; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; UNICODE_STRING ValueNameCopy; - KPROCESSOR_MODE PreviousMode; PAGED_CODE(); PreviousMode = ExGetPreviousMode(); + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + PreviousMode, + (PVOID*)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + return Status; + if (!DataSize) Data = NULL; @@ -653,7 +888,11 @@ NtSetValueKey(IN HANDLE KeyHandle, { PVOID DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM); if (!DataCopy) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); return STATUS_INSUFFICIENT_RESOURCES; + } _SEH2_TRY { ProbeForRead(Data, DataSize, 1); @@ -667,7 +906,9 @@ NtSetValueKey(IN HANDLE KeyHandle, if (!NT_SUCCESS(Status)) { + /* Dereference and return status */ ExFreePoolWithTag(DataCopy, TAG_CM); + ObDereferenceObject(KeyObject); return Status; } Data = DataCopy; @@ -676,21 +917,11 @@ NtSetValueKey(IN HANDLE KeyHandle, /* Capture the string */ Status = ProbeAndCaptureUnicodeString(&ValueNameCopy, PreviousMode, ValueName); if (!NT_SUCCESS(Status)) - goto end; + goto Quit; DPRINT("NtSetValueKey() KH 0x%p, VN '%wZ', TI %x, T %lu, DS %lu\n", KeyHandle, &ValueNameCopy, TitleIndex, Type, DataSize); - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - PreviousMode, - (PVOID*)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - goto end; - /* Make sure the name is aligned, not too long, and the data under 4GB */ if ( (ValueNameCopy.Length > 32767) || ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) || @@ -698,7 +929,7 @@ NtSetValueKey(IN HANDLE KeyHandle, { /* Fail */ Status = STATUS_INVALID_PARAMETER; - goto end; + goto Quit; } /* Ignore any null characters at the end */ @@ -714,7 +945,7 @@ NtSetValueKey(IN HANDLE KeyHandle, { /* Fail */ Status = STATUS_ACCESS_DENIED; - goto end; + goto Quit; } /* Setup callback */ @@ -742,13 +973,15 @@ NtSetValueKey(IN HANDLE KeyHandle, CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); } -end: - /* Dereference and return status */ - if (KeyObject) - ObDereferenceObject(KeyObject); - ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); +Quit: + if (ValueNameCopy.Buffer) + ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); + if ((PreviousMode != KernelMode) && Data) ExFreePoolWithTag(Data, TAG_CM); + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); return Status; } @@ -757,12 +990,13 @@ NTAPI NtDeleteValueKey(IN HANDLE KeyHandle, IN PUNICODE_STRING ValueName) { - PCM_KEY_BODY KeyObject; NTSTATUS Status; + PCM_KEY_BODY KeyObject; REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - UNICODE_STRING ValueNameCopy = *ValueName; + UNICODE_STRING ValueNameCopy; + PAGED_CODE(); /* Verify that the handle is valid and is a registry key */ @@ -772,22 +1006,28 @@ NtDeleteValueKey(IN HANDLE KeyHandle, PreviousMode, (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; - /* Don't touch read-only keys */ - if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) - { - /* Fail */ - ObDereferenceObject(KeyObject); - return STATUS_ACCESS_DENIED; - } + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&ValueNameCopy, PreviousMode, ValueName); + if (!NT_SUCCESS(Status)) + goto Quit; /* Make sure the name is aligned properly */ if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) { /* It isn't, so we'll fail */ - ObDereferenceObject(KeyObject); - return STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto Quit; + } + + /* Don't touch read-only keys */ + if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) + { + /* Fail */ + Status = STATUS_ACCESS_DENIED; + goto Quit; } /* Do the callback */ @@ -807,7 +1047,11 @@ NtDeleteValueKey(IN HANDLE KeyHandle, &PostOperationInfo); } - /* Dereference the key body */ +Quit: + if (ValueNameCopy.Buffer) + ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); + + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; } @@ -884,11 +1128,17 @@ NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, { NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + OBJECT_ATTRIBUTES CapturedTargetKey; + OBJECT_ATTRIBUTES CapturedSourceFile; + UNICODE_STRING TargetKeyName, SourceFileName; + HANDLE KmTargetKeyRootDir = NULL, KmSourceFileRootDir = NULL; PCM_KEY_BODY KeyBody = NULL; + PAGED_CODE(); /* Validate flags */ - if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; + if (Flags & ~REG_NO_LAZY_FLUSH) + return STATUS_INVALID_PARAMETER; /* Validate privilege */ if (!SeSinglePrivilegeCheck(SeRestorePrivilege, PreviousMode)) @@ -900,6 +1150,77 @@ NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, /* Block APCs */ KeEnterCriticalRegion(); + /* Check for user-mode caller */ + if (PreviousMode != KernelMode) + { + /* Prepare to probe parameters */ + _SEH2_TRY + { + /* Probe target key */ + ProbeForRead(TargetKey, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + + /* Probe source file */ + ProbeForRead(SourceFile, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Quit); + } + _SEH2_END; + } + + /* Probe and capture the target key attributes, including the security */ + Status = ProbeAndCaptureObjectAttributes(&CapturedTargetKey, + &TargetKeyName, + PreviousMode, + TargetKey, + TRUE); + if (!NT_SUCCESS(Status)) + goto Quit; + + /* + * Probe and capture the source file attributes, but not the security. + * A proper security context is built by CmLoadKey(). + */ + Status = ProbeAndCaptureObjectAttributes(&CapturedSourceFile, + &SourceFileName, + PreviousMode, + SourceFile, + FALSE); + if (!NT_SUCCESS(Status)) + { + ReleaseCapturedObjectAttributes(&CapturedTargetKey, PreviousMode); + goto Quit; + } + + /* Make sure the target key root directory handle is a kernel handle */ + Status = CmpConvertHandleToKernelHandle(CapturedTargetKey.RootDirectory, + CmpKeyObjectType, + KEY_READ, + PreviousMode, + &KmTargetKeyRootDir); + if (!NT_SUCCESS(Status)) + goto Cleanup; + CapturedTargetKey.RootDirectory = KmTargetKeyRootDir; + CapturedTargetKey.Attributes |= OBJ_KERNEL_HANDLE; + + /* Make sure the source file root directory handle is a kernel handle */ + Status = CmpConvertHandleToKernelHandle(CapturedSourceFile.RootDirectory, + IoFileObjectType, + FILE_TRAVERSE, + PreviousMode, + &KmSourceFileRootDir); + if (!NT_SUCCESS(Status)) + goto Cleanup; + CapturedSourceFile.RootDirectory = KmSourceFileRootDir; + CapturedSourceFile.Attributes |= OBJ_KERNEL_HANDLE; + /* Check if we have a trust class */ if (TrustClassKey) { @@ -913,11 +1234,26 @@ NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, } /* Call the internal API */ - Status = CmLoadKey(TargetKey, SourceFile, Flags, KeyBody); + Status = CmLoadKey(&CapturedTargetKey, + &CapturedSourceFile, + Flags, + KeyBody); /* Dereference the trust key, if any */ if (KeyBody) ObDereferenceObject(KeyBody); +Cleanup: + /* Close the local kernel handles */ + if (KmSourceFileRootDir) + ObCloseHandle(KmSourceFileRootDir, KernelMode); + if (KmTargetKeyRootDir) + ObCloseHandle(KmTargetKeyRootDir, KernelMode); + + /* Release the captured object attributes */ + ReleaseCapturedObjectAttributes(&CapturedSourceFile, PreviousMode); + ReleaseCapturedObjectAttributes(&CapturedTargetKey, PreviousMode); + +Quit: /* Bring back APCs */ KeLeaveCriticalRegion(); @@ -1272,6 +1608,7 @@ NtSaveKeyEx(IN HANDLE KeyHandle, IN ULONG Flags) { NTSTATUS Status; + HANDLE KmFileHandle = NULL; PCM_KEY_BODY KeyObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); @@ -1294,6 +1631,15 @@ NtSaveKeyEx(IN HANDLE KeyHandle, return STATUS_PRIVILEGE_NOT_HELD; } + /* Make sure the target file handle is a kernel handle */ + Status = CmpConvertHandleToKernelHandle(FileHandle, + IoFileObjectType, + FILE_WRITE_DATA, + PreviousMode, + &KmFileHandle); + if (!NT_SUCCESS(Status)) + goto Quit; + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_READ, @@ -1301,12 +1647,20 @@ NtSaveKeyEx(IN HANDLE KeyHandle, PreviousMode, (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + goto Quit; /* Call the internal API */ - Status = CmSaveKey(KeyObject->KeyControlBlock, FileHandle, Flags); + Status = CmSaveKey(KeyObject->KeyControlBlock, KmFileHandle, Flags); + /* Dereference the registry key */ ObDereferenceObject(KeyObject); + +Quit: + /* Close the local kernel handle */ + if (KmFileHandle) + ObCloseHandle(KmFileHandle, KernelMode); + return Status; } @@ -1316,10 +1670,11 @@ NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, IN HANDLE LowPrecedenceKeyHandle, IN HANDLE FileHandle) { + NTSTATUS Status; KPROCESSOR_MODE PreviousMode; + HANDLE KmFileHandle = NULL; PCM_KEY_BODY HighPrecedenceKeyObject = NULL; PCM_KEY_BODY LowPrecedenceKeyObject = NULL; - NTSTATUS Status; PAGED_CODE(); @@ -1334,6 +1689,15 @@ NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, return STATUS_PRIVILEGE_NOT_HELD; } + /* Make sure the target file handle is a kernel handle */ + Status = CmpConvertHandleToKernelHandle(FileHandle, + IoFileObjectType, + FILE_WRITE_DATA, + PreviousMode, + &KmFileHandle); + if (!NT_SUCCESS(Status)) + goto Quit; + /* Verify that the handles are valid and are registry keys */ Status = ObReferenceObjectByHandle(HighPrecedenceKeyHandle, KEY_READ, @@ -1342,7 +1706,7 @@ NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, (PVOID*)&HighPrecedenceKeyObject, NULL); if (!NT_SUCCESS(Status)) - goto done; + goto Quit; Status = ObReferenceObjectByHandle(LowPrecedenceKeyHandle, KEY_READ, @@ -1351,20 +1715,24 @@ NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, (PVOID*)&LowPrecedenceKeyObject, NULL); if (!NT_SUCCESS(Status)) - goto done; + goto Quit; /* Call the internal API */ Status = CmSaveMergedKeys(HighPrecedenceKeyObject->KeyControlBlock, LowPrecedenceKeyObject->KeyControlBlock, - FileHandle); + KmFileHandle); -done: +Quit: + /* Dereference the opened key objects */ if (LowPrecedenceKeyObject) ObDereferenceObject(LowPrecedenceKeyObject); - if (HighPrecedenceKeyObject) ObDereferenceObject(HighPrecedenceKeyObject); + /* Close the local kernel handle */ + if (KmFileHandle) + ObCloseHandle(KmFileHandle, KernelMode); + return Status; } @@ -1392,8 +1760,9 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, IN ULONG Flags) { NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; + OBJECT_ATTRIBUTES CapturedTargetKey; UNICODE_STRING ObjectName; + HANDLE KmTargetKeyRootDir = NULL; CM_PARSE_CONTEXT ParseContext = {0}; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PCM_KEY_BODY KeyBody = NULL; @@ -1420,18 +1789,15 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); - ObjectAttributes = *TargetKey; + CapturedTargetKey = *TargetKey; /* Probe the string */ - ProbeForReadUnicodeString(&TargetKey->ObjectName); - - ObjectName = *TargetKey->ObjectName; - + ObjectName = ProbeForReadUnicodeString(CapturedTargetKey.ObjectName); ProbeForRead(ObjectName.Buffer, ObjectName.Length, sizeof(WCHAR)); - ObjectAttributes.ObjectName = &ObjectName; + CapturedTargetKey.ObjectName = &ObjectName; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1443,38 +1809,54 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, else { /* Save the target attributes directly */ - ObjectAttributes = *TargetKey; + CapturedTargetKey = *TargetKey; } + /* Make sure the target key root directory handle is a kernel handle */ + Status = CmpConvertHandleToKernelHandle(CapturedTargetKey.RootDirectory, + CmpKeyObjectType, + KEY_WRITE, + PreviousMode, + &KmTargetKeyRootDir); + if (!NT_SUCCESS(Status)) + return Status; + CapturedTargetKey.RootDirectory = KmTargetKeyRootDir; + CapturedTargetKey.Attributes |= OBJ_KERNEL_HANDLE; + /* Setup the parse context */ ParseContext.CreateOperation = TRUE; ParseContext.CreateOptions = REG_OPTION_BACKUP_RESTORE; /* Do the create */ - Status = ObOpenObjectByName(&ObjectAttributes, + /* Open a local handle to the key */ + Status = ObOpenObjectByName(&CapturedTargetKey, CmpKeyObjectType, KernelMode, NULL, KEY_WRITE, &ParseContext, &Handle); + if (NT_SUCCESS(Status)) + { + /* Reference the key object */ + Status = ObReferenceObjectByHandle(Handle, + KEY_WRITE, + CmpKeyObjectType, + KernelMode, + (PVOID*)&KeyBody, + NULL); - /* Return if failure encountered */ - if (!NT_SUCCESS(Status)) return Status; - - /* Reference it */ - Status = ObReferenceObjectByHandle(Handle, - KEY_WRITE, - CmpKeyObjectType, - KernelMode, - (PVOID *)&KeyBody, - NULL); + /* Close the handle */ + ObCloseHandle(Handle, KernelMode); + } - /* Close the handle */ - ZwClose(Handle); + /* Close the local kernel handle */ + if (KmTargetKeyRootDir) + ObCloseHandle(KmTargetKeyRootDir, KernelMode); - /* Return if failure encountered */ - if (!NT_SUCCESS(Status)) return Status; + /* Return if a failure was encountered */ + if (!NT_SUCCESS(Status)) + return Status; /* Acquire the lock depending on flags */ if (Flags == REG_FORCE_UNLOAD) @@ -1506,7 +1888,7 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, { /* Return appropriate status */ Status = STATUS_KEY_DELETED; - goto Quickie; + goto Quit; } /* Check if it's a read-only key */ @@ -1514,21 +1896,27 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, { /* Return appropriate status */ Status = STATUS_ACCESS_DENIED; - goto Quickie; + goto Quit; } - /* Call the internal API */ - Status = CmUnloadKey(KeyBody->KeyControlBlock, - Flags); + /* Call the internal API. Note that CmUnloadKey() unlocks the registry only on success. */ + Status = CmUnloadKey(KeyBody->KeyControlBlock, Flags); /* Check if we failed, but really need to succeed */ if ((Status == STATUS_CANNOT_DELETE) && (Flags == REG_FORCE_UNLOAD)) { /* TODO: We should perform another attempt here */ - ASSERT(FALSE); + _SEH2_TRY + { + DPRINT1("NtUnloadKey2(%wZ): We want to force-unload the hive but couldn't unload it: Retrying is UNIMPLEMENTED!\n", TargetKey->ObjectName); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; } - /* If CmUnloadKey failed we need to unlock registry ourselves */ + /* If CmUnloadKey() failed we need to unlock registry ourselves */ if (!NT_SUCCESS(Status)) { if (Flags != REG_FORCE_UNLOAD) @@ -1544,7 +1932,7 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, CmpUnlockRegistry(); } -Quickie: +Quit: /* Dereference the key */ ObDereferenceObject(KeyBody);

1 0

01/01: [SYSDM] Fix controls order and label height in IDD_SYSSETTINGS dialog
by Stanislav Motylkov 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3290d4619bf5c858f18a3… commit 3290d4619bf5c858f18a30a9fdc4a2aea2be27ca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 21 02:15:01 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 21 15:36:28 2018 +0200 [SYSDM] Fix controls order and label height in IDD_SYSSETTINGS dialog This fixes checkbox rendering issue in russian translation. Dialogs in other translations are ok. CORE-13792 --- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/fr-FR.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 96db6e7343..fb37dd5cda 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -68,8 +68,8 @@ CAPTION "Настройки на уредбата" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Сведения за версията", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Докладване като работна установка", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "РеактОС е сглобен като сървърна РУ и се докладва като такава. Отметнете това поле, за да го промените само за това приложение.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Докладване като работна установка", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "Добре", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 211d769dd6..3837c27381 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -73,8 +73,8 @@ CAPTION "Nastavení systému" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Informace o verzi", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Hlásit se jako pracovní stanice", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS je vytvořen jako serverový OS a jako takový se také hlásí. Po zaškrtnutí tohoto políčka se pro aplikace toto chování změní.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Hlásit se jako pracovní stanice", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index d660f446ed..103e281508 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index db8e9ba9b8..823c372bd5 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -77,8 +77,8 @@ CAPTION "Systemeinstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Versionsinfo", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Als Workstation identifizieren", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS ist als Serversystem konzipiert worden und identifiziert sich auch als solches. Diese Einstellung ändert das Verhalten für Anwendungen.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Als Workstation identifizieren", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 74259359d0..e39ca8b53a 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index ef2df155fb..c97e4e1200 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "&Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "&Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index a55bcd75b3..5d1209a135 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -70,8 +70,8 @@ CAPTION "Ajustes del sistema" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Información de la versión ", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Convertirse en equipo de escritorio", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS está diseñado como un sistema operativo servidor y de forma predeterminada es tratado como tal. Seleccione esta casilla para hacer que las aplicaciones lo detecten según sus preferencias.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Convertirse en equipo de escritorio", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "Aceptar", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 4c25ba6d5b..4037a2e853 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 6a41211008..484b1d2466 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -70,8 +70,8 @@ CAPTION "הגדרות מערכת" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "מידע גרסה", IDC_STATIC, 6, 3, 210, 73 - CONTROL "דווח כתחנת עבודה", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "דווח כתחנת עבודה", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "אישור", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index ee43a6bb9b..a5e947540a 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -70,8 +70,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index c8b0fe9d40..ee8c01d702 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 76d2154ce0..fb0440f20a 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Informazioni sulla versione", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Notifica come Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS è compilato come server ed è notificato come tale. Non per questa applicazione.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Notifica come Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 41149b8be0..d9fd5ab814 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -68,8 +68,8 @@ CAPTION "システムの設定" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN GROUPBOX "バージョン情報", IDC_STATIC, 6, 3, 210, 73 - CONTROL "ワークステーションとしてふるまう", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS はサーバ OS としてビルドされているため、サーバとしてふるまいます。これを変更するにはこのボックスにチェックしてください。ただしアプリケーションに対してのみ有効です。", IDC_STATIC, 15, 15, 183, 41 + CONTROL "ワークステーションとしてふるまう", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 17f3564649..39695f63e0 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index d34b317747..c6e208b476 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -68,8 +68,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index e355aed3c6..4a312434b0 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -77,8 +77,8 @@ CAPTION "Ustawienia systemowe" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Informowanie o wersji", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Zgłaszaj jako stację roboczą", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS jest zbudowany w oparciu o wersję serwerową. Zaznacz pole, aby ReactOS zgłaszał się aplikacjom jako stacja robocza.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Zgłaszaj jako stację roboczą", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index cae3c86887..aad4895d74 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -77,8 +77,8 @@ CAPTION "Opțiuni de sistem" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Informații versiune", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Solicit &autoraportarea sistemului ca stație de lucru", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS este construit ca sistem server și se raportează ca atare. Bifați această căsuță pentru a dedica sistemul exclusiv aplicațiilor.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Solicit &autoraportarea sistemului ca stație de lucru", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "Î&nchide", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 4e5c6ee52f..0cb0522e69 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -68,8 +68,8 @@ CAPTION "Системные параметры" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Информация о версии", IDC_STATIC, 6, 3, 210, 73 + LTEXT "ReactOS собран как серверная ОС и сообщает приложениям об этом. Установка флажка изменит это (только для приложений).", IDC_STATIC, 15, 15, 183, 41 CONTROL "Представляться как рабочая станция", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 - LTEXT "ReactOS собран как серверная ОС и сообщает приложениям об этом. Установка флажка изменит это (только для приложений).", IDC_STATIC, 15, 15, 183, 55 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 0422408d73..a3fb6402c2 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -76,8 +76,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 6cc6143829..ca6f45162d 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -68,8 +68,8 @@ CAPTION "Cilësimet Sistemit" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Versioni Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Raporto si StacionPune", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10 LTEXT "ReactOS është ndërtuar si një server OS dhe raporton si të tillë. Kontrolloni këtë kuti për të ndryshuar vetëm këtë program.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Raporto si StacionPune", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 88, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 546a589377..d7b22afbca 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -70,8 +70,8 @@ CAPTION "System Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index f5b2a45c5e..2e1b180c2b 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -70,8 +70,8 @@ CAPTION "Dizge Ayarları" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Sürüm Bilgisi",IDC_STATIC, 6, 3, 210, 73 - CONTROL "İş İstasyonu Olarak Bildir", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS, bir sunucu işletim dizgesi olarak yapılmıştır ve öyle bildirilir. Yalnızca uygulamalar için, bunu değiştirmek için bu kutucuğu imleyiniz.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "İş İstasyonu Olarak Bildir", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "Tamam", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index b567946151..bb5ddfa9f1 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -76,8 +76,8 @@ CAPTION "Налаштування системи" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Інформація про версію", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Позначити як робочу станцію", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS повудована як серверна ОС, і так само про себе повідомляє. Обрати прапорець, щоб змінити це лише для програм.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Позначити як робочу станцію", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index b47fbc501d..71188b1d02 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -71,8 +71,8 @@ CAPTION "系统设置" FONT 9, "宋体", 0, 0, 0x1 BEGIN GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 - CONTROL "报告为工作站(&R)", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS 作为服务器操作系统而被构建，并如此被报告。选中此框可更改（仅对于应用程序有效）。", IDC_STATIC, 15, 15, 183, 41 + CONTROL "报告为工作站(&R)", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "确定", IDOK, 166, 83, 50, 14 END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index c2ca25f64b..08dacee0ce 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -70,8 +70,8 @@ CAPTION "系統設置" FONT 9, "新細明體", 0, 0, 0x1 BEGIN GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 - CONTROL "作爲工作站的報告", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS建作爲服務器操作系統並沒有這樣的報告。選中此框可更改此僅對應用程序而已。", IDC_STATIC, 15, 15, 183, 41 + CONTROL "作爲工作站的報告", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "確定", IDOK, 166, 83, 50, 14 END

1 0

01/01: [APPWIZ] Do not display the message box if the user aborts the download
by Bișoc George 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f31cf503fb5450dd60635… commit f31cf503fb5450dd6063571412374a22754e0ca2 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Oct 14 16:07:51 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 21 13:10:12 2018 +0200 [APPWIZ] Do not display the message box if the user aborts the download CORE-15183 --- dll/cpl/appwiz/addons.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index c2fb28d2ad..238348d0dc 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -362,10 +362,15 @@ static DWORD WINAPI download_proc(PVOID arg) hres = URLDownloadToFileW(NULL, GeckoUrl, tmp_file, 0, &InstallCallback); if(FAILED(hres)) { - ERR("URLDownloadToFile failed: %08x\n", hres); if (LoadStringW(hApplet, IDS_DWL_FAILED, message, sizeof(message) / sizeof(WCHAR))) { - MessageBoxW(NULL, message, NULL, MB_ICONERROR); + /* If the user aborted the download, DO NOT display the message box */ + if (hres == E_ABORT) { + TRACE("Downloading of Gecko package aborted!\n"); + } else { + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } } + ERR("URLDownloadToFile failed: %08x\n", hres); } else { if(sha_check(tmp_file)) { install_file(tmp_file);

1 0

02/02: [REGEDIT] Trivial resizing code fix
by Katayama Hirofumi MZ 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=125db5ead912a90f288e3… commit 125db5ead912a90f288e3f75fa713e27430bf4f9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 15 23:28:19 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 21 13:08:26 2018 +0200 [REGEDIT] Trivial resizing code fix --- base/applications/regedit/framewnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 7bddbf8158..7a3682572f 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -52,8 +52,8 @@ static void resize_frame_rect(HWND hWnd, PRECT prect) if (IsWindowVisible(hStatusBar)) { SetupStatusBar(hWnd, TRUE); - GetClientRect(hStatusBar, &rt); - prect->bottom -= rt.bottom; + GetWindowRect(hStatusBar, &rt); + prect->bottom -= rt.bottom - rt.top; } MoveWindow(g_pChildWnd->hWnd, prect->left, prect->top, prect->right, prect->bottom, TRUE); }

1 0

01/02: [REGEDIT] Code formatting
by Katayama Hirofumi MZ 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3231e0bf5dbf57bb9d65… commit b3231e0bf5dbf57bb9d657486db7ce3059cf2e31 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 15 23:13:06 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 21 13:07:43 2018 +0200 [REGEDIT] Code formatting --- base/applications/regedit/childwnd.c | 46 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index d3a6cd0c5b..3afe53a740 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -43,6 +43,7 @@ extern void ResizeWnd(int cx, int cy) HDWP hdwp = BeginDeferWindowPos(4); RECT rt, rs, rb; const int tHeight = 22; + const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE; SetRect(&rt, 0, 0, cx, cy); cy = 0; if (hStatusBar != NULL) @@ -51,12 +52,29 @@ extern void ResizeWnd(int cx, int cy) cy = rs.bottom - rs.top; } GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb); - cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2; - if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - 2*tHeight, rt.top, 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); - if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); - if (hdwp) EndDeferWindowPos(hdwp); + cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH / 2; + if (hdwp) + hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, NULL, + rt.left, rt.top, + rt.right - rt.left - 2*tHeight, tHeight, + uFlags); + if (hdwp) + hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, NULL, + rt.right - 2*tHeight, rt.top, + 2*tHeight, tHeight, + uFlags); + if (hdwp) + hdwp = DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, NULL, + rt.left, rt.top + tHeight + 2, + g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left, rt.bottom - rt.top - cy, + uFlags); + if (hdwp) + hdwp = DeferWindowPos(hdwp, g_pChildWnd->hListWnd, NULL, + rt.left + cx, rt.top + tHeight + 2, + rt.right - cx, rt.bottom - rt.top - cy, + uFlags); + if (hdwp) + EndDeferWindowPos(hdwp); } /******************************************************************************* @@ -143,14 +161,14 @@ static BOOL ChildWnd_CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l /* TODO */ break; case ID_TREE_EXPANDBRANCH: - (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND); + TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND); break; case ID_TREE_COLLAPSEBRANCH: - (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE); + TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE); break; case ID_TREE_RENAME: SetFocus(g_pChildWnd->hTreeWnd); - (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); + TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); break; case ID_TREE_DELETE: hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd); @@ -312,7 +330,7 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) /* Wipe the listview, the status bar and the address bar if the root key was selected */ if (TreeView_GetParent(g_pChildWnd->hTreeWnd, hItem) == NULL) { - (void)ListView_DeleteAllItems(g_pChildWnd->hListWnd); + ListView_DeleteAllItems(g_pChildWnd->hListWnd); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)NULL); SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)NULL); return; @@ -610,7 +628,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa { lResult = FALSE; RegCloseKey(hKey); - (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem); + TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem); } else { @@ -728,18 +746,18 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa hti.pt.x = pt.x; hti.pt.y = pt.y; ScreenToClient(g_pChildWnd->hTreeWnd, &hti.pt); - (void)TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti); + TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti); } if (hti.flags & TVHT_ONITEM) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); - (void)TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem); + TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem); memset(&item, 0, sizeof(item)); item.mask = TVIF_STATE | TVIF_CHILDREN; item.hItem = hti.hItem; - (void)TreeView_GetItem(g_pChildWnd->hTreeWnd, &item); + TreeView_GetItem(g_pChildWnd->hTreeWnd, &item); /* Set the Expand/Collapse menu item appropriately */ LoadStringW(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, COUNT_OF(buffer));

1 0

01/01: [CHKDSK] Fix MSVC build (thanks for spotting the mistake!)
by Pierre Schweitzer 21 Oct '18

21 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3849426432d06fceceb8e… commit 3849426432d06fceceb8e06661c091c516a0e7d0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 21 11:22:45 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Oct 21 11:22:45 2018 +0200 [CHKDSK] Fix MSVC build (thanks for spotting the mistake!) Addendum to ec9fc7f --- base/system/chkdsk/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/chkdsk/lang/fr-FR.rc b/base/system/chkdsk/lang/fr-FR.rc index 4a847cbeff..1b8e9f29b0 100644 --- a/base/system/chkdsk/lang/fr-FR.rc +++ b/base/system/chkdsk/lang/fr-FR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN

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