Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[pschweitzer] 75780: [FSUTIL] Fix a cppcheck warning
by pschweitzer＠svn.reactos.org 07 Sep '17

07 Sep '17

Author: pschweitzer Date: Thu Sep 7 12:49:13 2017 New Revision: 75780 URL: http://svn.reactos.org/svn/reactos?rev=75780&view=rev Log: [FSUTIL] Fix a cppcheck warning Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Thu Sep 7 12:49:13 2017 @@ -52,7 +52,7 @@ CloseHandle(Volume); /* Print the status */ - _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], (VolumeStatus & VOLUME_IS_DIRTY ? _T("dirty") : _T("clean"))); + _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], ((VolumeStatus & VOLUME_IS_DIRTY) ? _T("dirty") : _T("clean"))); return 0; }

1 0

[tkreuzer] 75779: [WDMAUD.DRV/KMIXER] Replace a float mul/div/round operation with integer math.
by tkreuzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: tkreuzer Date: Wed Sep 6 21:09:25 2017 New Revision: 75779 URL: http://svn.reactos.org/svn/reactos?rev=75779&view=rev Log: [WDMAUD.DRV/KMIXER] Replace a float mul/div/round operation with integer math. Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Wed Sep 6 21:09:25 2017 @@ -50,7 +50,7 @@ return ERROR_NOT_ENOUGH_MEMORY; } - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; + NewSamples = ((((ULONG64)NumSamples * NewRate) + (OldRate / 2)) / OldRate) + 2; FloatOut = HeapAlloc(GetProcessHeap(), 0, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut) Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Wed Sep 6 21:09:25 2017 @@ -59,7 +59,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; + NewSamples = ((((ULONG64)NumSamples * NewRate) + (OldRate / 2)) / OldRate) + 2; FloatOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut)

1 0

[pschweitzer] 75778: [FSUTIL] Print nicer error messages
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 17:11:03 2017 New Revision: 75778 URL: http://svn.reactos.org/svn/reactos?rev=75778&view=rev Log: [FSUTIL] Print nicer error messages Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -72,7 +72,7 @@ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hVolume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return INVALID_HANDLE_VALUE; } @@ -99,3 +99,24 @@ _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); } } + +int PrintErrorMessage(DWORD Error) +{ + TCHAR * String; + + /* Try to get textual error */ + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, Error, 0, (TCHAR *)&String, 0, NULL) != 0) + { + /* And print it */ + _ftprintf(stderr, _T("Error: %s\n"), String); + LocalFree(String); + } + else + { + /* Otherwise, just print the error number */ + _ftprintf(stderr, _T("Error: %d\n"), Error); + } + + return Error; +} Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -44,7 +44,7 @@ if (DeviceIoControl(Volume, FSCTL_IS_VOLUME_DIRTY, NULL, 0, &VolumeStatus, sizeof(ULONG), &BytesRead, NULL) == FALSE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); CloseHandle(Volume); return 1; } @@ -81,7 +81,7 @@ /* And set the dirty bit */ if (DeviceIoControl(Volume, FSCTL_MARK_VOLUME_DIRTY, NULL, 0, NULL, 0, &BytesRead, NULL) == FALSE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); CloseHandle(Volume); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -30,7 +30,7 @@ Drives = GetLogicalDrives(); if (Drives == 0) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return 1; } @@ -119,7 +119,7 @@ if (!GetVolumeInformation(argv[1], VolumeName, MAX_PATH + 1, &Serial, &MaxComponentLen, &Flags, FileSystem, MAX_PATH + 1)) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -26,4 +26,6 @@ HandlerItem * HandlersList, int HandlerListCount); +int PrintErrorMessage(DWORD Error); + #endif

1 0

