Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 01/01: [DISKPART] Implement the uniqueid command

by Eric Kohl

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; }

2 years, 9 months

[reactos] 01/01: [DISKPART] Add volume support

by Eric Kohl

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);

2 years, 9 months

[reactos] 05/05: [FREELDR:INF] Change immutable input string pointers to PCSTR when it's possible.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eeb4cbcb6be063606c801… commit eeb4cbcb6be063606c801dea317a1a671ed0cbd4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 20 19:47:04 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 25 18:54:22 2022 +0100 [FREELDR:INF] Change immutable input string pointers to PCSTR when it's possible. --- boot/freeldr/freeldr/ntldr/inffile.c | 16 ++++++++-------- boot/freeldr/freeldr/ntldr/inffile.h | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/inffile.c b/boot/freeldr/freeldr/ntldr/inffile.c index a9dd7152eaf..b915fcbf576 100644 --- a/boot/freeldr/freeldr/ntldr/inffile.c +++ b/boot/freeldr/freeldr/ntldr/inffile.c @@ -225,7 +225,7 @@ static PINFCACHESECTION InfpCacheAddSection( PINFCACHE Cache, - PCHAR Name) + PCSTR Name) { PINFCACHESECTION Section = NULL; SIZE_T Size; @@ -308,7 +308,7 @@ static PVOID InfpAddKeyToLine( PINFCACHELINE Line, - PCHAR Key) + PCSTR Key) { if (Line == NULL) return NULL; @@ -330,7 +330,7 @@ static PVOID InfpAddFieldToLine( PINFCACHELINE Line, - PCHAR Data) + PCSTR Data) { PINFCACHEFIELD Field; SIZE_T Size; @@ -1134,7 +1134,7 @@ InfFindNextLine ( BOOLEAN InfFindFirstMatchLine ( PINFCONTEXT ContextIn, - PCHAR Key, + PCSTR Key, PINFCONTEXT ContextOut) { PINFCACHELINE CacheLine; @@ -1171,7 +1171,7 @@ InfFindFirstMatchLine ( BOOLEAN InfFindNextMatchLine ( PINFCONTEXT ContextIn, - PCHAR Key, + PCSTR Key, PINFCONTEXT ContextOut) { PINFCACHELINE CacheLine; @@ -1208,7 +1208,7 @@ InfFindNextMatchLine ( LONG InfGetLineCount( HINF InfHandle, - PCHAR Section) + PCSTR Section) { PINFCACHE Cache; PINFCACHESECTION CacheSection; @@ -1490,8 +1490,8 @@ InfGetStringField ( BOOLEAN InfGetData ( PINFCONTEXT Context, - PCHAR *Key, - PCHAR *Data) + PCSTR *Key, + PCSTR *Data) { PINFCACHELINE CacheKey; diff --git a/boot/freeldr/freeldr/ntldr/inffile.h b/boot/freeldr/freeldr/ntldr/inffile.h index be1ae482340..752f6707ab5 100644 --- a/boot/freeldr/freeldr/ntldr/inffile.h +++ b/boot/freeldr/freeldr/ntldr/inffile.h @@ -49,18 +49,18 @@ InfFindNextLine (PINFCONTEXT ContextIn, BOOLEAN InfFindFirstMatchLine (PINFCONTEXT ContextIn, - PCHAR Key, + PCSTR Key, PINFCONTEXT ContextOut); BOOLEAN InfFindNextMatchLine (PINFCONTEXT ContextIn, - PCHAR Key, + PCSTR Key, PINFCONTEXT ContextOut); LONG InfGetLineCount (HINF InfHandle, - PCHAR Section); + PCSTR Section); LONG InfGetFieldCount (PINFCONTEXT Context); @@ -96,8 +96,8 @@ InfGetStringField (PINFCONTEXT Context, BOOLEAN InfGetData (PINFCONTEXT Context, - PCHAR *Key, - PCHAR *Data); + PCSTR *Key, + PCSTR *Data); BOOLEAN InfGetDataField (PINFCONTEXT Context,

2 years, 9 months

[reactos] 04/05: [SDK:RTL] Consistently use the Allocate/FreeStringMemory helpers when allocating/freeing string buffers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51c305f516f99514b910… commit e51c305f516f99514b910c9ecc8b498630fb1fbc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 21:04:44 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 25 18:54:21 2022 +0100 [SDK:RTL] Consistently use the Allocate/FreeStringMemory helpers when allocating/freeing string buffers. --- sdk/lib/rtl/path.c | 4 ++-- sdk/lib/rtl/registry.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index 360c68df735..e045e16ebb4 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -2532,11 +2532,11 @@ Quickie: DPRINT("Status: %lx %S %S\n", Status, StaticBuffer, TempDynamicString.Buffer); if ((StaticString) && (StaticBuffer) && (StaticBuffer != StaticString->Buffer)) { - RtlpFreeMemory(StaticBuffer, TAG_USTR); + RtlpFreeStringMemory(StaticBuffer, TAG_USTR); } if (TempDynamicString.Buffer) { - RtlpFreeMemory(TempDynamicString.Buffer, TAG_USTR); + RtlpFreeStringMemory(TempDynamicString.Buffer, TAG_USTR); } /* Print out any unusual errors */ diff --git a/sdk/lib/rtl/registry.c b/sdk/lib/rtl/registry.c index bc69d4d0b33..3172213265f 100644 --- a/sdk/lib/rtl/registry.c +++ b/sdk/lib/rtl/registry.c @@ -61,7 +61,7 @@ RtlpQueryRegistryDirect(IN ULONG ValueType, if (!ReturnString->Buffer) { /* Allocate it */ - ReturnString->Buffer = RtlpAllocateMemory(ActualLength, TAG_RTLREGISTRY); + ReturnString->Buffer = RtlpAllocateStringMemory(ActualLength, TAG_RTLREGISTRY); if (!ReturnString->Buffer) return STATUS_NO_MEMORY; ReturnString->MaximumLength = ActualLength; }

2 years, 9 months

[reactos] 03/05: [SDK:RTL] Don't copy-paste rtl.h into rtl_vista.h; just include it instead.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab827f522568f84964544… commit ab827f522568f8496454462936c2024cb160db3c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 21:07:38 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 25 18:54:20 2022 +0100 [SDK:RTL] Don't copy-paste rtl.h into rtl_vista.h; just include it instead. --- sdk/lib/rtl/rtl_vista.h | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/sdk/lib/rtl/rtl_vista.h b/sdk/lib/rtl/rtl_vista.h index ef887b77681..af14ef4fcb6 100644 --- a/sdk/lib/rtl/rtl_vista.h +++ b/sdk/lib/rtl/rtl_vista.h @@ -14,49 +14,7 @@ #define _WIN32_WINNT 0x600 #define WINVER 0x600 -/* We're a core NT DLL, we don't import syscalls */ -#define _INC_SWPRINTF_INL_ -#undef __MSVCRT__ - -/* C Headers */ -#include <stdlib.h> -#include <stdio.h> - -/* PSDK/NDK Headers */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define CONST_VTABLE -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> -#include <ntintsafe.h> -#include <ndk/exfuncs.h> -#include <ndk/iofuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/ldrfuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> -#include <ndk/setypes.h> -#include <ndk/sefuncs.h> -#include <ndk/umfuncs.h> - -/* SEH support with PSEH */ -#include <pseh/pseh2.h> - -/* Use intrinsics for x86 and x64 */ -#if defined(_M_IX86) || defined(_M_AMD64) -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedExchange _InterlockedExchange -#define InterlockedBitTestAndSet _interlockedbittestandset -#define InterlockedBitTestAndSet64 _interlockedbittestandset64 -#endif +/* Main RTL Header */ +#include "rtl.h" #endif /* RTL_VISTA_H */

2 years, 9 months

[reactos] 02/05: [SDK:RTL] Place source files in alphabetical order in CMakeLists.txt

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa404fb2b442e0425cc70… commit fa404fb2b442e0425cc70995bad36a797dd25e40 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 01:27:36 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 25 18:54:19 2022 +0100 [SDK:RTL] Place source files in alphabetical order in CMakeLists.txt --- sdk/lib/rtl/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index bc90a11fc28..5a0158675d5 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -38,10 +38,10 @@ list(APPEND SOURCE heapuser.c image.c interlck.c - memstream.c - message.c largeint.c luid.c + memstream.c + message.c network.c nls.c path.c @@ -58,14 +58,14 @@ list(APPEND SOURCE rxact.c sd.c security.c - slist.c sid.c + slist.c splaytree.c sysvol.c thread.c time.c - timezone.c timerqueue.c + timezone.c trace.c unicode.c unicodeprefix.c

2 years, 9 months

[reactos] 01/05: [SDK:REACTOS][CMLIB][BOOT] Get rid of the FreeLdr-specific __FREELDR_H define, and use the standard NT _BLDR_ instead.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d3c3a757ab67c8c897a7… commit 9d3c3a757ab67c8c897a7f4dfb7de3ba0b31000f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 20 16:45:51 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 25 18:54:18 2022 +0100 [SDK:REACTOS][CMLIB][BOOT] Get rid of the FreeLdr-specific __FREELDR_H define, and use the standard NT _BLDR_ instead. This standard _BLDR_ define is already defined for both FreeLdr and boot/environ UEFI bootloader lib, so no actual behavioural changes should occur. --- boot/environ/include/bl.h | 1 - sdk/include/reactos/drivers/xbox/superio.h | 6 +++--- sdk/lib/cmlib/cmlib.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 22481b123eb..e5a338a8b11 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -42,7 +42,6 @@ #include <GlobalVariable.h> /* Registry Headers */ -#define __FREELDR_H #include <cmlib.h> /* DEFINES *******************************************************************/ diff --git a/sdk/include/reactos/drivers/xbox/superio.h b/sdk/include/reactos/drivers/xbox/superio.h index ccb430c0fe5..2e1d9480103 100644 --- a/sdk/include/reactos/drivers/xbox/superio.h +++ b/sdk/include/reactos/drivers/xbox/superio.h @@ -70,7 +70,7 @@ LpcWriteRegister(UCHAR Register, UCHAR Value) WRITE_PORT_UCHAR((PUCHAR)(LPC_IO_BASE + 1), Value); } -#ifndef __FREELDR_H +#ifndef _BLDR_ FORCEINLINE ULONG LpcDetectSuperIO(VOID) @@ -105,7 +105,7 @@ LpcGetIoBase() return Base; } -#ifndef __FREELDR_H +#ifndef _BLDR_ FORCEINLINE ULONG LpcGetIoBaseMPU() @@ -128,7 +128,7 @@ LpcGetIrqPrimary() return LpcReadRegister(LPC_CONFIG_DEVICE_INTERRUPT_PRIMARY); } -#ifndef __FREELDR_H +#ifndef _BLDR_ FORCEINLINE ULONG LpcGetIrqSecondary() diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index 06b4a953525..1946ec5437b 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -214,7 +214,7 @@ #include "hivedata.h" #include "cmdata.h" -#if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H) // || defined(_BLDR_) +#if defined(_TYPEDEFS_HOST_H) || defined(_BLDR_) #define PCM_KEY_SECURITY_CACHE_ENTRY PVOID #define PCM_KEY_CONTROL_BLOCK PVOID @@ -224,7 +224,7 @@ #define CMP_SECURITY_HASH_LISTS 64 // #endif // Commented out until one finds a way to properly include - // this header in freeldr and in ntoskrnl. + // this header in the bootloader and in ntoskrnl. // // Use Count Log and Entry

2 years, 9 months

[reactos] 01/01: [CRT_APITEST] wctomb.c Fix '\n.' typos CORE-18103

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44a6987493e3c6e4c100a… commit 44a6987493e3c6e4c100a5274aa6273277d3334a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Mar 25 18:42:07 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Mar 25 18:42:07 2022 +0100 [CRT_APITEST] wctomb.c Fix '\n.' typos CORE-18103 Addendum to 0.4.15-dev-139-g 3cb0bdaa0bd427cba21a8288ad0a4d37b2743037 Those were the only new cases introduced in the ReactOS source tree since our last cleanup in that regard. Ftr I think adding such finishing dots in debug prints are nonsense in general. --- modules/rostests/apitests/crt/wctomb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/crt/wctomb.c b/modules/rostests/apitests/crt/wctomb.c index 8048f56df13..8ea72cce10f 100644 --- a/modules/rostests/apitests/crt/wctomb.c +++ b/modules/rostests/apitests/crt/wctomb.c @@ -35,16 +35,16 @@ START_TEST(wctomb) /* Do not give output to the caller */ Length = wctomb(NULL, 0); - ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d.\n", Length); /* Do the same but expect a valid wide character argument this time */ Length = wctomb(NULL, wchSrc[0]); - ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d.\n", Length); /* Don't return anything to the output even if conversion is impossible */ Length = wctomb(NULL, wchSrc[1]); ok(errno == 0, "The error number (errno) should be 0 even though an invalid character in current locale is given but got %d.\n", errno); - ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d.\n", Length); /* Attempt to convert a character not possible in current locale */ Length = wctomb(chDest, wchSrc[1]);

2 years, 9 months

[reactos] 01/01: [REACTOS] Fix ' \n' typos in *.rc CORE-18103

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8107ee446bc001413892… commit a8107ee446bc001413892029a8f239d1aa7be2c2 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Mar 23 21:10:08 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Mar 23 21:10:08 2022 +0100 [REACTOS] Fix ' \n' typos in *.rc CORE-18103 Some new were introduced recently since we did that replacement the last time. Kill them quickly. --- base/applications/mscutils/servman/lang/bg-BG.rc | 2 +- base/applications/network/tracert/lang/zh-TW.rc | 2 +- base/setup/reactos/lang/eu-ES.rc | 4 ++-- dll/win32/shell32/lang/eu-ES.rc | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc b/base/applications/mscutils/servman/lang/bg-BG.rc index 7c6f26f1c79..bab920c9b4a 100644 --- a/base/applications/mscutils/servman/lang/bg-BG.rc +++ b/base/applications/mscutils/servman/lang/bg-BG.rc @@ -280,7 +280,7 @@ END STRINGTABLE BEGIN - IDS_HELP_OPTIONS "СЪЗДАВАНЕ НА ВЪЗМОЖНОСТ:\nБЕЛЕЖКА: Името на възможността включва знака за равенство.\n type= <own|share|interact|kernel|filesys|rec>\n (подразбирано = own)\n start= <boot|system|auto|demand|disabled>\n (подразбирано = demand) \n error= <normal|severe|critical|ignore>\n (подразбирано = normal)\n group= <LoadOrderGroup>\n tag= <yes|no>\n depend= <Dependencies(separated by / (forward slash))>\n obj= <AccountName|ObjectName>\n (подразбирано = Loc [...] + IDS_HELP_OPTIONS "СЪЗДАВАНЕ НА ВЪЗМОЖНОСТ:\nБЕЛЕЖКА: Името на възможността включва знака за равенство.\n type= <own|share|interact|kernel|filesys|rec>\n (подразбирано = own)\n start= <boot|system|auto|demand|disabled>\n (подразбирано = demand)\n error= <normal|severe|critical|ignore>\n (подразбирано = normal)\n group= <LoadOrderGroup>\n tag= <yes|no>\n depend= <Dependencies(separated by / (forward slash))>\n obj= <AccountName|ObjectName>\n (подразбирано = Loca [...] END /* Hints */ diff --git a/base/applications/network/tracert/lang/zh-TW.rc b/base/applications/network/tracert/lang/zh-TW.rc index 0d4b7f76a6f..fa1194ae662 100644 --- a/base/applications/network/tracert/lang/zh-TW.rc +++ b/base/applications/network/tracert/lang/zh-TW.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN IDS_USAGE "\n\ -用法: tracert [-d] [-h 最大躍點數目] [-j 主機清單] [-w 逾時] 目標名稱 \n\n\ +用法: tracert [-d] [-h 最大躍點數目] [-j 主機清單] [-w 逾時] 目標名稱\n\n\ 選項:\n\ -d 不要將位址解析為主機名稱。\n\ -h 最大躍點數目搜尋目標所使用的最大躍點數目。\n\ diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 1c983362f58..e0397efac90 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -119,9 +119,9 @@ BEGIN EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Directorio de destino:", IDC_STATIC, 18, 89, 74, 11 EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - AUTOCHECKBOX "Confirmo que las configuraciones de instalación son correctas. También conozco \nque ReactOS está en un fase de software Alpha y podría romper mi ordenador y corromper mis datos.", + AUTOCHECKBOX "Confirmo que las configuraciones de instalación son correctas. También conozco\nque ReactOS está en un fase de software Alpha y podría romper mi ordenador y corromper mis datos.", IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE - LTEXT "Por favor, confirme que todas las configuraciones son correctas, \nluego haga clic en Instalar para empezar el Proceso de Instalación.", IDC_STATIC, 7, 124, 303, 18 + LTEXT "Por favor, confirme que todas las configuraciones son correctas,\nluego haga clic en Instalar para empezar el Proceso de Instalación.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index e402528aa2e..d8b3f6c867b 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -343,15 +343,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Erroreak bilatzea", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 - LTEXT "Aukera honekin erroreak bilatuko dira \nbolumenean.", -1, 40, 25, 160, 20 + LTEXT "Aukera honekin erroreak bilatuko dira\nbolumenean.", -1, 40, 25, 160, 20 PUSHBUTTON "&Bilatu orain...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Desfragmentazioa", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 - LTEXT "Aukera honekin bolumeneko fitxategiak \ndesfragmentatuko dira.", -1, 40, 85, 160, 20 + LTEXT "Aukera honekin bolumeneko fitxategiak\ndesfragmentatuko dira.", -1, 40, 85, 160, 20 PUSHBUTTON "&Desfragmentatu orain...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Babeskopia", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 - LTEXT "Aukera honekin bolumeneko fitxategien \nbabeskopia egingo da.", -1, 40, 150, 160, 20 + LTEXT "Aukera honekin bolumeneko fitxategien\nbabeskopia egingo da.", -1, 40, 150, 160, 20 PUSHBUTTON "&Egin babeskopia orain...", 14002, 90, 170, 130, 15, WS_TABSTOP END

2 years, 9 months

[reactos] 01/01: [SERVICES] Restore Herves name and readd g_dwServiceBits CORE-18071

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b66389c14078d1745d5a4… commit b66389c14078d1745d5a415c7af1a195e8ececf1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Mar 20 20:52:53 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Mar 20 20:52:53 2022 +0100 [SERVICES] Restore Herves name and readd g_dwServiceBits CORE-18071 Partial revert of 0.4.15-dev-4274-g d31a55723797ce85f60a7fa1491d916a583b1167 As hbelusca explained the special character will warn only once for each non-UTF8-file and not every time, unlike I anticipated. The g_dwServiceBits is not important right now, but hpoussin expects it to be a preparation step for making the stuff passed to the function SetServiceBits() persistent https://docs.microsoft.com/en-us/windows/win32/api/lmserver/nf-lmserver-set… for (yet unknown) features to come. --- base/system/services/database.c | 2 +- base/system/services/rpcserver.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index ad790736177..d773a44e102 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -4,7 +4,7 @@ * FILE: base/system/services/database.c * PURPOSE: Database control interface * COPYRIGHT: Copyright 2002-2006 Eric Kohl - * Copyright 2006 H. Poussineau <hpoussin(a)reactos.org> + * Copyright 2006 Herv� Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * Gregor Brunmar <gregor.brunmar(a)home.se> * diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 2c8e96d3b57..cad1f3b0487 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -4,7 +4,7 @@ * FILE: base/system/services/rpcserver.c * PURPOSE: RPC server interface for the advapi32 calls * COPYRIGHT: Copyright 2005-2006 Eric Kohl - * Copyright 2006-2007 H. Poussineau <hpoussin(a)reactos.org> + * Copyright 2006-2007 Herv� Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -99,6 +99,7 @@ ScmServiceMapping = {SERVICE_READ, SERVICE_EXECUTE, SERVICE_ALL_ACCESS}; +DWORD g_dwServiceBits = 0; /* FUNCTIONS ***************************************************************/ @@ -1893,14 +1894,20 @@ RI_ScSetServiceBitsW( if (bSetBitsOn) { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits |= dwServiceBits; + g_dwServiceBits |= dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } else { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits &= ~dwServiceBits; + g_dwServiceBits &= ~dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } return ERROR_SUCCESS;

2 years, 9 months

← Newer
1
2
3
4
5
6
7
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022