Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [DISKPART] Silence a debug message
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96d137a559c985f576b05… commit 96d137a559c985f576b05e4942f1ce9d35dc5474 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 13:07:53 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 13:07:53 2022 +0200 [DISKPART] Silence a debug message --- base/system/diskpart/partlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 038557a4133..8d27b585ecc 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -1315,8 +1315,7 @@ AddVolumeToList( IO_STATUS_BLOCK Iosb; NTSTATUS Status; - - ConPrintf(StdOut, L"AddVolumeToList(%s)\n", pszVolumeName); + DPRINT("AddVolumeToList(%S)\n", pszVolumeName); VolumeEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,

1 0

[reactos] 01/01: [DISKPART] Improve the LIST VOLUME command
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a1c00c1178b79f550aed… commit 5a1c00c1178b79f550aed0430c8e26f4892032fa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 12:41:42 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 12:41:42 2022 +0200 [DISKPART] Improve the LIST VOLUME command --- base/system/diskpart/diskpart.h | 12 ++- base/system/diskpart/lang/en-US.rc | 6 +- base/system/diskpart/lang/pl-PL.rc | 6 +- base/system/diskpart/lang/pt-PT.rc | 6 +- base/system/diskpart/lang/ro-RO.rc | 6 +- base/system/diskpart/lang/ru-RU.rc | 6 +- base/system/diskpart/lang/sq-AL.rc | 6 +- base/system/diskpart/lang/tr-TR.rc | 6 +- base/system/diskpart/lang/zh-CN.rc | 6 +- base/system/diskpart/lang/zh-TW.rc | 6 +- base/system/diskpart/list.c | 45 ++++++-- base/system/diskpart/partlist.c | 211 ++++++++++++++++++++++++++++++++----- 12 files changed, 258 insertions(+), 64 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 218b6030a17..23ea593e7b4 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -83,6 +83,14 @@ typedef enum _FORMATSTATE Formatted } FORMATSTATE, *PFORMATSTATE; +typedef enum _VOLUME_TYPE +{ + VOLUME_TYPE_CDROM, + VOLUME_TYPE_PARTITION, + VOLUME_TYPE_REMOVABLE, + VOLUME_TYPE_UNKNOWN +} VOLUME_TYPE, *PVOLUME_TYPE; + typedef struct _PARTENTRY { LIST_ENTRY ListEntry; @@ -185,9 +193,11 @@ typedef struct _VOLENTRY PWSTR pszLabel; PWSTR pszFilesystem; - UINT DriveType; + VOLUME_TYPE VolumeType; ULARGE_INTEGER Size; + PVOLUME_DISK_EXTENTS pExtents; + } VOLENTRY, *PVOLENTRY; diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 7289cb2d159..4eeadf4066a 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -47,16 +47,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" 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 FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END /* RESCAN command string */ diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 426c948519d..69de3471d20 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -47,16 +47,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\nDysk ### Stan Rozmiar Wolne Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Dysk ### Stan Rozmiar Wolne Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\nPartycja Typ Rozmiar Przesunięcie\n" + IDS_LIST_PARTITION_HEAD " Partycja Typ Rozmiar Przesunięcie\n" 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 FS Typ Rozmiar Stan Info\n" IDS_LIST_VOLUME_LINE " ----------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Wolumin %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Wolumin %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END /* RESCAN command string */ diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 86ec0a9c6e1..0edee6239c9 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disco ## Estado Tamanho Livre Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disco ## Estado Tamanho Livre Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- --------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partição Tipo Tamanho deslocamento\n" + IDS_LIST_PARTITION_HEAD " Partição Tipo Tamanho deslocamento\n" 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 FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index add736038ea..7f69919ca93 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disc ### Stare Dimensiune Liber Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disc ### Stare Dimensiune Liber Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partiție Tip Dim. Depl.\n" + IDS_LIST_PARTITION_HEAD " Partiție Tip Dim. Depl.\n" 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 " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 41867204039..3ecfe9122bf 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Диск ### Состояние Размер Свободно Дин GPT\n" + IDS_LIST_DISK_HEAD " Диск ### Состояние Размер Свободно Дин GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Разметка Тип Размер Отступ\n" + IDS_LIST_PARTITION_HEAD " Разметка Тип Размер Отступ\n" 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 " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 1f75c1588bf..49e7ea9ff34 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -46,16 +46,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" 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 ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 1daaf0e90e4..bb106bccd82 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Durum Boyut Boş Dev Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Durum Boyut Boş Dev Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Bölüm Tür Boyut Ofset\n" + IDS_LIST_PARTITION_HEAD " Bölüm Tür Boyut Ofset\n" 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 " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index e698bc05167..1a23e12d8cd 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -51,16 +51,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n 磁盘 ### 状态大小可用活动 Gpt\n" + IDS_LIST_DISK_HEAD " 磁盘 ### 状态大小可用活动 Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n 分区类型大小偏移量\n" + IDS_LIST_PARTITION_HEAD " 分区类型大小偏移量\n" 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 " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 87dad569f01..6f931d2e0dd 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -45,16 +45,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n 磁碟 ### 狀態大小可用 Dyn Gpt\n" + IDS_LIST_DISK_HEAD " 磁碟 ### 狀態大小可用 Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n 分區類型大小偏移量\n" + IDS_LIST_PARTITION_HEAD " 分區類型大小偏移量\n" 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 " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 4eb1d8fb823..21589c727cf 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -26,6 +26,7 @@ ListDisk( LPWSTR lpFreeUnit; /* Header labels */ + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_DISK_HEAD); ConResPuts(StdOut, IDS_LIST_DISK_LINE); @@ -55,7 +56,7 @@ ListDisk( lpFreeUnit = L"B"; ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, - (CurrentDisk == DiskEntry) ? L'*': ' ', + (CurrentDisk == DiskEntry) ? L'*' : L' ', DiskEntry->DiskNumber, L"Online", DiskSize, @@ -94,6 +95,7 @@ ListPartition( } /* Header labels */ + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_PARTITION_HEAD); ConResPuts(StdOut, IDS_LIST_PARTITION_LINE); @@ -141,7 +143,7 @@ ListPartition( } ConResPrintf(StdOut, IDS_LIST_PARTITION_FORMAT, - (CurrentPartition == PartEntry) ? L'*': ' ', + (CurrentPartition == PartEntry) ? L'*' : L' ', PartNumber++, IsContainerPartition(PartEntry->PartitionType) ? L"Extended" : L"Primary", PartSize, @@ -197,7 +199,7 @@ ListPartition( } ConResPrintf(StdOut, IDS_LIST_PARTITION_FORMAT, - (CurrentPartition == PartEntry) ? L'*': ' ', + (CurrentPartition == PartEntry) ? L'*' : L' ', PartNumber++, L"Logical", PartSize, @@ -223,8 +225,10 @@ ListVolume( PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; ULONGLONG VolumeSize; - LPWSTR lpSizeUnit; + PWSTR pszSizeUnit; + PWSTR pszVolumeType; + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); @@ -237,31 +241,52 @@ ListVolume( if (VolumeSize >= 10737418240) /* 10 GB */ { VolumeSize = RoundingDivide(VolumeSize, 1073741824); - lpSizeUnit = L"GB"; + pszSizeUnit = L"GB"; } else if (VolumeSize >= 10485760) /* 10 MB */ { VolumeSize = RoundingDivide(VolumeSize, 1048576); - lpSizeUnit = L"MB"; + pszSizeUnit = L"MB"; } else { VolumeSize = RoundingDivide(VolumeSize, 1024); - lpSizeUnit = L"KB"; + pszSizeUnit = L"KB"; + } + + switch (VolumeEntry->VolumeType) + { + case VOLUME_TYPE_CDROM: + pszVolumeType = L"DVD"; + break; + + case VOLUME_TYPE_PARTITION: + pszVolumeType = L"Partition"; + break; + + case VOLUME_TYPE_REMOVABLE: + pszVolumeType = L"Removable"; + break; + + case VOLUME_TYPE_UNKNOWN: + default: + pszVolumeType = L"Unknown"; + break; } ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, + (CurrentVolume == VolumeEntry) ? L'*' : L' ', VolumeEntry->VolumeNumber, VolumeEntry->DriveLetter, (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", - VolumeEntry->DriveType, - VolumeSize, lpSizeUnit); + pszVolumeType, + VolumeSize, pszSizeUnit); Entry = Entry->Flink; } - ConPuts(StdOut, L"\n\n"); + ConPuts(StdOut, L"\n"); return TRUE; } diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 568f902ea38..038557a4133 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -1186,6 +1186,112 @@ DestroyPartitionList(VOID) } +static +VOID +GetVolumeExtents( + _In_ HANDLE VolumeHandle, + _In_ PVOLENTRY VolumeEntry) +{ + DWORD dwBytesReturned = 0, dwLength, i; + PVOLUME_DISK_EXTENTS pExtents; + BOOL bResult; + DWORD dwError; + + dwLength = sizeof(VOLUME_DISK_EXTENTS); + pExtents = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (pExtents == NULL) + return; + + bResult = DeviceIoControl(VolumeHandle, + IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, + NULL, + 0, + pExtents, + dwLength, + &dwBytesReturned, + NULL); + if (!bResult) + { + dwError = GetLastError(); + + if (dwError != ERROR_MORE_DATA) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + return; + } + else + { + dwLength = sizeof(VOLUME_DISK_EXTENTS) + ((pExtents->NumberOfDiskExtents - 1) * sizeof(DISK_EXTENT)); + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + pExtents = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (pExtents == NULL) + { + return; + } + + bResult = DeviceIoControl(VolumeHandle, + IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, + NULL, + 0, + pExtents, + dwLength, + &dwBytesReturned, + NULL); + if (!bResult) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + return; + } + } + } + + for (i = 0; i < pExtents->NumberOfDiskExtents; i++) + VolumeEntry->Size.QuadPart += pExtents->Extents[i].ExtentLength.QuadPart; + + VolumeEntry->pExtents = pExtents; +} + + +static +VOID +GetVolumeType( + HANDLE VolumeHandle, + _In_ PVOLENTRY VolumeEntry) +{ + FILE_FS_DEVICE_INFORMATION DeviceInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &DeviceInfo, + sizeof(FILE_FS_DEVICE_INFORMATION), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + return; + + switch (DeviceInfo.DeviceType) + { + case FILE_DEVICE_CD_ROM: + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + VolumeEntry->VolumeType = VOLUME_TYPE_CDROM; + break; + + case FILE_DEVICE_DISK: + case FILE_DEVICE_DISK_FILE_SYSTEM: + if (DeviceInfo.Characteristics & FILE_REMOVABLE_MEDIA) + VolumeEntry->VolumeType = VOLUME_TYPE_REMOVABLE; + else + VolumeEntry->VolumeType = VOLUME_TYPE_PARTITION; + break; + + default: + VolumeEntry->VolumeType = VOLUME_TYPE_UNKNOWN; + break; + } +} + + static VOID AddVolumeToList( @@ -1193,30 +1299,72 @@ AddVolumeToList( PWSTR pszVolumeName) { PVOLENTRY VolumeEntry; + HANDLE VolumeHandle; - WCHAR szPathNames[256]; - DWORD dwLength; + DWORD dwError, dwLength; + WCHAR szPathNames[MAX_PATH + 1]; WCHAR szVolumeName[MAX_PATH + 1]; WCHAR szFilesystem[MAX_PATH + 1]; + DWORD CharCount = 0; + WCHAR DeviceName[MAX_PATH] = L""; + size_t Index = 0; + + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + + ConPrintf(StdOut, L"AddVolumeToList(%s)\n", pszVolumeName); VolumeEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VOLENTRY)); if (VolumeEntry == NULL) + return; + + VolumeEntry->VolumeNumber = ulVolumeNumber; + wcscpy(VolumeEntry->VolumeName, pszVolumeName); + + Index = wcslen(pszVolumeName) - 1; + + pszVolumeName[Index] = L'\0'; + + CharCount = QueryDosDeviceW(&pszVolumeName[4], DeviceName, ARRAYSIZE(DeviceName)); + + pszVolumeName[Index] = L'\\'; + + if (CharCount == 0) { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry); return; } + DPRINT("DeviceName: %S\n", DeviceName); - if (GetVolumePathNamesForVolumeNameW(pszVolumeName, - szPathNames, - 256, - &dwLength)) + RtlInitUnicodeString(&Name, DeviceName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&VolumeHandle, + SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + 0, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT); + if (NT_SUCCESS(Status)) { - VolumeEntry->DriveLetter = szPathNames[0]; + GetVolumeType(VolumeHandle, VolumeEntry); + GetVolumeExtents(VolumeHandle, VolumeEntry); + NtClose(VolumeHandle); + } - if (GetVolumeInformationW(szPathNames, + if (GetVolumeInformationW(pszVolumeName, szVolumeName, MAX_PATH + 1, NULL, // [out, optional] LPDWORD lpVolumeSerialNumber, @@ -1224,31 +1372,39 @@ AddVolumeToList( 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->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); + } + else + { + dwError = GetLastError(); + if (dwError == ERROR_UNRECOGNIZED_VOLUME) + { VolumeEntry->pszFilesystem = RtlAllocateHeap(RtlGetProcessHeap(), 0, - (wcslen(szFilesystem) + 1) * sizeof(WCHAR)); + (3 + 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 - ); + wcscpy(VolumeEntry->pszFilesystem, L"RAW"); } } - VolumeEntry->VolumeNumber = ulVolumeNumber; - wcscpy(VolumeEntry->VolumeName, pszVolumeName); + if (GetVolumePathNamesForVolumeNameW(pszVolumeName, + szPathNames, + ARRAYSIZE(szPathNames), + &dwLength)) + { + VolumeEntry->DriveLetter = szPathNames[0]; + } InsertTailList(&VolumeListHead, &VolumeEntry->ListEntry); @@ -1313,6 +1469,9 @@ DestroyVolumeList(VOID) if (VolumeEntry->pszFilesystem) RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pszFilesystem); + if (VolumeEntry->pExtents) + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pExtents); + /* Release disk entry */ RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry); }