[pschweitzer] 75777: [FSUTIL] Implement fsutil fsinfo volumeinfo. Works well with our various FS :-)
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 16:35:46 2017 New Revision: 75777 URL: http://svn.reactos.org/svn/reactos?rev=75777&view=rev Log: [FSUTIL] Implement fsutil fsinfo volumeinfo. Works well with our various FS :-) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 16:35:46 2017 @@ -11,11 +11,13 @@ /* Add handlers here for subcommands */ static int DrivesMain(int argc, const TCHAR *argv[]); static int DriveTypeMain(int argc, const TCHAR *argv[]); +static int VolumeInfoMain(int argc, const TCHAR *argv[]); static HandlerItem HandlersList[] = { /* Proc, name, help */ { DrivesMain, _T("drives"), _T("Enumerates the drives") }, { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, + { VolumeInfoMain, _T("volumeinfo"), _T("Provides informations about a volume") }, }; static int @@ -95,6 +97,65 @@ return 0; } +static int +VolumeInfoMain(int argc, const TCHAR *argv[]) +{ + DWORD Serial, MaxComponentLen, Flags; + TCHAR VolumeName[MAX_PATH + 1], FileSystem[MAX_PATH + 1]; + +#define HANDLE_FLAG(Flags, Flag, Desc) \ + if (Flags & Flag) \ + _ftprintf(stdout, Desc) + + /* We need a volume (path) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo volumeinfo <volume_path>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo volumeinfo c:\\\n")); + return 1; + } + + /* Gather information */ + if (!GetVolumeInformation(argv[1], VolumeName, MAX_PATH + 1, &Serial, + &MaxComponentLen, &Flags, FileSystem, MAX_PATH + 1)) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* Display general information */ + _ftprintf(stdout, _T("Volume name: %s\n"), VolumeName); + _ftprintf(stdout, _T("Volume serial number: 0x%x\n"), Serial); + _ftprintf(stdout, _T("Maximum component length: %u\n"), MaxComponentLen); + _ftprintf(stdout, _T("File system name: %s\n"), FileSystem); + + /* Display specific flags */ + HANDLE_FLAG(Flags, FILE_CASE_SENSITIVE_SEARCH, _T("Supports case-sensitive file names\n")); + HANDLE_FLAG(Flags, FILE_CASE_PRESERVED_NAMES, _T("Supports preserved case of file names\n")); + HANDLE_FLAG(Flags, FILE_UNICODE_ON_DISK, _T("Supports unicode file names\n")); + HANDLE_FLAG(Flags, FILE_PERSISTENT_ACLS, _T("Preserves and applies ACLs\n")); + HANDLE_FLAG(Flags, FILE_FILE_COMPRESSION, _T("Supports compression per file\n")); + HANDLE_FLAG(Flags, FILE_VOLUME_QUOTAS, _T("Supports disk quotas\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_SPARSE_FILES, _T("Supports sparse files\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_REPARSE_POINTS, _T("Supports reparse points\n")); + HANDLE_FLAG(Flags, FILE_VOLUME_IS_COMPRESSED, _T("Is a compressed volume\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_OBJECT_IDS, _T("Supports object identifiers\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_ENCRYPTION, _T("Supports the Encrypted File System (EFS)\n")); + HANDLE_FLAG(Flags, FILE_NAMED_STREAMS, _T("Supports named streams\n")); + HANDLE_FLAG(Flags, FILE_READ_ONLY_VOLUME, _T("Is a read-only volume\n")); + HANDLE_FLAG(Flags, FILE_SEQUENTIAL_WRITE_ONCE, _T("Supports a single sequential write\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_TRANSACTIONS, _T("Supports transactions\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_HARD_LINKS, _T("Supports hard links\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_EXTENDED_ATTRIBUTES, _T("Supports extended attributes\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_OPEN_BY_FILE_ID, _T("Supports opening files per file identifier\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_USN_JOURNAL, _T("Supports Update Sequence Number (USN) journals\n")); + HANDLE_FLAG(Flags, FILE_DAX_VOLUME, _T("Is a direct access volume\n")); + +#undef HANDLE_FLAGS + + return 0; +} + static void PrintUsage(const TCHAR * Command) {

1 0

[pschweitzer] 75776: [XDK] Add missing defines for FS features
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 16:28:22 2017 New Revision: 75776 URL: http://svn.reactos.org/svn/reactos?rev=75776&view=rev Log: [XDK] Add missing defines for FS features Modified: trunk/reactos/sdk/include/xdk/iotypes.h trunk/reactos/sdk/include/xdk/winnt_old.h Modified: trunk/reactos/sdk/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Wed Sep 6 16:28:22 2017 @@ -5270,6 +5270,10 @@ #define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000 #define FILE_SUPPORTS_OPEN_BY_FILE_ID 0x01000000 #define FILE_SUPPORTS_USN_JOURNAL 0x02000000 +#define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 +#define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 +#define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 #define FILE_NEED_EA 0x00000080 Modified: trunk/reactos/sdk/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/winnt_old.… ============================================================================== --- trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] Wed Sep 6 16:28:22 2017 @@ -286,20 +286,31 @@ #define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800 #define FILE_NOTIFY_VALID_MASK 0x00000fff -#define FILE_CASE_SENSITIVE_SEARCH 0x00000001 -#define FILE_CASE_PRESERVED_NAMES 0x00000002 -#define FILE_UNICODE_ON_DISK 0x00000004 -#define FILE_PERSISTENT_ACLS 0x00000008 -#define FILE_FILE_COMPRESSION 0x00000010 -#define FILE_VOLUME_QUOTAS 0x00000020 -#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 -#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 -#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 -#define FS_LFN_APIS 0x00004000 -#define FILE_VOLUME_IS_COMPRESSED 0x00008000 -#define FILE_SUPPORTS_OBJECT_IDS 0x00010000 -#define FILE_SUPPORTS_ENCRYPTION 0x00020000 -#define FILE_NAMED_STREAMS 0x00040000 +#define FILE_CASE_SENSITIVE_SEARCH 0x00000001 +#define FILE_CASE_PRESERVED_NAMES 0x00000002 +#define FILE_UNICODE_ON_DISK 0x00000004 +#define FILE_PERSISTENT_ACLS 0x00000008 +#define FILE_FILE_COMPRESSION 0x00000010 +#define FILE_VOLUME_QUOTAS 0x00000020 +#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 +#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 +#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 +#define FS_LFN_APIS 0x00004000 +#define FILE_VOLUME_IS_COMPRESSED 0x00008000 +#define FILE_SUPPORTS_OBJECT_IDS 0x00010000 +#define FILE_SUPPORTS_ENCRYPTION 0x00020000 +#define FILE_NAMED_STREAMS 0x00040000 +#define FILE_READ_ONLY_VOLUME 0x00080000 +#define FILE_SEQUENTIAL_WRITE_ONCE 0x00100000 +#define FILE_SUPPORTS_TRANSACTIONS 0x00200000 +#define FILE_SUPPORTS_HARD_LINKS 0x00400000 +#define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000 +#define FILE_SUPPORTS_OPEN_BY_FILE_ID 0x01000000 +#define FILE_SUPPORTS_USN_JOURNAL 0x02000000 +#define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 +#define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 +#define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 #define IO_COMPLETION_QUERY_STATE 0x0001 #define IO_COMPLETION_MODIFY_STATE 0x0002

1 0

[pschweitzer] 75775: [FSUTIL] Fix build (how does it even build locally?!)
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 15:36:05 2017 New Revision: 75775 URL: http://svn.reactos.org/svn/reactos?rev=75775&view=rev Log: [FSUTIL] Fix build (how does it even build locally?!) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 15:36:05 2017 @@ -5,6 +5,8 @@ * PURPOSE: FSutil file systems information * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> */ + +#include "fsutil.h" /* Add handlers here for subcommands */ static int DrivesMain(int argc, const TCHAR *argv[]);

1 0

[pschweitzer] 75774: [FSUTIL] Implement fsutil fsinfo drives and fsutil fsinfo drivetype
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 15:32:02 2017 New Revision: 75774 URL: http://svn.reactos.org/svn/reactos?rev=75774&view=rev Log: [FSUTIL] Implement fsutil fsinfo drives and fsutil fsinfo drivetype Added: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c (with props) Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE common.c dirty.c + fsinfo.c fsutil.c fsutil.h) add_executable(fsutil ${SOURCE} fsutil.rc) Added: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -0,0 +1,109 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/fsinfo.c + * PURPOSE: FSutil file systems information + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +/* Add handlers here for subcommands */ +static int DrivesMain(int argc, const TCHAR *argv[]); +static int DriveTypeMain(int argc, const TCHAR *argv[]); +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { DrivesMain, _T("drives"), _T("Enumerates the drives") }, + { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, +}; + +static int +DrivesMain(int argc, const TCHAR *argv[]) +{ + UINT i; + DWORD Drives; + + /* Get the drives bitmap */ + Drives = GetLogicalDrives(); + if (Drives == 0) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* And output any found drive */ + _ftprintf(stdout, _T("Drives:")); + for (i = 0; i < 26; i++) + { + if (Drives & (1 << i)) + { + _ftprintf(stdout, _T(" %c:\\"), 'A' + i); + } + } + _ftprintf(stdout, _T("\n")); + + return 0; +} + +static int +DriveTypeMain(int argc, const TCHAR *argv[]) +{ + UINT Type; + + /* We need a volume (letter) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo drivetype <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo drivetype c:\n")); + return 1; + } + + /* Get its drive type and make it readable */ + Type = GetDriveType(argv[1]); + switch (Type) + { + case DRIVE_UNKNOWN: + _ftprintf(stdout, _T("%s - unknown drive type\n"), argv[1]); + break; + + case DRIVE_NO_ROOT_DIR: + _ftprintf(stdout, _T("%s - not a root directory\n"), argv[1]); + break; + + case DRIVE_REMOVABLE: + _ftprintf(stdout, _T("%s - removable drive\n"), argv[1]); + break; + + case DRIVE_FIXED: + _ftprintf(stdout, _T("%s - fixed drive\n"), argv[1]); + break; + + case DRIVE_REMOTE: + _ftprintf(stdout, _T("%s - remote or network drive\n"), argv[1]); + break; + + case DRIVE_CDROM: + _ftprintf(stdout, _T("%s - CD-ROM drive\n"), argv[1]); + break; + + case DRIVE_RAMDISK: + _ftprintf(stdout, _T("%s - RAM disk drive\n"), argv[1]); + break; + } + + return 0; +} + +static void +PrintUsage(const TCHAR * Command) +{ + PrintDefaultUsage(_T(" FSINFO "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); +} + +int +FsInfoMain(int argc, const TCHAR *argv[]) +{ + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -10,10 +10,12 @@ /* Add handlers here for commands */ int DirtyMain(int argc, const TCHAR *argv[]); +int FsInfoMain(int argc, const TCHAR *argv[]); static HandlerItem HandlersList[] = { /* Proc, name, help */ { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") }, + { FsInfoMain, _T("fsinfo"), _T("Gathers informations about file systems") }, }; static void

