Ros-diffs June 2022

ros-diffs@reactos.org

17 participants
236 discussions

[reactos] 01/01: [NTOS:SE] Fix MSVC build
by George Bișoc 13 Jun '22

13 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e0da736b7054b149dd4f… commit 8e0da736b7054b149dd4feef97d42661fab41a09 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Jun 13 20:12:32 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jun 13 20:12:32 2022 +0200 [NTOS:SE] Fix MSVC build --- ntoskrnl/se/tokencls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 2a6806ba3d8..24adad4f61c 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -481,7 +481,7 @@ NtQueryInformationToken( NTSTATUS Status; KPROCESSOR_MODE PreviousMode; PTOKEN Token; - ULONG RequiredLength; + ULONG RequiredLength = 0; union { PSID PSid;

1 0

[reactos] 01/01: [NTOS:SE] Remove redundant ReturnLength NULL check
by George Bișoc 13 Jun '22

13 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93381263a1f3bfffe70f7… commit 93381263a1f3bfffe70f72bd63944bdff62f93e8 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Jun 13 19:28:12 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jun 13 19:28:12 2022 +0200 [NTOS:SE] Remove redundant ReturnLength NULL check In NtQueryInformationToken function, remove the useless and redundant NULL check for two primary reasons. First, DefaultQueryInfoBufferCheck already does the necessary probing validation checks and second, ReturnLength must NEVER be NULL! If the caller does not respect the calling rules of NtQueryInformationToken, the caller is expected to be miserably punished. --- ntoskrnl/se/tokencls.c | 78 ++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 50e81a9a453..2a6806ba3d8 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -450,8 +450,11 @@ SeQueryInformationToken( * Length of the token information buffer, in bytes. * * @param[out] ReturnLength - * If specified in the call, the function returns the total length size of the token - * information buffer.. + * A pointer to a variable provided by the caller that receives the actual length + * of the buffer pointed by TokenInformation, in bytes. If TokenInformation is NULL + * and TokenInformationLength is 0, this parameter receives the required length + * needed to store the buffer information in memory. This parameter must not + * be NULL! * * @return * Returns STATUS_SUCCESS if information querying has completed successfully. @@ -459,8 +462,9 @@ SeQueryInformationToken( * the token information buffer is not greater than the required length. * STATUS_INVALID_HANDLE is returned if the token handle is not a valid one. * STATUS_INVALID_INFO_CLASS is returned if the information class is not a valid - * one (that is, the class doesn't belong to TOKEN_INFORMATION_CLASS). A failure - * NTSTATUS code is returned otherwise. + * one (that is, the class doesn't belong to TOKEN_INFORMATION_CLASS). + * STATUS_ACCESS_VIOLATION is returned if ReturnLength is NULL. A failure NTSTATUS + * code is returned otherwise. */ _Must_inspect_result_ __kernel_entry @@ -542,10 +546,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -587,10 +588,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -623,10 +621,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -660,10 +655,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -697,10 +689,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -742,10 +731,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -774,10 +760,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -806,10 +789,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -846,10 +826,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -887,10 +864,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -919,10 +893,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -969,10 +940,7 @@ NtQueryInformationToken( Status = STATUS_BUFFER_TOO_SMALL; } - if (ReturnLength != NULL) - { - *ReturnLength = RequiredLength; - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1018,11 +986,7 @@ NtQueryInformationToken( { /* Buffer size was already verified, no need to check here again */ *(PULONG)TokenInformation = SessionId; - - if (ReturnLength != NULL) - { - *ReturnLength = sizeof(ULONG); - } + *ReturnLength = RequiredLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[reactos] 02/02: [NTDLL_APITEST] NtQueryInformationToken: write tests for TokenSandBoxInert
by George Bișoc 13 Jun '22

13 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d1805504e9005b9fd8c8… commit 2d1805504e9005b9fd8c849393931bf83c2fa2c2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 12 14:31:41 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jun 13 18:17:10 2022 +0200 [NTDLL_APITEST] NtQueryInformationToken: write tests for TokenSandBoxInert --- .../apitests/ntdll/NtQueryInformationToken.c | 80 ++++++++++++++++++---- 1 file changed, 67 insertions(+), 13 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationToken.c b/modules/rostests/apitests/ntdll/NtQueryInformationToken.c index 18e8001f99b..0a017f30d1a 100644 --- a/modules/rostests/apitests/ntdll/NtQueryInformationToken.c +++ b/modules/rostests/apitests/ntdll/NtQueryInformationToken.c @@ -19,7 +19,7 @@ OpenCurrentToken(VOID) &Token); if (!Success) { - ok(0, "OpenProcessToken() has failed to get the process' token (error code: %lu)!\n", GetLastError()); + ok(FALSE, "OpenProcessToken() has failed to get the process' token (error code: %lu)!\n", GetLastError()); return NULL; } @@ -52,7 +52,7 @@ QueryTokenUserTests( UserToken = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!UserToken) { - ok(0, "Failed to allocate from heap for token user (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token user (required buffer length %lu)!\n", BufferLength); return; } @@ -98,7 +98,7 @@ QueryTokenGroupsTests( Groups = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!Groups) { - ok(0, "Failed to allocate from heap for token groups (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token groups (required buffer length %lu)!\n", BufferLength); return; } @@ -142,7 +142,7 @@ QueryTokenPrivilegesTests( Privileges = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!Privileges) { - ok(0, "Failed to allocate from heap for token privileges (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token privileges (required buffer length %lu)!\n", BufferLength); return; } @@ -187,7 +187,7 @@ QueryTokenOwnerTests( Owner = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!Owner) { - ok(0, "Failed to allocate from heap for token owner (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token owner (required buffer length %lu)!\n", BufferLength); return; } @@ -235,7 +235,7 @@ QueryTokenPrimaryGroupTests( PrimaryGroup = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!PrimaryGroup) { - ok(0, "Failed to allocate from heap for token primary group (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token primary group (required buffer length %lu)!\n", BufferLength); return; } @@ -281,7 +281,7 @@ QueryTokenDefaultDaclTests( Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!Dacl) { - ok(0, "Failed to allocate from heap for token default DACL (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token default DACL (required buffer length %lu)!\n", BufferLength); return; } @@ -327,7 +327,7 @@ QueryTokenSourceTests( Source = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!Source) { - ok(0, "Failed to allocate from heap for token source (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for token source (required buffer length %lu)!\n", BufferLength); return; } @@ -423,7 +423,7 @@ QueryTokenImpersonationTests( &DupToken); if (!NT_SUCCESS(Status)) { - ok(0, "Failed to duplicate token (Status code %lx)!\n", Status); + ok(FALSE, "Failed to duplicate token (Status code %lx)!\n", Status); return; } @@ -515,7 +515,7 @@ QueryTokenRestrictedSidsTest( RestrictedGroups = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!RestrictedGroups) { - ok(0, "Failed to allocate from heap for restricted SIDs (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for restricted SIDs (required buffer length %lu)!\n", BufferLength); return; } @@ -541,7 +541,7 @@ QueryTokenRestrictedSidsTest( &WorldSid); if (!NT_SUCCESS(Status)) { - ok(0, "Failed to allocate World SID (Status code %lx)!\n", Status); + ok(FALSE, "Failed to allocate World SID (Status code %lx)!\n", Status); return; } @@ -557,7 +557,7 @@ QueryTokenRestrictedSidsTest( &FilteredToken); if (!NT_SUCCESS(Status)) { - ok(0, "Failed to filter the current token (Status code %lx)!\n", Status); + ok(FALSE, "Failed to filter the current token (Status code %lx)!\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, WorldSid); return; } @@ -572,7 +572,7 @@ QueryTokenRestrictedSidsTest( RestrictedGroups = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); if (!RestrictedGroups) { - ok(0, "Failed to allocate from heap for restricted SIDs (required buffer length %lu)!\n", BufferLength); + ok(FALSE, "Failed to allocate from heap for restricted SIDs (required buffer length %lu)!\n", BufferLength); RtlFreeHeap(RtlGetProcessHeap(), 0, WorldSid); return; } @@ -617,6 +617,59 @@ QueryTokenSessionIdTests( ok(SessionId == 0, "The session ID of current token must be 0 (current session %lu)!\n", SessionId); } +static +VOID +QueryTokenIsSandboxInert( + _In_ HANDLE Token) +{ + NTSTATUS Status; + ULONG IsTokenInert; + ULONG BufferLength; + HANDLE FilteredToken; + + /* + * Query the sandbox inert token information, + * it must not be inert. + */ + Status = NtQueryInformationToken(Token, + TokenSandBoxInert, + &IsTokenInert, + sizeof(ULONG), + &BufferLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok(IsTokenInert == FALSE, "The token must not be a sandbox inert one!\n"); + + /* + * Try to turn the token into an inert + * one by filtering it. + */ + Status = NtFilterToken(Token, + SANDBOX_INERT, + NULL, + NULL, + NULL, + &FilteredToken); + if (!NT_SUCCESS(Status)) + { + ok(FALSE, "Failed to filter the current token (Status code %lx)!\n", Status); + return; + } + + /* + * Now do a query again, this time + * the token should be inert. + */ + Status = NtQueryInformationToken(FilteredToken, + TokenSandBoxInert, + &IsTokenInert, + sizeof(ULONG), + &BufferLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok(IsTokenInert == TRUE, "The token must be a sandbox inert one after filtering!\n"); + + CloseHandle(FilteredToken); +} + static VOID QueryTokenOriginTests( @@ -693,6 +746,7 @@ START_TEST(NtQueryInformationToken) QueryTokenStatisticsTests(Token); QueryTokenRestrictedSidsTest(Token); QueryTokenSessionIdTests(Token); + QueryTokenIsSandboxInert(Token); QueryTokenOriginTests(Token); CloseHandle(Token);

1 0

[reactos] 01/02: [NTOS:SE] NtQueryInformationToken: implement token sandbox inert querying
by George Bișoc 13 Jun '22

13 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e1f292062732a0e35abe… commit 5e1f292062732a0e35abe385f2954aec8d2af5bd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 12 14:30:44 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jun 13 18:17:10 2022 +0200 [NTOS:SE] NtQueryInformationToken: implement token sandbox inert querying --- ntoskrnl/include/internal/se.h | 5 +++++ ntoskrnl/se/token.c | 21 +++++++++++++++++++++ ntoskrnl/se/tokencls.c | 21 +++++++++++++++++++-- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index db2dd0b58a3..de65310b331 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -443,6 +443,11 @@ SeCopyClientToken( _In_ KPROCESSOR_MODE PreviousMode, _Out_ PACCESS_TOKEN* NewToken); +BOOLEAN +NTAPI +SeTokenIsInert( + _In_ PTOKEN Token); + ULONG RtlLengthSidAndAttributes( _In_ ULONG Count, diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 83b962f1ba9..ad2dd8e806f 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1180,6 +1180,27 @@ SeCopyClientToken( return Status; } +/** + * @brief + * Determines if a token is a sandbox inert token or not, + * based upon the token flags. + * + * @param[in] Token + * A valid access token to determine if such token is inert. + * + * @return + * Returns TRUE if the token is inert, FALSE otherwise. + */ +BOOLEAN +NTAPI +SeTokenIsInert( + _In_ PTOKEN Token) +{ + PAGED_CODE(); + + return (((PTOKEN)Token)->TokenFlags & TOKEN_SANDBOX_INERT) != 0; +} + /** * @brief * Internal function that deals with access token object destruction and deletion. diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index b9d1615d23e..50e81a9a453 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -984,9 +984,26 @@ NtQueryInformationToken( } case TokenSandBoxInert: - DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + { + ULONG IsTokenSandBoxInert; + + DPRINT("NtQueryInformationToken(TokenSandBoxInert)\n"); + + IsTokenSandBoxInert = SeTokenIsInert(Token); + _SEH2_TRY + { + /* Buffer size was already verified, no need to check here again */ + *(PULONG)TokenInformation = IsTokenSandBoxInert; + *ReturnLength = sizeof(ULONG); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; + } case TokenSessionId: {

1 0

[reactos] 01/01: [DISKPART] Add help text for the LIST PARTITION command
by Eric Kohl 12 Jun '22

12 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=124fe7504e98e5c285b0a… commit 124fe7504e98e5c285b0a1d4412ca91260bc3d18 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 12 23:26:53 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 12 23:26:53 2022 +0200 [DISKPART] Add help text for the LIST PARTITION command --- base/system/diskpart/diskpart_msg.mc | 142 ++++++++++++++++++++++++++++++++--- 1 file changed, 132 insertions(+), 10 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 2daa41eaab4..99942f66998 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -2472,34 +2472,156 @@ SymbolicName=MSG_COMMAND_LIST_PARTITION Severity=Informational Facility=System Language=English -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=German -<Add LIST PARTITION command help text here> + Zeigt eine Liste der Partitionen in der Partitionstabelle für den + ausgewählten Datenträger an. + +Syntax: LIST PARTITION + + Auf dynamischen Datenträgern entsprechen die Partitionen nicht unbedingt + den dynamischen Volumes auf dem Datenträger. Partitionen werden auf + dynamischen Datenträgern möglicherweise nicht erstellt oder gelöscht. + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss ein + Datenträger ausgewählt werden. + +Beispiel: + + LIST PARTITION . Language=Polish -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Portugese -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Romanian -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Russian -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Albanian -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Turkish -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Chinese -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION . Language=Taiwanese -<Add LIST PARTITION command help text here> + Displays a list of partitions in the partition table for the selected disk. + +Syntax: LIST PARTITION + + On dynamic disks, the partitions do not neccessarily correspond to the + dynamic volumes on the disk. Partitions may not be created or deleted + on dynamic disks. + + A disk must be selected for this operation to succeed. + +Example: + + LIST PARTITION .

1 0

[reactos] 01/01: [DISKPART] Add help text for the LIST DISK command
by Eric Kohl 12 Jun '22

12 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c90ea83eff1bb65f50d3… commit 7c90ea83eff1bb65f50d36b74c54c38dd4e2da41 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 12 16:15:18 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 12 16:15:18 2022 +0200 [DISKPART] Add help text for the LIST DISK command --- base/system/diskpart/diskpart_msg.mc | 243 +++++++++++++++++++++++++++++++++-- 1 file changed, 233 insertions(+), 10 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index df8fdc0d525..2daa41eaab4 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -2214,34 +2214,257 @@ SymbolicName=MSG_COMMAND_LIST_DISK Severity=Informational Facility=System Language=English -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=German -<Add LIST DISK command help text here> + Zeigt eine Liste der Datenträger an. + +Syntax: LIST DISK + + Zeigt eine Liste mit Datenträgern und entsprechenden Informa- + tionen an - beispielsweise Größe, verfügbarer Speicherplatz sowie + Angaben dazu, ob es sich bei dem Datenträger um einen + Basisdatenträger oder um einen dynamischer Datenträger handelt + und ob der MBR- oder der GUID-Partitionsstil (Master Boot Record + oder GUID-Partitionstabelle) verwendet wird. + Den Fokus besitzt der mit einem Sternchen (*) markierte Datenträger. + + In der Spalte "FREE" wird nicht der gesamte freie Speicherplatz + auf dem Datenträger, sondern der verbleibende, verwendbare freie + Speicherplatz angezeigt. Bei einem Datenträger mit 10 GB mit + 4 primären Partitionen zu 5 GB verbleibt beispielsweise kein freier + verwendbarer Speicherplatz (es können keine weiteren Partitionen + erstellt werden). Ein weiteres Beispiel ist ein 10 GB Datenträger mit + 3 primären Partitionen und einer erweiterten Partition mit 8 GB. Die + erweiterte Partition besitzt eine Größe von 3 GB mit einem logischen + Laufwerk (2 GB). Für den Datenträger wird nur 1 GB als frei + angezeigt - 1 GB freier Speicherplatz in der erweiterten Partition. + +Beispiel: + + LIST DISK . Language=Polish -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Portugese -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Romanian -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Russian -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Albanian -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Turkish -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Chinese -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . Language=Taiwanese -<Add LIST DISK command help text here> + Displays a list of disks. + +Syntax: LIST DISK + + Displays a list of disks and information about them, such as their + size, amount of available free space, whether the disk is a basic + or dynamic disk, and whether the disk uses the master boot record + (MBR) or GUID partition table (GPT) partition style. The disk marked + with an asterisk (*) has focus. + + Note that the FREE column does not display the total amount of free + space on the disk, but rather the amount of usable free space left + on the disk. For example, if you have a 10GB disk with 4 primary + partitions covering 5GB, there is no usable free space left (no + more partitions may be created). Another example would be you have + a 10GB disk with 3 primary partitions and an extended partition + covering 8GB. The exended partition is of size 3GB with one logical + drive of size 2GB. The disk will show only 1GB as free - the + 1GB of free space in the extended partition. + +Example: + + LIST DISK . MessageId=10033

1 0

[reactos] 01/01: [NTOSKRNL] Force a probe against ReturnLength on query & Misc ICIF stuff
by George Bișoc 12 Jun '22

12 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0d86ab5885af2cc9fa40… commit d0d86ab5885af2cc9fa40104f47040c63db407be Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Jun 11 13:19:51 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 12 11:05:05 2022 +0200 [NTOSKRNL] Force a probe against ReturnLength on query & Misc ICIF stuff NtQueryInformationToken is by far the only system call in NT where ReturnLength simply cannot be optional. On Windows this parameter is always probed and an argument to NULL directly leads to an access violation exception. This is due to the fact of how tokens work, as its information contents (token user, owner, primary group, et al) are dynamic and can vary throughout over time in memory. What happens on current ReactOS master however is that ReturnLength is only probed if the parameter is not NULL. On a NULL case scenario the probing checks succeed and NtQueryInformationToken fails later. For this, just get rid of CompleteProbing parameter and opt in for a bit mask flag based approach, with ICIF_FORCE_RETURN_LENGTH_PROBE being set on DefaultQueryInfoBufferCheck which NtQueryInformationToken calls it to do sanity checks. In addition to that... - Document the ICIF probe helpers - Annotate the ICIF prope helpers with SAL - With the riddance of CompleteProbing and adoption of flags based approach, add ICIF_PROBE_READ_WRITE and ICIF_PROBE_READ flags alongside with ICIF_FORCE_RETURN_LENGTH_PROBE --- ntoskrnl/ex/event.c | 4 +- ntoskrnl/ex/mutant.c | 4 +- ntoskrnl/ex/sem.c | 4 +- ntoskrnl/ex/timer.c | 4 +- ntoskrnl/include/internal/icif.h | 7 +- ntoskrnl/include/internal/probe.h | 196 ++++++++++++++++++++++++++++++++++---- ntoskrnl/io/iomgr/iocomp.c | 4 +- ntoskrnl/ps/query.c | 8 +- ntoskrnl/se/tokencls.c | 4 +- 9 files changed, 200 insertions(+), 35 deletions(-) diff --git a/ntoskrnl/ex/event.c b/ntoskrnl/ex/event.c index e30420f65bb..27222cb3c4a 100644 --- a/ntoskrnl/ex/event.c +++ b/ntoskrnl/ex/event.c @@ -329,12 +329,12 @@ NtQueryEvent(IN HANDLE EventHandle, ExEventInfoClass, sizeof(ExEventInfoClass) / sizeof(ExEventInfoClass[0]), + ICIF_PROBE_READ_WRITE, EventInformation, EventInformationLength, ReturnLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if(!NT_SUCCESS(Status)) { /* Invalid buffers */ diff --git a/ntoskrnl/ex/mutant.c b/ntoskrnl/ex/mutant.c index bab471c6173..c5b0204c3c1 100644 --- a/ntoskrnl/ex/mutant.c +++ b/ntoskrnl/ex/mutant.c @@ -239,12 +239,12 @@ NtQueryMutant(IN HANDLE MutantHandle, ExMutantInfoClass, sizeof(ExMutantInfoClass) / sizeof(ExMutantInfoClass[0]), + ICIF_PROBE_READ_WRITE, MutantInformation, MutantInformationLength, ResultLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT("NtQueryMutant() failed, Status: 0x%x\n", Status); diff --git a/ntoskrnl/ex/sem.c b/ntoskrnl/ex/sem.c index 29c622814ff..29b8b75bf5a 100644 --- a/ntoskrnl/ex/sem.c +++ b/ntoskrnl/ex/sem.c @@ -235,12 +235,12 @@ NtQuerySemaphore(IN HANDLE SemaphoreHandle, ExSemaphoreInfoClass, sizeof(ExSemaphoreInfoClass) / sizeof(ExSemaphoreInfoClass[0]), + ICIF_PROBE_READ_WRITE, SemaphoreInformation, SemaphoreInformationLength, ReturnLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if (!NT_SUCCESS(Status)) { /* Invalid buffers */ diff --git a/ntoskrnl/ex/timer.c b/ntoskrnl/ex/timer.c index 0c33675333c..6566648c5d6 100644 --- a/ntoskrnl/ex/timer.c +++ b/ntoskrnl/ex/timer.c @@ -532,12 +532,12 @@ NtQueryTimer(IN HANDLE TimerHandle, ExTimerInfoClass, sizeof(ExTimerInfoClass) / sizeof(ExTimerInfoClass[0]), + ICIF_PROBE_READ_WRITE, TimerInformation, TimerInformationLength, ReturnLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if (!NT_SUCCESS(Status)) return Status; /* Get the Timer Object */ diff --git a/ntoskrnl/include/internal/icif.h b/ntoskrnl/include/internal/icif.h index e73ad9e1b2c..39066d935e9 100644 --- a/ntoskrnl/include/internal/icif.h +++ b/ntoskrnl/include/internal/icif.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Internal header for information classes info interface - * COPYRIGHT: Copyright ??? - * Copyright 2020-2021 George Bișoc <george.bisoc(a)reactos.org> + * COPYRIGHT: Copyright 2020-2022 George Bișoc <george.bisoc(a)reactos.org> */ #pragma once @@ -22,6 +21,10 @@ #define ICIF_SET_SIZE_VARIABLE 0x8 #define ICIF_SIZE_VARIABLE (ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE) +#define ICIF_PROBE_READ_WRITE 0x0 +#define ICIF_PROBE_READ 0x1 +#define ICIF_FORCE_RETURN_LENGTH_PROBE 0x2 + typedef struct _INFORMATION_CLASS_INFO { USHORT RequiredSizeQUERY; diff --git a/ntoskrnl/include/internal/probe.h b/ntoskrnl/include/internal/probe.h index b819718f5ae..ff1d3c5275b 100644 --- a/ntoskrnl/include/internal/probe.h +++ b/ntoskrnl/include/internal/probe.h @@ -1,16 +1,79 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Internal header containing information class probing helpers + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + #pragma once #include <reactos/probe.h> +/** + * @brief + * Probe helper that validates the provided parameters whenever + * a NtSet*** system call is invoked from user or kernel mode. + * + * @param[in] Class + * The specific class information that the caller explicitly + * requested information to be set into an object. + * + * @param[in] ClassList + * An internal INFORMATION_CLASS_INFO consisting of a list array + * of information classes checked against the requested information + * classes given in Class parameter. + * + * @param[in] ClassListEntries + * Specifies the number of class entries in an array, provided by + * the ClassList parameter. + * + * @param[in] Buffer + * A pointer to an arbitrary data content in memory to be validated. + * Such pointer points to the actual arbitrary information class buffer + * to be set into the object. This buffer is validated only if the + * calling processor mode is UM (aka user mode). + * + * @param[in] BufferLength + * The length of the buffer pointed by the Buffer parameter, whose size + * is in bytes. + * + * @param[in] PreviousMode + * The processor calling level mode. This level mode determines the procedure + * of probing validation in action. If the level calling mode is KM (aka kernel mode) + * this function will only validate the properties of the information class itself + * such as the required information length size. If the calling mode is UM, the + * pointer buffer provided by Buffer parameter is also validated. + * + * @return + * The outcome of the probe validation is based upon the returned NTSTATUS code. + * STATUS_SUCCESS is returned if the validation succeeded. Otherwise, one of the + * following failure status codes is returned: + * + * STATUS_INVALID_INFO_CLASS -- Indicates the given information class is not a valid + * valid SET class (ICIF_SET flag is not set to the corresponding information class) + * or the actual class is not present in the class list array. + * + * STATUS_INFO_LENGTH_MISMATCH -- Indicates the information length doesn't match with + * the one that the information class itself expects. This is the case with classes + * ICIF_SET_SIZE_VARIABLE is not set, which means that the class requires a fixed + * length size. + * + * STATUS_ACCESS_VIOLATION -- Indicates the buffer is not within the user mode probe + * address range. The function will raise an exception. + * + * STATUS_DATATYPE_MISALIGNMENT -- Indicates the address of the buffer in memory is + * not aligned to the required alignment set. + */ static __inline NTSTATUS -DefaultSetInfoBufferCheck(ULONG Class, - const INFORMATION_CLASS_INFO *ClassList, - ULONG ClassListEntries, - PVOID Buffer, - ULONG BufferLength, - KPROCESSOR_MODE PreviousMode) +DefaultSetInfoBufferCheck( + _In_ ULONG Class, + _In_ const INFORMATION_CLASS_INFO *ClassList, + _In_ ULONG ClassListEntries, + _In_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; @@ -53,18 +116,116 @@ DefaultSetInfoBufferCheck(ULONG Class, return Status; } +/** + * @brief + * Probe helper that validates the provided parameters whenever + * a NtQuery*** system call is invoked from user or kernel mode. + * + * @param[in] Class + * The specific class information that the caller explicitly + * requested information to be queried from an object. + * + * @param[in] ClassList + * An internal INFORMATION_CLASS_INFO consisting of a list array + * of information classes checked against the requested information + * classes given in Class parameter. + * + * @param[in] ClassListEntries + * Specifies the number of class entries in an array, provided by + * the ClassList parameter. + * + * @param[in] Flags + * Specifies a bit mask flag that influences how the query probe + * validation must be performed against Buffer and ReturnLength + * parameters. For further information in regard of this parameter, + * see remarks. + * + * @param[in] Buffer + * A pointer to an arbitrary data content in memory to be validated. + * Such parameter must be an initialized variable where the queried + * information is going to be received into this pointer. If the calling + * processor mode is UM (aka user mode) this parameter is validated. + * This parameter can be NULL (see remarks for more details). + * + * @param[in] BufferLength + * The length of the buffer pointed by the Buffer parameter, whose size + * is in bytes. If the Buffer parameter is NULL, this parameter can be 0. + * + * @param[in] ReturnLength + * The returned length of the buffer whose size is in bytes. If Buffer is + * NULL as well as BufferLength is 0, this parameter receives the actual + * return length needed to store the buffer in memory space. If the + * processor level calling mode is UM, this parameter is validated. + * If ICIF_FORCE_RETURN_LENGTH_PROBE is specified in Flags parameter, + * ReturnLength mustn't be NULL (see remarks). Otherwise it can be NULL. + * + * @param[in] ReturnLengthPtr + * This parameter is of the same nature as the ReturnLength one, with the + * difference being that the type parameter can be a ULONG on x86 systems + * or a ULONGLONG on AMD64 systems. If the processor level calling mode is + * UM, this parameter is validated. This parameter is currently unused. + * + * @param[in] PreviousMode + * The processor calling level mode. This level mode determines the procedure + * of probing validation in action. If the level calling mode is KM (aka kernel mode) + * this function will only validate the properties of the information class itself + * such as the required information length size. If the calling mode is UM, the + * pointer buffer provided by Buffer parameter is also validated as well as + * the return length parameter. + * + * @return + * The outcome of the probe validation is based upon the returned NTSTATUS code. + * STATUS_SUCCESS is returned if the validation succeeded. Otherwise, one of the + * following failure status codes is returned: + * + * STATUS_INVALID_INFO_CLASS -- Indicates the given information class is not a valid + * QUERY class (ICIF_QUERY flag is not set to the corresponding information class) + * or the actual class is not present in the class list array. + * + * STATUS_INFO_LENGTH_MISMATCH -- Indicates the information length doesn't match with the + * one that the information class itself expects. This is the case with classes where + * ICIF_QUERY_SIZE_VARIABLE is not set, which means that the class requires a fixed length size. + * + * STATUS_ACCESS_VIOLATION -- Indicates the buffer is not within the user mode probe address range + * or the buffer variable is not writable (see remarks). The function will raise an exception. + * + * STATUS_DATATYPE_MISALIGNMENT -- Indicates the address of the buffer in memory is not + * aligned to the required alignment set. + * + * @remarks + * The probing of Buffer and ReturnLength are influenced based on the probe flags + * pointed by Flags parameter. The following flags are: + * + * ICIF_PROBE_READ_WRITE -- This flag explicitly tells the function to do a read and + * write probe against Buffer parameter. ProbeForWrite is invoked in this case. + * This is the default mechanism. + * + * ICIF_PROBE_READ -- This flag explicitly tells the function to do a read probe against + * Buffer parameter only, that is, the function does not probe if the parameter is actually + * writable. ProbeForRead is invoked in this case. + * + * ICIF_FORCE_RETURN_LENGTH_PROBE -- If this flag is set, the function will force probe + * the ReturnLength parameter. In this scenario if ReturnLength is NULL a STATUS_ACCESS_VIOLATION + * exception is raised. NtQueryInformationToken is the only NT system call where ReturnLength + * has to be properly initialized and not NULL. + * + * Buffer parameter can be NULL if the caller does not want to actually query a certain information + * from an object. This is typically with query NT syscalls where a caller has to query the actual + * buffer length needed to store the queried information before doing a "real" query in the first place. + */ static __inline NTSTATUS -DefaultQueryInfoBufferCheck(ULONG Class, - const INFORMATION_CLASS_INFO *ClassList, - ULONG ClassListEntries, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength, - PULONG_PTR ReturnLengthPtr, - KPROCESSOR_MODE PreviousMode, - BOOLEAN CompleteProbing) +DefaultQueryInfoBufferCheck( + _In_ ULONG Class, + _In_ const INFORMATION_CLASS_INFO *ClassList, + _In_ ULONG ClassListEntries, + _In_ ULONG Flags, + _In_opt_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_opt_ PULONG ReturnLength, + _In_opt_ PULONG_PTR ReturnLengthPtr, + _In_ KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; @@ -91,7 +252,7 @@ DefaultQueryInfoBufferCheck(ULONG Class, { if (Buffer != NULL) { - if (!CompleteProbing) + if (Flags & ICIF_PROBE_READ) { ProbeForRead(Buffer, BufferLength, @@ -105,10 +266,11 @@ DefaultQueryInfoBufferCheck(ULONG Class, } } - if (ReturnLength != NULL) + if ((Flags & ICIF_FORCE_RETURN_LENGTH_PROBE) || (ReturnLength != NULL)) { ProbeForWriteUlong(ReturnLength); } + if (ReturnLengthPtr != NULL) { ProbeForWrite(ReturnLengthPtr, sizeof(ULONG_PTR), sizeof(ULONG_PTR)); diff --git a/ntoskrnl/io/iomgr/iocomp.c b/ntoskrnl/io/iomgr/iocomp.c index 41457a66574..fbc655aedfc 100644 --- a/ntoskrnl/io/iomgr/iocomp.c +++ b/ntoskrnl/io/iomgr/iocomp.c @@ -395,12 +395,12 @@ NtQueryIoCompletion(IN HANDLE IoCompletionHandle, IoCompletionInfoClass, sizeof(IoCompletionInfoClass) / sizeof(IoCompletionInfoClass[0]), + ICIF_PROBE_READ_WRITE, IoCompletionInformation, IoCompletionInformationLength, ResultLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if (!NT_SUCCESS(Status)) return Status; /* Get the Object */ diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 7b6f8aecf0e..cc7bae50ba4 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -90,12 +90,12 @@ NtQueryInformationProcess( Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, PsProcessInfoClass, RTL_NUMBER_OF(PsProcessInfoClass), + ICIF_PROBE_READ, ProcessInformation, ProcessInformationLength, ReturnLength, NULL, - PreviousMode, - FALSE); + PreviousMode); if (!NT_SUCCESS(Status)) { DPRINT1("NtQueryInformationProcess(): Information verification class failed! (Status -> 0x%lx, ProcessInformationClass -> %lx)\n", Status, ProcessInformationClass); @@ -2643,12 +2643,12 @@ NtQueryInformationThread(IN HANDLE ThreadHandle, Status = DefaultQueryInfoBufferCheck(ThreadInformationClass, PsThreadInfoClass, RTL_NUMBER_OF(PsThreadInfoClass), + ICIF_PROBE_READ, ThreadInformation, ThreadInformationLength, ReturnLength, NULL, - PreviousMode, - FALSE); + PreviousMode); if (!NT_SUCCESS(Status)) { DPRINT1("NtQueryInformationThread(): Information verification class failed! (Status -> 0x%lx , ThreadInformationClass -> %lx)\n", Status, ThreadInformationClass); diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 70b1ecafa79..b9d1615d23e 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -492,12 +492,12 @@ NtQueryInformationToken( Status = DefaultQueryInfoBufferCheck(TokenInformationClass, SeTokenInformationClass, RTL_NUMBER_OF(SeTokenInformationClass), + ICIF_PROBE_READ_WRITE | ICIF_FORCE_RETURN_LENGTH_PROBE, TokenInformation, TokenInformationLength, ReturnLength, NULL, - PreviousMode, - TRUE); + PreviousMode); if (!NT_SUCCESS(Status)) { DPRINT("NtQueryInformationToken() failed, Status: 0x%x\n", Status);

1 0

[reactos] 01/01: [DISKPART] Add help text for the SELECT VOLUME command
by Eric Kohl 12 Jun '22

12 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad9b9303545aec4a9edac… commit ad9b9303545aec4a9edac1a26290d7e1f2fac31b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 12 09:32:40 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 12 09:32:40 2022 +0200 [DISKPART] Add help text for the SELECT VOLUME command --- base/system/diskpart/diskpart_msg.mc | 212 +++++++++++++++++++++++++++++++++-- 1 file changed, 202 insertions(+), 10 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 472ff199dcd..df8fdc0d525 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -3417,34 +3417,226 @@ SymbolicName=MSG_COMMAND_SELECT_VOLUME Severity=Informational Facility=System Language=English -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=German -<Add SELECT VOLUME command help text here> + Wählt das angegebene Volume aus und setzt den Fokus auf dieses Volume. + +Syntax: SELECT VOLUME={<N> | <L>} + + VOLUME=<N> Die Nummer des Volumes, das den Fokus erhalten soll. + + VOLUME=<L> Der Laufwerkbuchstabe oder Pfad des eingebundenen Ordners des + Volumes, das den Fokus erhalten soll. + + Wenn kein Volume angegeben ist, listet der Befehl SELECT das aktuelle + Volume auf, das den Fokus besitzt. Sie können das Volume mit einer Nummer, + einem Laufwerkbuchstaben oder dem Pfad des eingebundenen + Ordners angeben. + Auf einem Basisdatenträger erhält bei Auswahl eines Volumes auch die + entsprechende Partition den Fokus. Mit dem Befehl LIST VOLUME können Sie + die Nummern aller auf dem Computer vorhandenen Volumes anzeigen. + +Beispiel: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Polish -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Portugese -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Romanian -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Russian -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Albanian -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Turkish -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Chinese -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH . Language=Taiwanese -<Add SELECT VOLUME command help text here> + Selects the specified volume and shifts the focus to it. + +Syntax: SELECT VOLUME={<N> | <D>} + + VOLUME=<N> The number of the volume to receive the focus. + + VOLUME=<D> The drive letter or mounted folder path of the volume + to receive the focus. + + If no volume is specified, the select command lists the current volume with + focus. You can specify the volume by number, drive letter, or mounted folder + path. On a basic disk, selecting a volume also gives the corresponding + partition focus. You can view the numbers of all volumes on the computer by + using the list volume command. + +Example: + + SELECT VOLUME=1 + SELECT VOLUME=C + SELECT VOLUME=C:\\MountH .

1 0

[reactos] 01/01: [DISKPART] Add help text for the SELECT PARTITION command
by Eric Kohl 11 Jun '22

11 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bea98592fd64a8c98d5a… commit 7bea98592fd64a8c98d5a1cbd314ef5cc9f2faa4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 11 22:34:07 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 11 22:34:07 2022 +0200 [DISKPART] Add help text for the SELECT PARTITION command --- base/system/diskpart/diskpart_msg.mc | 202 +++++++++++++++++++++++++++++++++-- 1 file changed, 192 insertions(+), 10 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index ed0cebc248e..472ff199dcd 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -3199,34 +3199,216 @@ SymbolicName=MSG_COMMAND_SELECT_PARTITION Severity=Informational Facility=System Language=English -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=German -<Add SELECT PARTITION command help text here> + Wählt die angegebene Partition aus und setzt den Fokus auf diese + Partition. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + Die Nummer der Partition, die den Fokus erhalten soll. + + Wenn keine Partition angegeben ist, listet der Befehl SELECT die + aktuelle Partition auf, die den Fokus hat. Sie können die Partition + mit ihrer Nummer angeben. Mit dem Befehl LIST PARTITION können die + Nummern aller auf dem aktuellen Datenträger enthaltenen Partitionen + angezeigt werden. + + Bevor Sie eine Partition auswählen können, müssen Sie zunächst mit dem + DiskPart-Befehl SELECT DISK einen Datenträger auswählen. + +Beispiel: + + SELECT PARTITION=1 . Language=Polish -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Portugese -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Romanian -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Russian -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Albanian -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Turkish -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Chinese -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 . Language=Taiwanese -<Add SELECT PARTITION command help text here> + Selects the specified partition and shifts the focus to it. + +Syntax: SELECT PARTITION=<N> + + PARTITION=<N> + + The number of the partition to receive the focus. + + If no partition is specified, the select command lists the current + partition with focus. You can specify the partition by its number. You can + view the numbers of all partitions on the current disk by using the list + partition command. + + You must first select a disk using the DiskPart select disk command before + you can select a partition. + +Example: + + SELECT PARTITION=1 .

1 0

[reactos] 01/01: [DISKPART] Implement the SETID command
by Eric Kohl 11 Jun '22

11 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dec75ff670286f47d824… commit 7dec75ff670286f47d82431838330b1ee20a0f66 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 11 14:31:55 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 11 14:31:55 2022 +0200 [DISKPART] Implement the SETID command --- base/system/diskpart/lang/de-DE.rc | 8 ++++ base/system/diskpart/lang/en-US.rc | 8 ++++ base/system/diskpart/lang/pl-PL.rc | 8 ++++ base/system/diskpart/lang/pt-PT.rc | 8 ++++ base/system/diskpart/lang/ro-RO.rc | 8 ++++ base/system/diskpart/lang/ru-RU.rc | 8 ++++ base/system/diskpart/lang/sq-AL.rc | 8 ++++ base/system/diskpart/lang/tr-TR.rc | 8 ++++ base/system/diskpart/lang/zh-CN.rc | 8 ++++ base/system/diskpart/lang/zh-TW.rc | 8 ++++ base/system/diskpart/resource.h | 6 +++ base/system/diskpart/setid.c | 76 +++++++++++++++++++++++++++++++++++++- 12 files changed, 161 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 97378fd99fe..6de5a7687ba 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -117,6 +117,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart konnte den Partitionstyp nicht ändern.\n" + IDS_SETID_SUCCESS "\nDer Partitionstyp wurde erfolgreich geändert.\n" + IDS_SETID_INVALID_FORMAT "\nDas Format des Partitionstyps ist ungültig.\n" + IDS_SETID_INVALID_TYPE "\nDer Partitionstyp ist ungültig.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 8b3222d2de7..e0e23003df4 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -117,6 +117,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 10c96c15d8e..d15721a8809 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -117,6 +117,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nNieprawidłowy wolumin.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index b3ea79004d2..1187c52bad2 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -119,6 +119,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index de6dcf2e770..8ff6e4805f0 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -119,6 +119,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index acc78d19517..52a5058d27b 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -119,6 +119,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 495b4b13913..04943b671bf 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -121,6 +121,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 94579802b28..683a4bd5617 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -119,6 +119,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index e35519e0d37..ec002a4ac88 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -126,6 +126,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 9ff8b00064c..cb5751ed667 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -120,6 +120,14 @@ BEGIN IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END +STRINGTABLE +BEGIN + IDS_SETID_FAIL "\nDiskPart was unable to change the partition type.\n" + IDS_SETID_SUCCESS "\nThe partition type was changed successfully.\n" + IDS_SETID_INVALID_FORMAT "\nThe format of the partition type is invalid.\n" + IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n" +END + /* Disk Status */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index fd5899887c8..5afab820c6f 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -89,6 +89,12 @@ #define IDS_SELECT_VOLUME 4408 #define IDS_SELECT_VOLUME_INVALID 4409 +#define IDS_SETID_FAIL 4450 +#define IDS_SETID_SUCCESS 4451 +#define IDS_SETID_INVALID_FORMAT 4452 +#define IDS_SETID_INVALID_TYPE 4453 + + #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 #define IDS_STATUS_DISK_HEALTHY 33 diff --git a/base/system/diskpart/setid.c b/base/system/diskpart/setid.c index 6cec3925fc3..7ab488de374 100644 --- a/base/system/diskpart/setid.c +++ b/base/system/diskpart/setid.c @@ -8,7 +8,81 @@ #include "diskpart.h" -BOOL setid_main(INT argc, LPWSTR *argv) +#define NDEBUG +#include <debug.h> + + +BOOL +setid_main( + _In_ INT argc, + _In_ PWSTR *argv) { + UCHAR PartitionType = 0; + INT i, length; + PWSTR pszSuffix = NULL; + NTSTATUS Status; + + DPRINT("SetId()\n"); + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return TRUE; + } + + for (i = 1; i < argc; i++) + { + if (HasPrefix(argv[i], L"id=", &pszSuffix)) + { + /* id=<Byte>|<GUID> */ + DPRINT("Id : %s\n", pszSuffix); + + length = wcslen(pszSuffix); + if (length == 0) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + + if (length > 2) + { + ConResPuts(StdErr, IDS_SETID_INVALID_FORMAT); + return TRUE; + } + + /* Byte */ + PartitionType = (UCHAR)wcstoul(pszSuffix, NULL, 16); + if (PartitionType == 0) + { + ConResPuts(StdErr, IDS_SETID_INVALID_FORMAT); + return TRUE; + } + } + } + + if (PartitionType == 0x42) + { + ConResPuts(StdErr, IDS_SETID_INVALID_TYPE); + return TRUE; + } + + CurrentPartition->PartitionType = PartitionType; + CurrentDisk->Dirty = TRUE; + UpdateDiskLayout(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (!NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_SETID_FAIL); + return TRUE; + } + + ConResPuts(StdOut, IDS_SETID_SUCCESS); + return TRUE; }

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 June 2022