Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 04/10: [NTOS:SE] Implement object type list utilities

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e38f4c2b360e40e918da9… commit e38f4c2b360e40e918da94cf8fe7245fb9433746 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Jun 21 17:52:47 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:54:17 2023 +0200 [NTOS:SE] Implement object type list utilities This implements various private kernel routines for object type list management needed for access check code infrastructure. In addition, update the code documentation and add missing comments. --- ntoskrnl/se/objtype.c | 321 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 298 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/se/objtype.c b/ntoskrnl/se/objtype.c index 24af8fff4f0..b459c2dc172 100644 --- a/ntoskrnl/se/objtype.c +++ b/ntoskrnl/se/objtype.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Security object type list support routines * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ @@ -11,78 +12,351 @@ #define NDEBUG #include <debug.h> -/* PRIVATE FUNCTIONS ***********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /** * @brief - * Captures a list of object types. + * Validates a list of object types passed from user mode, + * ensuring the following conditions are met for a valid + * list: + * + * - The list must not be too big and it can be read + * - Each object must have a valid level + * - The level hierarchy between objects has to be consistent + * (e.g. a root cannot have a level 2 subordinate object) + * - The list must have only one root and it must be in the + * first position + * - Each object type GUID can be read and captured * * @param[in] ObjectTypeList - * An existing list of object types. + * A pointer to an object type list of which the elements + * are being validated. * * @param[in] ObjectTypeListLength - * The length size of the list. + * The length of the list, representing the number of object + * elements in that list. + * + * @return + * Returns STATUS_SUCCESS if the list has been validated and it + * contains valid objects. STATUS_INVALID_PARAMETER is returned + * if the list is not valid. Otherwise a NTSTATUS code is returned. + */ +static +NTSTATUS +SepValidateObjectTypeList( + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength) +{ + PGUID ObjectTypeGuid; + ULONG ObjectTypeIndex; + USHORT Level, PrevLevel; + SIZE_T Size; + + /* Ensure we do not hit an integer overflow */ + Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); + if (Size == 0) + { + DPRINT1("The object type list is too big, integer overflow alert!\n"); + return STATUS_INVALID_PARAMETER; + } + + _SEH2_TRY + { + /* Ensure we can actually read from that list */ + ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); + + /* Begin looping for each object from the list */ + for (ObjectTypeIndex = 0; + ObjectTypeIndex < ObjectTypeListLength; + ObjectTypeIndex++) + { + /* Get the level of this object and check for validity */ + Level = ObjectTypeList[ObjectTypeIndex].Level; + if (Level > ACCESS_MAX_LEVEL) + { + DPRINT1("Invalid object level found (level %u, at index %lu)\n", Level, ObjectTypeIndex); + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + + /* Are we past the first position in the list? */ + if (ObjectTypeIndex != 0) + { + /* Ensure that we do not have two object roots */ + if (Level == ACCESS_OBJECT_GUID) + { + DPRINT1("This list has two roots (at index %lu)\n", ObjectTypeIndex); + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + + /* + * Ensure the current level is consistent with the prior level. + * That means, if the previous object is the root (denoted by the + * level as ACCESS_OBJECT_GUID aka 0) the current object must + * be a child of the parent which is the root (also called a + * property set). Whereas a property is a sibling of the + * child, the property set. + */ + if (Level > PrevLevel + 1) + { + DPRINT1("The object levels are not consistent (current level %u, previous level %u, at index %lu)\n", + Level, PrevLevel, ObjectTypeIndex); + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + } + else + { + /* This is the first position so the object must be the root */ + if (Level != ACCESS_OBJECT_GUID) + { + DPRINT1("The object is not the root at first index!\n"); + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + } + + /* Get the object type and check that we can read from it */ + ObjectTypeGuid = ObjectTypeList[ObjectTypeIndex].ObjectType; + ProbeForRead(ObjectTypeGuid, sizeof(GUID), sizeof(ULONG)); + + /* + * Cache the level, we need it to ensure the levels between + * the previous and the next object are consistent with each other. + */ + PrevLevel = Level; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + +/** + * @brief + * Compares two object type GUIDs for equality. + * + * @param[in] Guid1 + * A pointer to the first object type GUID. + * + * @param[in] Guid2 + * A pointer to the second object type GUID. + * + * @return + * Returns TRUE if both GUIDs are equal, FALSE otherwise. + */ +static +BOOLEAN +SepIsEqualObjectTypeGuid( + _In_ CONST GUID *Guid1, + _In_ CONST GUID *Guid2) +{ + return RtlCompareMemory(Guid1, Guid2, sizeof(GUID)) == sizeof(GUID); +} + +/* PUBLIC FUNCTIONS ************************************************************/ + +/** + * @brief + * Captures an object type GUID from an object + * access control entry (ACE). + * + * @param[in] Ace + * A pointer to an access control entry, of which + * the object type GUID is to be captured from. + * + * @param[in] IsAceDenied + * If set to TRUE, the function will capture the + * GUID from a denied object ACE, otherwise from + * the allowed object ACE. + * + * @return + * Returns a pointer to an object type GUID, otherwise + * NULL is returned if the target ACE does not have + * an object type GUID. + */ +PGUID +SepGetObjectTypeGuidFromAce( + _In_ PACE Ace, + _In_ BOOLEAN IsAceDenied) +{ + PGUID ObjectTypeGuid = NULL; + + PAGED_CODE(); + + /* This Ace must not be NULL */ + ASSERT(Ace); + + /* Grab the GUID based on the object type ACE header */ + ObjectTypeGuid = IsAceDenied ? (PGUID)&((PACCESS_DENIED_OBJECT_ACE)Ace)->ObjectType : + (PGUID)&((PACCESS_ALLOWED_OBJECT_ACE)Ace)->ObjectType; + return ObjectTypeGuid; +} + +/** + * @brief + * Searches for an object type GUID if it exists + * on an object type list. + * + * @param[in] ObjectTypeList + * A pointer to an object type list. + * + * @param[in] ObjectTypeListLength + * The length of the list, representing the number + * of object elements in that list. + * + * @param[in] ObjectTypeGuid + * A pointer to an object type GUID to search in the + * list of interest. + * + * @param[out] ObjectIndex + * If the function found the target GUID, the function + * returns a pointer to the object index location to + * this parameter. + * + * @return + * Returns TRUE if the object type GUID of interest exists + * in the target list, FALSE otherwise. + */ +BOOLEAN +SepObjectTypeGuidInList( + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGUID ObjectTypeGuid, + _Out_ PULONG ObjectIndex) +{ + ULONG ObjectTypeIndex; + GUID ObjectTypeGuidToSearch; + + PAGED_CODE(); + + /* Loop over the object elements */ + for (ObjectTypeIndex = 0; + ObjectTypeIndex < ObjectTypeListLength; + ObjectTypeIndex++) + { + /* Is this the object we are searching for? */ + ObjectTypeGuidToSearch = ObjectTypeList[ObjectTypeIndex].ObjectTypeGuid; + if (SepIsEqualObjectTypeGuid(ObjectTypeGuid, &ObjectTypeGuidToSearch)) + { + /* Return the indext of that object to caller */ + *ObjectIndex = ObjectTypeIndex; + return TRUE; + } + } + + return FALSE; +} + +/** + * @brief + * Captures a list of object types and converts it to + * an internal form for use by the kernel. The list + * is validated before its data is copied. + * + * @param[in] ObjectTypeList + * A pointer to a list of object types passed from + * UM to be captured. + * + * @param[in] ObjectTypeListLength + * The length size of the list. This length represents + * the number of object elements in that list. * * @param[in] PreviousMode - * Processor access level mode. + * Processor access level mode. This has to be set to + * UserMode as object type access check is not supported + * in the kernel. * * @param[out] CapturedObjectTypeList - * The captured list of object types. + * A pointer to a returned captured list of object types. * * @return * Returns STATUS_SUCCESS if the list of object types has been captured * successfully. STATUS_INVALID_PARAMETER is returned if the caller hasn't - * supplied a buffer list of object types. STATUS_INSUFFICIENT_RESOURCES - * is returned if pool memory allocation for the captured list has failed. + * supplied a buffer list of object types or the list is invalid. + * STATUS_INSUFFICIENT_RESOURCES is returned if pool memory allocation + * for the captured list has failed. */ NTSTATUS SeCaptureObjectTypeList( _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, _In_ ULONG ObjectTypeListLength, _In_ KPROCESSOR_MODE PreviousMode, - _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList) + _Out_ POBJECT_TYPE_LIST_INTERNAL *CapturedObjectTypeList) { + NTSTATUS Status; + ULONG ObjectTypeIndex; SIZE_T Size; + PGUID ObjectTypeGuid; + POBJECT_TYPE_LIST_INTERNAL InternalTypeList; + + PAGED_CODE(); + /* We do not support that in the kernel */ if (PreviousMode == KernelMode) { return STATUS_NOT_IMPLEMENTED; } + /* No count elements of objects means no captured list for you */ if (ObjectTypeListLength == 0) { *CapturedObjectTypeList = NULL; return STATUS_SUCCESS; } + /* Check if the caller supplied a list since we have the count of elements */ if (ObjectTypeList == NULL) { + DPRINT1("The caller did not provide a list of object types!\n"); return STATUS_INVALID_PARAMETER; } - /* Calculate the list size and check for integer overflow */ - Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); - if (Size == 0) + /* Validate that list before we copy contents from it */ + Status = SepValidateObjectTypeList(ObjectTypeList, ObjectTypeListLength); + if (!NT_SUCCESS(Status)) { - return STATUS_INVALID_PARAMETER; + DPRINT1("SepValidateObjectTypeList failed (Status 0x%08lx)\n", Status); + return Status; } /* Allocate a new list */ - *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); - if (*CapturedObjectTypeList == NULL) + Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST_INTERNAL); + InternalTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); + if (InternalTypeList == NULL) { + DPRINT1("Failed to allocate pool memory for the object type list!\n"); return STATUS_INSUFFICIENT_RESOURCES; } _SEH2_TRY { - ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); - RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size); + /* Loop for every object element, data was already probed */ + for (ObjectTypeIndex = 0; + ObjectTypeIndex < ObjectTypeListLength; + ObjectTypeIndex++) + { + /* Copy the object type GUID */ + ObjectTypeGuid = ObjectTypeList[ObjectTypeIndex].ObjectType; + InternalTypeList[ObjectTypeIndex].ObjectTypeGuid = *ObjectTypeGuid; + + /* Copy the object hierarchy level */ + InternalTypeList[ObjectTypeIndex].Level = ObjectTypeList[ObjectTypeIndex].Level; + + /* Initialize the access check rights */ + InternalTypeList[ObjectTypeIndex].ObjectAccessRights.RemainingAccessRights = 0; + InternalTypeList[ObjectTypeIndex].ObjectAccessRights.GrantedAccessRights = 0; + InternalTypeList[ObjectTypeIndex].ObjectAccessRights.DeniedAccessRights = 0; + } + + /* Give the captured list to caller */ + *CapturedObjectTypeList = InternalTypeList; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); - *CapturedObjectTypeList = NULL; + ExFreePoolWithTag(InternalTypeList, TAG_SEPA); + InternalTypeList = NULL; _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -99,17 +373,18 @@ SeCaptureObjectTypeList( * * @param[in] PreviousMode * Processor access level mode. - * - * @return - * Nothing. */ VOID SeReleaseObjectTypeList( - _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ _Post_invalid_ POBJECT_TYPE_LIST_INTERNAL CapturedObjectTypeList, _In_ KPROCESSOR_MODE PreviousMode) { + PAGED_CODE(); + if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL)) + { ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA); + } } /* EOF */