1 0

[pschweitzer] 75773: [FSUTIL] Add a helper for opening a volume. Make it check for local devices if needed
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 12:41:52 2017 New Revision: 75773 URL: http://svn.reactos.org/svn/reactos?rev=75773&view=rev Log: [FSUTIL] Add a helper for opening a volume. Make it check for local devices if needed Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -46,6 +46,39 @@ return ret; } +HANDLE OpenVolume(const TCHAR * Volume, + BOOLEAN AllowRemote) +{ + UINT Type; + HANDLE hVolume; + TCHAR VolumeID[PATH_MAX]; + + /* Create full name */ + _stprintf(VolumeID, _T("\\\\.\\%s"), Volume); + + /* Get volume type */ + if (!AllowRemote && Volume[1] == L':') + { + Type = GetDriveType(Volume); + if (Type == DRIVE_REMOTE) + { + _ftprintf(stderr, _T("FSUTIL needs a local device\n")); + return INVALID_HANDLE_VALUE; + } + } + + /* Open the volume */ + hVolume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hVolume == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return INVALID_HANDLE_VALUE; + } + + return hVolume; +} + void PrintDefaultUsage(const TCHAR * Command, const TCHAR * SubCommand, HandlerItem * HandlersList, Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -23,7 +23,6 @@ QueryMain(int argc, const TCHAR *argv[]) { HANDLE Volume; - TCHAR VolumeID[PATH_MAX]; ULONG VolumeStatus, BytesRead; /* We need a volume (letter or GUID) */ @@ -34,15 +33,10 @@ return 1; } - /* Create full name */ - _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); - - /* Open the volume */ - Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); if (Volume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); return 1; } @@ -68,7 +62,6 @@ { HANDLE Volume; DWORD BytesRead; - TCHAR VolumeID[PATH_MAX]; /* We need a volume (letter or GUID) */ if (argc < 2) @@ -78,15 +71,10 @@ return 1; } - /* Create full name */ - _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); - - /* Open the volume */ - Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); if (Volume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -18,6 +18,9 @@ int HandlerListCount, void (*UsageHelper)(const TCHAR *)); +HANDLE OpenVolume(const TCHAR * Volume, + BOOLEAN AllowRemote); + void PrintDefaultUsage(const TCHAR * Command, const TCHAR * SubCommand, HandlerItem * HandlersList,

1 0

[pschweitzer] 75772: [FASTFAT] Don't decrease the open handle count too much (in cleanup & close). This avoid overflow and allows correct openings count
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 11:49:30 2017 New Revision: 75772 URL: http://svn.reactos.org/svn/reactos?rev=75772&view=rev Log: [FASTFAT] Don't decrease the open handle count too much (in cleanup & close). This avoid overflow and allows correct openings count Modified: trunk/reactos/drivers/filesystems/fastfat/close.c Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Wed Sep 6 11:49:30 2017 @@ -52,7 +52,6 @@ FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; - DeviceExt->OpenHandleCount--; if (pCcb) {

1 0

[pschweitzer] 75771: [FASTFAT] Don't return uninit status on allocation failure.
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 11:48:42 2017 New Revision: 75771 URL: http://svn.reactos.org/svn/reactos?rev=75771&view=rev Log: [FASTFAT] Don't return uninit status on allocation failure. Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] Wed Sep 6 11:48:42 2017 @@ -39,7 +39,7 @@ } else { - Status = IoStatus.Status; + Status = STATUS_INSUFFICIENT_RESOURCES; } return Status;

1 0

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017