Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [DISKPART] Improve the conversion of numeric command parameters
by Eric Kohl 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8476ae6ed511b694ca85b… commit 8476ae6ed511b694ca85bcebdc70fff007cc1911 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 28 00:04:24 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 28 00:04:24 2022 +0200 [DISKPART] Improve the conversion of numeric command parameters --- base/system/diskpart/diskpart.h | 4 ++++ base/system/diskpart/misc.c | 22 ++++++++++++++++++ base/system/diskpart/select.c | 50 +++++++++++++++++++++++++---------------- base/system/diskpart/uniqueid.c | 17 ++++++-------- 4 files changed, 64 insertions(+), 29 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 39aae2f8a94..877f0063351 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -286,6 +286,10 @@ BOOL list_main(INT argc, LPWSTR *argv); BOOL merge_main(INT argc, LPWSTR *argv); /* misc.c */ +BOOL +IsDecString( + _In_ PWSTR pszDecString); + BOOL IsHexString( _In_ PWSTR pszHexString); diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index 2487530d405..65ba3a0ddb0 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -10,6 +10,28 @@ /* FUNCTIONS ******************************************************************/ +BOOL +IsDecString( + _In_ PWSTR pszDecString) +{ + PWSTR ptr; + + if ((pszDecString == NULL) || (*pszDecString == UNICODE_NULL)) + return FALSE; + + ptr = pszDecString; + while (*ptr != UNICODE_NULL) + { + if (!iswdigit(*ptr)) + return FALSE; + + ptr++; + } + + return TRUE; +} + + BOOL IsHexString( _In_ PWSTR pszHexString) diff --git a/base/system/diskpart/select.c b/base/system/diskpart/select.c index 4a1804ebbfd..aa2432484ae 100644 --- a/base/system/diskpart/select.c +++ b/base/system/diskpart/select.c @@ -21,8 +21,7 @@ SelectDisk( { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - LONG lValue; - LPWSTR endptr = NULL; + ULONG ulValue; DPRINT("Select Disk()\n"); @@ -41,9 +40,14 @@ SelectDisk( return; } - lValue = wcstol(argv[2], &endptr, 10); - if (((lValue == 0) && (endptr == argv[2])) || - (lValue < 0)) + if (!IsDecString(argv[2])) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + ulValue = wcstoul(argv[2], NULL, 10); + if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; @@ -56,7 +60,7 @@ SelectDisk( { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->DiskNumber == (ULONG)lValue) + if (DiskEntry->DiskNumber == ulValue) { CurrentDisk = DiskEntry; CurrentPartition = NULL; @@ -79,8 +83,7 @@ SelectPartition( { PLIST_ENTRY Entry; PPARTENTRY PartEntry; - LONG lValue; - LPWSTR endptr = NULL; + ULONG ulValue; ULONG PartNumber = 1; DPRINT("Select Partition()\n"); @@ -106,9 +109,14 @@ SelectPartition( return; } - lValue = wcstol(argv[2], &endptr, 10); - if (((lValue == 0) && (endptr == argv[2])) || - (lValue < 0)) + if (!IsDecString(argv[2])) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + ulValue = wcstoul(argv[2], NULL, 10); + if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; @@ -121,7 +129,7 @@ SelectPartition( if (PartEntry->PartitionType != 0) { - if (PartNumber == (ULONG)lValue) + if (PartNumber == ulValue) { CurrentPartition = PartEntry; ConResPrintf(StdOut, IDS_SELECT_PARTITION, PartNumber); @@ -141,7 +149,7 @@ SelectPartition( if (PartEntry->PartitionType != 0) { - if (PartNumber == (ULONG)lValue) + if (PartNumber == ulValue) { CurrentPartition = PartEntry; ConResPrintf(StdOut, IDS_SELECT_PARTITION, PartNumber); @@ -165,8 +173,7 @@ SelectVolume( { PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; - LONG lValue; - LPWSTR endptr = NULL; + ULONG ulValue; DPRINT("SelectVolume()\n"); @@ -185,9 +192,14 @@ SelectVolume( return; } - lValue = wcstol(argv[2], &endptr, 10); - if (((lValue == 0) && (endptr == argv[2])) || - (lValue < 0)) + if (!IsDecString(argv[2])) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + ulValue = wcstoul(argv[2], NULL, 10); + if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; @@ -200,7 +212,7 @@ SelectVolume( { VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); - if (VolumeEntry->VolumeNumber == (ULONG)lValue) + if (VolumeEntry->VolumeNumber == ulValue) { CurrentVolume = VolumeEntry; ConResPrintf(StdOut, IDS_SELECT_VOLUME, CurrentVolume->VolumeNumber); diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c index df7d3bf6696..28c206ec65d 100644 --- a/base/system/diskpart/uniqueid.c +++ b/base/system/diskpart/uniqueid.c @@ -19,9 +19,7 @@ UniqueIdDisk( _In_ INT argc, _In_ LPWSTR *argv) { - ULONG ulLength; - ULONG ulValue; - PWSTR startptr = NULL, endptr = NULL; + ULONG ulLength, ulValue; if (CurrentDisk == NULL) { @@ -39,31 +37,30 @@ UniqueIdDisk( if (argc != 3) { - ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; } ulLength = wcslen(argv[2]); if ((ulLength <= 3) || (ulLength > 11)) { - ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; } if (!HasPrefix(argv[2], L"ID=")) { - ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; } - startptr = &argv[2][3]; - if (!IsHexString(startptr)) + if (!IsHexString(&argv[2][3])) { - ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return; } - ulValue = wcstoul(startptr, &endptr, 16); + ulValue = wcstoul(&argv[2][3], NULL, 16); if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS);

1 0

[reactos] 01/01: [DISKPART] Move helper functions to a separate file
by Eric Kohl 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72087c1e3aac64ee94618… commit 72087c1e3aac64ee94618ad845b5e751759d8b9b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 27 20:09:34 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 27 20:09:34 2022 +0200 [DISKPART] Move helper functions to a separate file --- base/system/diskpart/CMakeLists.txt | 1 + base/system/diskpart/diskpart.h | 19 +++++++++++--- base/system/diskpart/list.c | 9 ------- base/system/diskpart/misc.c | 50 +++++++++++++++++++++++++++++++++++++ base/system/diskpart/uniqueid.c | 34 ++----------------------- 5 files changed, 68 insertions(+), 45 deletions(-) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index f9b5bdd5a3f..0c0c9977947 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -29,6 +29,7 @@ list(APPEND SOURCE interpreter.c list.c merge.c + misc.c offline.c online.c partlist.c diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index b961e1e7f37..39aae2f8a94 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -282,13 +282,24 @@ VOID InterpretMain(VOID); /* list.c */ BOOL list_main(INT argc, LPWSTR *argv); +/* merge.c */ +BOOL merge_main(INT argc, LPWSTR *argv); + +/* misc.c */ +BOOL +IsHexString( + _In_ PWSTR pszHexString); + +BOOL +HasPrefix( + _In_ PWSTR pszString, + _In_ PWSTR pszPrefix); + ULONGLONG RoundingDivide( - _In_ ULONGLONG Dividend, - _In_ ULONGLONG Divisor); + _In_ ULONGLONG Dividend, + _In_ ULONGLONG Divisor); -/* merge.c */ -BOOL merge_main(INT argc, LPWSTR *argv); /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 714f5e3c257..a6a2ebfde89 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -13,15 +13,6 @@ /* FUNCTIONS ******************************************************************/ -ULONGLONG -RoundingDivide( - IN ULONGLONG Dividend, - IN ULONGLONG Divisor) -{ - return (Dividend + Divisor / 2) / Divisor; -} - - static VOID ListDisk(VOID) diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c new file mode 100644 index 00000000000..2487530d405 --- /dev/null +++ b/base/system/diskpart/misc.c @@ -0,0 +1,50 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/misc.c + * PURPOSE: Manages all the partitions of the OS in an interactive way. + * PROGRAMMERS: Eric Kohl + */ + +#include "diskpart.h" + +/* FUNCTIONS ******************************************************************/ + +BOOL +IsHexString( + _In_ PWSTR pszHexString) +{ + PWSTR ptr; + + if ((pszHexString == NULL) || (*pszHexString == UNICODE_NULL)) + return FALSE; + + ptr = pszHexString; + while (*ptr != UNICODE_NULL) + { + if (!iswxdigit(*ptr)) + return FALSE; + + ptr++; + } + + return TRUE; +} + + +BOOL +HasPrefix( + _In_ PWSTR pszString, + _In_ PWSTR pszPrefix) +{ + return (_wcsnicmp(pszString, pszPrefix, wcslen(pszPrefix)) == 0); +} + + +ULONGLONG +RoundingDivide( + _In_ ULONGLONG Dividend, + _In_ ULONGLONG Divisor) +{ + return (Dividend + Divisor / 2) / Divisor; +} diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c index af2c5e4fc64..df7d3bf6696 100644 --- a/base/system/diskpart/uniqueid.c +++ b/base/system/diskpart/uniqueid.c @@ -13,36 +13,6 @@ /* FUNCTIONS ******************************************************************/ -static -BOOL -isHexString( - _In_ PWSTR pszHexString) -{ - PWSTR ptr; - - ptr = pszHexString; - while (*ptr != UNICODE_NULL) - { - if (!iswxdigit(*ptr)) - return FALSE; - - ptr++; - } - - return TRUE; -} - - -static -BOOL -hasPrefix( - _In_ PWSTR pszString, - _In_ PWSTR pszPrefix) -{ - return (_wcsnicmp(pszString, pszPrefix, wcslen(pszPrefix)) == 0); -} - - static VOID UniqueIdDisk( @@ -80,14 +50,14 @@ UniqueIdDisk( return; } - if (!hasPrefix(argv[2], L"ID=")) + if (!HasPrefix(argv[2], L"ID=")) { ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); return; } startptr = &argv[2][3]; - if (isHexString(startptr) == FALSE) + if (!IsHexString(startptr)) { ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); return;

1 0

[reactos] 03/03: [SDK:CMLIB] Const-ify the unicode strings that are only used as input and not modified.
by Hermès Bélusca-Maïto 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d873865971163e045bd2a… commit d873865971163e045bd2a2924638dd44150a97a0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 27 00:53:03 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 27 19:38:54 2022 +0200 [SDK:CMLIB] Const-ify the unicode strings that are only used as input and not modified. --- sdk/lib/cmlib/cmindex.c | 4 ++-- sdk/lib/cmlib/cmlib.h | 8 ++++---- sdk/lib/cmlib/cmname.c | 6 +++--- sdk/lib/cmlib/cmvalue.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/lib/cmlib/cmindex.c b/sdk/lib/cmlib/cmindex.c index 599900124d5..0e6ccf04c2a 100644 --- a/sdk/lib/cmlib/cmindex.c +++ b/sdk/lib/cmlib/cmindex.c @@ -923,7 +923,7 @@ NTAPI CmpAddToLeaf(IN PHHIVE Hive, IN HCELL_INDEX LeafCell, IN HCELL_INDEX NewKey, - IN PUNICODE_STRING Name) + IN PCUNICODE_STRING Name) { PCM_KEY_INDEX Leaf; PCM_KEY_FAST_INDEX FastLeaf; @@ -1265,7 +1265,7 @@ HCELL_INDEX NTAPI CmpSelectLeaf(IN PHHIVE Hive, IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name, + IN PCUNICODE_STRING Name, IN HSTORAGE_TYPE Type, IN PHCELL_INDEX *RootCell) { diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index 6b65b73dc17..e4ae010702e 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -567,7 +567,7 @@ USHORT NTAPI CmpNameSize( IN PHHIVE Hive, - IN PUNICODE_STRING Name + IN PCUNICODE_STRING Name ); USHORT @@ -582,7 +582,7 @@ NTAPI CmpCopyName( IN PHHIVE Hive, OUT PWCHAR Destination, - IN PUNICODE_STRING Source + IN PCUNICODE_STRING Source ); VOID @@ -599,7 +599,7 @@ NTAPI CmpFindNameInList( IN PHHIVE Hive, IN PCHILD_LIST ChildList, - IN PUNICODE_STRING Name, + IN PCUNICODE_STRING Name, OUT PULONG ChildIndex OPTIONAL, OUT PHCELL_INDEX CellIndex ); @@ -613,7 +613,7 @@ NTAPI CmpFindValueByName( IN PHHIVE Hive, IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name + IN PCUNICODE_STRING Name ); PCELL_DATA diff --git a/sdk/lib/cmlib/cmname.c b/sdk/lib/cmlib/cmname.c index b12374023c8..265a86a9216 100644 --- a/sdk/lib/cmlib/cmname.c +++ b/sdk/lib/cmlib/cmname.c @@ -20,7 +20,7 @@ USHORT NTAPI CmpCopyName(IN PHHIVE Hive, OUT PWCHAR Destination, - IN PUNICODE_STRING Source) + IN PCUNICODE_STRING Source) { ULONG i; @@ -72,7 +72,7 @@ CmpCopyCompressedName(OUT PWCHAR Destination, USHORT NTAPI CmpNameSize(IN PHHIVE Hive, - IN PUNICODE_STRING Name) + IN PCUNICODE_STRING Name) { ULONG i; @@ -148,7 +148,7 @@ BOOLEAN NTAPI CmpFindNameInList(IN PHHIVE Hive, IN PCHILD_LIST ChildList, - IN PUNICODE_STRING Name, + IN PCUNICODE_STRING Name, OUT PULONG ChildIndex OPTIONAL, OUT PHCELL_INDEX CellIndex) { diff --git a/sdk/lib/cmlib/cmvalue.c b/sdk/lib/cmlib/cmvalue.c index 86344a77079..a9c46a9fcdf 100644 --- a/sdk/lib/cmlib/cmvalue.c +++ b/sdk/lib/cmlib/cmvalue.c @@ -98,7 +98,7 @@ HCELL_INDEX NTAPI CmpFindValueByName(IN PHHIVE Hive, IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name) + IN PCUNICODE_STRING Name) { HCELL_INDEX CellIndex;

1 0

[reactos] 02/03: [BOOTDATA] Properly capitalize 'Boot File System'.
by Hermès Bélusca-Maïto 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6da36ed1b6155a73f452… commit a6da36ed1b6155a73f452010ec0f7a7cc72557a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 26 01:53:41 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 27 19:38:53 2022 +0200 [BOOTDATA] Properly capitalize 'Boot File System'. --- boot/bootdata/hivesys.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index d0b05adb09d..48c51e04636 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -129,7 +129,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\AppMgmt","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Base","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Boot Bus Extender","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Boot file system","",0x00000000,"Driver Group" +HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Boot File System","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\CryptSvc","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\DcomLaunch","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\dmadmin","",0x00000000,"Service" @@ -173,7 +173,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\AFD","",0x00000000,"Serv HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\AppMgmt","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Base","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Boot Bus Extender","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Boot file system","",0x00000000,"Driver Group" +HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Boot File System","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Browser","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\CryptSvc","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\DcomLaunch","",0x00000000,"Service" @@ -1655,7 +1655,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager" ; Filesystem recognizer driver HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot file system" +HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008

1 0

[reactos] 01/03: [NTOS:CONFIG] Add missing HvGetCell casts. Addendum to a4cad7be6.
by Hermès Bélusca-Maïto 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce641de1e08a8d6db03ff… commit ce641de1e08a8d6db03ff7fed7ebd09f91795ae7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 27 19:09:34 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 27 19:38:53 2022 +0200 [NTOS:CONFIG] Add missing HvGetCell casts. Addendum to a4cad7be6. --- ntoskrnl/config/cmboot.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/config/cmboot.c b/ntoskrnl/config/cmboot.c index 2a2a74a534e..98dd2a053ef 100644 --- a/ntoskrnl/config/cmboot.c +++ b/ntoskrnl/config/cmboot.c @@ -146,19 +146,19 @@ CmpFindTagIndex(IN PHHIVE Hive, ASSERT(Hive->ReleaseCellRoutine == NULL); /* Get the tag */ - Value = HvGetCell(Hive, TagCell); + Value = (PCM_KEY_VALUE)HvGetCell(Hive, TagCell); ASSERT(Value); DriverTag = (PULONG)CmpValueToData(Hive, Value, &Length); ASSERT(DriverTag); /* Get the order array */ - Node = HvGetCell(Hive, GroupOrderCell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrderCell); ASSERT(Node); OrderCell = CmpFindValueByName(Hive, Node, GroupName); if (OrderCell == HCELL_NIL) return -2; /* And read it */ - TagValue = HvGetCell(Hive, OrderCell); + TagValue = (PCM_KEY_VALUE)HvGetCell(Hive, OrderCell); CmpGetValueData(Hive, TagValue, &Length, (PVOID*)&TagOrder, &BufferAllocated, &OrderCell); ASSERT(TagOrder); @@ -208,7 +208,7 @@ CmpAddDriverToList(IN PHHIVE Hive, DriverEntry->FilePath.Buffer = NULL; /* Get the driver cell */ - Node = HvGetCell(Hive, DriverCell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell); ASSERT(Node); /* Get the name from the cell */ @@ -258,7 +258,7 @@ CmpAddDriverToList(IN PHHIVE Hive, else { /* Path name exists, so grab it */ - Value = HvGetCell(Hive, ValueCell); + Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); ASSERT(Value); /* Allocate and setup the path name */ @@ -297,7 +297,7 @@ CmpAddDriverToList(IN PHHIVE Hive, else { /* Otherwise, read whatever the data says */ - Value = HvGetCell(Hive, ValueCell); + Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); ASSERT(Value); ErrorControl = (PULONG)CmpValueToData(Hive, Value, &Length); ASSERT(ErrorControl); @@ -315,7 +315,7 @@ CmpAddDriverToList(IN PHHIVE Hive, else { /* Found it, read the group value */ - Value = HvGetCell(Hive, ValueCell); + Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); ASSERT(Value); /* Copy it into the node */ @@ -362,13 +362,13 @@ CmpIsLoadType(IN PHHIVE Hive, ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the start cell */ - Node = HvGetCell(Hive, Cell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); ASSERT(Node); ValueCell = CmpFindValueByName(Hive, Node, &ValueString); if (ValueCell == HCELL_NIL) return FALSE; /* Read the start value */ - Value = HvGetCell(Hive, ValueCell); + Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); ASSERT(Value); Data = (PLONG)CmpValueToData(Hive, Value, &Length); ASSERT(Data); @@ -397,7 +397,7 @@ CmpFindDrivers(IN PHHIVE Hive, ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the control set key */ - ControlNode = HvGetCell(Hive, ControlSet); + ControlNode = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet); ASSERT(ControlNode); /* Get services cell */ @@ -406,7 +406,7 @@ CmpFindDrivers(IN PHHIVE Hive, if (ServicesCell == HCELL_NIL) return FALSE; /* Open services key */ - ServicesNode = HvGetCell(Hive, ServicesCell); + ServicesNode = (PCM_KEY_NODE)HvGetCell(Hive, ServicesCell); ASSERT(ServicesNode); /* Get control cell */ @@ -416,7 +416,7 @@ CmpFindDrivers(IN PHHIVE Hive, /* Get the group order cell and read it */ RtlInitUnicodeString(&Name, L"GroupOrderList"); - Node = HvGetCell(Hive, ControlCell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell); ASSERT(Node); GroupOrderCell = CmpFindSubKeyByName(Hive, Node, &Name); if (GroupOrderCell == HCELL_NIL) return FALSE; @@ -426,13 +426,13 @@ CmpFindDrivers(IN PHHIVE Hive, { /* Open the Safe Boot key */ RtlInitUnicodeString(&Name, L"SafeBoot"); - Node = HvGetCell(Hive, ControlCell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell); ASSERT(Node); SafeBootCell = CmpFindSubKeyByName(Hive, Node, &Name); if (SafeBootCell == HCELL_NIL) return FALSE; /* Open the correct start key (depending on the mode) */ - Node = HvGetCell(Hive, SafeBootCell); + Node = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell); ASSERT(Node); switch(InitSafeBootMode) { @@ -571,28 +571,28 @@ CmpSortDriverList(IN PHHIVE Hive, ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the control key */ - Node = HvGetCell(Hive, ControlSet); + Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet); ASSERT(Node); RtlInitUnicodeString(&Name, L"Control"); Controls = CmpFindSubKeyByName(Hive, Node, &Name); if (Controls == HCELL_NIL) return FALSE; /* Open the service group order */ - Node = HvGetCell(Hive, Controls); + Node = (PCM_KEY_NODE)HvGetCell(Hive, Controls); ASSERT(Node); RtlInitUnicodeString(&Name, L"ServiceGroupOrder"); GroupOrder = CmpFindSubKeyByName(Hive, Node, &Name); if (GroupOrder == HCELL_NIL) return FALSE; /* Open the list key */ - Node = HvGetCell(Hive, GroupOrder); + Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrder); ASSERT(Node); RtlInitUnicodeString(&Name, L"list"); ListCell = CmpFindValueByName(Hive, Node, &Name); if (ListCell == HCELL_NIL) return FALSE; /* Now read the actual list */ - ListNode = HvGetCell(Hive, ListCell); + ListNode = (PCM_KEY_VALUE)HvGetCell(Hive, ListCell); ASSERT(ListNode); if (ListNode->Type != REG_MULTI_SZ) return FALSE; @@ -736,12 +736,12 @@ CmpIsSafe(IN PHHIVE Hive, /* Driver key node (mandatory) */ ASSERT(DriverCell != HCELL_NIL); - DriverNode = HvGetCell(Hive, DriverCell); + DriverNode = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell); ASSERT(DriverNode); /* Safe boot key node (optional but return TRUE if not present) */ if(SafeBootCell == HCELL_NIL) return TRUE; - SafeBootNode = HvGetCell(Hive, SafeBootCell); + SafeBootNode = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell); if(!SafeBootNode) return FALSE; /* Search by the name from the group */ @@ -749,7 +749,7 @@ CmpIsSafe(IN PHHIVE Hive, CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); if(CellIndex != HCELL_NIL) { - KeyValue = HvGetCell(Hive, CellIndex); + KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); ASSERT(KeyValue); if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) { @@ -795,7 +795,7 @@ CmpIsSafe(IN PHHIVE Hive, CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); if(CellIndex != HCELL_NIL) { - KeyValue = HvGetCell(Hive, CellIndex); + KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); ASSERT(KeyValue); if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) {

1 0

[reactos] 02/02: [SDK:CMLIB] HvGetCell is a macro calling the hive's GetCellRoutine callback.
by Hermès Bélusca-Maïto 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ccd435eb0b3237c98d39… commit 8ccd435eb0b3237c98d39f4a55f9bff669ff29a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 27 17:30:52 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 27 18:37:16 2022 +0200 [SDK:CMLIB] HvGetCell is a macro calling the hive's GetCellRoutine callback. In principle there should be different get-cell routines, depending on the type of the hive (given by the OperationType parameter of HvInitialize): for flat hives, memory-mapped hives, etc. For now in ReactOS we only support a restricted subset of these, therefore we are still happy with a single get-cell callback... This may change in the future. --- sdk/lib/cmlib/cmlib.h | 19 +++++++++++-------- sdk/lib/cmlib/hivecell.c | 17 ++++++++--------- sdk/lib/cmlib/hiveinit.c | 5 +++++ 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index 1946ec5437b..6b65b73dc17 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -384,15 +384,13 @@ VOID CMAPI HvFree( PHHIVE RegistryHive); -PVOID CMAPI -HvGetCell( - PHHIVE RegistryHive, - HCELL_INDEX CellOffset); +#define HvGetCell(Hive, Cell) \ + (Hive)->GetCellRoutine(Hive, Cell) -#define HvReleaseCell(h, c) \ -do { \ - if ((h)->ReleaseCellRoutine) \ - (h)->ReleaseCellRoutine(h, c); \ +#define HvReleaseCell(Hive, Cell) \ +do { \ + if ((Hive)->ReleaseCellRoutine) \ + (Hive)->ReleaseCellRoutine(Hive, Cell); \ } while(0) LONG CMAPI @@ -468,6 +466,11 @@ HvReleaseFreeCellRefArray( * Private functions. */ +PCELL_DATA CMAPI +HvpGetCellData( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CellIndex); + PHBIN CMAPI HvpAddBin( PHHIVE RegistryHive, diff --git a/sdk/lib/cmlib/hivecell.c b/sdk/lib/cmlib/hivecell.c index a267130e494..9820ab8de22 100644 --- a/sdk/lib/cmlib/hivecell.c +++ b/sdk/lib/cmlib/hivecell.c @@ -29,13 +29,13 @@ HvpGetCellHeader( ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; ASSERT(Block != NULL); - return (PVOID)((ULONG_PTR)Block + CellOffset); + return (PHCELL)((ULONG_PTR)Block + CellOffset); } else { ASSERT(HvGetCellType(CellIndex) == Stable); - return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + - CellIndex); + return (PHCELL)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + + CellIndex); } } @@ -63,13 +63,12 @@ HvIsCellAllocated(IN PHHIVE RegistryHive, return FALSE; } -PVOID CMAPI -HvGetCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) +PCELL_DATA CMAPI +HvpGetCellData( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CellIndex) { - ASSERT(CellIndex != HCELL_NIL); - return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); + return (PCELL_DATA)(HvpGetCellHeader(Hive, CellIndex) + 1); } static __inline LONG CMAPI diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index fcbbe08961c..2b070fb4f7e 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -562,6 +562,11 @@ HvInitialize( #endif Hive->HiveFlags = HiveFlags & ~HIVE_NOLAZYFLUSH; + // TODO: The CellRoutines point to different callbacks + // depending on the OperationType. + Hive->GetCellRoutine = HvpGetCellData; + Hive->ReleaseCellRoutine = NULL; + switch (OperationType) { case HINIT_CREATE:

1 0

[reactos] 01/02: [SDK:CMLIB][MKHIVE][BOOT:ENVIRON][NTOS:CONFIG] Add missing HvGetCell casts. Replace some ASSERT(FALSE).
by Hermès Bélusca-Maïto 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4cad7be6bc8251ae65ec… commit a4cad7be6bc8251ae65ec46be2b36d8083e11205 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 27 17:41:16 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 27 18:37:16 2022 +0200 [SDK:CMLIB][MKHIVE][BOOT:ENVIRON][NTOS:CONFIG] Add missing HvGetCell casts. Replace some ASSERT(FALSE). --- boot/environ/lib/misc/bootreg.c | 2 +- ntoskrnl/config/cmapi.c | 12 ++++++------ ntoskrnl/config/cmkcbncb.c | 3 +-- ntoskrnl/config/cmparse.c | 8 ++++---- sdk/lib/cmlib/cminit.c | 8 ++++---- sdk/lib/cmlib/cmkeydel.c | 25 +++++++++++++------------ sdk/lib/cmlib/cmse.c | 10 +++++----- sdk/tools/mkhive/registry.c | 4 ++-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/boot/environ/lib/misc/bootreg.c b/boot/environ/lib/misc/bootreg.c index 957bb122f5f..0551e4c7884 100644 --- a/boot/environ/lib/misc/bootreg.c +++ b/boot/environ/lib/misc/bootreg.c @@ -826,7 +826,7 @@ BiEnumerateSubKeys ( } /* Get the cell data for it */ - Node = HvGetCell(Hive, CellIndex); + Node = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); if (!Node) { Status = STATUS_REGISTRY_CORRUPT; diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 25daeb46c57..6555658435f 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -180,7 +180,7 @@ CmpSetValueKeyNew(IN PHHIVE Hive, /* Get the actual data for it */ CellData = HvGetCell(Hive, ValueCell); - if (!CellData) ASSERT(FALSE); + ASSERT(CellData); /* Now we can release it, make sure it's also dirty */ HvReleaseCell(Hive, ValueCell); @@ -355,7 +355,7 @@ CmpSetValueKeyExisting(IN PHHIVE Hive, /* Now get the actual data for our data cell */ CellData = HvGetCell(Hive, NewCell); - if (!CellData) ASSERT(FALSE); + ASSERT(CellData); /* Release it immediately */ HvReleaseCell(Hive, NewCell); @@ -1378,7 +1378,7 @@ CmpQueryKeyDataFromCache( #if DBG /* Get the cell node */ - Node = HvGetCell(KeyHive, KeyCell); + Node = (PCM_KEY_NODE)HvGetCell(KeyHive, KeyCell); if (Node != NULL) { ULONG SubKeyCount; @@ -1457,7 +1457,7 @@ CmpQueryKeyDataFromCache( DPRINT1("Kcb cache incoherency detected, kcb = %p\n", Kcb); /* Get the cell node */ - Node = HvGetCell(KeyHive, KeyCell); + Node = (PCM_KEY_NODE)HvGetCell(KeyHive, KeyCell); if (Node == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -2468,7 +2468,7 @@ CmpDeepCopyKeyInternal(IN PHHIVE SourceHive, DestKeyCell); /* Get the source cell node */ - SrcNode = HvGetCell(SourceHive, SrcKeyCell); + SrcNode = (PCM_KEY_NODE)HvGetCell(SourceHive, SrcKeyCell); ASSERT(SrcNode); /* Sanity check */ @@ -2487,7 +2487,7 @@ CmpDeepCopyKeyInternal(IN PHHIVE SourceHive, } /* Get the destination cell node */ - DestNode = HvGetCell(DestinationHive, NewKeyCell); + DestNode = (PCM_KEY_NODE)HvGetCell(DestinationHive, NewKeyCell); ASSERT(DestNode); /* Set the parent and copy the flags */ diff --git a/ntoskrnl/config/cmkcbncb.c b/ntoskrnl/config/cmkcbncb.c index cb4035f75cc..2241d530ae8 100644 --- a/ntoskrnl/config/cmkcbncb.c +++ b/ntoskrnl/config/cmkcbncb.c @@ -961,8 +961,7 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) if the key is not deleted */ if (!DeletedKey && !MyKcb->Delete) { - KeyNode = HvGetCell(MyKcb->KeyHive, MyKcb->KeyCell); - + KeyNode = (PCM_KEY_NODE)HvGetCell(MyKcb->KeyHive, MyKcb->KeyCell); if (!KeyNode) { /* Failure */ diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index 2fb6a997f71..52a3219babb 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -845,7 +845,7 @@ CmpCreateLinkNode(IN PHHIVE Hive, HvMarkCellDirty(Context->ChildHive.KeyHive, ChildCell, FALSE); /* Get the key node */ - KeyNode = HvGetCell(Context->ChildHive.KeyHive, ChildCell); + KeyNode = (PCM_KEY_NODE)HvGetCell(Context->ChildHive.KeyHive, ChildCell); if (!KeyNode) { /* Fail */ @@ -862,7 +862,7 @@ CmpCreateLinkNode(IN PHHIVE Hive, KeyNode->Flags |= KEY_HIVE_ENTRY | KEY_NO_DELETE; /* Get the link node */ - KeyNode = HvGetCell(Hive, LinkCell); + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, LinkCell); if (!KeyNode) { /* Fail */ @@ -895,7 +895,7 @@ CmpCreateLinkNode(IN PHHIVE Hive, HvReleaseCell(Hive, LinkCell); /* Get the parent node */ - KeyNode = HvGetCell(Hive, Cell); + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!KeyNode) { /* Fail */ @@ -1183,7 +1183,7 @@ CmpParseKey(IN PVOID ParseObject, /* Get the new node */ Cell = NextCell; Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); - if (!Node) ASSERT(FALSE); + ASSERT(Node); /* Check if this was the last key */ if (Last) diff --git a/sdk/lib/cmlib/cminit.c b/sdk/lib/cmlib/cminit.c index 699376e75d9..d7c7d208797 100644 --- a/sdk/lib/cmlib/cminit.c +++ b/sdk/lib/cmlib/cminit.c @@ -87,7 +87,7 @@ CmpPrepareIndexOfKeys( { for (i = 0; i < IndexCell->Count; i++) { - PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); + PCM_KEY_INDEX SubIndexCell = (PCM_KEY_INDEX)HvGetCell(RegistryHive, IndexCell->List[i]); if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); else @@ -100,7 +100,7 @@ CmpPrepareIndexOfKeys( PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; for (i = 0; i < HashCell->Count; i++) { - PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); + PCM_KEY_NODE SubKeyCell = (PCM_KEY_NODE)HvGetCell(RegistryHive, HashCell->List[i].Cell); CmpPrepareKey(RegistryHive, SubKeyCell); } } @@ -126,7 +126,7 @@ CmpPrepareKey( /* Enumerate and add subkeys */ if (KeyCell->SubKeyCounts[Stable] > 0) { - IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); + IndexCell = (PCM_KEY_INDEX)HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); CmpPrepareIndexOfKeys(RegistryHive, IndexCell); } } @@ -137,6 +137,6 @@ CmPrepareHive( { PCM_KEY_NODE RootCell; - RootCell = HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); + RootCell = (PCM_KEY_NODE)HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); CmpPrepareKey(RegistryHive, RootCell); } diff --git a/sdk/lib/cmlib/cmkeydel.c b/sdk/lib/cmlib/cmkeydel.c index 9baeaa886a7..6a2f9d52214 100644 --- a/sdk/lib/cmlib/cmkeydel.c +++ b/sdk/lib/cmlib/cmkeydel.c @@ -26,7 +26,7 @@ CmpMarkKeyDirty(IN PHHIVE Hive, ULONG i; /* Get the cell data for our target */ - CellData = HvGetCell(Hive, Cell); + CellData = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!CellData) return FALSE; /* Check if sanity checks requested */ @@ -63,8 +63,8 @@ CmpMarkKeyDirty(IN PHHIVE Hive, HvMarkCellDirty(Hive, CellData->Security, FALSE); /* Get the security data and release it */ - SecurityData = HvGetCell(Hive, CellData->Security); - if (!SecurityData) ASSERT(FALSE); + SecurityData = (PCM_KEY_SECURITY)HvGetCell(Hive, CellData->Security); + ASSERT(SecurityData); HvReleaseCell(Hive, CellData->Security); /* Mark the security links dirty too */ @@ -81,7 +81,7 @@ CmpMarkKeyDirty(IN PHHIVE Hive, /* Get the list data itself, and release it */ ListData = HvGetCell(Hive, CellData->ValueList.List); - if (!ListData) ASSERT(FALSE); + ASSERT(ListData); HvReleaseCell(Hive, CellData->ValueList.List); /* Loop all values */ @@ -127,8 +127,8 @@ CmpFreeKeyBody(IN PHHIVE Hive, PCM_KEY_NODE CellData; /* Get the key node */ - CellData = HvGetCell(Hive, Cell); - if (!CellData) ASSERT(FALSE); + CellData = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + ASSERT(CellData); /* Check if we can delete the child cells */ if (!(CellData->Flags & KEY_HIVE_EXIT)) @@ -169,8 +169,8 @@ CmpFreeKeyByCell(IN PHHIVE Hive, CmpMarkKeyDirty(Hive, Cell, TRUE); /* Get the target node and release it */ - CellData = HvGetCell(Hive, Cell); - if (!CellData) ASSERT(FALSE); + CellData = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + ASSERT(CellData); HvReleaseCell(Hive, Cell); /* Make sure we don't have subkeys */ @@ -184,8 +184,8 @@ CmpFreeKeyByCell(IN PHHIVE Hive, if (!Result) return STATUS_INSUFFICIENT_RESOURCES; /* Get the parent node and release it */ - ParentData = HvGetCell(Hive, CellData->Parent); - if (!ParentData) ASSERT(FALSE); + ParentData = (PCM_KEY_NODE)HvGetCell(Hive, CellData->Parent); + ASSERT(ParentData); HvReleaseCell(Hive, CellData->Parent); /* Check if the parent node has no more subkeys */ @@ -206,14 +206,15 @@ CmpFreeKeyByCell(IN PHHIVE Hive, { /* Get the value list and release it */ ListData = HvGetCell(Hive, CellData->ValueList.List); - if (!ListData) ASSERT(FALSE); + ASSERT(ListData); HvReleaseCell(Hive, CellData->ValueList.List); /* Loop every value */ for (i = 0; i < CellData->ValueList.Count; i++) { /* Free it */ - if (!CmpFreeValue(Hive, ListData->u.KeyList[i])) ASSERT(FALSE); + Result = CmpFreeValue(Hive, ListData->u.KeyList[i]); + ASSERT(Result); } /* Free the value list */ diff --git a/sdk/lib/cmlib/cmse.c b/sdk/lib/cmlib/cmse.c index 6b3a8c18b65..98a1e035936 100644 --- a/sdk/lib/cmlib/cmse.c +++ b/sdk/lib/cmlib/cmse.c @@ -25,17 +25,17 @@ CmpRemoveSecurityCellList(IN PHHIVE Hive, // ASSERT( (((PCMHIVE)Hive)->HiveSecurityLockOwner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive() == TRUE) ); - SecurityData = HvGetCell(Hive, SecurityCell); + SecurityData = (PCM_KEY_SECURITY)HvGetCell(Hive, SecurityCell); if (!SecurityData) return; - FlinkCell = HvGetCell(Hive, SecurityData->Flink); + FlinkCell = (PCM_KEY_SECURITY)HvGetCell(Hive, SecurityData->Flink); if (!FlinkCell) { HvReleaseCell(Hive, SecurityCell); return; } - BlinkCell = HvGetCell(Hive, SecurityData->Blink); + BlinkCell = (PCM_KEY_SECURITY)HvGetCell(Hive, SecurityData->Blink); if (!BlinkCell) { HvReleaseCell(Hive, SecurityData->Flink); @@ -72,7 +72,7 @@ CmpFreeSecurityDescriptor(IN PHHIVE Hive, // ASSERT( (((PCMHIVE)Hive)->HiveSecurityLockOwner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive() == TRUE) ); - CellData = HvGetCell(Hive, Cell); + CellData = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!CellData) return; ASSERT(CellData->Signature == CM_KEY_NODE_SIGNATURE); @@ -89,7 +89,7 @@ CmpFreeSecurityDescriptor(IN PHHIVE Hive, return; } - SecurityData = HvGetCell(Hive, CellData->Security); + SecurityData = (PCM_KEY_SECURITY)HvGetCell(Hive, CellData->Security); if (!SecurityData) { HvReleaseCell(Hive, Cell); diff --git a/sdk/tools/mkhive/registry.c b/sdk/tools/mkhive/registry.c index 9628f67573a..99823e33839 100644 --- a/sdk/tools/mkhive/registry.c +++ b/sdk/tools/mkhive/registry.c @@ -733,7 +733,7 @@ RegSetValueExW( else { /* The value already exists, use it. Get the value cell. */ - ValueCell = HvGetCell(&Key->RegistryHive->Hive, CellIndex); + ValueCell = (PCM_KEY_VALUE)HvGetCell(&Key->RegistryHive->Hive, CellIndex); ASSERT(ValueCell != NULL); Status = STATUS_SUCCESS; } @@ -887,7 +887,7 @@ RegQueryValueExW( return ERROR_FILE_NOT_FOUND; // STATUS_OBJECT_NAME_NOT_FOUND; /* Get the value cell */ - ValueCell = HvGetCell(Hive, CellIndex); + ValueCell = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); ASSERT(ValueCell != NULL); RepGetValueData(Hive, ValueCell, lpType, lpData, lpcbData);

1 0

[reactos] 01/01: [DISKPART] Store full scsi address in the diskentry
by Eric Kohl 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=641fdb342ef0d4717ef26… commit 641fdb342ef0d4717ef26837b499ede893189114 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 27 18:05:04 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 27 18:05:04 2022 +0200 [DISKPART] Store full scsi address in the diskentry --- base/system/diskpart/diskpart.h | 5 +++-- base/system/diskpart/partlist.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index c7a453ed241..b961e1e7f37 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -152,8 +152,9 @@ typedef struct _DISKENTRY ULONG DiskNumber; USHORT Port; - USHORT Bus; - USHORT Id; + USHORT PathId; + USHORT TargetId; + USHORT Lun; /* Has the partition list been modified? */ BOOLEAN Dirty; diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 2113373ce83..6d91e385571 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -936,8 +936,9 @@ AddDiskToList( DiskEntry->DiskNumber = DiskNumber; DiskEntry->Port = ScsiAddress.PortNumber; - DiskEntry->Bus = ScsiAddress.PathId; - DiskEntry->Id = ScsiAddress.TargetId; + DiskEntry->PathId = ScsiAddress.PathId; + DiskEntry->TargetId = ScsiAddress.TargetId; + DiskEntry->Lun = ScsiAddress.Lun; GetDriverName(DiskEntry);

1 0

[reactos] 01/01: [DISKPART] Implement the uniqueid command
by Eric Kohl 27 Mar '22

27 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a63f3e85a6e1e8ee6733… commit 5a63f3e85a6e1e8ee6733d2ad3124fb190699c52 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 27 17:54:38 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 27 17:54:38 2022 +0200 [DISKPART] Implement the uniqueid command TODO: Set disk signatures. --- base/system/diskpart/diskpart.h | 2 + base/system/diskpart/uniqueid.c | 115 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 751c3ff6aaf..c7a453ed241 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -20,6 +20,8 @@ #include <winreg.h> #include <wincon.h> +#include <errno.h> + #include <conutils.h> /* diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c index 9096c7a2425..af2c5e4fc64 100644 --- a/base/system/diskpart/uniqueid.c +++ b/base/system/diskpart/uniqueid.c @@ -8,7 +8,122 @@ #include "diskpart.h" +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +static +BOOL +isHexString( + _In_ PWSTR pszHexString) +{ + PWSTR ptr; + + ptr = pszHexString; + while (*ptr != UNICODE_NULL) + { + if (!iswxdigit(*ptr)) + return FALSE; + + ptr++; + } + + return TRUE; +} + + +static +BOOL +hasPrefix( + _In_ PWSTR pszString, + _In_ PWSTR pszPrefix) +{ + return (_wcsnicmp(pszString, pszPrefix, wcslen(pszPrefix)) == 0); +} + + +static +VOID +UniqueIdDisk( + _In_ INT argc, + _In_ LPWSTR *argv) +{ + ULONG ulLength; + ULONG ulValue; + PWSTR startptr = NULL, endptr = NULL; + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return; + } + + if (argc == 2) + { + ConPuts(StdOut, L"\n"); + ConPrintf(StdOut, L"Disk ID: %08lx\n", CurrentDisk->LayoutBuffer->Signature); + ConPuts(StdOut, L"\n"); + return; + } + + if (argc != 3) + { + ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + return; + } + + ulLength = wcslen(argv[2]); + if ((ulLength <= 3) || (ulLength > 11)) + { + ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + return; + } + + if (!hasPrefix(argv[2], L"ID=")) + { + ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + return; + } + + startptr = &argv[2][3]; + if (isHexString(startptr) == FALSE) + { + ConResPuts(StdOut, IDS_ERROR_INVALID_ARGS); + return; + } + + ulValue = wcstoul(startptr, &endptr, 16); + if ((ulValue == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + ConPrintf(StdOut, L"Setting the disk signature is not implemented yet!\n"); +#if 0 + DPRINT1("New Signature: %lx\n", ulValue); + CurrentDisk->LayoutBuffer->Signature = ulValue; +// SetDiskLayout(CurrentDisk); +#endif + +} + + BOOL uniqueid_main(INT argc, LPWSTR *argv) { + /* gets the first word from the string */ + if (argc == 1) + { + ConResPuts(StdOut, IDS_HELP_CMD_UNIQUEID); + return TRUE; + } + + /* determines which details to print (disk, partition, etc.) */ + if (!wcsicmp(argv[1], L"disk")) + UniqueIdDisk(argc, argv); + else + ConResPuts(StdOut, IDS_HELP_CMD_UNIQUEID); + return TRUE; }

1 0

[reactos] 01/01: [DISKPART] Add volume support
by Eric Kohl 26 Mar '22

26 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ba6b097543d7ede44c12… commit 2ba6b097543d7ede44c12e7942a94ebbec3a6293 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 26 15:18:08 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 26 15:18:08 2022 +0100 [DISKPART] Add volume support Add the 'list volume' and 'select volume' commands --- base/system/diskpart/diskpart.c | 2 + base/system/diskpart/diskpart.h | 24 +++++++ base/system/diskpart/lang/en-US.rc | 5 +- base/system/diskpart/lang/pl-PL.rc | 5 +- base/system/diskpart/lang/pt-PT.rc | 5 +- base/system/diskpart/lang/ro-RO.rc | 5 +- base/system/diskpart/lang/ru-RU.rc | 5 +- base/system/diskpart/lang/sq-AL.rc | 5 +- base/system/diskpart/lang/tr-TR.rc | 5 +- base/system/diskpart/lang/zh-CN.rc | 5 +- base/system/diskpart/lang/zh-TW.rc | 5 +- base/system/diskpart/list.c | 41 +++++++++++ base/system/diskpart/partlist.c | 135 +++++++++++++++++++++++++++++++++++++ base/system/diskpart/rescan.c | 2 + base/system/diskpart/resource.h | 3 + base/system/diskpart/select.c | 59 ++++++++++++++++ 16 files changed, 302 insertions(+), 9 deletions(-) diff --git a/base/system/diskpart/diskpart.c b/base/system/diskpart/diskpart.c index 30b7da20f35..5f678a556d7 100644 --- a/base/system/diskpart/diskpart.c +++ b/base/system/diskpart/diskpart.c @@ -94,6 +94,7 @@ int wmain(int argc, const LPWSTR argv[]) timeout = 0; CreatePartitionList(); + CreateVolumeList(); /* If there are no command arguments, then go straight to the interpreter */ if (argc < 2) @@ -190,6 +191,7 @@ int wmain(int argc, const LPWSTR argv[]) ConResPuts(StdOut, IDS_APP_LEAVING); done: + DestroyVolumeList(); DestroyPartitionList(); return result; diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index abfc2213c74..751c3ff6aaf 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -170,14 +170,32 @@ typedef struct _DISKENTRY } DISKENTRY, *PDISKENTRY; +typedef struct _VOLENTRY +{ + LIST_ENTRY ListEntry; + + ULONG VolumeNumber; + WCHAR VolumeName[MAX_PATH]; + + WCHAR DriveLetter; + + PWSTR pszLabel; + PWSTR pszFilesystem; + UINT DriveType; + ULARGE_INTEGER Size; + +} VOLENTRY, *PVOLENTRY; + /* GLOBAL VARIABLES ***********************************************************/ extern LIST_ENTRY DiskListHead; extern LIST_ENTRY BiosDiskListHead; +extern LIST_ENTRY VolumeListHead; extern PDISKENTRY CurrentDisk; extern PPARTENTRY CurrentPartition; +extern PVOLENTRY CurrentVolume; /* PROTOTYPES *****************************************************************/ @@ -282,6 +300,12 @@ CreatePartitionList(VOID); VOID DestroyPartitionList(VOID); +NTSTATUS +CreateVolumeList(VOID); + +VOID +DestroyVolumeList(VOID); + /* recover.c */ BOOL recover_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 0137f34f10c..f23a5cc13e0 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -44,7 +44,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" - IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -66,6 +68,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 8078bed8715..2656950d8b7 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -44,7 +44,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- ------------\n" IDS_LIST_PARTITION_FORMAT "%c Partycja %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n" - IDS_LIST_VOLUME_HEAD " Wolumin ### Lit Etykieta\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -66,6 +68,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nNieprawidłowa partycja.\n\n" IDS_SELECT_NO_VOLUME "\nNie wybrano woluminu.\nWybierz dysk i spróbuj ponownie.\n\n" IDS_SELECT_VOLUME "\nObecnie wybranym woluminem jest wolumin %lu.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 9ce8e6ac0a1..f3321412c72 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -46,7 +46,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ------- --------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partição %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n" - IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -68,6 +70,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nNenhum volume actualmente seleccionado.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_SELECT_VOLUME "\nVolume %lu é agora o volume seleccionado.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 0e75e449ac2..99c311a7800 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -46,7 +46,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partiție %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n" - IDS_LIST_VOLUME_HEAD "Volum ###\tLtr\tEtichetă\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -68,6 +70,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nPartiție nevalidă.\n\n" IDS_SELECT_NO_VOLUME "\nMomentan nu există niciun volum selectat.\nSelectați un disc apoi reîncercați.\n\n" IDS_SELECT_VOLUME "\nVolumul %lu este selectat acum.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index b3bd8015dfe..ad20e840a0c 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -46,7 +46,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n" - IDS_LIST_VOLUME_HEAD "Том ###\tИмя\tМетка\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -68,6 +70,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nОшибка в разметке диска.\n\n" IDS_SELECT_NO_VOLUME "\nТом на диске не указан.\nВыберите том диска и повторите.\n\n" IDS_SELECT_VOLUME "\nВыбран текущим %lu том диска.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 87ad6659c59..2238218d669 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -48,7 +48,9 @@ BEGIN IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" - IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -70,6 +72,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 4788477ea59..193502965c6 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -46,7 +46,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" - IDS_LIST_VOLUME_HEAD "Birim ###\tHarf\tEtiket\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -68,6 +70,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\nGeçersiz bölüm.\n\n" IDS_SELECT_NO_VOLUME "\nŞimdilik bir birim seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_VOLUME "\nBirim %lu şimdi seçilen birimdir.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 1a9fd494bb4..e04d919004c 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -47,7 +47,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" - IDS_LIST_VOLUME_HEAD " 卷 ### Ltr 标签\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -69,6 +71,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\n无效的分区。\n\n" IDS_SELECT_NO_VOLUME "\n没有当前所选的卷。\n请选择一个磁盘，再试一次。\n\n" IDS_SELECT_VOLUME "\n卷 %lu 现在是所选的卷。\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 21be6d0cd81..15a26899024 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -47,7 +47,9 @@ BEGIN IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" - IDS_LIST_VOLUME_HEAD " 磁碟區 ### Ltr 標籤\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT " Volume %3lu %c %-11s %-5s %10u %4I64u %-2s\n" END /* RESCAN command string */ @@ -69,6 +71,7 @@ BEGIN IDS_SELECT_PARTITION_INVALID "\n無效的磁碟分割。\n\n" IDS_SELECT_NO_VOLUME "\n目前沒有選擇磁碟區。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_VOLUME "\n磁碟區 %lu 現在是所選的磁碟區。\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" END /* Disk Status */ diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index dd7e54c8f38..714f5e3c257 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -220,7 +220,48 @@ static VOID ListVolume(VOID) { + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + ULONGLONG VolumeSize; + LPWSTR lpSizeUnit; + ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); + ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + VolumeSize = VolumeEntry->Size.QuadPart; + if (VolumeSize >= 10737418240) /* 10 GB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1073741824); + lpSizeUnit = L"GB"; + } + else if (VolumeSize >= 10485760) /* 10 MB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1048576); + lpSizeUnit = L"MB"; + } + else + { + VolumeSize = RoundingDivide(VolumeSize, 1024); + lpSizeUnit = L"KB"; + } + + ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, + VolumeEntry->VolumeNumber, + VolumeEntry->DriveLetter, + (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", + (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", + VolumeEntry->DriveType, + VolumeSize, lpSizeUnit); + + Entry = Entry->Flink; + } + + ConPuts(StdOut, L"\n\n"); } static diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 6202eb0439c..2113373ce83 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -69,9 +69,11 @@ typedef struct _PARTITION_SECTOR LIST_ENTRY DiskListHead; LIST_ENTRY BiosDiskListHead; +LIST_ENTRY VolumeListHead; PDISKENTRY CurrentDisk = NULL; PPARTENTRY CurrentPartition = NULL; +PVOLENTRY CurrentVolume = NULL; /* FUNCTIONS ******************************************************************/ @@ -1173,4 +1175,137 @@ DestroyPartitionList(VOID) } } + +static +VOID +AddVolumeToList( + ULONG ulVolumeNumber, + PWSTR pszVolumeName) +{ + PVOLENTRY VolumeEntry; + + WCHAR szPathNames[256]; + DWORD dwLength; + WCHAR szVolumeName[MAX_PATH + 1]; + WCHAR szFilesystem[MAX_PATH + 1]; + + + VolumeEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(VOLENTRY)); + if (VolumeEntry == NULL) + { + return; + } + + + if (GetVolumePathNamesForVolumeNameW(pszVolumeName, + szPathNames, + 256, + &dwLength)) + { + VolumeEntry->DriveLetter = szPathNames[0]; + + if (GetVolumeInformationW(szPathNames, + szVolumeName, + MAX_PATH + 1, + NULL, // [out, optional] LPDWORD lpVolumeSerialNumber, + NULL, // [out, optional] LPDWORD lpMaximumComponentLength, + NULL, // [out, optional] LPDWORD lpFileSystemFlags, + szFilesystem, + MAX_PATH + 1)) + { + VolumeEntry->pszLabel = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(szVolumeName) + 1) * sizeof(WCHAR)); + if (VolumeEntry->pszLabel) + wcscpy(VolumeEntry->pszLabel, szVolumeName); + + VolumeEntry->pszFilesystem = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(szFilesystem) + 1) * sizeof(WCHAR)); + if (VolumeEntry->pszFilesystem) + wcscpy(VolumeEntry->pszFilesystem, szFilesystem); + + VolumeEntry->DriveType = GetDriveType(szPathNames); + + GetDiskFreeSpaceExW(szPathNames, + NULL, // [out, optional] PULARGE_INTEGER lpFreeBytesAvailableToCaller, + &VolumeEntry->Size, // [out, optional] PULARGE_INTEGER lpTotalNumberOfBytes, + NULL // [out, optional] PULARGE_INTEGER lpTotalNumberOfFreeBytes + ); + } + } + + VolumeEntry->VolumeNumber = ulVolumeNumber; + wcscpy(VolumeEntry->VolumeName, pszVolumeName); + + InsertTailList(&VolumeListHead, + &VolumeEntry->ListEntry); +} + + +NTSTATUS +CreateVolumeList(VOID) +{ + HANDLE hVolume = INVALID_HANDLE_VALUE; + WCHAR szVolumeName[MAX_PATH]; + ULONG ulVolumeNumber = 0; + BOOL Success; + + CurrentVolume = NULL; + + InitializeListHead(&VolumeListHead); + + hVolume = FindFirstVolumeW(szVolumeName, ARRAYSIZE(szVolumeName)); + if (hVolume == INVALID_HANDLE_VALUE) + { + + return STATUS_UNSUCCESSFUL; + } + + AddVolumeToList(ulVolumeNumber++, szVolumeName); + + for (;;) + { + Success = FindNextVolumeW(hVolume, szVolumeName, ARRAYSIZE(szVolumeName)); + if (!Success) + { + break; + } + + AddVolumeToList(ulVolumeNumber++, szVolumeName); + } + + FindVolumeClose(hVolume); + + return STATUS_SUCCESS; +} + + +VOID +DestroyVolumeList(VOID) +{ + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + + CurrentVolume = NULL; + + /* Release disk and partition info */ + while (!IsListEmpty(&VolumeListHead)) + { + Entry = RemoveHeadList(&VolumeListHead); + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (VolumeEntry->pszLabel) + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pszLabel); + + if (VolumeEntry->pszFilesystem) + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pszFilesystem); + + /* Release disk entry */ + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry); + } +} + /* EOF */ diff --git a/base/system/diskpart/rescan.c b/base/system/diskpart/rescan.c index cf4e461a0f2..29371861f01 100644 --- a/base/system/diskpart/rescan.c +++ b/base/system/diskpart/rescan.c @@ -11,8 +11,10 @@ BOOL rescan_main(INT argc, LPWSTR *argv) { ConResPuts(StdOut, IDS_RESCAN_START); + DestroyVolumeList(); DestroyPartitionList(); CreatePartitionList(); + CreateVolumeList(); ConResPuts(StdOut, IDS_RESCAN_END); return TRUE; diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 4e2b35f9e24..34924947a98 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -40,6 +40,8 @@ #define IDS_LIST_PARTITION_FORMAT 3305 #define IDS_LIST_PARTITION_NO_DISK 3306 #define IDS_LIST_VOLUME_HEAD 3307 +#define IDS_LIST_VOLUME_LINE 3308 +#define IDS_LIST_VOLUME_FORMAT 3309 #define IDS_RESCAN_START 4100 #define IDS_RESCAN_END 4101 @@ -53,6 +55,7 @@ #define IDS_SELECT_PARTITION_INVALID 4406 #define IDS_SELECT_NO_VOLUME 4407 #define IDS_SELECT_VOLUME 4408 +#define IDS_SELECT_VOLUME_INVALID 4409 #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 diff --git a/base/system/diskpart/select.c b/base/system/diskpart/select.c index bebdbadde5a..4a1804ebbfd 100644 --- a/base/system/diskpart/select.c +++ b/base/system/diskpart/select.c @@ -157,6 +157,63 @@ SelectPartition( } +static +VOID +SelectVolume( + INT argc, + LPWSTR *argv) +{ + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + LONG lValue; + LPWSTR endptr = NULL; + + DPRINT("SelectVolume()\n"); + + if (argc > 3) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + if (argc == 2) + { + if (CurrentDisk == NULL) + ConResPuts(StdOut, IDS_SELECT_NO_VOLUME); + else + ConResPrintf(StdOut, IDS_SELECT_VOLUME, CurrentVolume->VolumeNumber); + return; + } + + lValue = wcstol(argv[2], &endptr, 10); + if (((lValue == 0) && (endptr == argv[2])) || + (lValue < 0)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return; + } + + CurrentVolume = NULL; + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (VolumeEntry->VolumeNumber == (ULONG)lValue) + { + CurrentVolume = VolumeEntry; + ConResPrintf(StdOut, IDS_SELECT_VOLUME, CurrentVolume->VolumeNumber); + return; + } + + Entry = Entry->Flink; + } + + ConResPuts(StdErr, IDS_SELECT_VOLUME_INVALID); +} + + BOOL select_main( INT argc, @@ -174,6 +231,8 @@ select_main( SelectDisk(argc, argv); else if (!wcsicmp(argv[1], L"partition")) SelectPartition(argc, argv); + else if (!wcsicmp(argv[1], L"volume")) + SelectVolume(argc, argv); else ConResPuts(StdOut, IDS_HELP_CMD_SELECT);

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