1 year, 4 months

[reactos] 03/10: [NTOS:SE] Implement SepDumpAccessAndStatusList

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f3fab72a9b242394fe64… commit 5f3fab72a9b242394fe64119072c2449e8acead0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Jun 21 17:44:34 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:54:17 2023 +0200 [NTOS:SE] Implement SepDumpAccessAndStatusList This function will dump all the access status and granted access rights of each object list of a list whenever an access check by type (or by type result list) fails. This is for debugging purposes. --- ntoskrnl/se/debug.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c index 87e4f1e57e1..1f038ac0702 100644 --- a/ntoskrnl/se/debug.c +++ b/ntoskrnl/se/debug.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Security subsystem debug routines support - * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * COPYRIGHT: Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ @@ -344,4 +344,40 @@ SepDumpAccessRightsStats( #endif } +/** + * @brief + * Dumps access and status values of each object type + * in the result list. + */ +VOID +SepDumpAccessAndStatusList( + _In_ PACCESS_MASK GrantedAccessList, + _In_ PNTSTATUS AccessStatusList, + _In_ BOOLEAN IsResultList, + _In_ POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength) +{ +#ifndef NDEBUG + ULONG ResultListIndex; + ULONG ObjectTypeIndex; + ULONG ResultListLength; + + DbgPrint("================== ACCESS & STATUS OBJECT TYPE LIST STATISTICS ==================\n"); + ResultListLength = IsResultList ? ObjectTypeListLength : 1; + for (ResultListIndex = 0; ResultListIndex < ResultListLength; ResultListIndex++) + { + DbgPrint("Result Index #%lu, Granted access rights -> 0x%08lx, Access status -> 0x%08lx\n", + ResultListIndex, GrantedAccessList[ResultListIndex], AccessStatusList[ResultListIndex]); + } + + for (ObjectTypeIndex = 0; ObjectTypeIndex < ObjectTypeListLength; ObjectTypeIndex++) + { + DbgPrint("================== #%lu OBJECT ACCESS RIGHTS ==================\n", ObjectTypeIndex); + DbgPrint("Remaining access rights -> 0x%08lx\n", ObjectTypeList[ObjectTypeIndex].ObjectAccessRights.RemainingAccessRights); + DbgPrint("Granted access rights -> 0x%08lx\n", ObjectTypeList[ObjectTypeIndex].ObjectAccessRights.GrantedAccessRights); + DbgPrint("Denied access rights -> 0x%08lx\n", ObjectTypeList[ObjectTypeIndex].ObjectAccessRights.DeniedAccessRights); + } +#endif +} + /* EOF */

1 year, 4 months

[reactos] 02/10: [NTOS:SE] Declare function prototypes & add OBJECT_TYPE_LIST_INTERNAL

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5654ce7b9a1ccd7f35ec6… commit 5654ce7b9a1ccd7f35ec6ae5d27f218ff6bb15d9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 20 10:55:35 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:54:17 2023 +0200 [NTOS:SE] Declare function prototypes & add OBJECT_TYPE_LIST_INTERNAL OBJECT_TYPE_LIST_INTERNAL will serve as an internal kernel data structure to hold validated object type contents that are copied from UM. The difference between the public and the internal one is that the internal structure has an additional member for access check rights that have been granted on each object element in the list. --- ntoskrnl/include/internal/se.h | 36 +++++++++++++++++++++++++++++++++--- ntoskrnl/se/audit.c | 4 ++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index d261b03c54a..db32e6bff73 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Internal header for the Security Manager * COPYRIGHT: Copyright Eric Kohl - * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ #pragma once @@ -45,6 +45,16 @@ typedef struct _ACCESS_CHECK_RIGHTS ACCESS_MASK DeniedAccessRights; } ACCESS_CHECK_RIGHTS, *PACCESS_CHECK_RIGHTS; +// +// Internal object type list structure +// +typedef struct _OBJECT_TYPE_LIST_INTERNAL +{ + GUID ObjectTypeGuid; + USHORT Level; + ACCESS_CHECK_RIGHTS ObjectAccessRights; +} OBJECT_TYPE_LIST_INTERNAL, *POBJECT_TYPE_LIST_INTERNAL; + typedef enum _ACCESS_CHECK_RIGHT_TYPE { AccessCheckMaximum, @@ -304,6 +314,14 @@ SepDumpTokenDebugInfo( VOID SepDumpAccessRightsStats( _In_ PACCESS_CHECK_RIGHTS AccessRights); + +VOID +SepDumpAccessAndStatusList( + _In_ PACCESS_MASK GrantedAccessList, + _In_ PNTSTATUS AccessStatusList, + _In_ BOOLEAN IsResultList, + _In_ POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength); #endif // DBG // @@ -827,16 +845,28 @@ SepReleaseSecurityQualityOfService( // // Object type list functions // +PGUID +SepGetObjectTypeGuidFromAce( + _In_ PACE Ace, + _In_ BOOLEAN IsAceDenied); + +BOOLEAN +SepObjectTypeGuidInList( + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGUID ObjectTypeGuid, + _Out_ PULONG ObjectIndex); + NTSTATUS SeCaptureObjectTypeList( _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, _In_ ULONG ObjectTypeListLength, _In_ KPROCESSOR_MODE PreviousMode, - _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList); + _Out_ POBJECT_TYPE_LIST_INTERNAL *CapturedObjectTypeList); VOID SeReleaseObjectTypeList( - _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ _Post_invalid_ POBJECT_TYPE_LIST_INTERNAL CapturedObjectTypeList, _In_ KPROCESSOR_MODE PreviousMode); // diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index e2a5cc49c23..aae45beb31f 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -497,7 +497,7 @@ SepAccessCheckAndAuditAlarmWorker( _In_ ACCESS_MASK DesiredAccess, _In_ AUDIT_EVENT_TYPE AuditType, _In_ BOOLEAN HaveAuditPrivilege, - _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList, @@ -641,7 +641,7 @@ SepAccessCheckAndAuditAlarm( ACCESS_MASK GrantedAccess, *SafeGrantedAccessList; NTSTATUS AccessStatus, *SafeAccessStatusList; PSID CapturedPrincipalSelfSid; - POBJECT_TYPE_LIST CapturedObjectTypeList; + POBJECT_TYPE_LIST_INTERNAL CapturedObjectTypeList; ULONG i; BOOLEAN LocalGenerateOnClose; NTSTATUS Status;

1 year, 4 months

[reactos] 01/10: [NTOS:SE] Update the NT access check syscalls SAL2 annotations

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edcf3f5363cbaf212654f… commit edcf3f5363cbaf212654f78eda5542b1d7cea4be Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 20 10:42:08 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:53:45 2023 +0200 [NTOS:SE] Update the NT access check syscalls SAL2 annotations The newly updated SAL2 annotations reflect those from Process Hacker. Also these syscalls must have their function's status code checked, as most of other Native syscalls have them checked. --- sdk/include/ndk/sefuncs.h | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/sdk/include/ndk/sefuncs.h b/sdk/include/ndk/sefuncs.h index b0227a223d0..3c24177cb16 100644 --- a/sdk/include/ndk/sefuncs.h +++ b/sdk/include/ndk/sefuncs.h @@ -13,6 +13,7 @@ Abstract: Author: Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + George Bișoc (george.bisoc(a)reactos.org) - Updated - 23-Apr-2023 --*/ @@ -79,6 +80,8 @@ SeTokenImpersonationLevel( // // Native Calls // +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI @@ -87,40 +90,44 @@ NtAccessCheck( _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, _In_ PGENERIC_MAPPING GenericMapping, - _Out_ PPRIVILEGE_SET PrivilegeSet, - _Out_ PULONG ReturnLength, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Inout_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus); +_Must_inspect_result_ +NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheckByType( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PSID PrincipalSelfSid, + _In_opt_ PSID PrincipalSelfSid, _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeLength, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, - _In_ PPRIVILEGE_SET PrivilegeSet, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, _Inout_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus); +_Must_inspect_result_ +NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheckByTypeResultList( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PSID PrincipalSelfSid, + _In_opt_ PSID PrincipalSelfSid, _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeLength, + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, - _In_ PPRIVILEGE_SET PrivilegeSet, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, _Inout_ PULONG PrivilegeSetLength, - _Out_ PACCESS_MASK GrantedAccess, - _Out_ PNTSTATUS AccessStatus); + _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccess, + _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatus); _Must_inspect_result_ __kernel_entry NTSYSCALLAPI @@ -331,8 +338,8 @@ ZwAccessCheck( _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, _In_ PGENERIC_MAPPING GenericMapping, - _Out_ PPRIVILEGE_SET PrivilegeSet, - _Out_ PULONG ReturnLength, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Out_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus);

1 year, 4 months

[reactos] 01/01: [KERNEL32] Improve a few NT6 stubs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08629037ea7cfda9fab9e… commit 08629037ea7cfda9fab9e898b38c8e66ef77373a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 08:54:16 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 22 18:46:31 2023 +0300 [KERNEL32] Improve a few NT6 stubs --- dll/win32/kernel32/kernel32.spec | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 2853c50d579..e72f99fb295 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -169,12 +169,12 @@ @ stdcall -version=0x600+ CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) -@ stub -version=0x600+ CreateThreadpool -@ stub -version=0x600+ CreateThreadpoolCleanupGroup -@ stub -version=0x600+ CreateThreadpoolIo -@ stub -version=0x600+ CreateThreadpoolTimer -@ stub -version=0x600+ CreateThreadpoolWait -@ stub -version=0x600+ CreateThreadpoolWork +@ stdcall -stub -version=0x600+ CreateThreadpool(ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolCleanupGroup() +@ stdcall -stub -version=0x600+ CreateThreadpoolIo(ptr ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolTimer(ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolWait(ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolWork(ptr ptr ptr) @ stdcall CreateTimerQueue() @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @@ -202,7 +202,7 @@ @ stub -version=0x600+ DeleteFileTransactedA @ stub -version=0x600+ DeleteFileTransactedW @ stdcall DeleteFileW(wstr) -@ stub -version=0x600+ DeleteProcThreadAttributeList +@ stdcall -stub -version=0x600+ DeleteProcThreadAttributeList(ptr) @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx(long long) @ stdcall DeleteTimerQueueTimer(long long long) @@ -418,7 +418,7 @@ @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) ; missing in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) -@ stub -version=0x600+ GetConsoleScreenBufferInfoEx +@ stdcall -stub -version=0x600+ GetConsoleScreenBufferInfoEx(ptr ptr) @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @@ -544,7 +544,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) -@ stub -version=0x600+ GetPhysicallyInstalledSystemMemory +@ stdcall -stub -version=0x600+ GetPhysicallyInstalledSystemMemory(ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) @@ -593,7 +593,7 @@ @ stub -version=0x600+ GetSystemDEPPolicy @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() -@ stub -version=0x600+ GetSystemDefaultLocaleName +@ stdcall -stub -version=0x600+ GetSystemDefaultLocaleName(ptr long) @ stdcall GetSystemDefaultUILanguage() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) @@ -620,7 +620,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) -@ stub -version=0x600+ GetThreadErrorMode +@ stdcall -stub -version=0x600+ GetThreadErrorMode() @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) @ stdcall GetThreadLocale() @@ -636,7 +636,7 @@ @ stdcall -version=0x600+ GetTimeFormatEx(wstr long ptr wstr wstr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) -@ stub -version=0x600+ GetTimeZoneInformationForYear +@ stdcall -stub -version=0x600+ GetTimeZoneInformationForYear(long ptr ptr) @ stdcall -version=0x600+ GetUILanguageInfo(long wstr wstr ptr ptr) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @@ -704,19 +704,19 @@ @ stdcall -version=0x351-0x502 HeapUsage(long long long long ptr) @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) -@ stub -version=0x600+ IdnToAscii -@ stub -version=0x600+ IdnToNameprepUnicode -@ stub -version=0x600+ IdnToUnicode +@ stdcall -stub -version=0x600+ IdnToAscii(long wstr long ptr long) +@ stdcall -stub -version=0x600+ IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall -stub -version=0x600+ IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stub -version=0x600+ InitOnceBeginInitialize -@ stub -version=0x600+ InitOnceComplete +@ stdcall -stub -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall -stub -version=0x600+ InitOnceComplete(ptr long ptr) @ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) -@ stub -version=0x600+ InitOnceInitialize +@ stdcall -stub -version=0x600+ InitOnceInitialize(ptr) @ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall -version=0x600+ InitializeCriticalSectionEx(ptr long long) -@ stub -version=0x600+ InitializeProcThreadAttributeList +@ stdcall -stub -version=0x600+ InitializeProcThreadAttributeList(ptr long long ptr) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall -version=0x600+ InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @@ -744,7 +744,7 @@ @ stdcall IsDBCSLeadByteEx(long long) @ stdcall IsDebuggerPresent() @ stdcall IsNLSDefinedString(long long ptr long long) -@ stub -version=0x600+ IsNormalizedString +@ stdcall -stub -version=0x600+ IsNormalizedString(long wstr long) @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() @@ -826,8 +826,8 @@ @ stub -version=0x600+ NlsUpdateLocale @ stub -version=0x600+ NlsUpdateSystemLocale @ stub -version=0x600+ NlsWriteEtwEvent -@ stub -version=0x600+ NormalizeString -@ stub -version=0x600+ NotifyUILanguageChange +@ stdcall -stub -version=0x600+ NormalizeString(long wstr long ptr long) +@ stdcall -stub -version=0x600+ NotifyUILanguageChange(long wstr wstr long ptr) @ stdcall OpenConsoleW(wstr long long long) @ stdcall -version=0x500-0x502 OpenDataFile(long long) @ stdcall OpenEventA(long long str) @@ -1072,7 +1072,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) -@ stub -version=0x600+ SetThreadErrorMode +@ stdcall -stub -version=0x600+ SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) @@ -1104,7 +1104,7 @@ @ stdcall -version=0x600+ SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stub -version=0x600+ StartThreadpoolIo -@ stub -version=0x600+ SubmitThreadpoolWork +@ stdcall -stub -version=0x600+ SubmitThreadpoolWork(ptr) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @ stdcall SwitchToThread() @@ -1138,7 +1138,7 @@ @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) @ stub -version=0x600+ UpdateCalendarDayOfWeek -@ stub -version=0x600+ UpdateProcThreadAttribute +@ stdcall -stub -version=0x600+ UpdateProcThreadAttribute(ptr long ptr ptr ptr ptr ptr) @ stdcall UpdateResourceA(long str str long ptr long) @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @@ -1173,7 +1173,7 @@ @ stub -version=0x600+ WaitForThreadpoolIoCallbacks @ stub -version=0x600+ WaitForThreadpoolTimerCallbacks @ stub -version=0x600+ WaitForThreadpoolWaitCallbacks -@ stub -version=0x600+ WaitForThreadpoolWorkCallbacks +@ stdcall -stub -version=0x600+ WaitForThreadpoolWorkCallbacks(ptr long) @ stdcall WaitNamedPipeA(str long) @ stdcall WaitNamedPipeW(wstr long) @ stdcall -version=0x600+ WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable

1 year, 4 months

[reactos] 01/01: [COM_APITEST] shdocvw: Add CLSID_MruPidlList (#5602)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fec935ec24951d279c55f… commit fec935ec24951d279c55f023d236d9a24501d83f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 22 23:07:46 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 23:07:46 2023 +0900 [COM_APITEST] shdocvw: Add CLSID_MruPidlList (#5602) CORE-9283 --- modules/rostests/apitests/com/com_apitest.c | 1 + modules/rostests/apitests/com/com_apitest.h | 2 ++ modules/rostests/apitests/com/shdocvw.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 66d22ada9b2..3200c556c7c 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -205,6 +205,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IMenuPopup), TRUE }, { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, + { ID_NAME(IID_IMruPidlList) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE }, diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index d4b208db94c..c8c8ad08d12 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -87,6 +87,7 @@ DEFINE_GUID(CLSID_ImgCtxThumbnailExtractor,0x7376d660, 0xc583, 0x11d0, 0xa3, 0xa DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); +DEFINE_GUID(CLSID_MruPidlList, 0x42AEDC87, 0x2188, 0x41FD, 0xB9, 0xA3, 0x0C, 0x96, 0x6F, 0xEA, 0xBE, 0xC1); DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); @@ -142,6 +143,7 @@ DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x1 DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); DEFINE_GUID(IID_IInitializeWithBindCtx, 0x71c0d2bc, 0x726d, 0x45cc, 0xa6, 0xc0, 0x2e, 0x31, 0xc1, 0xdb, 0x21, 0x59); DEFINE_GUID(IID_IItemNameLimits, 0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4); +DEFINE_GUID(IID_IMruPidlList, 0x47851649, 0xa2ef, 0x4e67, 0xba, 0xec, 0xc6, 0xa1, 0x53, 0xac, 0x72, 0xec); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_INamespaceWalk, 0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f); DEFINE_GUID(IID_INamespaceWalkCB, 0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e); diff --git a/modules/rostests/apitests/com/shdocvw.c b/modules/rostests/apitests/com/shdocvw.c index 5b746969d2a..34ea3efb43d 100644 --- a/modules/rostests/apitests/com/shdocvw.c +++ b/modules/rostests/apitests/com/shdocvw.c @@ -88,6 +88,13 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IUnknown }, } }, + { + ID_NAME(CLSID_MruPidlList), + { + { 0x0, &IID_IMruPidlList }, + { 0x0, &IID_IUnknown }, + } + }, { ID_NAME(CLSID_SH_FavBand), {

1 year, 4 months

[reactos] 01/01: [REACTOS] Fix typos in comments (#5591)

by Andriy Shevchenko

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ea03b5b22c9d22a949ce… commit 2ea03b5b22c9d22a949ce498276d494b8bdc758b Author: Andriy Shevchenko <nfxpnk(a)gmail.com> AuthorDate: Tue Aug 22 16:20:29 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 16:20:29 2023 +0300 [REACTOS] Fix typos in comments (#5591) Fixing typos in code comments enhances code readability and comprehension for developers and collaborators. --- sdk/lib/rtl/handle.c | 2 +- sdk/tools/rsym/rsym64.c | 2 +- sdk/tools/utf16le/utf16le.cpp | 2 +- sdk/tools/winesync/winesync.py | 2 +- subsystems/csr/csrsrv/procsup.c | 2 +- subsystems/csr/csrsrv/status.h | 4 ++-- subsystems/mvdm/ntvdm/bios/bios32/bios32.c | 2 +- subsystems/mvdm/ntvdm/cpu/cpu.c | 2 +- win32ss/drivers/miniport/vga_new/vga.c | 4 ++-- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/ldevobj.c | 2 +- win32ss/gdi/ntgdi/gdipool.c | 2 +- win32ss/reactx/dxg/historic.c | 2 +- win32ss/reactx/ntddraw/d3d.c | 2 +- win32ss/user/ntuser/desktop.c | 2 +- win32ss/user/ntuser/hook.c | 2 +- win32ss/user/ntuser/hotkey.c | 4 ++-- win32ss/user/ntuser/input.c | 2 +- win32ss/user/ntuser/kbdlayout.c | 2 +- win32ss/user/ntuser/windc.c | 2 +- win32ss/user/user32/controls/ghost.c | 2 +- win32ss/user/user32/misc/misc.c | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sdk/lib/rtl/handle.c b/sdk/lib/rtl/handle.c index 5c24199199b..d811f805be5 100644 --- a/sdk/lib/rtl/handle.c +++ b/sdk/lib/rtl/handle.c @@ -71,7 +71,7 @@ RtlAllocateHandle( /* Check if we are out of free handles entries */ if (HandleTable->FreeHandles == NULL) { - /* Check if we don't have uncomitted handle entries yet */ + /* Check if we don't have uncommitted handle entries yet */ if (HandleTable->UnCommittedHandles == NULL) { /* Use the maximum number of handle entries */ diff --git a/sdk/tools/rsym/rsym64.c b/sdk/tools/rsym/rsym64.c index 80861e4814f..07e5596fa08 100644 --- a/sdk/tools/rsym/rsym64.c +++ b/sdk/tools/rsym/rsym64.c @@ -781,7 +781,7 @@ ParsePEHeaders(PFILE_INFO File) File->UsedSections = 0; File->eh_frame.idx = -1; - /* Allocate array of chars, specifiying whether to copy the section */ + /* Allocate array of chars, specifying whether to copy the section */ File->UseSection = malloc(File->AllSections); for (i = 0; i < File->AllSections; i++) diff --git a/sdk/tools/utf16le/utf16le.cpp b/sdk/tools/utf16le/utf16le.cpp index 391205cbba5..cf41bc0f8c7 100644 --- a/sdk/tools/utf16le/utf16le.cpp +++ b/sdk/tools/utf16le/utf16le.cpp @@ -180,7 +180,7 @@ public: wchar_t ret = (wchar_t)-1; switch (encoding) { - case detect: // if still unknwon + case detect: // if still unknown encoding = utf8; // assume utf8 as default case utf8: unsigned char c, tmp; diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index cdee060db52..d596a5dd710 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -259,7 +259,7 @@ class wine_sync: return True, warning_message def revert_staged_patchset(self): - # revert all of this in one commmit + # revert all of this in one commit staged_patch_dir_path = os.path.join(self.reactos_src, self.staged_patch_dir) if not os.path.isdir(staged_patch_dir_path): return True diff --git a/subsystems/csr/csrsrv/procsup.c b/subsystems/csr/csrsrv/procsup.c index 7abf0d1f6d6..82b5dbbee3c 100644 --- a/subsystems/csr/csrsrv/procsup.c +++ b/subsystems/csr/csrsrv/procsup.c @@ -1048,7 +1048,7 @@ CsrLockProcessByClientId(IN HANDLE Pid, * @return TRUE if the reversion was succesful, FALSE otherwise. * * @remarks Impersonation can be recursive; as such, the impersonation token - * will only be deleted once the CSR Thread's impersonaton count + * will only be deleted once the CSR Thread's impersonation count * has reached zero. * *--*/ diff --git a/subsystems/csr/csrsrv/status.h b/subsystems/csr/csrsrv/status.h index c8b922f905a..1eebf18a820 100644 --- a/subsystems/csr/csrsrv/status.h +++ b/subsystems/csr/csrsrv/status.h @@ -14,7 +14,7 @@ * up the DosDevices Object Directory, and initializing each component. * * procsup.c - Handles all internal functions dealing with the CSR Process Object, - * including de/allocation, de/referencing, un/locking, prority, and + * including de/allocation, de/referencing, un/locking, priority, and * lookups. Also handles all external APIs which touch the CSR Process Object. * * server.c - Handles all internal functions related to loading and managing Server @@ -24,7 +24,7 @@ * * session.c - Handles all internal functions dealing with the CSR Session Object, * including de/allocation, de/referencing, and un/locking. Holds the SB API - * Dispatch/Name Tables and the public CsrSv API Interface for commmunication + * Dispatch/Name Tables and the public CsrSv API Interface for communication * with the Session Manager. * * thredsup.c - Handles all internal functions dealing with the CSR Thread Object, diff --git a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c index 95b2a31f0cf..a5c06c5295f 100644 --- a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c +++ b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c @@ -442,7 +442,7 @@ static VOID WINAPI BiosMiscService(LPWORD Stack) case 0xC2: { // FIXME: Reenable this call when we understand why - // our included mouse driver doesn't correctly reeanble + // our included mouse driver doesn't correctly reenable // mouse reporting! // BiosMousePs2Interface(Stack); // break; diff --git a/subsystems/mvdm/ntvdm/cpu/cpu.c b/subsystems/mvdm/ntvdm/cpu/cpu.c index 2fcbc00dd80..1e0cc03c21a 100644 --- a/subsystems/mvdm/ntvdm/cpu/cpu.c +++ b/subsystems/mvdm/ntvdm/cpu/cpu.c @@ -131,7 +131,7 @@ LONG CpuExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) /* * Check whether the access exception was done inside the virtual memory space - * (caused by an emulated app) or outside (casued by a bug in ourselves). + * (caused by an emulated app) or outside (caused by a bug in ourselves). */ if (Address < (ULONG_PTR)BaseAddress || Address >= (ULONG_PTR)BaseAddress + MAX_ADDRESS) diff --git a/win32ss/drivers/miniport/vga_new/vga.c b/win32ss/drivers/miniport/vga_new/vga.c index 41906254181..1b2da4b548b 100644 --- a/win32ss/drivers/miniport/vga_new/vga.c +++ b/win32ss/drivers/miniport/vga_new/vga.c @@ -749,10 +749,10 @@ Return Value: // eVb: 1.13 [END] // - // Always return succcess since settings the text mode will fail on + // Always return success since settings the text mode will fail on // non-x86. // - // Also, failiure to set the text mode is not fatal in any way, since + // Also, failure to set the text mode is not fatal in any way, since // this operation must be followed by another set mode operation. // diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index ed6c00435e2..d9f6b8a9465 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -200,7 +200,7 @@ EngpUpdateGraphicsDeviceList(VOID) ERR("VGA adapter = %lu\n", iVGACompatible); } - /* Get the maximum mumber of adapters */ + /* Get the maximum number of adapters */ if (!RegReadDWORD(hkey, L"MaxObjectNumber", &ulMaxObjectNumber)) { ERR("Could not read MaxObjectNumber, defaulting to 0.\n"); diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 9582c8e943a..b4f13b88d19 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -407,7 +407,7 @@ LDEVOBJ_pLoadDriver( /* Check if the ldev is associated with a file */ if (pldev->pGdiDriverInfo) { - /* Check for match (case insensative) */ + /* Check for match (case insensitive) */ if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, TRUE)) { /* Image found in LDEV list */ diff --git a/win32ss/gdi/ntgdi/gdipool.c b/win32ss/gdi/ntgdi/gdipool.c index d85972f38dd..9a19cbea1b6 100644 --- a/win32ss/gdi/ntgdi/gdipool.c +++ b/win32ss/gdi/ntgdi/gdipool.c @@ -184,7 +184,7 @@ GdiPoolAllocate( cjOffset = ulIndex * pPool->cjAllocSize; pvAlloc = (PVOID)((ULONG_PTR)pSection->pvBaseAddress + cjOffset); - /* Check if memory is comitted */ + /* Check if memory is committed */ ulPageBit = 1 << (cjOffset / PAGE_SIZE); ulPageBit |= 1 << ((cjOffset + pPool->cjAllocSize - 1) / PAGE_SIZE); if ((pSection->ulCommitBitmap & ulPageBit) != ulPageBit) diff --git a/win32ss/reactx/dxg/historic.c b/win32ss/reactx/dxg/historic.c index a24eee8c634..e25d3196f94 100644 --- a/win32ss/reactx/dxg/historic.c +++ b/win32ss/reactx/dxg/historic.c @@ -18,7 +18,7 @@ * The function DxDxgGenericThunk redirects DirectX calls to other functions. * * @param ULONG_PTR ulIndex -* The functions we want redirct +* The functions we want to redirect * * @param ULONG_PTR ulHandle * Unknown diff --git a/win32ss/reactx/ntddraw/d3d.c b/win32ss/reactx/ntddraw/d3d.c index 07eb7297829..8eb87a5879f 100644 --- a/win32ss/reactx/ntddraw/d3d.c +++ b/win32ss/reactx/ntddraw/d3d.c @@ -135,7 +135,7 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, * @name NtGdiD3dContextDestroy * @implemented * -* The Function NtGdiD3dContextDestroy destorys the context data we got from NtGdiD3dContextCreate +* The Function NtGdiD3dContextDestroy destroys the context data we got from NtGdiD3dContextCreate * It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is fully implemented * in win32k.sys in windows 2000 and below * diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 16b7aa0b8c2..7f200cbfc92 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -170,7 +170,7 @@ IntDesktopObjectDelete( if (pdesk->spwndMessage) co_UserDestroyWindow(pdesk->spwndMessage); - /* Remove the desktop from the window station's list of associcated desktops */ + /* Remove the desktop from the window station's list of associated desktops */ RemoveEntryList(&pdesk->ListEntry); /* Free the heap */ diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 8f82d5b2f46..b9879c01320 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -43,7 +43,7 @@ IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload) { /* A callback in user mode can trigger UserLoadApiHook to be called and as a result IntLoadHookModule will be called recursively. - To solve this we set the flag that means that the appliaction has + To solve this we set the flag that means that the application has loaded the api hook before the callback and in case of error we remove it */ ppi->W32PF_flags |= W32PF_APIHOOKLOADED; diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c index 93b43d100d8..d2ae2c4766f 100644 --- a/win32ss/user/ntuser/hotkey.c +++ b/win32ss/user/ntuser/hotkey.c @@ -7,7 +7,7 @@ */ /* - * FIXME: Hotkey notifications are triggered by keyboard input (physical or programatically) + * FIXME: Hotkey notifications are triggered by keyboard input (physical or programmatically) * and since only desktops on WinSta0 can receive input in seems very wrong to allow * windows/threads on destops not belonging to WinSta0 to set hotkeys (receive notifications). * -- Gunnar @@ -52,7 +52,7 @@ StartDebugHotKeys(VOID) } UserRegisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12, MOD_SHIFT, vk); UserRegisterHotKey(PWND_BOTTOM, IDHK_F12, 0, vk); - TRACE("Start up the debugger hotkeys!! If you see this you eneabled debugprints. Congrats!\n"); + TRACE("Start up the debugger hotkeys!! If you see this you enabled debugprints. Congrats!\n"); } /* diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index 9c2c69b353c..f153bcf59a6 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -42,7 +42,7 @@ IntLastInputTick(BOOL bUpdate) /* * DoTheScreenSaver * - * Check if scrensaver should be started and sends message to SAS window + * Check if screensaver should be started and sends message to SAS window */ VOID FASTCALL DoTheScreenSaver(VOID) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index ef66cad9ddc..33875c2cebf 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -579,7 +579,7 @@ IntReorderKeyboardLayouts( /* * UserSetDefaultInputLang * - * Sets default kyboard layout for system. Called from UserSystemParametersInfo. + * Sets default keyboard layout for system. Called from UserSystemParametersInfo. */ BOOL NTAPI diff --git a/win32ss/user/ntuser/windc.c b/win32ss/user/ntuser/windc.c index 9a4a7dde211..0f2d2781e30 100644 --- a/win32ss/user/ntuser/windc.c +++ b/win32ss/user/ntuser/windc.c @@ -1022,7 +1022,7 @@ NtUserGetDC(HWND hWnd) * Select logical palette into device context. * \param hDC handle to the device context * \param hpal handle to the palette - * \param ForceBackground If this value is FALSE the logical palette will be copied to the device palette only when the applicatioon + * \param ForceBackground If this value is FALSE the logical palette will be copied to the device palette only when the application * is in the foreground. If this value is TRUE then map the colors in the logical palette to the device * palette colors in the best way. * \return old palette diff --git a/win32ss/user/user32/controls/ghost.c b/win32ss/user/user32/controls/ghost.c index 0abc0648731..dac759f3843 100644 --- a/win32ss/user/user32/controls/ghost.c +++ b/win32ss/user/user32/controls/ghost.c @@ -331,7 +331,7 @@ Ghost_OnNCPaint(HWND hwnd, HRGN hrgn, BOOL bUnicode) { HDC hdc; - // do the default behaivour + // do the default behaviour if (bUnicode) DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)hrgn, 0); else diff --git a/win32ss/user/user32/misc/misc.c b/win32ss/user/user32/misc/misc.c index 621ec567f8e..d834697b6a1 100644 --- a/win32ss/user/user32/misc/misc.c +++ b/win32ss/user/user32/misc/misc.c @@ -61,7 +61,7 @@ GetW32ThreadInfo(VOID) * 2) pSecurityInfo - type of information to retrieve * 3) pSecurityDescriptor - buffer which receives descriptor * 4) dwLength - size, in bytes, of buffer 'pSecurityDescriptor' - * 5) pdwLengthNeeded - reseives actual size of descriptor + * 5) pdwLengthNeeded - receives actual size of the descriptor * * Return Vaules: * TRUE on success

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SDK][SHELL32_APITEST][SHLWAPI_WINETEST] Property Bag on Desktop Upgrade (#5590)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2d8e464c805122243f47… commit a2d8e464c805122243f474801d2c96f2d40eca8d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 22 12:01:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 12:01:20 2023 +0900 [SHLWAPI][SDK][SHELL32_APITEST][SHLWAPI_WINETEST] Property Bag on Desktop Upgrade (#5590) - Add CDesktopUpgradePropertyBag class. - Implement SHGetDesktopUpgradePropertyBag function. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 2 + dll/win32/shlwapi/propbag.cpp | 195 ++++++++++++++++++++++- modules/rostests/apitests/shell32/ShellState.cpp | 3 +- modules/rostests/winetests/shlwapi/ordinal.c | 5 + sdk/include/reactos/shlwapi_undoc.h | 19 +++ 5 files changed, 221 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 6f8855fd10a..985b79a9f40 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4505,6 +4505,7 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) */ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { +#ifndef __REACTOS__ enum _shellkey_flags { SHKEY_Root_HKCU = 0x1, SHKEY_Root_HKLM = 0x2, @@ -4520,6 +4521,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) SHKEY_Subkey_MUICache = 0x5000, SHKEY_Subkey_FileExts = 0x6000 }; +#endif static const WCHAR explorerW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index ce65aa6c6a0..fbd5b87a49b 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -719,7 +719,7 @@ SHGetIniStringUTF7W( return SHGetIniStringW(lpAppName, lpKeyName + 1, lpReturnedString, nSize, lpFileName); return GetPrivateProfileStringW(lpAppName, lpKeyName, L"", lpReturnedString, nSize, lpFileName); -} +} /************************************************************************** * SHSetIniStringUTF7W (SHLWAPI.474) @@ -995,3 +995,196 @@ SHCreatePropertyBagOnProfileSection( return pIniPB->QueryInterface(riid, ppvObj); } + +class CDesktopUpgradePropertyBag : public CBasePropertyBag +{ +protected: + BOOL _AlreadyUpgraded(HKEY hKey); + VOID _MarkAsUpgraded(HKEY hkey); + HRESULT _ReadFlags(VARIANT *pvari); + HRESULT _ReadItemPositions(VARIANT *pvari); + IStream* _GetOldDesktopViewStream(); + IStream* _NewStreamFromOld(IStream *pOldStream); + +public: + CDesktopUpgradePropertyBag() : CBasePropertyBag(0) { } + + STDMETHODIMP Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override + { + return E_NOTIMPL; + } +}; + +VOID CDesktopUpgradePropertyBag::_MarkAsUpgraded(HKEY hkey) +{ + DWORD dwValue = TRUE; + SHSetValueW(hkey, NULL, L"Upgrade", REG_DWORD, &dwValue, sizeof(dwValue)); +} + +BOOL CDesktopUpgradePropertyBag::_AlreadyUpgraded(HKEY hKey) +{ + // Check the existence of the value written in _MarkAsUpgraded. + DWORD dwValue, cbData = sizeof(dwValue); + return SHGetValueW(hKey, NULL, L"Upgrade", NULL, &dwValue, &cbData) == ERROR_SUCCESS; +} + +typedef DWORDLONG DESKVIEW_FLAGS; // 64-bit data + +HRESULT CDesktopUpgradePropertyBag::_ReadFlags(VARIANT *pvari) +{ + DESKVIEW_FLAGS Flags; + DWORD cbValue = sizeof(Flags); + if (SHGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\DeskView", + L"Settings", + NULL, + &Flags, + &cbValue) != ERROR_SUCCESS || cbValue < sizeof(Flags)) + { + return E_FAIL; + } + + V_UINT(pvari) = ((UINT)(Flags >> 32)) | 0x220; // FIXME: Magic number + V_VT(pvari) = VT_UINT; + return S_OK; +} + +typedef struct tagOLD_STREAM_HEADER +{ + WORD wMagic; + WORD awUnknown[6]; + WORD wSize; +} OLD_STREAM_HEADER, *POLD_STREAM_HEADER; + +IStream* CDesktopUpgradePropertyBag::_NewStreamFromOld(IStream *pOldStream) +{ + OLD_STREAM_HEADER Header; + HRESULT hr = pOldStream->Read(&Header, sizeof(Header), NULL); + if (FAILED(hr) || Header.wMagic != 28) + return NULL; + + // Move stream pointer + LARGE_INTEGER li; + li.QuadPart = Header.wSize - sizeof(Header); + hr = pOldStream->Seek(li, STREAM_SEEK_CUR, NULL); + if (FAILED(hr)) + return NULL; + + // Get the size + ULARGE_INTEGER uli; + hr = IStream_Size(pOldStream, &uli); + if (FAILED(hr)) + return NULL; + + // Create new stream and attach + CComPtr<IStream> pNewStream; + pNewStream.Attach(SHCreateMemStream(NULL, 0)); + if (!pNewStream) + return NULL; + + // Subtract Header.wSize from the size + uli.QuadPart -= Header.wSize; + + // Copy to pNewStream + hr = pOldStream->CopyTo(pNewStream, uli, NULL, NULL); + if (FAILED(hr)) + return NULL; + + li.QuadPart = 0; + pNewStream->Seek(li, STREAM_SEEK_SET, NULL); + + return pNewStream.Detach(); +} + +IStream* CDesktopUpgradePropertyBag::_GetOldDesktopViewStream() +{ + HKEY hKey = SHGetShellKey(SHKEY_Root_HKCU, L"Streams\\Desktop", FALSE); + if (!hKey) + return NULL; + + CComPtr<IStream> pOldStream; + if (!_AlreadyUpgraded(hKey)) + { + pOldStream.Attach(SHOpenRegStream2W(hKey, NULL, L"ViewView2", 0)); + if (pOldStream) + { + ULARGE_INTEGER uli; + HRESULT hr = IStream_Size(pOldStream, &uli); + if (SUCCEEDED(hr) && !uli.QuadPart) + pOldStream.Release(); + } + + if (!pOldStream) + pOldStream.Attach(SHOpenRegStream2W(hKey, NULL, L"ViewView", 0)); + + _MarkAsUpgraded(hKey); + } + + ::RegCloseKey(hKey); + return pOldStream.Detach(); +} + +HRESULT CDesktopUpgradePropertyBag::_ReadItemPositions(VARIANT *pvari) +{ + CComPtr<IStream> pOldStream; + pOldStream.Attach(_GetOldDesktopViewStream()); + if (!pOldStream) + return E_FAIL; + + HRESULT hr = E_FAIL; + IStream *pNewStream = _NewStreamFromOld(pOldStream); + if (pNewStream) + { + V_UNKNOWN(pvari) = pNewStream; + V_VT(pvari) = VT_UNKNOWN; + hr = S_OK; + } + + return hr; +} + +STDMETHODIMP +CDesktopUpgradePropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + VARTYPE vt = V_VT(pvari); + + HRESULT hr = E_FAIL; + if (StrCmpW(L"FFlags", pszPropName) == 0) + hr = _ReadFlags(pvari); + else if (StrCmpNW(L"ItemPos", pszPropName, 7) == 0) + hr = _ReadItemPositions(pvari); + + if (FAILED(hr)) + { + ::VariantInit(pvari); + return hr; + } + + return ::VariantChangeType(pvari, pvari, 0, vt); +} + +/************************************************************************** + * SHGetDesktopUpgradePropertyBag (Not exported; used in CViewStatePropertyBag) + * + * Creates or gets a property bag object for desktop upgrade + * + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + */ +HRESULT SHGetDesktopUpgradePropertyBag(REFIID riid, void **ppvObj) +{ + *ppvObj = NULL; + CComPtr<CDesktopUpgradePropertyBag> pPropBag(new CDesktopUpgradePropertyBag()); + return pPropBag->QueryInterface(riid, ppvObj); +} diff --git a/modules/rostests/apitests/shell32/ShellState.cpp b/modules/rostests/apitests/shell32/ShellState.cpp index 7c50806d2fd..97ae49c719a 100644 --- a/modules/rostests/apitests/shell32/ShellState.cpp +++ b/modules/rostests/apitests/shell32/ShellState.cpp @@ -12,6 +12,7 @@ #include <shellutils.h> #include <strsafe.h> #include <shlwapi.h> +#include <shlwapi_undoc.h> /* [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer] */ /* The contents of RegValue ShellState. */ @@ -72,8 +73,6 @@ static int read_key(REGSHELLSTATE *prss) return 0; } -extern "C" HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create); - static int read_advanced_key(SHELLSTATE* pss) { HKEY hKey; diff --git a/modules/rostests/winetests/shlwapi/ordinal.c b/modules/rostests/winetests/shlwapi/ordinal.c index cd9231351e6..f4ea269f2ce 100644 --- a/modules/rostests/winetests/shlwapi/ordinal.c +++ b/modules/rostests/winetests/shlwapi/ordinal.c @@ -33,6 +33,9 @@ #include "docobj.h" #include "shobjidl.h" #include "shlobj.h" +#ifdef __REACTOS__ + #include <shlwapi_undoc.h> +#endif /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; @@ -2796,6 +2799,7 @@ static void test_SHSetIniString(void) DeleteFileW(TestIniW); } +#ifndef __REACTOS__ enum _shellkey_flags { SHKEY_Root_HKCU = 0x1, SHKEY_Root_HKLM = 0x2, @@ -2811,6 +2815,7 @@ enum _shellkey_flags { SHKEY_Subkey_MUICache = 0x5000, SHKEY_Subkey_FileExts = 0x6000 }; +#endif static void test_SHGetShellKey(void) { diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 270bc344291..37363db934b 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -217,6 +217,25 @@ SHSetIniStringUTF7W( _In_opt_z_ LPCWSTR lpString, _In_z_ LPCWSTR lpFileName); +enum _shellkey_flags +{ + SHKEY_Root_HKCU = 0x1, + SHKEY_Root_HKLM = 0x2, + SHKEY_Key_Explorer = 0x00, + SHKEY_Key_Shell = 0x10, + SHKEY_Key_ShellNoRoam = 0x20, + SHKEY_Key_Classes = 0x30, + SHKEY_Subkey_Default = 0x0000, + SHKEY_Subkey_ResourceName = 0x1000, + SHKEY_Subkey_Handlers = 0x2000, + SHKEY_Subkey_Associations = 0x3000, + SHKEY_Subkey_Volatile = 0x4000, + SHKEY_Subkey_MUICache = 0x5000, + SHKEY_Subkey_FileExts = 0x6000 +}; + +HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create); + int WINAPIV ShellMessageBoxWrapW(

1 year, 4 months

[reactos] 01/01: [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE (#5586)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7cb6f49209b95fcac7fc… commit e7cb6f49209b95fcac7fcf55918cb29289abe455 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 21 21:46:20 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 21 21:46:20 2023 +0300 [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE (#5586) * [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE On x64 the test sometimes fails to connect and then times out on the testbot, causing the system to be rebooted. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- modules/rostests/kmtests/tcpip/TcpIp_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/tcpip/TcpIp_user.c b/modules/rostests/kmtests/tcpip/TcpIp_user.c index 60286d2e48a..f28972ff21c 100644 --- a/modules/rostests/kmtests/tcpip/TcpIp_user.c +++ b/modules/rostests/kmtests/tcpip/TcpIp_user.c @@ -113,7 +113,8 @@ START_TEST(TcpIpConnect) Error = KmtSendToDriver(IOCTL_TEST_CONNECT); ok_eq_ulong(Error, ERROR_SUCCESS); - WaitForSingleObject(AcceptThread, INFINITE); + Error = WaitForSingleObject(AcceptThread, 10 * 1000); + ok(Error == WAIT_OBJECT_0, "AcceptThread timed out\n"); UnloadTcpIpTestDriver();

1 year, 4 months

[reactos] 01/01: [KERNEL32] Add CompareStringOrdinal from wine-3.21

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a0b53386c2126a44f02c… commit 3a0b53386c2126a44f02c7787381612c4b9434a1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 13 15:43:10 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 20 15:17:41 2023 +0300 [KERNEL32] Add CompareStringOrdinal from wine-3.21 --- dll/win32/kernel32/kernel32.spec | 2 +- dll/win32/kernel32/winnls/string/lang.c | 25 ++++++++++++++++++++++++- sdk/include/ndk/rtlfuncs.h | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index f1b6314052c..2853c50d579 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -87,7 +87,7 @@ @ stdcall CompareFileTime(ptr ptr) @ stdcall CompareStringA(long long str long str long) @ stdcall -version=0x600+ CompareStringEx(wstr long wstr long wstr long ptr ptr ptr) -@ stdcall -stub -version=0x600+ CompareStringOrdinal(wstr long wstr long long) +@ stdcall -version=0x600+ CompareStringOrdinal(wstr long wstr long long) @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) ;@ stdcall -arch=x86_64 ConsoleIMERoutine() diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index 51f1edf0175..1d3fdbe4a1b 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -33,7 +33,7 @@ DEBUG_CHANNEL(nls); #endif #undef WINVER -#define WINVER 0x600 +#define WINVER DLL_EXPORT_VERSION /* From winnls.h */ #define LOCALE_NAME_USER_DEFAULT NULL @@ -2765,6 +2765,29 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, return ret; } +#if (WINVER >= 0x0600) +/****************************************************************************** + * CompareStringOrdinal (KERNEL32.@) + */ +INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) +{ + int ret; + + if (!str1 || !str2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (len1 < 0) len1 = strlenW(str1); + if (len2 < 0) len2 = strlenW(str2); + + ret = RtlCompareUnicodeStrings( str1, len1, str2, len2, ignore_case ); + if (ret < 0) return CSTR_LESS_THAN; + if (ret > 0) return CSTR_GREATER_THAN; + return CSTR_EQUAL; +} +#endif + #ifdef __REACTOS__ HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) #else diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 05dc37686ba..47830b87990 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -2123,6 +2123,18 @@ RtlCompareUnicodeString( BOOLEAN CaseInsensitive ); +_Must_inspect_result_ +NTSYSAPI +LONG +NTAPI +RtlCompareUnicodeStrings( + _In_reads_(String1Length) PCWCH String1, + _In_ SIZE_T String1Length, + _In_reads_(String2Length) PCWCH String2, + _In_ SIZE_T String2Length, + _In_ BOOLEAN CaseInSensitive +); + NTSYSAPI VOID NTAPI

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs