Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/03: [SETUPLIB][USETUP] Factor out the usage of FS provider structures.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1fbc2d651e10590435f4… commit c1fbc2d651e10590435f4d7722f13b1315457d41 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 24 17:52:33 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:05 2019 +0100 [SETUPLIB][USETUP] Factor out the usage of FS provider structures. Similarly to FMIFS this structure should be private. Instead file-system names are passed to the helper functions, allowing to use the names returned by the FS drivers. The names are then internally mapped to the corresponding FS providers. In particular this allows to handle the "RAW" file-system and to assign the 'Unformatted' flag to partitions having this FS. Finally this helps us refining the checks performed to see whether the current "active" system partition uses a supported file-system. --- base/setup/lib/bootsup.c | 38 ++-- base/setup/lib/fsutil.c | 481 +++++++++++++++++++++++++++++----------- base/setup/lib/fsutil.h | 113 ++++++++-- base/setup/lib/utils/partlist.c | 294 ++++++++++++++---------- base/setup/lib/utils/partlist.h | 13 +- base/setup/usetup/chkdsk.c | 20 +- base/setup/usetup/chkdsk.h | 3 +- base/setup/usetup/format.c | 20 +- base/setup/usetup/format.h | 3 +- base/setup/usetup/fslist.c | 48 ++-- base/setup/usetup/fslist.h | 6 +- base/setup/usetup/usetup.c | 46 ++-- 12 files changed, 718 insertions(+), 367 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 3d494c949a..ec9a1a4cf5 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -2351,38 +2351,38 @@ InstallFatBootcodeToFloppy( IN PUNICODE_STRING SourceRootPath, IN PUNICODE_STRING DestinationArcPath) { + static const PCWSTR FloppyDevice = L"\\Device\\Floppy0\\"; + NTSTATUS Status; - PFILE_SYSTEM FatFS; - UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; /* Verify that the floppy disk is accessible */ - if (DoesDirExist(NULL, FloppyDevice.Buffer) == FALSE) + if (DoesDirExist(NULL, FloppyDevice) == FALSE) return STATUS_DEVICE_NOT_READY; /* Format the floppy disk */ - FatFS = GetFileSystemByName(L"FAT"); - if (!FatFS) - { - DPRINT1("FAT FS non existent on this system?!\n"); - return STATUS_NOT_SUPPORTED; - } - Status = FatFS->FormatFunc(&FloppyDevice, - FMIFS_FLOPPY, - NULL, - TRUE, - 0, - NULL); + // FormatPartition(...) + Status = FormatFileSystem(FloppyDevice, + L"FAT", + FMIFS_FLOPPY, + NULL, + TRUE, + 0, + NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + if (Status == STATUS_NOT_SUPPORTED) + DPRINT1("FAT FS non existent on this system?!\n"); + else + DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + return Status; } /* Copy FreeLoader to the boot partition */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice.Buffer, L"freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice, L"freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath, FALSE); @@ -2394,7 +2394,7 @@ InstallFatBootcodeToFloppy( /* Create new 'freeldr.ini' */ DPRINT("Create new 'freeldr.ini'\n"); - Status = CreateFreeLoaderIniForReactOS(FloppyDevice.Buffer, DestinationArcPath->Buffer); + Status = CreateFreeLoaderIniForReactOS(FloppyDevice, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); @@ -2403,7 +2403,7 @@ InstallFatBootcodeToFloppy( /* Install FAT12 boosector */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 1, FloppyDevice.Buffer); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 1, FloppyDevice); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index b9d0ed838f..8955518465 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -2,8 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2019 Hermes Belusca-Maito */ // @@ -28,10 +28,18 @@ #include <debug.h> -/* GLOBALS ******************************************************************/ +/* LOCALS *******************************************************************/ + +/** IFS_PROVIDER **/ +typedef struct _FILE_SYSTEM +{ + PCWSTR FileSystemName; + FORMATEX FormatFunc; + CHKDSKEX ChkdskFunc; +} FILE_SYSTEM, *PFILE_SYSTEM; /* The list of file systems on which we can install ReactOS */ -FILE_SYSTEM RegisteredFileSystems[] = +static FILE_SYSTEM RegisteredFileSystems[] = { /* NOTE: The FAT formatter automatically determines * whether it will use FAT-16 or FAT-32. */ @@ -54,16 +62,24 @@ FILE_SYSTEM RegisteredFileSystems[] = /* FUNCTIONS ****************************************************************/ -PFILE_SYSTEM -GetRegisteredFileSystems(OUT PULONG Count) +/** QueryAvailableFileSystemFormat() **/ +BOOLEAN +GetRegisteredFileSystems( + IN ULONG Index, + OUT PCWSTR* FileSystemName) { - *Count = ARRAYSIZE(RegisteredFileSystems); - return RegisteredFileSystems; + if (Index >= ARRAYSIZE(RegisteredFileSystems)) + return FALSE; + + *FileSystemName = RegisteredFileSystems[Index].FileSystemName; + + return TRUE; } -PFILE_SYSTEM + +/** GetProvider() **/ +static PFILE_SYSTEM GetFileSystemByName( - // IN PFILE_SYSTEM_LIST List, IN PCWSTR FileSystemName) { #if 0 // Reenable when the list of registered FSes will again be dynamic @@ -75,25 +91,33 @@ GetFileSystemByName( while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) + if (Item->FileSystemName && + (wcsicmp(FileSystemName, Item->FileSystemName) == 0 || + /* Map FAT32 back to FAT */ + (wcsicmp(FileSystemName, L"FAT32") == 0 && wcsicmp(Item->FileSystemName, L"FAT") == 0))) + { return Item; + } ListEntry = ListEntry->Flink; } #else - ULONG Count; - PFILE_SYSTEM FileSystems; + ULONG Count = ARRAYSIZE(RegisteredFileSystems); + PFILE_SYSTEM FileSystems = RegisteredFileSystems; - FileSystems = GetRegisteredFileSystems(&Count); - if (!FileSystems || Count == 0) - return NULL; + ASSERT(FileSystems && Count != 0); while (Count--) { - if (FileSystems->FileSystemName && wcsicmp(FileSystemName, FileSystems->FileSystemName) == 0) + if (FileSystems->FileSystemName && + (wcsicmp(FileSystemName, FileSystems->FileSystemName) == 0 || + /* Map FAT32 back to FAT */ + (wcsicmp(FileSystemName, L"FAT32") == 0 && wcsicmp(FileSystems->FileSystemName, L"FAT") == 0))) + { return FileSystems; + } ++FileSystems; } @@ -105,40 +129,59 @@ GetFileSystemByName( // -// FileSystem recognition (using NT OS functionality) +// FileSystem recognition, using NT OS functionality // /* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ -static NTSTATUS -_MyGetFileSystem( - IN struct _PARTENTRY* PartEntry, +NTSTATUS +GetFileSystemNameByHandle( + IN HANDLE PartitionHandle, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { NTSTATUS Status; - UNICODE_STRING PartitionRootPath; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE FileHandle; IO_STATUS_BLOCK IoStatusBlock; - WCHAR PathBuffer[MAX_PATH]; UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - PartEntry->DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + /* Retrieve the FS attributes */ + Status = NtQueryVolumeInformationFile(PartitionHandle, + &IoStatusBlock, + FileFsAttribute, + sizeof(Buffer), + FileFsAttributeInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryVolumeInformationFile failed, Status 0x%08lx\n", Status); + return Status; + } + + if (FileSystemNameSize < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) + return STATUS_BUFFER_TOO_SMALL; + + return RtlStringCbCopyNW(FileSystemName, FileSystemNameSize, + FileFsAttribute->FileSystemName, + FileFsAttribute->FileSystemNameLength); +} + +NTSTATUS +GetFileSystemName_UStr( + IN PUNICODE_STRING PartitionPath, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE PartitionHandle; + IO_STATUS_BLOCK IoStatusBlock; /* Open the partition */ InitializeObjectAttributes(&ObjectAttributes, - &PartitionRootPath, + PartitionPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenFile(&FileHandle, // PartitionHandle, + Status = NtOpenFile(&PartitionHandle, FILE_GENERIC_READ /* | SYNCHRONIZE */, &ObjectAttributes, &IoStatusBlock, @@ -146,72 +189,62 @@ _MyGetFileSystem( 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionRootPath, Status); + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", PartitionPath, Status); return Status; } /* Retrieve the FS attributes */ - Status = NtQueryVolumeInformationFile(FileHandle, - &IoStatusBlock, - FileFsAttribute, - sizeof(Buffer), - FileFsAttributeInformation); - NtClose(FileHandle); - + Status = GetFileSystemNameByHandle(PartitionHandle, FileSystemName, FileSystemNameSize); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQueryVolumeInformationFile failed for partition '%wZ', Status 0x%08lx\n", - &PartitionRootPath, Status); - return Status; + DPRINT1("GetFileSystemNameByHandle() failed for partition '%wZ', Status 0x%08lx\n", + PartitionPath, Status); } - if (FileSystemNameSize < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) - return STATUS_BUFFER_TOO_SMALL; + /* Close the partition */ + NtClose(PartitionHandle); - return RtlStringCbCopyNW(FileSystemName, FileSystemNameSize, - FileFsAttribute->FileSystemName, - FileFsAttribute->FileSystemNameLength); + return Status; } -PFILE_SYSTEM -GetFileSystem( - // IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry) +NTSTATUS +GetFileSystemName( + IN PCWSTR Partition, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) { - PFILE_SYSTEM CurrentFileSystem; - NTSTATUS Status; - PWSTR FileSystemName = NULL; - WCHAR FsRecFileSystemName[MAX_PATH]; + UNICODE_STRING PartitionPath; - CurrentFileSystem = PartEntry->FileSystem; + RtlInitUnicodeString(&PartitionPath, Partition); + return GetFileSystemName_UStr(&PartitionPath, + FileSystemName, + FileSystemNameSize); +} - /* We have a file system, return it */ - if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) - return CurrentFileSystem; +NTSTATUS +InferFileSystemByHandle( + IN HANDLE PartitionHandle, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; - DPRINT1("File system not found, try to guess one...\n"); + if (FileSystemNameSize < sizeof(WCHAR)) + return STATUS_BUFFER_TOO_SMALL; - CurrentFileSystem = NULL; + *FileSystemName = L'\0'; - /* - * We don't have one... - * - * Try to infer a file system using NT file system recognition. - */ - Status = _MyGetFileSystem(PartEntry, FsRecFileSystemName, sizeof(FsRecFileSystemName)); - if (NT_SUCCESS(Status) && *FsRecFileSystemName) + /* Try to infer a file system using NT file system recognition */ + Status = GetFileSystemNameByHandle(PartitionHandle, + FileSystemName, + FileSystemNameSize); + if (NT_SUCCESS(Status) && *FileSystemName) { - /* Temporary HACK: map FAT32 back to FAT */ - if (wcscmp(FsRecFileSystemName, L"FAT32") == 0) - RtlStringCbCopyW(FsRecFileSystemName, sizeof(FsRecFileSystemName), L"FAT"); - - FileSystemName = FsRecFileSystemName; goto Quit; } /* - * We don't have one... - * * Try to infer a preferred file system for this partition, given its ID. * * WARNING: This is partly a hack, since partitions with the same ID can @@ -224,131 +257,313 @@ GetFileSystem( * On the contrary, for unformatted partitions with a given ID, the * following code is OK. */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE ) || - (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32 ) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + if ((PartitionType == PARTITION_FAT_12) || + (PartitionType == PARTITION_FAT_16) || + (PartitionType == PARTITION_HUGE ) || + (PartitionType == PARTITION_XINT13)) { - FileSystemName = L"FAT"; + /* FAT12 or FAT16 */ + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"FAT"); } - else if (PartEntry->PartitionType == PARTITION_LINUX) + else if ((PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32_XINT13)) + { + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"FAT32"); + } + else if (PartitionType == PARTITION_LINUX) { // WARNING: See the warning above. /* Could also be EXT2/3/4, ReiserFS, ... */ - FileSystemName = L"BTRFS"; + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"BTRFS"); } - else if (PartEntry->PartitionType == PARTITION_IFS) + else if (PartitionType == PARTITION_IFS) { // WARNING: See the warning above. /* Could also be HPFS */ - FileSystemName = L"NTFS"; + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"NTFS"); } Quit: - // HACK: WARNING: We cannot write on this FS yet! - if (FileSystemName) + if (*FileSystemName) { - if (PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); + // WARNING: We cannot write on this FS yet! + if (PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + FileSystemName); + } } - DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", - PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); + DPRINT1("InferFileSystem -- PartitionType: 0x%02X ; FileSystem (guessed): %S\n", + PartitionType, *FileSystemName ? FileSystemName : L"None"); - if (FileSystemName) - CurrentFileSystem = GetFileSystemByName(FileSystemName); + return Status; +} - return CurrentFileSystem; +NTSTATUS +InferFileSystem( + IN PCWSTR Partition, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; + UNICODE_STRING PartitionPath; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE PartitionHandle; + IO_STATUS_BLOCK IoStatusBlock; + + /* Open the partition */ + RtlInitUnicodeString(&PartitionPath, Partition); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_GENERIC_READ /* | SYNCHRONIZE */, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionPath, Status); + return Status; + } + + /* Retrieve the FS */ + Status = InferFileSystemByHandle(PartitionHandle, + PartitionType, + FileSystemName, + FileSystemNameSize); + + /* Close the partition */ + NtClose(PartitionHandle); + + return Status; } +/** ChkdskEx() **/ +NTSTATUS +ChkdskFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + PFILE_SYSTEM FileSystem; -// -// Formatting routines -// + FileSystem = GetFileSystemByName(FileSystemName); -BOOLEAN -PreparePartitionForFormatting( - IN struct _PARTENTRY* PartEntry, - IN PFILE_SYSTEM FileSystem) + if (!FileSystem || !FileSystem->ChkdskFunc) + { + // BOOLEAN Argument = FALSE; + // Callback(DONE, 0, &Argument); + return STATUS_NOT_SUPPORTED; + } + + return FileSystem->ChkdskFunc(DriveRoot, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + Callback); +} + +NTSTATUS +ChkdskFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNICODE_STRING DriveRootU; + + RtlInitUnicodeString(&DriveRootU, DriveRoot); + return ChkdskFileSystem_UStr(&DriveRootU, + FileSystemName, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + Callback); +} + + +/** FormatEx() **/ +NTSTATUS +FormatFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) { - if (!FileSystem) + PFILE_SYSTEM FileSystem; + + FileSystem = GetFileSystemByName(FileSystemName); + + if (!FileSystem || !FileSystem->FormatFunc) { - DPRINT1("No file system specified?\n"); - return FALSE; + // BOOLEAN Argument = FALSE; + // Callback(DONE, 0, &Argument); + return STATUS_NOT_SUPPORTED; } - if (wcscmp(FileSystem->FileSystemName, L"FAT") == 0) + return FileSystem->FormatFunc(DriveRoot, + MediaFlag, + Label, + QuickFormat, + ClusterSize, + Callback); +} + +NTSTATUS +FormatFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + UNICODE_STRING DriveRootU; + UNICODE_STRING LabelU; + + RtlInitUnicodeString(&DriveRootU, DriveRoot); + RtlInitUnicodeString(&LabelU, Label); + + return FormatFileSystem_UStr(&DriveRootU, + FileSystemName, + MediaFlag, + &LabelU, + QuickFormat, + ClusterSize, + Callback); +} + + +UCHAR +FileSystemToPartitionType( + IN PCWSTR FileSystem, + IN PULARGE_INTEGER StartSector, + IN PULARGE_INTEGER SectorCount) +{ + ASSERT(FileSystem && StartSector && SectorCount); + + if (wcsicmp(FileSystem, L"FAT") == 0 || + wcsicmp(FileSystem, L"FAT32") == 0 || + wcsicmp(FileSystem, L"RAW") == 0) { - if (PartEntry->SectorCount.QuadPart < 8192) + if (SectorCount->QuadPart < 8192) { /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_12); + return PARTITION_FAT_12; } - else if (PartEntry->StartSector.QuadPart < 1450560) + else if (StartSector->QuadPart < 1450560) { /* Partition starts below the 8.4GB boundary ==> CHS partition */ - if (PartEntry->SectorCount.QuadPart < 65536) + if (SectorCount->QuadPart < 65536) { /* FAT16 CHS partition (partition size < 32MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_16); + return PARTITION_FAT_16; } - else if (PartEntry->SectorCount.QuadPart < 1048576) + else if (SectorCount->QuadPart < 1048576) { /* FAT16 CHS partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_HUGE); + return PARTITION_HUGE; } else { /* FAT32 CHS partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32); + return PARTITION_FAT32; } } else { /* Partition starts above the 8.4GB boundary ==> LBA partition */ - if (PartEntry->SectorCount.QuadPart < 1048576) + if (SectorCount->QuadPart < 1048576) { /* FAT16 LBA partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_XINT13); + return PARTITION_XINT13; } else { /* FAT32 LBA partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); + return PARTITION_FAT32_XINT13; } } } - else if (wcscmp(FileSystem->FileSystemName, L"BTRFS") == 0) + else if (wcsicmp(FileSystem, L"NTFS") == 0) { - SetPartitionType(PartEntry, PARTITION_LINUX); + return PARTITION_IFS; } -#if 0 - else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 0) + else if (wcsicmp(FileSystem, L"BTRFS") == 0 || + wcsicmp(FileSystem, L"EXT2") == 0 || + wcsicmp(FileSystem, L"EXT3") == 0 || + wcsicmp(FileSystem, L"EXT4") == 0 || + wcsicmp(FileSystem, L"FFS") == 0 || + wcsicmp(FileSystem, L"REISERFS") == 0) { - SetPartitionType(PartEntry, PARTITION_LINUX); + return PARTITION_LINUX; } - else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0) + else { - SetPartitionType(PartEntry, PARTITION_IFS); + /* Unknown file system */ + DPRINT1("Unknown file system '%S'\n", FileSystem); + return PARTITION_ENTRY_UNUSED; } -#endif - else +} + + +// +// Formatting routines +// + +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PCWSTR FileSystemName) +{ + UCHAR PartitionType; + + if (!FileSystemName || !*FileSystemName) + { + DPRINT1("No file system specified?\n"); + return FALSE; + } + + PartitionType = FileSystemToPartitionType(FileSystemName, + &PartEntry->StartSector, + &PartEntry->SectorCount); + if (PartitionType == PARTITION_ENTRY_UNUSED) { - /* Unknown file system? */ - DPRINT1("Unknown file system \"%S\"?\n", FileSystem->FileSystemName); + /* Unknown file system */ + DPRINT1("Unknown file system '%S'\n", FileSystemName); return FALSE; } + SetPartitionType(PartEntry, PartitionType); + // // FIXME: Do this now, or after the partition was actually formatted?? // /* Set the new partition's file system proper */ - PartEntry->FormatState = Formatted; // Well... This may be set after the real formatting takes place (in which case we should change the FormatState to another value) - PartEntry->FileSystem = FileSystem; + RtlStringCbCopyW(PartEntry->FileSystem, + sizeof(PartEntry->FileSystem), + FileSystemName); return TRUE; } diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index bb10c4a0f6..f6c83e953f 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -2,40 +2,113 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2019 Hermes Belusca-Maito */ #pragma once #include <fmifs/fmifs.h> -typedef struct _FILE_SYSTEM -{ - PCWSTR FileSystemName; - FORMATEX FormatFunc; - CHKDSKEX ChkdskFunc; -} FILE_SYSTEM, *PFILE_SYSTEM; +/** QueryAvailableFileSystemFormat() **/ +BOOLEAN +GetRegisteredFileSystems( + IN ULONG Index, + OUT PCWSTR* FileSystemName); -PFILE_SYSTEM -GetRegisteredFileSystems(OUT PULONG Count); +NTSTATUS +GetFileSystemNameByHandle( + IN HANDLE PartitionHandle, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); -PFILE_SYSTEM -GetFileSystemByName( - // IN PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName); +NTSTATUS +GetFileSystemName_UStr( + IN PUNICODE_STRING PartitionPath, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); -struct _PARTENTRY; // Defined in partlist.h +NTSTATUS +GetFileSystemName( + IN PCWSTR Partition, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + +NTSTATUS +InferFileSystemByHandle( + IN HANDLE PartitionHandle, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + +NTSTATUS +InferFileSystem( + IN PCWSTR Partition, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + + +/** ChkdskEx() **/ +NTSTATUS +ChkdskFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); + +NTSTATUS +ChkdskFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); -PFILE_SYSTEM -GetFileSystem( - // IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry); +/** FormatEx() **/ +NTSTATUS +FormatFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); + +NTSTATUS +FormatFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); + + +UCHAR +FileSystemToPartitionType( + IN PCWSTR FileSystem, + IN PULARGE_INTEGER StartSector, + IN PULARGE_INTEGER SectorCount); + + +// +// Formatting routines +// + +struct _PARTENTRY; // Defined in partlist.h BOOLEAN PreparePartitionForFormatting( IN struct _PARTENTRY* PartEntry, - IN PFILE_SYSTEM FileSystem); + IN PCWSTR FileSystemName); /* EOF */ diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index aee3c3c161..5c20c4bf36 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2,7 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2018-2019 Hermes Belusca-Maito */ #include "precomp.h" @@ -752,18 +753,19 @@ CreateInsertBlankRegion( NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - NewPartEntry->StartSector.QuadPart = StartSector; NewPartEntry->SectorCount.QuadPart = SectorCount; + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem[0] = L'\0'; + DPRINT1("First Sector : %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector : %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - /* Insert the table into the list */ + /* Insert the new entry into the list */ InsertTailList(ListHead, &NewPartEntry->ListEntry); return NewPartEntry; @@ -788,17 +790,8 @@ InitializePartitionEntry( { DPRINT1("Convert existing partition entry\n"); - /* Convert current entry to 'new (unformatted)' */ - PartEntry->IsPartitioned = TRUE; - PartEntry->New = TRUE; - PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; - PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; - PartEntry->AutoCreate = AutoCreate; - PartEntry->BootIndicator = FALSE; - PartEntry->LogicalPartition = FALSE; - NewPartEntry = PartEntry; + NewPartEntry->AutoCreate = AutoCreate; } else { @@ -811,28 +804,32 @@ InitializePartitionEntry( if (NewPartEntry == NULL) return NULL; - /* Insert the new entry into the list */ - InsertTailList(&PartEntry->ListEntry, - &NewPartEntry->ListEntry); - NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->IsPartitioned = TRUE; - NewPartEntry->New = TRUE; - NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - NewPartEntry->BootIndicator = FALSE; - NewPartEntry->LogicalPartition = FALSE; - NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + + /* Insert the new entry into the list */ + InsertTailList(&PartEntry->ListEntry, &NewPartEntry->ListEntry); } + /* Create entry as 'New (Unformatted)' */ + NewPartEntry->New = TRUE; + NewPartEntry->IsPartitioned = TRUE; + + NewPartEntry->PartitionType = FileSystemToPartitionType(L"RAW", &NewPartEntry->StartSector, &NewPartEntry->SectorCount); + ASSERT(NewPartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem[0] = L'\0'; + // NewPartEntry->AutoCreate = AutoCreate; + NewPartEntry->BootIndicator = FALSE; + NewPartEntry->LogicalPartition = FALSE; + DPRINT1("First Sector : %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector : %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); @@ -852,10 +849,10 @@ AddPartitionToDisk( NTSTATUS Status; PPARTITION_INFORMATION PartitionInfo; PPARTENTRY PartEntry; - HANDLE FileHandle; + HANDLE PartitionHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - WCHAR Buffer[MAX_PATH]; + WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING Name; UCHAR LabelBuffer[sizeof(FILE_FS_VOLUME_INFORMATION) + 256 * sizeof(WCHAR)]; PFILE_FS_VOLUME_INFORMATION LabelInfo = (PFILE_FS_VOLUME_INFORMATION)LabelBuffer; @@ -889,10 +886,16 @@ AddPartitionToDisk( PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; PartEntry->PartitionIndex = PartitionIndex; + /* Specify the partition as initially unformatted */ + PartEntry->FormatState = Unformatted; + PartEntry->FileSystem[0] = L'\0'; + + /* Initialize the partition volume label */ + RtlZeroMemory(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel)); + if (IsContainerPartition(PartEntry->PartitionType)) { PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; @@ -901,67 +904,81 @@ AddPartitionToDisk( { ASSERT(PartitionInfo->RecognizedPartition); - PartEntry->FileSystem = GetFileSystem(PartEntry); - if (PartEntry->FileSystem) - PartEntry->FormatState = Preformatted; - else - PartEntry->FormatState = Unformatted; - // PartEntry->FormatState = UnknownFormat; - } - else - { - /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ - PartEntry->FormatState = UnknownFormat; - } + /* Open the volume, ignore any errors */ + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&Name, PathBuffer); - /* Initialize the partition volume label */ - RtlZeroMemory(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel)); - - /* Open the volume, ignore any errors */ - RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&Name, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + PartitionHandle = NULL; + Status = NtOpenFile(&PartitionHandle, + FILE_READ_DATA | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed, Status 0x%08lx\n", Status); + } - Status = NtOpenFile(&FileHandle, - FILE_READ_DATA | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (NT_SUCCESS(Status)) - { - /* Retrieve the partition volume label */ - Status = NtQueryVolumeInformationFile(FileHandle, - &IoStatusBlock, - &LabelBuffer, - sizeof(LabelBuffer), - FileFsVolumeInformation); - /* Close the handle */ - NtClose(FileHandle); - - /* Check for success */ - if (NT_SUCCESS(Status)) + if (/* NT_SUCCESS(Status) && */ PartitionHandle) + { + /* We don't have a FS, try to guess one */ + Status = InferFileSystemByHandle(PartitionHandle, + PartEntry->PartitionType, + PartEntry->FileSystem, + sizeof(PartEntry->FileSystem)); + if (!NT_SUCCESS(Status)) + DPRINT1("InferFileSystemByHandle() failed, Status 0x%08lx\n", Status); + } + if (*PartEntry->FileSystem) { - /* Copy the (possibly truncated) volume label and NULL-terminate it */ - RtlStringCbCopyNW(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel), - LabelInfo->VolumeLabel, LabelInfo->VolumeLabelLength); + if (wcsicmp(PartEntry->FileSystem, L"RAW") == 0) + PartEntry->FormatState = Unformatted; + else + PartEntry->FormatState = Preformatted; } else { - DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + PartEntry->FormatState = UnknownFormat; + } + + /* Retrieve the partition volume label */ + if (PartitionHandle) + { + Status = NtQueryVolumeInformationFile(PartitionHandle, + &IoStatusBlock, + &LabelBuffer, + sizeof(LabelBuffer), + FileFsVolumeInformation); + if (NT_SUCCESS(Status)) + { + /* Copy the (possibly truncated) volume label and NULL-terminate it */ + RtlStringCbCopyNW(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel), + LabelInfo->VolumeLabel, LabelInfo->VolumeLabelLength); + } + else + { + DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + } } + + /* Close the partition */ + if (PartitionHandle) + NtClose(PartitionHandle); } else { - DPRINT1("NtOpenFile() failed, Status 0x%08lx\n", Status); + /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ + PartEntry->FormatState = UnknownFormat; } InsertDiskRegion(DiskEntry, PartEntry, LogicalPartition); @@ -2784,7 +2801,7 @@ DismountVolume( IsContainerPartition(PartEntry->PartitionType) || !IsRecognizedPartition(PartEntry->PartitionType) || PartEntry->FormatState == Unformatted /* || PartEntry->FormatState == UnknownFormat */ || - PartEntry->FileSystem == NULL || + !*PartEntry->FileSystem || PartEntry->PartitionNumber == 0) { /* The partition is not mounted, so just return success */ @@ -2981,7 +2998,7 @@ DeleteCurrentPartition( PartEntry->IsPartitioned = FALSE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; + PartEntry->FileSystem[0] = L'\0'; PartEntry->DriveLetter = 0; PartEntry->OnDiskPartitionNumber = 0; PartEntry->PartitionNumber = 0; @@ -2993,6 +3010,84 @@ DeleteCurrentPartition( AssignDriveLetters(List); } +static +BOOLEAN +IsSupportedActivePartition( + IN PPARTENTRY PartEntry) +{ + /* Check the type and the filesystem of this partition */ + + /* + * We do not support extended partition containers (on MBR disks) marked + * as active, and containing code inside their extended boot records. + */ + if (IsContainerPartition(PartEntry->PartitionType)) + { + DPRINT1("System partition %lu in disk %lu is an extended partition container?!\n", + PartEntry->PartitionNumber, PartEntry->DiskEntry->DiskNumber); + return FALSE; + } + + /* + * ADDITIONAL CHECKS / BIG HACK: + * + * Retrieve its file system and check whether we have + * write support for it. If that is the case we are fine + * and we can use it directly. However if we don't have + * write support we will need to change the active system + * partition. + * + * NOTE that this is completely useless on architectures + * where a real system partition is required, as on these + * architectures the partition uses the FAT FS, for which + * we do have write support. + * NOTE also that for those architectures looking for a + * partition boot indicator is insufficient. + */ + if ((PartEntry->FormatState == Unformatted ) || + (PartEntry->FormatState == Preformatted) || + (PartEntry->FormatState == Formatted )) + { + ASSERT(*PartEntry->FileSystem); + + /* NOTE: Please keep in sync with the RegisteredFileSystems list! */ + if (wcsicmp(PartEntry->FileSystem, L"FAT") == 0 || + wcsicmp(PartEntry->FileSystem, L"FAT32") == 0 || + // wcsicmp(PartEntry->FileSystem, L"NTFS") == 0 || + wcsicmp(PartEntry->FileSystem, L"BTRFS") == 0 || + wcsicmp(PartEntry->FileSystem, L"RAW") == 0) + { + return TRUE; + } + else + { + // WARNING: We cannot write on this FS yet! + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + PartEntry->FileSystem); + return FALSE; + } + } + else // if (PartEntry->FormatState == UnknownFormat) + { + ASSERT(!*PartEntry->FileSystem); + + DPRINT1("System partition %lu in disk %lu with no or unknown FS?!\n", + PartEntry->PartitionNumber, PartEntry->DiskEntry->DiskNumber); + return FALSE; + } + + // HACK: WARNING: We cannot write on this FS yet! + // See fsutil.c:InferFileSystem() + if (PartEntry->PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + PartEntry->FileSystem); + return FALSE; + } + + return TRUE; +} + VOID CheckActiveSystemPartition( IN PPARTLIST List) @@ -3001,8 +3096,6 @@ CheckActiveSystemPartition( PPARTENTRY PartEntry; PLIST_ENTRY ListEntry; - PFILE_SYSTEM FileSystem; - /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { @@ -3154,36 +3247,9 @@ CheckActiveSystemPartition( /* Save it */ List->OriginalSystemPartition = List->SystemPartition; - /* - * ADDITIONAL CHECKS / BIG HACK: - * - * Retrieve its file system and check whether we have - * write support for it. If that is the case we are fine - * and we can use it directly. However if we don't have - * write support we will need to change the active system - * partition. - * - * NOTE that this is completely useless on architectures - * where a real system partition is required, as on these - * architectures the partition uses the FAT FS, for which - * we do have write support. - * NOTE also that for those architectures looking for a - * partition boot indicator is insufficient. - */ - FileSystem = GetFileSystem(List->OriginalSystemPartition); - if (FileSystem == NULL) - { - DPRINT1("System partition %lu in disk %lu with no FS?!\n", - List->OriginalSystemPartition->PartitionNumber, - List->OriginalSystemPartition->DiskEntry->DiskNumber); - goto FindAndUseAlternativeSystemPartition; - } - // HACK: WARNING: We cannot write on this FS yet! - // See fsutil.c:GetFileSystem() - if (List->OriginalSystemPartition->PartitionType == PARTITION_IFS) + /* If we get a candidate active partition, validate it */ + if (!IsSupportedActivePartition(List->OriginalSystemPartition)) { - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", - FileSystem->FileSystemName); goto FindAndUseAlternativeSystemPartition; } diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index a27454b4aa..57873a444e 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -2,7 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2018-2019 Hermes Belusca-Maito */ #pragma once @@ -30,8 +31,6 @@ typedef enum _FORMATSTATE Formatted } FORMATSTATE, *PFORMATSTATE; -struct _FILE_SYSTEM; - typedef struct _PARTENTRY { LIST_ENTRY ListEntry; @@ -52,13 +51,16 @@ typedef struct _PARTENTRY WCHAR DriveLetter; WCHAR VolumeLabel[20]; - // CHAR FileSystemName[9]; // NOTE: Superseded by the FileSystem member + WCHAR FileSystem[MAX_PATH+1]; + FORMATSTATE FormatState; BOOLEAN LogicalPartition; /* Partition is partitioned disk space */ BOOLEAN IsPartitioned; +/** The following three properties may be replaced by flags **/ + /* Partition is new, table does not exist on disk yet */ BOOLEAN New; @@ -68,9 +70,6 @@ typedef struct _PARTENTRY /* Partition must be checked */ BOOLEAN NeedsCheck; - FORMATSTATE FormatState; - struct _FILE_SYSTEM* FileSystem; - } PARTENTRY, *PPARTENTRY; diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c index 26f9b79c58..615e7022c0 100644 --- a/base/setup/usetup/chkdsk.c +++ b/base/setup/usetup/chkdsk.c @@ -56,14 +56,9 @@ ChkdskCallback( NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ - IN PFILE_SYSTEM FileSystem) + IN PCWSTR FileSystemName) { NTSTATUS Status; - // PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - - if (!FileSystem || !FileSystem->ChkdskFunc) - return STATUS_NOT_SUPPORTED; ChkdskProgressBar = CreateProgressBar(6, yScreen - 14, @@ -76,12 +71,13 @@ ChkdskPartition( ProgressSetStepCount(ChkdskProgressBar, 100); - Status = FileSystem->ChkdskFunc(DriveRoot, - TRUE, /* FixErrors */ - FALSE, /* Verbose */ - TRUE, /* CheckOnlyIfDirty */ - FALSE, /* ScanDrive */ - ChkdskCallback); /* Callback */ + Status = ChkdskFileSystem_UStr(DriveRoot, + FileSystemName, + TRUE, /* FixErrors */ + FALSE, /* Verbose */ + TRUE, /* CheckOnlyIfDirty */ + FALSE, /* ScanDrive */ + ChkdskCallback); /* Callback */ DestroyProgressBar(ChkdskProgressBar); ChkdskProgressBar = NULL; diff --git a/base/setup/usetup/chkdsk.h b/base/setup/usetup/chkdsk.h index 0eb2bed372..3207d2f7f6 100644 --- a/base/setup/usetup/chkdsk.h +++ b/base/setup/usetup/chkdsk.h @@ -28,7 +28,6 @@ NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ - IN PFILE_SYSTEM FileSystem); + IN PCWSTR FileSystemName); /* EOF */ diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index db8c14dcca..08e029ce54 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -88,13 +88,10 @@ FormatCallback( NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystemItem) + IN PCWSTR FileSystemName, + IN BOOLEAN QuickFormat) { NTSTATUS Status; - PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - - if (!FileSystem || !FileSystem->FormatFunc) - return STATUS_NOT_SUPPORTED; FormatProgressBar = CreateProgressBar(6, yScreen - 14, @@ -107,12 +104,13 @@ FormatPartition( ProgressSetStepCount(FormatProgressBar, 100); - Status = FileSystem->FormatFunc(DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystemItem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - FormatCallback); /* Callback */ + Status = FormatFileSystem_UStr(DriveRoot, + FileSystemName, + FMIFS_HARDDISK, /* MediaFlag */ + NULL, /* Label */ + QuickFormat, /* QuickFormat */ + 0, /* ClusterSize */ + FormatCallback); /* Callback */ DestroyProgressBar(FormatProgressBar); FormatProgressBar = NULL; diff --git a/base/setup/usetup/format.h b/base/setup/usetup/format.h index 3032f49651..b84ae57559 100644 --- a/base/setup/usetup/format.h +++ b/base/setup/usetup/format.h @@ -29,6 +29,7 @@ NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystemItem); + IN PCWSTR FileSystemName, + IN BOOLEAN QuickFormat); /* EOF */ diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index 6aa8c4e193..75c9fbfaf0 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -34,8 +34,7 @@ static VOID AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName, // Redundant, I need to check whether this is reaaaaally needed.... - IN PFILE_SYSTEM FileSystem) + IN PCWSTR FileSystem) { PFILE_SYSTEM_ITEM Item; @@ -43,7 +42,6 @@ AddProvider( if (!Item) return; - Item->FileSystemName = FileSystemName; Item->FileSystem = FileSystem; Item->QuickFormat = TRUE; InsertTailList(&List->ListHead, &Item->ListEntry); @@ -55,7 +53,6 @@ AddProvider( if (!Item) return; - Item->FileSystemName = FileSystemName; Item->FileSystem = FileSystem; Item->QuickFormat = FALSE; InsertTailList(&List->ListHead, &Item->ListEntry); @@ -63,19 +60,21 @@ AddProvider( static VOID InitializeFileSystemList( - IN PFILE_SYSTEM_LIST List) + IN PFILE_SYSTEM_LIST List, + IN BOOLEAN ForceFormat) { - ULONG Count; - PFILE_SYSTEM FileSystems; + ULONG Index = 0; + PCWSTR FileSystemName; - FileSystems = GetRegisteredFileSystems(&Count); - if (!FileSystems || Count == 0) - return; + while (GetRegisteredFileSystems(Index++, &FileSystemName)) + { + AddProvider(List, FileSystemName); + } - while (Count--) + if (!ForceFormat) { - AddProvider(List, FileSystems->FileSystemName, FileSystems); - ++FileSystems; + /* Add the 'Keep existing filesystem' dummy provider */ + AddProvider(List, NULL); } } @@ -99,19 +98,14 @@ CreateFileSystemList( List->Selected = NULL; InitializeListHead(&List->ListHead); - InitializeFileSystemList(List); - if (!ForceFormat) - { - /* Add the 'Keep existing filesystem' dummy provider */ - AddProvider(List, NULL, NULL); - } + InitializeFileSystemList(List, ForceFormat); /* Search for SelectFileSystem in list */ ListEntry = List->ListHead.Flink; while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcscmp(SelectFileSystem, Item->FileSystemName) == 0) + if (Item->FileSystem && wcsicmp(SelectFileSystem, Item->FileSystem) == 0) { List->Selected = Item; break; @@ -171,12 +165,12 @@ DrawFileSystemList( coPos, &Written); - if (Item->FileSystemName) + if (Item->FileSystem) { - if (Item->QuickFormat) - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystemName); - else - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); + snprintf(Buffer, sizeof(Buffer), + MUIGetString(Item->QuickFormat ? STRING_FORMATDISK1 + : STRING_FORMATDISK2), + Item->FileSystem); } else { @@ -184,13 +178,17 @@ DrawFileSystemList( } if (ListEntry == &List->Selected->ListEntry) + { CONSOLE_SetInvertedTextXY(List->Left, List->Top + (SHORT)Index, Buffer); + } else + { CONSOLE_SetTextXY(List->Left, List->Top + (SHORT)Index, Buffer); + } Index++; ListEntry = ListEntry->Flink; } diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h index d5f8b4c5ce..fc4a8b2f2d 100644 --- a/base/setup/usetup/fslist.h +++ b/base/setup/usetup/fslist.h @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.h * PURPOSE: Filesystem list functions @@ -30,8 +31,7 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - PCWSTR FileSystemName; /* Not owned by the item */ // Redundant, I need to check whether this is reaaaaally needed.... - PFILE_SYSTEM FileSystem; + PCWSTR FileSystem; BOOLEAN QuickFormat; } FILE_SYSTEM_ITEM, *PFILE_SYSTEM_ITEM; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f10effde10..b8df7c9261 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -22,7 +22,7 @@ * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ #include <usetup.h> @@ -3071,7 +3071,8 @@ FormatPartitionPage(PINPUT_RECORD Ir) if (SelectedFileSystem->FileSystem) { Status = FormatPartition(&PartitionRootPath, - SelectedFileSystem); + SelectedFileSystem->FileSystem, + SelectedFileSystem->QuickFormat); if (Status == STATUS_NOT_SUPPORTED) { sprintf(Buffer, @@ -3079,7 +3080,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - SelectedFileSystem->FileSystem->FileSystemName); + SelectedFileSystem->FileSystem); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -3147,7 +3148,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) NTSTATUS Status; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - PFILE_SYSTEM CurrentFileSystem; UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; @@ -3163,38 +3163,44 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - CurrentFileSystem = PartEntry->FileSystem; - DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystemName: %S\n", - PartEntry->PartitionType, (CurrentFileSystem ? CurrentFileSystem->FileSystemName : L"n/a")); + DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n", + PartEntry->PartitionType, (*PartEntry->FileSystem ? PartEntry->FileSystem : L"n/a")); /* HACK: Do not try to check a partition with an unknown filesystem */ - if (CurrentFileSystem == NULL) + if (!*PartEntry->FileSystem) { PartEntry->NeedsCheck = FALSE; return CHECK_FILE_SYSTEM_PAGE; } - Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); + /* Set PartitionRootPath */ + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Check the partition */ + Status = ChkdskPartition(&PartitionRootPath, PartEntry->FileSystem); if (Status == STATUS_NOT_SUPPORTED) { + /* + * Partition checking is not supported with the current filesystem, + * so disable FS checks on it. + */ + PartEntry->NeedsCheck = FALSE; + sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n" "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - CurrentFileSystem->FileSystemName); + PartEntry->FileSystem); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -4204,7 +4210,7 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - PartitionList->SystemPartition->FileSystem->FileSystemName); + PartitionList->SystemPartition->FileSystem); return QUIT_PAGE; } @@ -4241,7 +4247,7 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - PartitionList->SystemPartition->FileSystem->FileSystemName); + PartitionList->SystemPartition->FileSystem); return QUIT_PAGE; }

5 years, 9 months

[reactos] 03/03: [ACLAYERS] Implement the ForceDXSetupSuccess shim This shim is used on older installers that try to install DirectX, but encounter errors doing so with the bundled setup. CORE-15814

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b18da6730ee2b6f0a3859… commit b18da6730ee2b6f0a385963fe2f8ed535a094353 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Mar 8 00:32:20 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:35 2019 +0100 [ACLAYERS] Implement the ForceDXSetupSuccess shim This shim is used on older installers that try to install DirectX, but encounter errors doing so with the bundled setup. CORE-15814 --- dll/appcompat/shims/layer/CMakeLists.txt | 1 + dll/appcompat/shims/layer/forcedxsetupsuccess.c | 268 +++++++++++++++++++++++ dll/appcompat/shims/shimlib/shimlib.c | 9 +- dll/appcompat/shims/shimlib/shimlib.h | 2 +- media/sdb/sysmain.xml | 9 + modules/rostests/apitests/appshim/CMakeLists.txt | 1 + 6 files changed, 288 insertions(+), 2 deletions(-) diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt index 9567315c2c..92b168f85d 100644 --- a/dll/appcompat/shims/layer/CMakeLists.txt +++ b/dll/appcompat/shims/layer/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(aclayers.dll layer.spec) list(APPEND SOURCE dispmode.c + forcedxsetupsuccess.c versionlie.c vmhorizon.c main.c diff --git a/dll/appcompat/shims/layer/forcedxsetupsuccess.c b/dll/appcompat/shims/layer/forcedxsetupsuccess.c new file mode 100644 index 0000000000..f86339e078 --- /dev/null +++ b/dll/appcompat/shims/layer/forcedxsetupsuccess.c @@ -0,0 +1,268 @@ +/* + * PROJECT: ReactOS 'Layers' Shim library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ForceDxSetupSuccess shim + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include "ntndk.h" + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE hModule, LPCSTR lpProcName); +typedef BOOL (WINAPI* FREELIBRARYPROC)(HINSTANCE hLibModule); + + +#define SHIM_NS ForceDxSetupSuccess +#include <setup_shim.inl> + + +#define DSETUPERR_SUCCESS 0 + +INT WINAPI DirectXSetup(HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupA(HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupW(HWND hWnd, LPWSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupGetVersion(DWORD *lpdwVersion, DWORD *lpdwMinorVersion) +{ + if (lpdwVersion) + *lpdwVersion = MAKELONG(7, 4); // DirectX 7.0 + if (lpdwMinorVersion) + *lpdwMinorVersion = MAKELONG(1792, 0); + + return TRUE; +} + + +static +BOOLEAN +IsCharInAnsiString( + IN CHAR Char, + IN const STRING* MatchString) +{ + USHORT i; + + for (i = 0; i < MatchString->Length; i++) + { + if (Char == MatchString->Buffer[i]) + return TRUE; + } + + return FALSE; +} + + +NTSTATUS +NTAPI +FindCharInAnsiString( + IN const STRING* SearchString, + IN const STRING* MatchString, + OUT PUSHORT Position) +{ + BOOLEAN Found; + ULONG i, Length; + + *Position = 0; + + /* Search */ + Length = SearchString->Length; + for (i = Length - 1; (LONG)i >= 0; i--) + { + Found = IsCharInAnsiString(SearchString->Buffer[i], MatchString); + if (Found) + { + *Position = i; + return STATUS_SUCCESS; + } + } + + return STATUS_NOT_FOUND; +} + + +static BOOL IsDxSetupA(const PSTRING LibraryPath) +{ + static const STRING DxSetupDlls[] = { + RTL_CONSTANT_STRING("dsetup.dll"), + RTL_CONSTANT_STRING("dsetup32.dll"), + RTL_CONSTANT_STRING("dsetup"), + RTL_CONSTANT_STRING("dsetup32"), + }; + static const STRING PathDividerFind = RTL_CONSTANT_STRING("\\/"); + STRING LibraryName; + USHORT PathDivider; + DWORD n; + + if (!NT_SUCCESS(FindCharInAnsiString(LibraryPath, &PathDividerFind, &PathDivider))) + PathDivider = 0; + + if (PathDivider) + PathDivider += sizeof(CHAR); + + LibraryName.Buffer = LibraryPath->Buffer + PathDivider; + LibraryName.Length = LibraryPath->Length - PathDivider; + LibraryName.MaximumLength = LibraryPath->MaximumLength - PathDivider; + + for (n = 0; n < ARRAYSIZE(DxSetupDlls); ++n) + { + if (RtlEqualString(&LibraryName, DxSetupDlls + n, TRUE)) + { + SHIM_MSG("Found %Z\n", DxSetupDlls + n); + return TRUE; + } + } + return FALSE; +} + +static BOOL IsDxSetupW(PCUNICODE_STRING LibraryPath) +{ + static const UNICODE_STRING DxSetupDlls[] = { + RTL_CONSTANT_STRING(L"dsetup.dll"), + RTL_CONSTANT_STRING(L"dsetup32.dll"), + RTL_CONSTANT_STRING(L"dsetup"), + RTL_CONSTANT_STRING(L"dsetup32"), + }; + static const UNICODE_STRING PathDividerFind = RTL_CONSTANT_STRING(L"\\/"); + UNICODE_STRING LibraryName; + USHORT PathDivider; + DWORD n; + + if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, LibraryPath, &PathDividerFind, &PathDivider))) + PathDivider = 0; + + if (PathDivider) + PathDivider += sizeof(WCHAR); + + LibraryName.Buffer = LibraryPath->Buffer + PathDivider / sizeof(WCHAR); + LibraryName.Length = LibraryPath->Length - PathDivider; + LibraryName.MaximumLength = LibraryPath->MaximumLength - PathDivider; + + for (n = 0; n < ARRAYSIZE(DxSetupDlls); ++n) + { + if (RtlEqualUnicodeString(&LibraryName, DxSetupDlls + n, TRUE)) + { + SHIM_MSG("Found %wZ\n", DxSetupDlls + n); + return TRUE; + } + } + return FALSE; +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryA)(LPCSTR lpLibFileName) +{ + STRING Library; + + RtlInitAnsiString(&Library, lpLibFileName); + if (IsDxSetupA(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(0, LOADLIBRARYAPROC)(lpLibFileName); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryW)(LPCWSTR lpLibFileName) +{ + UNICODE_STRING Library; + + RtlInitUnicodeString(&Library, lpLibFileName); + if (IsDxSetupW(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(1, LOADLIBRARYWPROC)(lpLibFileName); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExA)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + STRING Library; + + RtlInitAnsiString(&Library, lpLibFileName); + if (IsDxSetupA(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(2, LOADLIBRARYEXAPROC)(lpLibFileName, hFile, dwFlags); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExW)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + UNICODE_STRING Library; + + RtlInitUnicodeString(&Library, lpLibFileName); + if (IsDxSetupW(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(3, LOADLIBRARYEXWPROC)(lpLibFileName, hFile, dwFlags); +} + +FARPROC WINAPI SHIM_OBJ_NAME(APIHook_GetProcAddress)(HMODULE hModule, LPCSTR lpProcName) +{ + static const STRING DxSetupFunctions[] = { + RTL_CONSTANT_STRING("DirectXSetup"), + RTL_CONSTANT_STRING("DirectXSetupA"), + RTL_CONSTANT_STRING("DirectXSetupW"), + RTL_CONSTANT_STRING("DirectXSetupGetVersion"), + }; + static const FARPROC DxSetupRedirections[] = { + DirectXSetup, + DirectXSetupA, + DirectXSetupW, + DirectXSetupGetVersion, + }; + DWORD n; + + if (hModule == ShimLib_Instance() && ((ULONG_PTR)lpProcName > MAXUSHORT)) + { + STRING ProcName; + RtlInitAnsiString(&ProcName, lpProcName); + for (n = 0; n < ARRAYSIZE(DxSetupFunctions); ++n) + { + if (RtlEqualString(&ProcName, DxSetupFunctions + n, TRUE)) + { + SHIM_MSG("Intercepted %Z\n", DxSetupFunctions + n); + return DxSetupRedirections[n]; + } + } + } + return CALL_SHIM(4, GETPROCADDRESSPROC)(hModule, lpProcName); +} + +BOOL WINAPI SHIM_OBJ_NAME(APIHook_FreeLibrary)(HINSTANCE hLibModule) +{ + if (hLibModule == ShimLib_Instance()) + { + SHIM_MSG("Intercepted\n"); + return TRUE; + } + + return CALL_SHIM(5, FREELIBRARYPROC)(hLibModule); +} + + +#define SHIM_NUM_HOOKS 6 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "LoadLibraryA", SHIM_OBJ_NAME(APIHook_LoadLibraryA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "LoadLibraryW", SHIM_OBJ_NAME(APIHook_LoadLibraryW)) \ + SHIM_HOOK(2, "KERNEL32.DLL", "LoadLibraryExA", SHIM_OBJ_NAME(APIHook_LoadLibraryExA)) \ + SHIM_HOOK(3, "KERNEL32.DLL", "LoadLibraryExW", SHIM_OBJ_NAME(APIHook_LoadLibraryExW)) \ + SHIM_HOOK(4, "KERNEL32.DLL", "GetProcAddress", SHIM_OBJ_NAME(APIHook_GetProcAddress)) \ + SHIM_HOOK(5, "KERNEL32.DLL", "FreeLibrary", SHIM_OBJ_NAME(APIHook_FreeLibrary)) + +#include <implement_shim.inl> diff --git a/dll/appcompat/shims/shimlib/shimlib.c b/dll/appcompat/shims/shimlib/shimlib.c index b9c2652ab6..fa3b22675e 100644 --- a/dll/appcompat/shims/shimlib/shimlib.c +++ b/dll/appcompat/shims/shimlib/shimlib.c @@ -23,18 +23,20 @@ typedef struct UsedShim ULONG g_ShimEngDebugLevel = 0xffffffff; +static HINSTANCE g_ShimLib_hInstance; static HANDLE g_ShimLib_Heap; static PSLIST_HEADER g_UsedShims; void ShimLib_Init(HINSTANCE hInstance) { + g_ShimLib_hInstance = hInstance; g_ShimLib_Heap = HeapCreate(0, 0x10000, 0); g_UsedShims = (PSLIST_HEADER)ShimLib_ShimMalloc(sizeof(SLIST_HEADER)); RtlInitializeSListHead(g_UsedShims); } -void ShimLib_Deinit() +void ShimLib_Deinit(VOID) { // Is this a good idea? HeapDestroy(g_ShimLib_Heap); @@ -50,6 +52,11 @@ void ShimLib_ShimFree(PVOID pData) HeapFree(g_ShimLib_Heap, 0, pData); } +HINSTANCE ShimLib_Instance(VOID) +{ + return g_ShimLib_hInstance; +} + PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLengthIncludingNullTerm) { PSTR NewString = ShimLib_ShimMalloc(stringLengthIncludingNullTerm); diff --git a/dll/appcompat/shims/shimlib/shimlib.h b/dll/appcompat/shims/shimlib/shimlib.h index 443f0b7964..0f016ac205 100644 --- a/dll/appcompat/shims/shimlib/shimlib.h +++ b/dll/appcompat/shims/shimlib/shimlib.h @@ -28,7 +28,7 @@ VOID ShimLib_ShimFree(PVOID pData); PCSTR ShimLib_StringDuplicateA(PCSTR szString); PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLength); BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString); - +HINSTANCE ShimLib_Instance(VOID); /* Forward events to generic handlers */ VOID ShimLib_Init(HINSTANCE hInstance); diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 472cded8f6..c5123e9d9a 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -215,6 +215,10 @@ <SHIM NAME="DisableThemes"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> + <SHIM NAME="ForceDXSetupSuccess"> + <DLLFILE>aclayers.dll</DLLFILE> + <DESCRIPTION>Some application using an older version of DirectX may encounter problems when calling LoadLibrary or GetProcAddress to use DSETUP.DLL or DSETUP32.DLL</DESCRIPTION> + </SHIM> <SHIM NAME="IgnoreFreeLibrary"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> @@ -239,10 +243,12 @@ <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" /> + <SHIM_REF NAME="ForceDXSetupSuccess" />  </LAYER> <LAYER NAME="WIN98"> <SHIM_REF NAME="Win98VersionLie" /> + <SHIM_REF NAME="ForceDXSetupSuccess" />  </LAYER> <LAYER NAME="NT4SP5"> @@ -363,6 +369,9 @@ <LAYER NAME="DisableThemes"> <SHIM_REF NAME="DisableThemes" /> </LAYER> + <LAYER NAME="ForceDXSetupSuccess"> + <SHIM_REF NAME="ForceDXSetupSuccess" /> + </LAYER> <LAYER NAME="VMHorizonSetup">  <SHIM_REF NAME="VMHorizonSetup" /> diff --git a/modules/rostests/apitests/appshim/CMakeLists.txt b/modules/rostests/apitests/appshim/CMakeLists.txt index b48600ceaa..f853119e50 100644 --- a/modules/rostests/apitests/appshim/CMakeLists.txt +++ b/modules/rostests/apitests/appshim/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE dispmode.c + forcedxsetup.c genral_hooks.c ignorefreelib.c layer_hooks.c

5 years, 9 months

[reactos] 02/03: [APPSHIM_APITEST] Add tests for ForceDXSetupSuccess

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=854af7f332381499fc4e8… commit 854af7f332381499fc4e8686aedb79a73d03b201 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Mar 7 21:18:52 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:34 2019 +0100 [APPSHIM_APITEST] Add tests for ForceDXSetupSuccess --- modules/rostests/apitests/appshim/forcedxsetup.c | 226 +++++++++++++++++++++++ modules/rostests/apitests/appshim/layer_hooks.c | 14 +- modules/rostests/apitests/appshim/testlist.c | 2 + 3 files changed, 241 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/appshim/forcedxsetup.c b/modules/rostests/apitests/appshim/forcedxsetup.c new file mode 100644 index 0000000000..a2b73149c5 --- /dev/null +++ b/modules/rostests/apitests/appshim/forcedxsetup.c @@ -0,0 +1,226 @@ +/* + * PROJECT: appshim_apitest + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for ForceDxSetupSuccess shim + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include "wine/test.h" + +#include "appshim_apitest.h" + +static HMODULE g_hShimDll; +static HMODULE g_hSentinelModule = (HMODULE)&g_hShimDll; /* Not a valid hmodule, so a nice sentinel */ +static tGETHOOKAPIS pGetHookAPIs; + +static INT (WINAPI *DirectXSetupGetVersion)(DWORD *lpdwVersion, DWORD *lpdwMinorVersion); + + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(PCSTR); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(PCWSTR); +typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE, PCSTR); +typedef BOOL(WINAPI* FREELIBRARYPROC)(HMODULE); + + +static HMODULE WINAPI my_LoadLibraryA(PCSTR Name) +{ + return g_hSentinelModule; +} + +static void test_LoadLibraryA(PHOOKAPI hook) +{ + LOADLIBRARYAPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = my_LoadLibraryA; + proc = hook->ReplacementFunction; + + /* Original function is not called */ + ok_ptr(proc("dsetup"), g_hShimDll); + ok_ptr(proc("dsetup.dll"), g_hShimDll); + ok_ptr(proc("DSETUP.DLL"), g_hShimDll); + ok_ptr(proc("DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc("dsetup32"), g_hShimDll); + ok_ptr(proc("dsetup32.dll"), g_hShimDll); + ok_ptr(proc("DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc("DSeTuP32.DlL"), g_hShimDll); + + ok_ptr(proc("c:\\bogus/dsetup"), g_hShimDll); + ok_ptr(proc("c:\\bogus\\dsetup.dll"), g_hShimDll); + ok_ptr(proc("c:/bogus/DSETUP.DLL"), g_hShimDll); + ok_ptr(proc("c:\\bogus\\DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc("////////////////////dsetup32"), g_hShimDll); + ok_ptr(proc("\\\\\\\\\\\\\\dsetup32.dll"), g_hShimDll); + ok_ptr(proc("xxxxxxxxxxx\\DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc("xxxxxxxxxxx//DSeTuP32.DlL"), g_hShimDll); + + /* Original function is called */ + ok_ptr(proc(NULL), g_hSentinelModule); + ok_ptr(proc("dsetup\\something"), g_hSentinelModule); + ok_ptr(proc("dsetup.dl"), g_hSentinelModule); + ok_ptr(proc("c:\\DSETUP.DLL."), g_hSentinelModule); + ok_ptr(proc("DSeTuP.D"), g_hSentinelModule); +} + +static HMODULE WINAPI my_LoadLibraryW(PCWSTR Name) +{ + return g_hSentinelModule; +} + +static void test_LoadLibraryW(PHOOKAPI hook) +{ + LOADLIBRARYWPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + + hook->OriginalFunction = my_LoadLibraryW; + proc = hook->ReplacementFunction; + + /* Original function is not called */ + ok_ptr(proc(L"dsetup"), g_hShimDll); + ok_ptr(proc(L"dsetup.dll"), g_hShimDll); + ok_ptr(proc(L"DSETUP.DLL"), g_hShimDll); + ok_ptr(proc(L"DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc(L"dsetup32"), g_hShimDll); + ok_ptr(proc(L"dsetup32.dll"), g_hShimDll); + ok_ptr(proc(L"DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc(L"DSeTuP32.DlL"), g_hShimDll); + + ok_ptr(proc(L"c:\\bogus/dsetup"), g_hShimDll); + ok_ptr(proc(L"c:\\bogus\\dsetup.dll"), g_hShimDll); + ok_ptr(proc(L"c:/bogus/DSETUP.DLL"), g_hShimDll); + ok_ptr(proc(L"c:\\bogus\\DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc(L"////////////////////dsetup32"), g_hShimDll); + ok_ptr(proc(L"\\\\\\\\\\\\\\dsetup32.dll"), g_hShimDll); + ok_ptr(proc(L"xxxxxxxxxxx\\DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc(L"xxxxxxxxxxx//DSeTuP32.DlL"), g_hShimDll); + + /* Original function is called */ + ok_ptr(proc(NULL), g_hSentinelModule); + ok_ptr(proc(L"dsetup\\something"), g_hSentinelModule); + ok_ptr(proc(L"dsetup.dl"), g_hSentinelModule); + ok_ptr(proc(L"c:\\DSETUP.DLL."), g_hSentinelModule); + ok_ptr(proc(L"DSeTuP.D"), g_hSentinelModule); +} + +static void test_GetProcAddress(PHOOKAPI hook) +{ + GETPROCADDRESSPROC proc; + DWORD n; + PCSTR Functions[] = { + "DirectXSetup", + "DirectXSetupA", + "DirectXSetupW", + "DirectXSetupGetVersion", + /* And not case sensitive? */ + "directxsetup", + "DIRECTXSETUPA", + "DiReCtXsEtUpW", + NULL + }; + HMODULE mod = GetModuleHandleA("kernel32.dll"); + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = GetProcAddress; /* Some versions seem to call GetProcAddress regardless of what is put here.. */ + proc = hook->ReplacementFunction; + + ok_ptr(proc(mod, "CreateFileA"), GetProcAddress(mod, "CreateFileA")); + ok_ptr(proc(g_hShimDll, "CreateFileA"), NULL); + + for (n = 0; Functions[n]; ++n) + { + FARPROC fn = proc(g_hShimDll, Functions[n]); + ok(fn != NULL, "Got NULL for %s\n", Functions[n]); + /* And yet, no export! */ + ok_ptr(GetProcAddress(g_hShimDll, Functions[n]), NULL); + } + + /* Not every function is shimmed */ + ok_ptr(proc(g_hShimDll, "DirectXSetupShowEULA"), NULL); + /* Retrieve a pointer for our next test */ + DirectXSetupGetVersion = (PVOID)proc(g_hShimDll, "DirectXSetupGetVersion"); +} + +static int g_NumShim = 0; +static int g_NumSentinel = 0; +static int g_NumCalls = 0; +BOOL WINAPI my_FreeLibrary(HMODULE module) +{ + if (module == g_hSentinelModule) + ++g_NumSentinel; + else if (module == g_hShimDll) + ++g_NumShim; + ++g_NumCalls; + return 33; +} + +static void test_FreeLibrary(PHOOKAPI hook) +{ + FREELIBRARYPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = my_FreeLibrary; + proc = hook->ReplacementFunction; + + ok_int(proc(NULL), 33); + ok_int(proc(NULL), 33); + ok_int(proc(g_hSentinelModule), 33); + ok_int(proc(g_hSentinelModule), 33); + ok_int(proc(g_hShimDll), TRUE); + ok_int(proc(g_hShimDll), TRUE); + + ok_int(g_NumShim, 0); + ok_int(g_NumSentinel, 2); + ok_int(g_NumCalls, 4); +} + + +START_TEST(forcedxsetup) +{ + DWORD num_shims = 0, n; + PHOOKAPI hook; + + if (!LoadShimDLL(L"aclayers.dll", &g_hShimDll, &pGetHookAPIs)) + return; + + hook = pGetHookAPIs("", L"ForceDxSetupSuccess", &num_shims); + + ok(hook != NULL, "Expected hook to be a valid pointer\n"); + ok(num_shims == 6, "Expected num_shims to be 6, was: %u\n", num_shims); + + if (!hook || !num_shims) + return; + + for (n = 0; n < num_shims; ++n) + { + if (!_stricmp(hook[n].FunctionName, "LoadLibraryA")) + test_LoadLibraryA(hook + n); + else if (!_stricmp(hook[n].FunctionName, "LoadLibraryW")) + test_LoadLibraryW(hook + n); + else if (!_stricmp(hook[n].FunctionName, "GetProcAddress")) + test_GetProcAddress(hook + n); + else if (!_stricmp(hook[n].FunctionName, "FreeLibrary")) + test_FreeLibrary(hook + n); + } + + ok(DirectXSetupGetVersion != NULL, "No DirectXSetupGetVersion\n"); + if (DirectXSetupGetVersion) + { + DWORD dwVersion = 0xdeadbeef; + DWORD dwMinorVersion = 0xbeefdead; + INT Res = DirectXSetupGetVersion(&dwVersion, &dwMinorVersion); + ok_int(Res, 1); + ok_hex(dwVersion, MAKELONG(7, 4)); // DirectX 7.0 + ok_hex(dwMinorVersion, MAKELONG(1792, 0)); + + Res = DirectXSetupGetVersion(NULL, NULL); + ok_int(Res, 1); + } +} diff --git a/modules/rostests/apitests/appshim/layer_hooks.c b/modules/rostests/apitests/appshim/layer_hooks.c index e1568629bf..715de78df2 100644 --- a/modules/rostests/apitests/appshim/layer_hooks.c +++ b/modules/rostests/apitests/appshim/layer_hooks.c @@ -27,12 +27,24 @@ typedef struct expect_shim_data { const WCHAR* ShimName; DWORD MinVersion; - expect_shim_hook hooks[4]; + expect_shim_hook hooks[6]; } expect_shim_data; static expect_shim_data data[] = { + { + L"ForceDXSetupSuccess", + 0, + { + { "KERNEL32.DLL", "LoadLibraryA" }, + { "KERNEL32.DLL", "LoadLibraryW" }, + { "KERNEL32.DLL", "LoadLibraryExA" }, + { "KERNEL32.DLL", "LoadLibraryExW" }, + { "KERNEL32.DLL", "GetProcAddress" }, + { "KERNEL32.DLL", "FreeLibrary" }, + } + }, { L"VerifyVersionInfoLite", 0, diff --git a/modules/rostests/apitests/appshim/testlist.c b/modules/rostests/apitests/appshim/testlist.c index a3e7b7132d..78bf621b9d 100644 --- a/modules/rostests/apitests/appshim/testlist.c +++ b/modules/rostests/apitests/appshim/testlist.c @@ -4,6 +4,7 @@ #include <wine/test.h> extern void func_dispmode(void); +extern void func_forcedxsetup(void); extern void func_genral_hooks(void); extern void func_ignorefreelib(void); extern void func_layer_hooks(void); @@ -12,6 +13,7 @@ extern void func_versionlie(void); const struct test winetest_testlist[] = { { "dispmode", func_dispmode }, + { "forcedxsetup", func_forcedxsetup }, { "genral_hooks", func_genral_hooks }, { "ignorefreelib", func_ignorefreelib }, { "layer_hooks", func_layer_hooks },

5 years, 9 months

[reactos] 01/03: [ACLAYERS][ACGENRAL] Do not use the crt entrypoint.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76af1fb019029a3cd1292… commit 76af1fb019029a3cd12928b6d971ece20490e42e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Oct 10 00:19:54 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:22 2019 +0100 [ACLAYERS][ACGENRAL] Do not use the crt entrypoint. --- dll/appcompat/shims/genral/CMakeLists.txt | 4 ++-- dll/appcompat/shims/layer/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/appcompat/shims/genral/CMakeLists.txt b/dll/appcompat/shims/genral/CMakeLists.txt index 86db9bbc91..b0e98edcec 100644 --- a/dll/appcompat/shims/genral/CMakeLists.txt +++ b/dll/appcompat/shims/genral/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(acgenral SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/acgenral.def) -set_module_type(acgenral win32dll) +set_module_type(acgenral win32dll ENTRYPOINT DllMain 12) target_link_libraries(acgenral shimlib) -add_importlibs(acgenral uxtheme msvcrt kernel32 ntdll) +add_importlibs(acgenral uxtheme kernel32 ntdll) add_cd_file(TARGET acgenral DESTINATION reactos/AppPatch FOR all) diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt index f62c8dd13c..9567315c2c 100644 --- a/dll/appcompat/shims/layer/CMakeLists.txt +++ b/dll/appcompat/shims/layer/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(aclayers SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/aclayers.def) -set_module_type(aclayers win32dll) +set_module_type(aclayers win32dll ENTRYPOINT DllMain 12) target_link_libraries(aclayers shimlib) -add_importlibs(aclayers user32 msvcrt kernel32 ntdll) +add_importlibs(aclayers user32 kernel32 ntdll) add_cd_file(TARGET aclayers DESTINATION reactos/AppPatch FOR all)

5 years, 9 months

[reactos] 01/01: [AFD] Don't reallocate buffers if windows sizes didn't change

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e07b3b9f9448ff17c636… commit 4e07b3b9f9448ff17c636bd2de9b72d9f1e403f2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 10 12:27:30 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 10 12:27:30 2019 +0100 [AFD] Don't reallocate buffers if windows sizes didn't change --- drivers/network/afd/afd/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/network/afd/afd/info.c b/drivers/network/afd/afd/info.c index c780eb86a2..78e0cb0851 100644 --- a/drivers/network/afd/afd/info.c +++ b/drivers/network/afd/afd/info.c @@ -128,7 +128,8 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) { /* FIXME: likely not right, check tcpip.sys for TDI_QUERY_MAX_DATAGRAM_INFO */ - if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF) + if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF && + InfoReq->Information.Ulong != FCB->Recv.Size) { NewBuffer = ExAllocatePoolWithTag(PagedPool, InfoReq->Information.Ulong, @@ -172,7 +173,8 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, if (FCB->State == SOCKET_STATE_CONNECTED || FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) { - if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF) + if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF && + InfoReq->Information.Ulong != FCB->Send.Size) { NewBuffer = ExAllocatePoolWithTag(PagedPool, InfoReq->Information.Ulong,

5 years, 9 months

[reactos] 01/01: [WIN32K] Keep a reference on an ETHREAD while THREADINFO exists

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba893e11723adbea6923a… commit ba893e11723adbea6923a1899b700e8223020eda Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Mar 13 23:00:17 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Mar 10 11:14:40 2019 +0100 [WIN32K] Keep a reference on an ETHREAD while THREADINFO exists --- win32ss/user/ntuser/main.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 318a7ea70e..b790fd84ef 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -89,13 +89,6 @@ AllocW32Process(IN PEPROCESS Process, return STATUS_SUCCESS; } -#define FreeW32Process(/*Process*/ W32Process) \ -do { \ - /*PPROCESSINFO W32Process = PsGetProcessWin32Process(Process);*/ \ - /*ASSERT(W32Process);*/ \ - IntDereferenceProcessInfo(W32Process); \ -} while(0) - /* * Called from IntDereferenceProcessInfo */ @@ -332,7 +325,7 @@ ExitProcessCallback(PEPROCESS Process) ppiCurrent->peProcess = NULL; /* Finally, dereference */ - FreeW32Process(/*Process*/ ppiCurrent); // IntDereferenceProcessInfo(ppiCurrent); + IntDereferenceProcessInfo(ppiCurrent); return STATUS_SUCCESS; } @@ -397,19 +390,13 @@ AllocW32Thread(IN PETHREAD Thread, RtlZeroMemory(ptiCurrent, sizeof(*ptiCurrent)); PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); + ObReferenceObject(Thread); IntReferenceThreadInfo(ptiCurrent); *W32Thread = ptiCurrent; return STATUS_SUCCESS; } -#define FreeW32Thread(/*Thread*/ W32Thread) \ -do { \ - /*PTHREADINFO W32Thread = PsGetThreadWin32Thread(Thread);*/ \ - /*ASSERT(W32Thread);*/ \ - IntDereferenceThreadInfo(W32Thread); \ -} while(0) - /* * Called from IntDereferenceThreadInfo */ @@ -428,6 +415,8 @@ UserDeleteW32Thread(PTHREADINFO pti) MsqCleanupThreadMsgs(pti); + ObDereferenceObject(pti->pEThread); + ExFreePoolWithTag(pti, USERTAG_THREADINFO); IntDereferenceProcessInfo(ppi); @@ -845,10 +834,9 @@ ExitThreadCallback(PETHREAD Thread) /* The thread is dying */ PsSetThreadWin32Thread(Thread /*ptiCurrent->pEThread*/, NULL, ptiCurrent); - ptiCurrent->pEThread = NULL; - /* Free the THREADINFO */ - FreeW32Thread(/*Thread*/ ptiCurrent); // IntDereferenceThreadInfo(ptiCurrent); + /* Dereference the THREADINFO */ + IntDereferenceThreadInfo(ptiCurrent); return STATUS_SUCCESS; }

5 years, 9 months

[reactos] 01/01: [NET] Move the remaining IDS_GENERIC_PAGE strings into the command messages and fix a size restriction of ConPrintf().

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5904abf94d78420ff0d7… commit e5904abf94d78420ff0d71e5207df3553f4b806d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 09:55:15 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 09:55:15 2019 +0100 [NET] Move the remaining IDS_GENERIC_PAGE strings into the command messages and fix a size restriction of ConPrintf(). --- base/applications/network/net/cmdAccounts.c | 1 - base/applications/network/net/cmdConfig.c | 1 - base/applications/network/net/cmdContinue.c | 1 - base/applications/network/net/cmdGroup.c | 1 - base/applications/network/net/cmdHelp.c | 2 - base/applications/network/net/cmdLocalGroup.c | 1 - base/applications/network/net/lang/en-US.rc | 1 - base/applications/network/net/lang/es-ES.rc | 1 - base/applications/network/net/lang/pl-PL.rc | 1 - base/applications/network/net/lang/ro-RO.rc | 1 - base/applications/network/net/lang/ru-RU.rc | 1 - base/applications/network/net/lang/tr-TR.rc | 1 - base/applications/network/net/lang/zh-CN.rc | 1 - base/applications/network/net/lang/zh-TW.rc | 1 - base/applications/network/net/main.c | 3 +- base/applications/network/net/resource.h | 1 - sdk/include/reactos/mc/net_msg.mc | 133 +++++++++++++++++++++++--- 17 files changed, 124 insertions(+), 28 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 2ffc6eb2c5..d04bc48f4f 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -47,7 +47,6 @@ cmdAccounts( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index ecc434ad5c..3f8569030c 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -201,7 +201,6 @@ cmdConfig( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); } else { diff --git a/base/applications/network/net/cmdContinue.c b/base/applications/network/net/cmdContinue.c index 7d656ca1e5..8b4716a411 100644 --- a/base/applications/network/net/cmdContinue.c +++ b/base/applications/network/net/cmdContinue.c @@ -31,7 +31,6 @@ INT cmdContinue(INT argc, WCHAR **argv) ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_CONTINUE_SYNTAX); PrintNetMessage(MSG_CONTINUE_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 1; } } diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index f825ed0408..919e9ddeae 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -225,7 +225,6 @@ cmdGroup( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_GROUP_SYNTAX); PrintNetMessage(MSG_GROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else if (_wcsicmp(argv[i], L"/add") == 0) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index a160075bed..449a2a00ef 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -68,7 +68,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_GROUP_SYNTAX); PrintNetMessage(MSG_GROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -83,7 +82,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_LOCALGROUP_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index 8be27ef8ca..673c9a683d 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -245,7 +245,6 @@ cmdLocalGroup( ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else if (_wcsicmp(argv[i], L"/add") == 0) diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 506027b1b7..18b5ca746b 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -120,7 +120,6 @@ BEGIN IDS_GENERIC_LOCKED "Locked" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index e39ea9767e..9e802f3d38 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -123,7 +123,6 @@ BEGIN IDS_GENERIC_LOCKED "Bloqueado" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 4ea9dd4828..7fe511779c 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -119,7 +119,6 @@ BEGIN IDS_GENERIC_LOCKED "Zablokowane" IDS_GENERIC_UNLIMITED "Bez ograniczeń" IDS_GENERIC_SYNTAX "Składnia tego polecenia jest następująca:\n\n" - IDS_GENERIC_PAGE "NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Opcja %s nie jest jeszcze obsługiwana.\n" IDS_ERROR_INVALID_OPTION_VALUE "Wprowadzono nieprawidłową wartość dla opcji %s.\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index b94139c74a..61328729ce 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -126,7 +126,6 @@ BEGIN IDS_GENERIC_LOCKED "Blocat" IDS_GENERIC_UNLIMITED "Nelimitat" IDS_GENERIC_SYNTAX "Sintaxa acestei comenzi:\n\n" - IDS_GENERIC_PAGE "NET HELP comandă | MORE (pentru afișare paginată).\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n" IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 90a255ae7e..70b4dd777b 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "Заблокировано" IDS_GENERIC_UNLIMITED "Не ограничено" IDS_GENERIC_SYNTAX "Синтаксис данной команды:\n\n" - IDS_GENERIC_PAGE "NET HELP имя_команды | MORE - постраничный просмотр справки.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n" IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index aef7a7227e..5c001e5429 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "Kilitli" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 96c8aae7e1..35ae37150a 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "锁定" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n" IDS_ERROR_INVALID_OPTION_VALUE "您输入了 %s 选项的无效的值。\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index ff067a2add..b50e07c4e4 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -122,7 +122,6 @@ BEGIN IDS_GENERIC_LOCKED "鎖定" IDS_GENERIC_UNLIMITED "Unlimited" IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n" IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n" diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 63c825a11b..4707c148cd 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -163,7 +163,8 @@ PrintNetMessage( NULL); if (pBuffer) { - ConPrintf(StdOut, L"%s\n", pBuffer); + ConPuts(StdOut, pBuffer); + ConPuts(StdOut, L"\n"); LocalFree(pBuffer); pBuffer = NULL; } diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index ec2cab3cc2..1be6288333 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -116,7 +116,6 @@ #define IDS_GENERIC_LOCKED 605 #define IDS_GENERIC_UNLIMITED 606 #define IDS_GENERIC_SYNTAX 607 -#define IDS_GENERIC_PAGE 608 #define IDS_ERROR_OPTION_NOT_SUPPORTED 700 #define IDS_ERROR_INVALID_OPTION_VALUE 701 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index a687c06a3c..d0313b87e6 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -921,6 +921,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONTINUE wznawia działanie usługi, która została. @@ -933,6 +935,8 @@ usługa Wstrzymana usługa SCHEDULE SERVER WORKSTATION + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -944,6 +948,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -955,6 +961,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -966,6 +974,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -977,6 +987,7 @@ service Is the paused service SCHEDULE SERVER WORKSTATION +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -988,6 +999,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONTINUE reactivates a service that has been suspended by NET PAUSE. @@ -999,6 +1012,8 @@ service Is the paused service SCHEDULE SERVER WORKSTATION + +NET HELP command | MORE displays one screen at a time. . @@ -1136,6 +1151,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET GROUP dodaje, wyświetla lub modyfikuje grupy globalne na serwerach. @@ -1154,6 +1171,8 @@ nazwa_użytkownika[ ...] Lista zawierająca nazwy jednego lub kilku Rozdziel kolejne nazwy znakiem spacji. /ADD Dodaje grupę lub dodaje nazwę użytkownika do grupy. /DELETE Usuwa grupę lub usuwa nazwę użytkownika z grupy. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET GROUP adds, displays or modifies global groups on servers. When @@ -1171,6 +1190,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET GROUP adds, displays or modifies global groups on servers. When @@ -1188,6 +1209,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET GROUP adds, displays or modifies global groups on servers. When @@ -1205,6 +1228,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET GROUP adds, displays or modifies global groups on servers. When @@ -1222,6 +1247,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET GROUP adds, displays or modifies global groups on servers. When @@ -1239,6 +1266,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET GROUP adds, displays or modifies global groups on servers. When @@ -1256,6 +1285,8 @@ username[ ...] List one or more usernames to add to or remove from a group. Separate multiple username entries with a space. /ADD Adds a group, or adds a username to a group. /DELETE Removes a group, or removes a username from a group. + +NET HELP command | MORE displays one screen at a time. . @@ -1337,7 +1368,7 @@ Language=Polish NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian Sunt disponibile următoarele comenzi: @@ -1352,7 +1383,7 @@ Language=Romanian NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian Доступны следующие команды: @@ -1367,7 +1398,7 @@ Language=Russian NET GROUP NET SESSION NET VIEW NET HELP SYNTAX explains how to read NET HELP syntax lines. - NET HELP command | MORE displays Help one screen at a time. + NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish Éstos son los argumentos de línea de comandos disponibles: @@ -1603,6 +1634,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET LOCALGROUP dodaje, wyświetla, lub modyfikuje grupy lokalne na komputerach @@ -1628,6 +1661,8 @@ nazwa[ ...] Lista zawierająca nazwy jednego lub kilku użytkowników poleceniem do grupy lokalnej należy wcześniej utworzyć odpowiednie konto. /DELETE Usuwa nazwę grupy lub użytkownika z grupy lokalnej. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1651,6 +1686,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1674,6 +1711,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1697,6 +1736,8 @@ name [ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1720,6 +1761,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1743,6 +1786,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET LOCALGROUP adds, displays or modifies local groups on computers. When @@ -1766,6 +1811,8 @@ name[ ...] List one or more usernames or groupnams to add to or must be established for users or global groups added to a local group with this command. /DELETE Removes a groupname or username from a local group. + +NET HELP command | MORE displays one screen at a time. . @@ -1875,40 +1922,56 @@ Language=English NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET PAUSE wstrzymuje usługę. usługa Nazwa wstrzymywanej usługi. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET PAUSE suspends a service. Pausing a service puts it on hold. service The name of the service to be paused. + +NET HELP command | MORE displays one screen at a time. . @@ -2226,6 +2289,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET START uruchamia usługi lub wyświetla uruchomione usługi. @@ -2235,6 +2300,8 @@ usługa Nazwa uruchamianej usługi. Nazwy usług mające dwa lub więcej słów wpisywane w. wierszu polecenia muszą być ujęte w cudzysłów. Przykładowo, NET START "NET LOGON" uruchamia usługę logowania w sieci. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET START starts services or lists running services. @@ -2244,6 +2311,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET START starts services or lists running services. @@ -2253,6 +2322,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET START starts services or lists running services. @@ -2262,6 +2333,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET START starts services or lists running services. @@ -2271,6 +2344,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET START starts services or lists running services. @@ -2280,6 +2355,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET START starts services or lists running services. @@ -2289,6 +2366,8 @@ service The name of the service to be started. When typed at the command prompt, service name of two words or more must be enclosed in quotation marks. For example, NET START "NET LOGON" starts the net logon service. + +NET HELP command | MORE displays one screen at a time. . @@ -2333,6 +2412,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET STATISTICS wyświetla dziennik statystyki dla lokalnej usługi @@ -2341,6 +2422,8 @@ usługi dla których statystyka jest dostępna. SERVER Wyświetla statystykę usługi Serwer. WORKSTATION Wyświetla statystykę usługi Stacja robocza. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET STATISTICS displays the statisticslog for the local Workstation or @@ -2349,6 +2432,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET STATISTICS displays the statisticslog for the local Workstation or @@ -2357,6 +2442,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET STATISTICS displays the statisticslog for the local Workstation or @@ -2365,6 +2452,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET STATISTICS displays the statisticslog for the local Workstation or @@ -2373,6 +2462,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET STATISTICS displays the statisticslog for the local Workstation or @@ -2381,6 +2472,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET STATISTICS displays the statisticslog for the local Workstation or @@ -2389,6 +2482,8 @@ the services for which statistics are available. SERVER Displays the Server service statistics. WORKSTATION Displays the Workstation service statistics. + +NET HELP command | MORE displays one screen at a time. . @@ -2434,6 +2529,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET STOP zatrzymuje usługi. @@ -2443,6 +2540,8 @@ usługa Nazwa zatrzymywanej usługi. Zatrzymanie usługi rozłącza wszystkie połączenia sieciowe używane przez usługę. Niektóre usługi zależą od innych. Zatrzymanie jednej może też zatrzymać inne. Niektóre usługi nie mogą być zatrzymane. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET STOP stops services. @@ -2452,6 +2551,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET STOP stops services. @@ -2461,6 +2562,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET STOP stops services. @@ -2470,6 +2573,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET STOP stops services. @@ -2479,6 +2584,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET STOP stops services. @@ -2488,6 +2595,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET STOP stops services. @@ -2497,6 +2606,8 @@ service The name of the service to be stopped. Stopping a service cancels any network connection the service is using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. + +NET HELP command | MORE displays one screen at a time. . @@ -2758,7 +2869,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Polish NET USER creates and modifies user accounts on computers. When used @@ -2832,7 +2943,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Romanian NET USER creates and modifies user accounts on computers. When used @@ -2906,7 +3017,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Russian NET USER creates and modifies user accounts on computers. When used @@ -2980,7 +3091,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Spanish NET USER creates and modifies user accounts on computers. When used @@ -3054,7 +3165,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Turkish NET USER creates and modifies user accounts on computers. When used @@ -3128,7 +3239,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Chinese NET USER creates and modifies user accounts on computers. When used @@ -3202,7 +3313,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese NET USER creates and modifies user accounts on computers. When used @@ -3276,7 +3387,7 @@ Options Are as follows: /WORKSTATIONS has no list or if the list is *, the user can log on from any computer. - NET HELP command | MORE displays Help one screen at a time. +NET HELP command | MORE displays Help one screen at a time. .

5 years, 9 months

[reactos] 01/01: [NET] Add help message for the NET USER command and move the IDS_GENERIC_PAGE string into the help messages.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b8141eb6c4c1656dd8a… commit e2b8141eb6c4c1656dd8abc4bc95ea22245a5648 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 08:59:32 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 08:59:32 2019 +0100 [NET] Add help message for the NET USER command and move the IDS_GENERIC_PAGE string into the help messages. --- base/applications/network/net/cmdHelp.c | 3 - sdk/include/reactos/mc/net_msg.mc | 640 +++++++++++++++++++++++++++++++- 2 files changed, 624 insertions(+), 19 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index 97e22e34b2..a160075bed 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -24,7 +24,6 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_ACCOUNTS_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -41,14 +40,12 @@ INT cmdHelp(INT argc, WCHAR **argv) { PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else { PrintNetMessage(MSG_CONFIG_SYNTAX); PrintNetMessage(MSG_CONFIG_HELP); - ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } } diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index dd0f13d188..a687c06a3c 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -117,6 +117,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET ACCOUNTS uaktualnia bazę kont użytkowników i zmienia hasło oraz wymagania @@ -161,6 +163,8 @@ spełnione dwa warunki. w bieżącej domenie. W innym wypadku, operacje te są dokonywane na komputerze lokalnym. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET ACCOUNTS actualizează baza de utilizatori și modifică parola și @@ -202,6 +206,8 @@ NET ACCOUNTS să aibă efect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET ACCOUNTS updates the user accounts database and modifies password @@ -243,6 +249,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET ACCOUNTS updates the user accounts database and modifies password @@ -284,6 +292,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET ACCOUNTS updates the user accounts database and modifies password @@ -325,6 +335,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET ACCOUNTS updates the user accounts database and modifies password @@ -366,6 +378,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET ACCOUNTS updates the user accounts database and modifies password @@ -407,6 +421,8 @@ NET ACCOUNTS to take effect. controller of the current domain. Otherwise, the operation is performed on the local computer. + +NET HELP command | MORE displays one screen at a time. . @@ -562,6 +578,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONFIG wyświetla informacje o konfiguracji usług Stacja robocza lub @@ -571,6 +589,8 @@ konfigurowania usługi, wpisz polecenie NET HELP CONFIG usługa. SERVER Wyświetla informacje o konfiguracji usługi Serwer WORKSTATION Wyświetla informacje o konfiguracji usługi Stacja robocza. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONFIG displays coniguration information of the Workstation or @@ -582,6 +602,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONFIG displays coniguration information of the Workstation or @@ -593,6 +615,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONFIG displays coniguration information of the Workstation or @@ -604,6 +628,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONFIG displays coniguration information of the Workstation or @@ -615,6 +641,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONFIG displays coniguration information of the Workstation or @@ -626,6 +654,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONFIG displays coniguration information of the Workstation or @@ -637,6 +667,8 @@ SERVER Displays information about the configuration of the Server service. WORKSTATION Displays information about the configuration of the Workstation service. + +NET HELP command | MORE displays one screen at a time. . @@ -699,6 +731,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Polish NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer. @@ -718,6 +752,8 @@ NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer. Aby wyświetlić bieżącą konfigurację usługi Serwer, wpisz NET CONFIG SERVER bez parametrów. + +NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian NET CONFIG SERVER displays or changes settings for the Server service. @@ -736,6 +772,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP comandă | MORE (pentru afișare paginată). . Language=Russian NET CONFIG SERVER displays or changes settings for the Server service. @@ -754,6 +792,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP имя_команды | MORE - постраничный просмотр справки. . Language=Spanish NET CONFIG SERVER displays or changes settings for the Server service. @@ -772,6 +812,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Turkish NET CONFIG SERVER displays or changes settings for the Server service. @@ -790,6 +832,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Chinese NET CONFIG SERVER displays or changes settings for the Server service. @@ -808,6 +852,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . Language=Taiwanese NET CONFIG SERVER displays or changes settings for the Server service. @@ -826,6 +872,8 @@ NET CONFIG SERVER displays or changes settings for the Server service. To display the current configuration for the Server service, type NET CONFIG SERVER without parameters. + +NET HELP command | MORE displays one screen at a time. . @@ -2639,36 +2687,596 @@ SymbolicName=MSG_USER_HELP Severity=Success Facility=System Language=English -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Polish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Romanian -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Russian -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Spanish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Turkish -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Chinese -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese -USER -... +NET USER creates and modifies user accounts on computers. When used +without switches, it lists the user accounts for the computer. The +user account information is stored in the user accounts database. + +username Is the name of the user account to add, delete, modify, or + view. The name of the user account can have as many as + 20 characters. +password Assigns or changes a password for the user's account. + A password must satisfy the minimum length set with the + /MINPWLEN option of the NET ACCOUNTS command. It can have as + many as 14 characters. +* Produces a prompt for the password. The password is not + displayed when you type it at a password prompt. +/DOMAIN Performs the operation on a domain controller of + the current domain. +/ADD Adds a user account to the user accounts database. +/DELETE Removes a user account from the user accounts database. + +Options Are as follows: + + Options Description + -------------------------------------------------------------------- + /ACTIVE:{YES | NO} Activates or deactivates the account. If + the account is not active, the user cannot + access the server. The default is YES. + /COMMENT:"text" Provides a descriptive comment about the + user's account. Enclose the text in + quotation marks. + /COUNTRYCODE:nnn Uses the operating system country code to + implement the specified language files for a + user's help and error messages. A value of + 0 signifies the default country code. + /EXPIRES:{date | NEVER} Causes the account to expire if date is + set. NEVER sets no time limit on the + account. An expiration date is in the + form mm/dd/yy(yy). Months can be a number, + spelled out, or abbreviated with three + letters. Year can be two or four numbers. + Use slashes(/) (no spaces) to separate + parts of the date. + /FULLNAME:"name" Is a user's full name (rather than a + username). Enclose the name in quotation + marks. + /HOMEDIR:pathname Sets the path for the user's home directory. + The path must exist. + /PASSWORDCHG:{YES | NO} Specifies whether users can change their + own password. The default is YES. + /PASSWORDREQ:{YES | NO} Specifies whether a user account must have + a password. The default is YES. + /PROFILEPATH[:path] Sets a path for the user's logon profile. + /SCRIPTPATH:pathname Is the location of the user's logon + script. + /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as + day[-day][,day[-day]],time[-time][,time + [-time]], limited to 1-hour increments. + Days can be spelled out or abbreviated. + Hours can be 12- or 24-hour notation. For + 12-hour notation, use am, pm, a.m., or + p.m. ALL means a user can always log on, + and a blank value means a user can never + log on. Separate day and time entries with + a comma, and separate multiple day and time + entries with a semicolon. + /USERCOMMENT:"text" Lets an administrator add or change the User + Comment for the account. + /WORKSTATIONS:{computername[,...] | *} + Lists as many as eight computers from + which a user can log on to the network. If + /WORKSTATIONS has no list or if the list is *, + the user can log on from any computer. + + NET HELP command | MORE displays Help one screen at a time. .

5 years, 9 months

[reactos] 01/01: [NET] Implement the NET SYNTAX pseudo command.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaee5e840b9b02aaf04ae… commit eaee5e840b9b02aaf04ae430bbda379790512b04 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 01:04:26 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 01:04:26 2019 +0100 [NET] Implement the NET SYNTAX pseudo command. --- base/applications/network/net/cmdHelp.c | 11 +- base/applications/network/net/main.c | 1 + base/applications/network/net/net.h | 1 + sdk/include/reactos/mc/net_msg.mc | 270 +++++++++++++++++++++++++++++++- 4 files changed, 274 insertions(+), 9 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index b1643a2c4f..97e22e34b2 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -186,12 +186,13 @@ INT cmdHelp(INT argc, WCHAR **argv) { return 0; } +#endif if (_wcsicmp(argv[2], L"SYNTAX") == 0) { + PrintNetMessage(MSG_SYNTAX_HELP); return 0; } -#endif PrintNetMessage(MSG_HELP_SYNTAX); PrintNetMessage(MSG_HELP_HELP); @@ -199,3 +200,11 @@ INT cmdHelp(INT argc, WCHAR **argv) return 0; } + +INT +cmdSyntax(INT argc, WCHAR **argv) +{ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintNetMessage(MSG_SYNTAX_HELP); + return 0; +} diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 773c25fd94..63c825a11b 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -38,6 +38,7 @@ COMMAND cmds[] = {L"start", cmdStart}, {L"statistics", cmdStatistics}, {L"stop", cmdStop}, + {L"syntax", cmdSyntax}, {L"time", unimplemented}, {L"use", cmdUse}, {L"user", cmdUser}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index d4845232eb..43c5ae5a6a 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -68,6 +68,7 @@ INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStatistics(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); +INT cmdSyntax(INT argc, WCHAR **argv); INT cmdUse(INT argc, WCHAR **argv); INT cmdUser(INT argc, WCHAR **argv); diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 5e7b14deb5..dd0f13d188 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1273,7 +1273,8 @@ Language=English NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Polish Dostępne polecenia to: @@ -1287,7 +1288,8 @@ Language=Polish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Romanian Sunt disponibile următoarele comenzi: @@ -1301,7 +1303,8 @@ Language=Romanian NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Russian Доступны следующие команды: @@ -1315,7 +1318,8 @@ Language=Russian NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Spanish Éstos son los argumentos de línea de comandos disponibles: @@ -1329,7 +1333,8 @@ Language=Spanish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Turkish Aşağıdaki komutlar kullanılabilir: @@ -1343,7 +1348,8 @@ Language=Turkish NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Chinese 以下命令可用: @@ -1357,7 +1363,8 @@ Language=Chinese NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . Language=Taiwanese 以下命令是可用的: @@ -1371,7 +1378,8 @@ Language=Taiwanese NET FILE NET SEND NET USER NET GROUP NET SESSION NET VIEW - ... + NET HELP SYNTAX explains how to read NET HELP syntax lines. + NET HELP command | MORE displays Help one screen at a time. . @@ -2776,3 +2784,249 @@ NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] . + + +MessageId=10047 +SymbolicName=MSG_SYNTAX_HELP +Severity=Success +Facility=System +Language=English +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Polish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Romanian +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Russian +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Spanish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Turkish +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Chinese +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +. +Language=Taiwanese +SYNTAX +The following conventions are used to indicate command syntax: + +- Capital letters represent words that must be typed as shown. Lower- + case letters represent names of items that may vary, such as filenames. + +- The [ and ] characters surround optional items that can be supplied + with the command. + +- The { and } characters surround lists of items. You must supply one + of the items with the command. + +- The | character separates items in a list. Only one of the items can + be supplied with the command. + + For example, in the following syntax, you must type NET COMMAND and + either SWITCH1 or SWITCH2. Supplying a name is optional. + NET COMMAND [name] {SWITCH1 | SWITCH2} + +- The [...] characters mean you can repeat the previous item. + Separate items with spaces. + +- The [,...] characters mean you can repeat the previous item, but + you must separate items with commas or semicolons, not spaces. + +- When typed at the command prompt, service names of two words or + more must be enclosed in quotation marks. For example, + NET START "COMPUTER BROWSER" starts the computer browser service. +.

5 years, 9 months

[reactos] 01/01: [NET] Fix some 'net help' and 'net user' issues.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d8859cfd897f22a2fe30… commit 4d8859cfd897f22a2fe301f2760a2f27084c3594 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 00:30:27 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 00:30:27 2019 +0100 [NET] Fix some 'net help' and 'net user' issues. --- base/applications/network/net/cmdHelp.c | 6 +++--- base/applications/network/net/cmdUser.c | 4 ++-- base/applications/network/net/main.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index 716009ed59..b1643a2c4f 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -13,13 +13,13 @@ INT cmdHelp(INT argc, WCHAR **argv) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); -/* if (argc != 3) { - ConResPuts(StdOut, IDS_HELP_SYNTAX); + PrintNetMessage(MSG_HELP_SYNTAX); + PrintNetMessage(MSG_HELP_HELP); return 0; } -*/ + if (_wcsicmp(argv[2], L"ACCOUNTS") == 0) { PrintNetMessage(MSG_ACCOUNTS_SYNTAX); diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 238baaa3cf..0cb5dacc8f 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -637,14 +637,14 @@ cmdUser( NET_API_STATUS Status; i = 2; - if (argv[i][0] != L'/') + if ((i < argc) && (argv[i][0] != L'/')) { lpUserName = argv[i]; // ConPrintf(StdOut, L"User: %s\n", lpUserName); i++; } - if (argv[i][0] != L'/') + if ((i < argc) && (argv[i][0] != L'/')) { lpPassword = argv[i]; // ConPrintf(StdOut, L"Password: %s\n", lpPassword); diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 579ea4c10c..773c25fd94 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -246,7 +246,10 @@ int wmain(int argc, WCHAR **argv) done: if (bRun == FALSE) + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); PrintNetMessage(MSG_NET_SYNTAX); + } if (hModuleNetMsg != NULL) FreeLibrary(hModuleNetMsg);

5 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
22
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 2019