1 0

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION LOGICAL
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=863400813abe6c8dd4720… commit 863400813abe6c8dd4720997e7fe36325971967e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 10:05:51 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 10:05:51 2022 +0200 [DISKPART] Implement CREATE PARTITION LOGICAL --- base/system/diskpart/create.c | 173 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 9fa6b189cbf..9617b7c4e60 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -184,13 +184,184 @@ CreateLogicalPartition( _In_ INT argc, _In_ PWSTR *argv) { + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL; + ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif + UCHAR PartitionType = 6; + INT i, length; + PWSTR pszSuffix = NULL; + if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } - ConPrintf(StdOut, L"Not implemented yet!\n"); + for (i = 3; i < argc; i++) + { + if (HasPrefix(argv[i], L"size=", &pszSuffix)) + { + /* size=<N> (MB) */ + DPRINT("Size : %s\n", pszSuffix); + + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) + { + /* offset=<N> (KB) */ + DPRINT("Offset : %s\n", pszSuffix); + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } +#endif + } + else if (HasPrefix(argv[i], L"id=", &pszSuffix)) + { + /* id=<Byte>|<GUID> */ + DPRINT("Id : %s\n", pszSuffix); + + length = wcslen(pszSuffix); + if ((length == 1) || (length == 2)) + { + /* Byte */ + PartitionType = (UCHAR)wcstoul(pszSuffix, NULL, 16); + if ((PartitionType == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } +#if 0 + else if () + { + /* GUID */ + } +#endif + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"align=", &pszSuffix)) + { + /* align=<N> */ + DPRINT("Align : %s\n", pszSuffix); + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif + } + else if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + DPRINT("NoErr\n", pszSuffix); + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + DPRINT1("Size: %I64u\n", ullSize); +#if 0 + DPRINT1("Offset: %I64u\n", ullOffset); +#endif + DPRINT1("Partition Type: %hx\n", PartitionType); + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + for (ListEntry = CurrentDisk->LogicalPartListHead.Flink; + ListEntry != &CurrentDisk->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + continue; + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = TRUE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PartitionType; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + break; + } + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; }

1 0

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION EXTENDED and warn about unimplemented options
by Eric Kohl 28 May '22

28 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52bbf6078ec2ea9e6d046… commit 52bbf6078ec2ea9e6d0467019d6d674de87878b4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 13:17:45 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 13:17:45 2022 +0200 [DISKPART] Implement CREATE PARTITION EXTENDED and warn about unimplemented options --- base/system/diskpart/create.c | 187 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 12 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 095bf4e3d10..9fa6b189cbf 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -14,16 +14,166 @@ BOOL CreateExtendedPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL; + ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif + INT i; + PWSTR pszSuffix = NULL; + if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } - ConPrintf(StdOut, L"Not implemented yet!\n"); + for (i = 3; i < argc; i++) + { + if (HasPrefix(argv[i], L"size=", &pszSuffix)) + { + /* size=<N> (MB) */ + DPRINT("Size : %s\n", pszSuffix); + + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) + { + /* offset=<N> (KB) */ + DPRINT("Offset : %s\n", pszSuffix); + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } +#endif + } + else if (HasPrefix(argv[i], L"align=", &pszSuffix)) + { + /* align=<N> */ + DPRINT("Align : %s\n", pszSuffix); + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif + } + else if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + DPRINT("NoErr\n", pszSuffix); + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + DPRINT1("Size: %I64u\n", ullSize); +#if 0 + DPRINT1("Offset: %I64u\n", ullOffset); +#endif + + if (GetPrimaryPartitionCount(CurrentDisk) >= 4) + { + ConPuts(StdOut, L"No space left for an extended partition!\n"); + return TRUE; + } + + if (CurrentDisk->ExtendedPartition != NULL) + { + ConPuts(StdOut, L"We already have an extended partition on this disk!\n"); + return TRUE; + } + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + ListEntry = CurrentDisk->PrimaryPartListHead.Blink; + + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + { + ConPuts(StdOut, L"No disk space left for an extended partition!\n"); + return TRUE; + } + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PARTITION_EXTENDED; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PARTITION_EXTENDED; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = FALSE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PARTITION_EXTENDED; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; } @@ -31,8 +181,8 @@ CreateExtendedPartition( BOOL CreateLogicalPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { if (CurrentDisk == NULL) { @@ -48,16 +198,19 @@ CreateLogicalPartition( BOOL CreatePrimaryPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { PPARTENTRY PartEntry, NewPartEntry; PLIST_ENTRY ListEntry; - ULONGLONG ullSize = 0ULL, ullOffset = 0ULL; + ULONGLONG ullSize = 0ULL; ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif UCHAR PartitionType = 6; INT i, length; -// BOOL bNoErr = FALSE; PWSTR pszSuffix = NULL; if (CurrentDisk == NULL) @@ -84,13 +237,15 @@ CreatePrimaryPartition( { /* offset=<N> (KB) */ DPRINT("Offset : %s\n", pszSuffix); - + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 ullOffset = _wcstoui64(pszSuffix, NULL, 10); if ((ullOffset == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; } +#endif } else if (HasPrefix(argv[i], L"id=", &pszSuffix)) { @@ -124,13 +279,19 @@ CreatePrimaryPartition( { /* align=<N> */ DPRINT("Align : %s\n", pszSuffix); -// bAlign = TRUE; + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif } else if (_wcsicmp(argv[i], L"noerr") == 0) { /* noerr */ DPRINT("NoErr\n", pszSuffix); -// bNoErr = TRUE; + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif } else { @@ -140,7 +301,9 @@ CreatePrimaryPartition( } DPRINT1("Size: %I64u\n", ullSize); +#if 0 DPRINT1("Offset: %I64u\n", ullOffset); +#endif DPRINT1("Partition Type: %hx\n", PartitionType); if (GetPrimaryPartitionCount(CurrentDisk) >= 4)

1 0

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION PRIMARY and DELETE PARTITION
by Eric Kohl 28 May '22

28 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=723947eab127001405d07… commit 723947eab127001405d07963f2046e147be6498f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 11:33:29 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 11:33:29 2022 +0200 [DISKPART] Implement CREATE PARTITION PRIMARY and DELETE PARTITION --- base/system/diskpart/create.c | 146 ++++++++-- base/system/diskpart/delete.c | 121 ++++++++ base/system/diskpart/diskpart.h | 34 ++- base/system/diskpart/partlist.c | 630 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 891 insertions(+), 40 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index a933da2c5ae..095bf4e3d10 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -8,6 +8,10 @@ #include "diskpart.h" +#define NDEBUG +#include <debug.h> + + BOOL CreateExtendedPartition( INT argc, @@ -47,32 +51,30 @@ CreatePrimaryPartition( INT argc, PWSTR *argv) { - LARGE_INTEGER liSize, liOffset; - INT i; + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL, ullOffset = 0ULL; + ULONGLONG ullSectorCount; + UCHAR PartitionType = 6; + INT i, length; // BOOL bNoErr = FALSE; PWSTR pszSuffix = NULL; - liSize.QuadPart = -1; - liOffset.QuadPart = -1; - -/* if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } -*/ for (i = 3; i < argc; i++) { if (HasPrefix(argv[i], L"size=", &pszSuffix)) { /* size=<N> (MB) */ - ConPrintf(StdOut, L"Size : %s\n", pszSuffix); + DPRINT("Size : %s\n", pszSuffix); - liSize.QuadPart = _wcstoui64(pszSuffix, NULL, 10); - if (((liSize.QuadPart == 0) && (errno == ERANGE)) || - (liSize.QuadPart < 0)) + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; @@ -81,11 +83,10 @@ CreatePrimaryPartition( else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) { /* offset=<N> (KB) */ - ConPrintf(StdOut, L"Offset : %s\n", pszSuffix); + DPRINT("Offset : %s\n", pszSuffix); - liOffset.QuadPart = _wcstoui64(pszSuffix, NULL, 10); - if (((liOffset.QuadPart == 0) && (errno == ERANGE)) || - (liOffset.QuadPart < 0)) + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; @@ -94,17 +95,41 @@ CreatePrimaryPartition( else if (HasPrefix(argv[i], L"id=", &pszSuffix)) { /* id=<Byte>|<GUID> */ - ConPrintf(StdOut, L"Id : %s\n", pszSuffix); + DPRINT("Id : %s\n", pszSuffix); + + length = wcslen(pszSuffix); + if ((length == 1) || (length == 2)) + { + /* Byte */ + PartitionType = (UCHAR)wcstoul(pszSuffix, NULL, 16); + if ((PartitionType == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } +#if 0 + else if () + { + /* GUID */ + } +#endif + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } } else if (HasPrefix(argv[i], L"align=", &pszSuffix)) { /* align=<N> */ - ConPrintf(StdOut, L"Align : %s\n", pszSuffix); + DPRINT("Align : %s\n", pszSuffix); +// bAlign = TRUE; } else if (_wcsicmp(argv[i], L"noerr") == 0) { /* noerr */ - ConPrintf(StdOut, L"NoErr\n", pszSuffix); + DPRINT("NoErr\n", pszSuffix); // bNoErr = TRUE; } else @@ -114,8 +139,89 @@ CreatePrimaryPartition( } } - ConPrintf(StdOut, L"Size: %I64d\n", liSize.QuadPart); - ConPrintf(StdOut, L"Offset: %I64d\n", liOffset.QuadPart); + DPRINT1("Size: %I64u\n", ullSize); + DPRINT1("Offset: %I64u\n", ullOffset); + DPRINT1("Partition Type: %hx\n", PartitionType); + + if (GetPrimaryPartitionCount(CurrentDisk) >= 4) + { + ConPuts(StdOut, L"No space left for another primary partition!\n"); + return TRUE; + } + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + for (ListEntry = CurrentDisk->PrimaryPartListHead.Flink; + ListEntry != &CurrentDisk->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + continue; + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = FALSE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PartitionType; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + break; + } + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; } diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index de712944dcc..c17498bd863 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -8,6 +8,9 @@ #include "diskpart.h" +#define NDEBUG +#include <debug.h> + BOOL DeleteDisk( _In_ INT argc, @@ -16,14 +19,132 @@ DeleteDisk( return TRUE; } + BOOL DeletePartition( _In_ INT argc, _In_ PWSTR *argv) { + PPARTENTRY PrevPartEntry; + PPARTENTRY NextPartEntry; + PPARTENTRY LogicalPartEntry; + PLIST_ENTRY Entry; + + DPRINT("DeletePartition()\n"); + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return TRUE; + } + + ASSERT(CurrentPartition->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Clear the system partition if it is being deleted */ +#if 0 + if (List->SystemPartition == PartEntry) + { + ASSERT(List->SystemPartition); + List->SystemPartition = NULL; + } +#endif + + /* Check which type of partition (primary/logical or extended) is being deleted */ + if (CurrentDisk->ExtendedPartition == CurrentPartition) + { + /* An extended partition is being deleted: delete all logical partition entries */ + while (!IsListEmpty(&CurrentDisk->LogicalPartListHead)) + { + Entry = RemoveHeadList(&CurrentDisk->LogicalPartListHead); + LogicalPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + /* Dismount the logical partition */ + DismountVolume(LogicalPartEntry); + + /* Delete it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, LogicalPartEntry); + } + + CurrentDisk->ExtendedPartition = NULL; + } + else + { + /* A primary partition is being deleted: dismount it */ + DismountVolume(CurrentPartition); + } + + /* Adjust the unpartitioned disk space entries */ + + /* Get pointer to previous and next unpartitioned entries */ + PrevPartEntry = GetPrevUnpartitionedEntry(CurrentPartition); + NextPartEntry = GetNextUnpartitionedEntry(CurrentPartition); + + if (PrevPartEntry != NULL && NextPartEntry != NULL) + { + /* Merge the previous, current and next unpartitioned entries */ + + /* Adjust the previous entry length */ + PrevPartEntry->SectorCount.QuadPart += (CurrentPartition->SectorCount.QuadPart + NextPartEntry->SectorCount.QuadPart); + + /* Remove the current and next entries */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + RemoveEntryList(&NextPartEntry->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, NextPartEntry); + } + else if (PrevPartEntry != NULL && NextPartEntry == NULL) + { + /* Merge the current and the previous unpartitioned entries */ + + /* Adjust the previous entry length */ + PrevPartEntry->SectorCount.QuadPart += CurrentPartition->SectorCount.QuadPart; + + /* Remove the current entry */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + } + else if (PrevPartEntry == NULL && NextPartEntry != NULL) + { + /* Merge the current and the next unpartitioned entries */ + + /* Adjust the next entry offset and length */ + NextPartEntry->StartSector.QuadPart = CurrentPartition->StartSector.QuadPart; + NextPartEntry->SectorCount.QuadPart += CurrentPartition->SectorCount.QuadPart; + + /* Remove the current entry */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + } + else + { + /* Nothing to merge but change the current entry */ + CurrentPartition->IsPartitioned = FALSE; + CurrentPartition->OnDiskPartitionNumber = 0; + CurrentPartition->PartitionNumber = 0; + // CurrentPartition->PartitionIndex = 0; + CurrentPartition->BootIndicator = FALSE; + CurrentPartition->PartitionType = PARTITION_ENTRY_UNUSED; + CurrentPartition->FormatState = Unformatted; + CurrentPartition->FileSystemName[0] = L'\0'; + CurrentPartition->DriveLetter = 0; + RtlZeroMemory(CurrentPartition->VolumeLabel, sizeof(CurrentPartition->VolumeLabel)); + } + + CurrentPartition = NULL; + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); + return TRUE; } + BOOL DeleteVolume( _In_ INT argc, diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index f13e6724262..218b6030a17 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -94,13 +94,14 @@ typedef struct _PARTENTRY BOOLEAN BootIndicator; UCHAR PartitionType; - ULONG HiddenSectors; + ULONG OnDiskPartitionNumber; ULONG PartitionNumber; ULONG PartitionIndex; CHAR DriveLetter; CHAR VolumeLabel[17]; CHAR FileSystemName[9]; + FORMATSTATE FormatState; BOOLEAN LogicalPartition; @@ -113,8 +114,6 @@ typedef struct _PARTENTRY /* Partition was created automatically. */ BOOLEAN AutoCreate; - FORMATSTATE FormatState; - /* Partition must be checked */ BOOLEAN NeedsCheck; @@ -383,6 +382,11 @@ BOOL offline_main(INT argc, LPWSTR *argv); BOOL online_main(INT argc, LPWSTR *argv); /* partlist.c */ +ULONGLONG +AlignDown( + _In_ ULONGLONG Value, + _In_ ULONG Alignment); + NTSTATUS CreatePartitionList(VOID); @@ -395,6 +399,30 @@ CreateVolumeList(VOID); VOID DestroyVolumeList(VOID); +NTSTATUS +WritePartitions( + _In_ PDISKENTRY DiskEntry); + +VOID +UpdateDiskLayout( + _In_ PDISKENTRY DiskEntry); + +PPARTENTRY +GetPrevUnpartitionedEntry( + _In_ PPARTENTRY PartEntry); + +PPARTENTRY +GetNextUnpartitionedEntry( + _In_ PPARTENTRY PartEntry); + +ULONG +GetPrimaryPartitionCount( + _In_ PDISKENTRY DiskEntry); + +NTSTATUS +DismountVolume( + IN PPARTENTRY PartEntry); + /* recover.c */ BOOL recover_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 6d91e385571..568f902ea38 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -10,6 +10,7 @@ #include "diskpart.h" #include <ntddscsi.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -80,8 +81,8 @@ PVOLENTRY CurrentVolume = NULL; ULONGLONG AlignDown( - IN ULONGLONG Value, - IN ULONG Alignment) + _In_ ULONGLONG Value, + _In_ ULONG Alignment) { ULONGLONG Temp; @@ -102,9 +103,9 @@ GetDriverName( RtlInitUnicodeString(&DiskEntry->DriverName, NULL); - swprintf(KeyName, - L"\\Scsi\\Scsi Port %lu", - DiskEntry->Port); + StringCchPrintfW(KeyName, ARRAYSIZE(KeyName), + L"\\Scsi\\Scsi Port %lu", + DiskEntry->Port); RtlZeroMemory(&QueryTable, sizeof(QueryTable)); @@ -280,7 +281,8 @@ EnumerateBiosDiskEntries(VOID) AdapterCount = 0; while (1) { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -291,7 +293,8 @@ EnumerateBiosDiskEntries(VOID) break; } - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -301,7 +304,8 @@ EnumerateBiosDiskEntries(VOID) { while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -313,7 +317,8 @@ EnumerateBiosDiskEntries(VOID) return; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -335,7 +340,8 @@ EnumerateBiosDiskEntries(VOID) break; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, @@ -420,7 +426,6 @@ AddPartitionToDisk( PartEntry->BootIndicator = PartitionInfo->BootIndicator; PartEntry->PartitionType = PartitionInfo->PartitionType; - PartEntry->HiddenSectors = PartitionInfo->HiddenSectors; PartEntry->LogicalPartition = LogicalPartition; PartEntry->IsPartitioned = TRUE; @@ -849,7 +854,8 @@ AddDiskToList( } Checksum = ~Checksum + 1; - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); + StringCchPrintfW(Identifier, ARRAYSIZE(Identifier), + L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); DiskEntry = RtlAllocateHeap(RtlGetProcessHeap(), @@ -927,8 +933,10 @@ AddDiskToList( (ULONGLONG)DiskGeometry.TracksPerCylinder * (ULONGLONG)DiskGeometry.SectorsPerTrack; - DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; - DiskEntry->CylinderAlignment = DiskGeometry.SectorsPerTrack * DiskGeometry.TracksPerCylinder; +// DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; +// DiskEntry->CylinderAlignment = DiskGeometry.SectorsPerTrack * DiskGeometry.TracksPerCylinder; + DiskEntry->SectorAlignment = (1024 * 1024) / DiskGeometry.BytesPerSector; + DiskEntry->CylinderAlignment = (1024 * 1024) / DiskGeometry.BytesPerSector; DPRINT1("SectorCount: %I64u\n", DiskEntry->SectorCount); DPRINT1("SectorAlignment: %lu\n", DiskEntry->SectorAlignment); @@ -1085,9 +1093,10 @@ CreatePartitionList(VOID) for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) { - swprintf(Buffer, - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, Buffer); @@ -1309,4 +1318,591 @@ DestroyVolumeList(VOID) } } + +NTSTATUS +WritePartitions( + _In_ PDISKENTRY DiskEntry) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE FileHandle; + IO_STATUS_BLOCK Iosb; + ULONG BufferSize; + PPARTITION_INFORMATION PartitionInfo; + ULONG PartitionCount; + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + WCHAR DstPath[MAX_PATH]; + + DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); + + /* If the disk is not dirty, there is nothing to do */ + if (!DiskEntry->Dirty) + return STATUS_SUCCESS; + + StringCchPrintfW(DstPath, ARRAYSIZE(DstPath), + L"\\Device\\Harddisk%lu\\Partition0", + DiskEntry->DiskNumber); + RtlInitUnicodeString(&Name, DstPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + return Status; + } + + // + // FIXME: We first *MUST* use IOCTL_DISK_CREATE_DISK to initialize + // the disk in MBR or GPT format in case the disk was not initialized!! + // For this we must ask the user which format to use. + // + + /* Save the original partition count to be restored later (see comment below) */ + PartitionCount = DiskEntry->LayoutBuffer->PartitionCount; + + /* Set the new disk layout and retrieve its updated version with possibly modified partition numbers */ + BufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((PartitionCount - 1) * sizeof(PARTITION_INFORMATION)); + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_SET_DRIVE_LAYOUT, + DiskEntry->LayoutBuffer, + BufferSize, + DiskEntry->LayoutBuffer, + BufferSize); + NtClose(FileHandle); + + /* + * IOCTL_DISK_SET_DRIVE_LAYOUT calls IoWritePartitionTable(), which converts + * DiskEntry->LayoutBuffer->PartitionCount into a partition *table* count, + * where such a table is expected to enumerate up to 4 partitions: + * partition *table* count == ROUND_UP(PartitionCount, 4) / 4 . + * Due to this we need to restore the original PartitionCount number. + */ + DiskEntry->LayoutBuffer->PartitionCount = PartitionCount; + + /* Check whether the IOCTL_DISK_SET_DRIVE_LAYOUT call succeeded */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("IOCTL_DISK_SET_DRIVE_LAYOUT failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Update the partition numbers */ + + /* Update the primary partition table */ + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; + PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; + } + } + + /* Update the logical partition table */ + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; + PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; + } + } + + /* The layout has been successfully updated, the disk is not dirty anymore */ + DiskEntry->Dirty = FALSE; + + return Status; +} + + +static +BOOLEAN +IsEmptyLayoutEntry( + IN PPARTITION_INFORMATION PartitionInfo) +{ + if (PartitionInfo->StartingOffset.QuadPart == 0 && + PartitionInfo->PartitionLength.QuadPart == 0) + { + return TRUE; + } + + return FALSE; +} + + +static +BOOLEAN +IsSamePrimaryLayoutEntry( + IN PPARTITION_INFORMATION PartitionInfo, + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) +{ + if ((PartitionInfo->StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector) && + (PartitionInfo->PartitionLength.QuadPart == PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector)) + { + return TRUE; + } + + return FALSE; +} + + +ULONG +GetPrimaryPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + for (Entry = DiskEntry->PrimaryPartListHead.Flink; + Entry != &DiskEntry->PrimaryPartListHead; + Entry = Entry->Flink) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + Count++; + } + + return Count; +} + + +static +ULONG +GetLogicalPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + Count++; + } + + return Count; +} + + +static +BOOLEAN +ReAllocateLayoutBuffer( + IN PDISKENTRY DiskEntry) +{ + PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; + ULONG NewPartitionCount; + ULONG CurrentPartitionCount = 0; + ULONG LayoutBufferSize; + ULONG i; + + DPRINT1("ReAllocateLayoutBuffer()\n"); + + NewPartitionCount = 4 + GetLogicalPartitionCount(DiskEntry) * 4; + + if (DiskEntry->LayoutBuffer) + CurrentPartitionCount = DiskEntry->LayoutBuffer->PartitionCount; + + DPRINT1("CurrentPartitionCount: %lu ; NewPartitionCount: %lu\n", + CurrentPartitionCount, NewPartitionCount); + + if (CurrentPartitionCount == NewPartitionCount) + return TRUE; + + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((NewPartitionCount - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + NewLayoutBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (NewLayoutBuffer == NULL) + { + DPRINT1("Failed to allocate the new layout buffer (size: %lu)\n", LayoutBufferSize); + return FALSE; + } + + NewLayoutBuffer->PartitionCount = NewPartitionCount; + + /* If the layout buffer grows, make sure the new (empty) entries are written to the disk */ + if (NewPartitionCount > CurrentPartitionCount) + { + for (i = CurrentPartitionCount; i < NewPartitionCount; i++) + { + NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + } + } + + DiskEntry->LayoutBuffer = NewLayoutBuffer; + + return TRUE; +} + + +VOID +UpdateDiskLayout( + IN PDISKENTRY DiskEntry) +{ + PPARTITION_INFORMATION PartitionInfo; + PPARTITION_INFORMATION LinkInfo = NULL; + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + LARGE_INTEGER HiddenSectors64; + ULONG Index; + ULONG PartitionNumber = 1; + + DPRINT1("UpdateDiskLayout()\n"); + + /* Resize the layout buffer if necessary */ + if (ReAllocateLayoutBuffer(DiskEntry) == FALSE) + { + DPRINT("ReAllocateLayoutBuffer() failed.\n"); + return; + } + + /* Update the primary partition table */ + Index = 0; + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + PartEntry->PartitionIndex = Index; + + /* Reset the current partition number only for newly-created (unmounted) partitions */ + if (PartEntry->New) + PartEntry->PartitionNumber = 0; + + PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); + + if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) + { + DPRINT1("Updating primary partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; + PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; + PartitionInfo->PartitionType = PartEntry->PartitionType; + PartitionInfo->BootIndicator = PartEntry->BootIndicator; + PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartEntry->PartitionType); + PartitionInfo->RewritePartition = TRUE; + } + + if (!IsContainerPartition(PartEntry->PartitionType)) + PartitionNumber++; + + Index++; + } + } + + ASSERT(Index <= 4); + + /* Update the logical partition table */ + Index = 4; + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + PartEntry->PartitionIndex = Index; + + /* Reset the current partition number only for newly-created (unmounted) partitions */ + if (PartEntry->New) + PartEntry->PartitionNumber = 0; + + PartEntry->OnDiskPartitionNumber = PartitionNumber; + + DPRINT1("Updating logical partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; + PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; + PartitionInfo->PartitionType = PartEntry->PartitionType; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartEntry->PartitionType); + PartitionInfo->RewritePartition = TRUE; + + /* Fill the link entry of the previous partition entry */ + if (LinkInfo != NULL) + { + LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->PartitionLength.QuadPart = (PartEntry->StartSector.QuadPart + DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + HiddenSectors64.QuadPart = PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart; + LinkInfo->HiddenSectors = HiddenSectors64.LowPart; + LinkInfo->PartitionNumber = 0; + LinkInfo->PartitionType = PARTITION_EXTENDED; + LinkInfo->BootIndicator = FALSE; + LinkInfo->RecognizedPartition = FALSE; + LinkInfo->RewritePartition = TRUE; + } + + /* Save a pointer to the link entry of the current partition entry */ + LinkInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index + 1]; + + PartitionNumber++; + Index += 4; + } + } + + /* Wipe unused primary partition entries */ + for (Index = GetPrimaryPartitionCount(DiskEntry); Index < 4; Index++) + { + DPRINT1("Primary partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping primary partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + + /* Wipe unused logical partition entries */ + for (Index = 4; Index < DiskEntry->LayoutBuffer->PartitionCount; Index++) + { + if (Index % 4 >= 2) + { + DPRINT1("Logical partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + } + + DiskEntry->Dirty = TRUE; +} + + +PPARTENTRY +GetPrevUnpartitionedEntry( + IN PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + PPARTENTRY PrevPartEntry; + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Blink != ListHead) + { + PrevPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Blink, + PARTENTRY, + ListEntry); + if (!PrevPartEntry->IsPartitioned) + { + ASSERT(PrevPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + return PrevPartEntry; + } + } + + return NULL; +} + + +PPARTENTRY +GetNextUnpartitionedEntry( + IN PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + PPARTENTRY NextPartEntry; + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Flink != ListHead) + { + NextPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Flink, + PARTENTRY, + ListEntry); + if (!NextPartEntry->IsPartitioned) + { + ASSERT(NextPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + return NextPartEntry; + } + } + + return NULL; +} + +NTSTATUS +DismountVolume( + IN PPARTENTRY PartEntry) +{ + NTSTATUS Status; + NTSTATUS LockStatus; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE PartitionHandle; + WCHAR Buffer[MAX_PATH]; + + /* Check whether the partition is valid and was mounted by the system */ + if (!PartEntry->IsPartitioned || + IsContainerPartition(PartEntry->PartitionType) || + !IsRecognizedPartition(PartEntry->PartitionType) || + PartEntry->FormatState == UnknownFormat || + // NOTE: If FormatState == Unformatted but *FileSystem != 0 this means + // it has been usually mounted with RawFS and thus needs to be dismounted. +/* !*PartEntry->FileSystem || */ + PartEntry->PartitionNumber == 0) + { + /* The partition is not mounted, so just return success */ + return STATUS_SUCCESS; + } + + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Open the volume */ + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + PartEntry->DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&Name, Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&PartitionHandle, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Cannot open volume %wZ for dismounting! (Status 0x%lx)\n", &Name, Status); + return Status; + } + + /* Lock the volume */ + LockStatus = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("WARNING: Failed to lock volume! Operations may fail! (Status 0x%lx)\n", LockStatus); + } + + /* Dismount the volume */ + Status = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_DISMOUNT_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to unmount volume (Status 0x%lx)\n", Status); + } + + /* Unlock the volume */ + LockStatus = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("Failed to unlock volume (Status 0x%lx)\n", LockStatus); + } + + /* Close the volume */ + NtClose(PartitionHandle); + + return Status; +} + /* EOF */

1 0

[reactos] 01/01: [DISKPART] Fix crashes in the interpreter
by Eric Kohl 28 May '22

28 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166b88f95c1eed0be0340… commit 166b88f95c1eed0be0340a25ba73da5911521159 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 09:54:46 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 09:54:46 2022 +0200 [DISKPART] Fix crashes in the interpreter --- base/system/diskpart/interpreter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 5e4eafa47ee..d2decf537f1 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -128,20 +128,20 @@ InterpretCmd( for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0)) cmdptr1 = cmdptr; if ((cmdptr2 == NULL) && (argc >= 2) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (wcsicmp(argv[1], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0)) cmdptr2 = cmdptr; if ((cmdptr3 == NULL) && (argc >= 3) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (wcsicmp(argv[1], cmdptr->cmd2) == 0) && - (wcsicmp(argv[2], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL) && (wcsicmp(argv[2], cmdptr->cmd3) == 0)) cmdptr3 = cmdptr; }

1 0

[reactos] 02/02: [PC98VID] Fix video driver settings
by Stanislav Motylkov 27 May '22

27 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e0e4428caf08d0b3548… commit 17e0e4428caf08d0b35487b1428531bd9e51b873 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu May 26 23:34:12 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 27 18:56:13 2022 +0300 [PC98VID] Fix video driver settings - Store settings in non hardware-profile registry key. - Rename driver file to vgapnp.sys to keep in sync with VBE. - This makes PC-98 video driver working again. Addendum to 073a1ea3 and f03750de. CORE-18201 CORE-17977 --- win32ss/drivers/miniport/pc98vid/CMakeLists.txt | 4 ++-- win32ss/drivers/miniport/pc98vid/pc98disp.inf | 4 ++-- win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf | 6 +++--- win32ss/drivers/miniport/vbe/CMakeLists.txt | 8 ++++++-- win32ss/drivers/miniport/vga_new/CMakeLists.txt | 6 +----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt index db0f8ae4a39..b1966da028d 100644 --- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt +++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt @@ -8,8 +8,8 @@ list(APPEND SOURCE add_library(pc98vid MODULE ${SOURCE} pc98vid.rc) set_module_type(pc98vid kernelmodedriver) -# Actual binary filename is vga.sys -set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +# Actual binary filename is vgapnp.sys +set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vgapnp" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_pch(pc98vid pc98vid.h SOURCE) add_importlibs(pc98vid ntoskrnl videoprt) diff --git a/win32ss/drivers/miniport/pc98vid/pc98disp.inf b/win32ss/drivers/miniport/pc98vid/pc98disp.inf index 81a8608625a..d67f9882517 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98disp.inf +++ b/win32ss/drivers/miniport/pc98vid/pc98disp.inf @@ -27,7 +27,7 @@ DefaultDestDir = 12 CopyFiles = pc98vid_CopyFiles.NT [pc98vid_CopyFiles.NT] -vga.sys +vgapnp.sys [Pc98Vid_Inst.NT.Services] AddService = vga, 0x00000002, vga_Service_Inst @@ -36,7 +36,7 @@ AddService = vga, 0x00000002, vga_Service_Inst ServiceType = 1 StartType = 1 ErrorControl = 0 -ServiceBinary = %12%\vga.sys +ServiceBinary = %12%\vgapnp.sys LoadOrderGroup = Video [vga.SoftwareSettings] diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf b/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf index becce43fdff..753dfb80bf4 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf +++ b/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf @@ -2,9 +2,9 @@ [AddReg] HKLM,"SYSTEM\CurrentControlSet\Services\vga","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vga.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vgapnp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1 diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt index 415c9cc8d4f..3b79632d850 100644 --- a/win32ss/drivers/miniport/vbe/CMakeLists.txt +++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt @@ -9,5 +9,9 @@ set_module_type(vgapnp kernelmodedriver) add_importlibs(vgapnp videoprt) add_pch(vgapnp vbemp.h SOURCE) target_link_libraries(vgapnp libcntpr) -add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) -add_registry_inf(vbemp_reg.inf) + +# pc98vid takes place of vga service on PC-98 platform +if(NOT SARCH STREQUAL "pc98") + add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) + add_registry_inf(vbemp_reg.inf) +endif() diff --git a/win32ss/drivers/miniport/vga_new/CMakeLists.txt b/win32ss/drivers/miniport/vga_new/CMakeLists.txt index b0e304ba906..b278c71e87e 100644 --- a/win32ss/drivers/miniport/vga_new/CMakeLists.txt +++ b/win32ss/drivers/miniport/vga_new/CMakeLists.txt @@ -15,8 +15,4 @@ target_link_libraries(vga libcntpr) set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) add_pch(vga vga.h SOURCE) - -# pc98vid takes place of vga.sys on PC-98 platform -if(NOT SARCH STREQUAL "pc98") - add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) -endif() +add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)

1 0

[reactos] 01/02: [XBOXVMP] Fix video driver settings
by Stanislav Motylkov 27 May '22

27 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5471363801a2faf160579… commit 5471363801a2faf160579615e663e18a4e5c206d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu May 26 02:48:39 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 27 18:54:20 2022 +0300 [XBOXVMP] Fix video driver settings - Store settings in non hardware-profile registry key. - This makes Xbox video driver working again. Addendum to f03750de. CORE-16216 --- win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf index e7c2a3c5fdf..43d659323e8 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf @@ -7,7 +7,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_00000000&REV_A1\0000","Service",0x00000000,"XboxVmp" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" ; This is not true but it allows to use 3rd party drivers while having the XboxVmp driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","VgaCompatible",0x00010001,1

1 0

[reactos] 01/01: [CMAKE] Fix buildbot builders
by Victor Perevertkin 26 May '22

26 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a6101ca03514c292dc1… commit a5a6101ca03514c292dc1d2c0cc8d9145c223627 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri May 27 01:48:52 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 27 01:48:52 2022 +0300 [CMAKE] Fix buildbot builders --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b05726a694..63353f0c58b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,8 @@ add_definitions( # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) -if (NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") + OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))) # Thankfully, GCC has this add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=) add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=)

1 0

[reactos] 02/02: [CMAKE] Do not use USE_CLANG_CL variable in CMake scripts
by Victor Perevertkin 26 May '22

26 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=447ef2aa4a15adfb4060b… commit 447ef2aa4a15adfb4060b72383a34001a14d13ac Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu May 26 02:03:50 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 27 01:37:37 2022 +0300 [CMAKE] Do not use USE_CLANG_CL variable in CMake scripts --- CMakeLists.txt | 3 ++- base/applications/network/CMakeLists.txt | 4 +--- base/applications/network/telnet/CMakeLists.txt | 2 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/wlansvc/CMakeLists.txt | 2 +- base/setup/usetup/CMakeLists.txt | 2 +- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- dll/3rdparty/libtirpc/CMakeLists.txt | 2 +- drivers/wdm/audio/backpln/portcls/CMakeLists.txt | 2 +- sdk/cmake/msvc.cmake | 16 ++++++++-------- sdk/lib/3rdparty/stlport/CMakeLists.txt | 2 +- sdk/lib/crt/stdlib/stdlib.cmake | 2 +- subsystems/mvdm/asm16.cmake | 2 +- win32ss/printing/base/spoolsv/CMakeLists.txt | 2 +- 14 files changed, 23 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40adc041d20..2b05726a694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,8 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to # Arch Options if(ARCH STREQUAL "i386") - if(NOT USE_CLANG_CL) + # clang-cl defines this one for itself + if(NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_definitions(-D_M_IX86) endif() add_definitions(-D_X86_ -D__i386__ -Di386) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index 46246108408..4f95614999e 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -10,9 +10,7 @@ add_subdirectory(netstat) add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) -if(NOT USE_CLANG_CL) - add_subdirectory(telnet) -endif() +add_subdirectory(telnet) add_subdirectory(tracert) add_subdirectory(whois) add_subdirectory(wlanconf) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index 1af3dfefe26..8d0de5ac306 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT MSVC) target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE) endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) endif() diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 347356773c3..a8141072143 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos/wine) add_executable(rpcss ${SOURCE} rpcss.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(rpcss PRIVATE "-Wno-cast-calling-convention") endif() diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index 0ac461728e5..f1023aff221 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND SOURCE add_executable(wlansvc ${SOURCE} wlansvc.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(wlansvc PRIVATE "-Wno-cast-calling-convention") endif() diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 35d4ac099ee..1ef57a42082 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -30,7 +30,7 @@ list(APPEND SOURCE add_executable(usetup ${SOURCE} usetup.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(usetup PRIVATE "-Wno-invalid-source-encoding") endif() diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 00d6dc8271b..c00416befbc 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -211,7 +211,7 @@ add_library(freeldr_common ${FREELDR_NTLDR_SOURCE} ${FREELDR_BOOTMGR_SOURCE}) -if(USE_CLANG_CL) +if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") # We need to reduce the binary size target_compile_options(freeldr_common PRIVATE "/Os") endif() @@ -219,7 +219,7 @@ if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") # Prevent a warning when doing a memcmp with address 0 set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") endif() -if(ARCH STREQUAL "amd64" AND NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") # Prevent using SSE (not support in freeldr) target_compile_options(freeldr_common PUBLIC -mno-sse) endif() diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index 0975514febf..a0cb36ce8eb 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -97,7 +97,7 @@ if(MSVC) # Disable warning C4273: 'strtok_s': inconsistent dll linkage # Disable warning C4313: 'fprintf': '%x' in format string conflicts with argument 2 of type 'HANDLE' target_compile_options(libtirpc PRIVATE /wd4273 /wd4313) - if (NOT USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") target_compile_options(libtirpc PRIVATE /wd4101 /wd4133 /wd4473 /wd4477) endif() else() diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index a873b75fe2a..a2bd9b19d4e 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(portcls MODULE portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(portcls PRIVATE "-Wno-missing-braces") endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 2d482227730..ede1597a454 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -33,14 +33,14 @@ endif() add_definitions(/D__STDC__=1) # Ignore any "standard" include paths, and do not use any default CRT library. -if(NOT USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(/X /Zl) endif() # Disable buffer security checks by default. add_compile_options(/GS-) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: ") endif() @@ -48,7 +48,7 @@ endif() # default for older compilers. See CORE-6507 if(ARCH STREQUAL "i386") # Clang's IA32 means i386, which doesn't have cmpxchg8b - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-march=${OARCH}) else() add_compile_options(/arch:IA32) @@ -93,7 +93,7 @@ if (MSVC_IDE) endif() # On x86 Debug builds, if it's not Clang-CL or msbuild, treat all warnings as errors -if ((ARCH STREQUAL "i386") AND (CMAKE_BUILD_TYPE STREQUAL "Debug") AND (NOT USE_CLANG_CL) AND (NOT MSVC_IDE)) +if ((ARCH STREQUAL "i386") AND (CMAKE_BUILD_TYPE STREQUAL "Debug") AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC") AND (NOT MSVC_IDE)) set(TREAT_ALL_WARNINGS_AS_ERRORS=TRUE) endif() @@ -140,7 +140,7 @@ endif() # - C4115: named type definition in parentheses add_compile_options(/w14115) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-nostdinc;-Wno-multichar;-Wno-char-subscripts;-Wno-microsoft-enum-forward-reference;-Wno-pragma-pack;-Wno-microsoft-anon-tag;-Wno-parentheses-equality;-Wno-unknown-pragmas>") endif() @@ -152,7 +152,7 @@ add_compile_definitions($<$<CONFIG:Release>:NDEBUG>) # Hotpatchable images if(ARCH STREQUAL "i386") - if(NOT USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(/hotpatch) endif() set(_hotpatch_link_flag "/FUNCTIONPADMIN:5") @@ -432,7 +432,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres get_defines(_defines) get_includes(_includes) - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") @@ -519,7 +519,7 @@ function(add_linker_script _target _linker_script_file) # Create the additional linker response file. set(_generated_file "${_generated_file_path_prefix}.rsp") - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") diff --git a/sdk/lib/3rdparty/stlport/CMakeLists.txt b/sdk/lib/3rdparty/stlport/CMakeLists.txt index b2f245bb62f..2fb3f5643a5 100644 --- a/sdk/lib/3rdparty/stlport/CMakeLists.txt +++ b/sdk/lib/3rdparty/stlport/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(stlport src/cxa.c src/c_locale.c) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(stlport PRIVATE -Wno-missing-braces -Wno-unused-local-typedef) target_compile_options(stlport PRIVATE -Wno-infinite-recursion -Wno-deprecated-register) target_compile_options(stlport PRIVATE -Wno-tautological-unsigned-zero-compare) diff --git a/sdk/lib/crt/stdlib/stdlib.cmake b/sdk/lib/crt/stdlib/stdlib.cmake index aaf745c4519..3ab02840e34 100644 --- a/sdk/lib/crt/stdlib/stdlib.cmake +++ b/sdk/lib/crt/stdlib/stdlib.cmake @@ -32,7 +32,7 @@ list(APPEND CRT_STDLIB_SOURCE stdlib/wmakpath_s.c ) -if(USE_CLANG_CL) +if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") if(ARCH STREQUAL "i386") list(APPEND CRT_STDLIB_ASM_SOURCE stdlib/clang-alias.s diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index 3848aa1f129..a2df957c080 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -100,7 +100,7 @@ function(add_asm16_bin _target _binary_file _base_address) ## ## All this part is the same as CreateBootSectorTarget ## - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") diff --git a/win32ss/printing/base/spoolsv/CMakeLists.txt b/win32ss/printing/base/spoolsv/CMakeLists.txt index 6602eba9fab..566fe63f107 100644 --- a/win32ss/printing/base/spoolsv/CMakeLists.txt +++ b/win32ss/printing/base/spoolsv/CMakeLists.txt @@ -35,7 +35,7 @@ set_target_properties(spoolsv ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(spoolsv PRIVATE "-Wno-cast-calling-convention") endif()

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