Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75934: [FSUTIL] Implement fsutil fsinfo statistics Note that compared to w2k3 one, ours really supports FAT volumes (even though our FAT doesn't support it!).
by pschweitzer＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: pschweitzer Date: Sat Sep 23 20:15:16 2017 New Revision: 75934 URL: http://svn.reactos.org/svn/reactos?rev=75934&view=rev Log: [FSUTIL] Implement fsutil fsinfo statistics Note that compared to w2k3 one, ours really supports FAT volumes (even though our FAT doesn't support it!). 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] Sat Sep 23 20:15:16 2017 @@ -12,12 +12,14 @@ static HandlerProc DrivesMain; static HandlerProc DriveTypeMain; static HandlerProc VolumeInfoMain; +static HandlerProc StatisticsMain; 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") }, + { StatisticsMain, _T("statistics"), _T("Displays volume statistics") }, }; static int @@ -156,6 +158,416 @@ return 0; } +#define DUMP_VALUE(stats, value) fprintf(stdout, "%s: %lu\n", #value, stats->value) + +static void +DumpBase(PFILESYSTEM_STATISTICS Base, TCHAR * Name) +{ + /* Print FS name */ + _ftprintf(stdout, _T("File system type: %s\n\n"), Name); + + /* And then, dump any base stat */ + DUMP_VALUE(Base, UserFileReads); + DUMP_VALUE(Base, UserFileReadBytes); + DUMP_VALUE(Base, UserDiskReads); + DUMP_VALUE(Base, UserFileWrites); + DUMP_VALUE(Base, UserFileWriteBytes); + DUMP_VALUE(Base, UserDiskWrites); + DUMP_VALUE(Base, MetaDataReads); + DUMP_VALUE(Base, MetaDataReadBytes); + DUMP_VALUE(Base, MetaDataDiskReads); + DUMP_VALUE(Base, MetaDataWrites); + DUMP_VALUE(Base, MetaDataWriteBytes); + DUMP_VALUE(Base, MetaDataDiskWrites); + + _ftprintf(stdout, _T("\n")); +} + +static void +DumpExFat(PVOID Statistics, PVOID Specific) +{ + PEXFAT_STATISTICS ExFat; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + ExFat = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("EXFAT")); + + /* Then, display the EXFAT specific ones */ + DUMP_VALUE(ExFat, CreateHits); + DUMP_VALUE(ExFat, SuccessfulCreates); + DUMP_VALUE(ExFat, FailedCreates); + DUMP_VALUE(ExFat, NonCachedReads); + DUMP_VALUE(ExFat, NonCachedReadBytes); + DUMP_VALUE(ExFat, NonCachedWrites); + DUMP_VALUE(ExFat, NonCachedWriteBytes); + DUMP_VALUE(ExFat, NonCachedDiskReads); + DUMP_VALUE(ExFat, NonCachedDiskWrites); +} + +static void +DumpFat(PVOID Statistics, PVOID Specific) +{ + PFAT_STATISTICS Fat; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + Fat = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("FAT")); + + /* Then, display the FAT specific ones */ + DUMP_VALUE(Fat, CreateHits); + DUMP_VALUE(Fat, SuccessfulCreates); + DUMP_VALUE(Fat, FailedCreates); + DUMP_VALUE(Fat, NonCachedReads); + DUMP_VALUE(Fat, NonCachedReadBytes); + DUMP_VALUE(Fat, NonCachedWrites); + DUMP_VALUE(Fat, NonCachedWriteBytes); + DUMP_VALUE(Fat, NonCachedDiskReads); + DUMP_VALUE(Fat, NonCachedDiskWrites); +} + +static void +DumpNtfs(PVOID Statistics, PVOID Specific) +{ + PNTFS_STATISTICS Ntfs; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + Ntfs = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("NTFS")); + + /* Then, display the NTFS specific ones */ + DUMP_VALUE(Ntfs, MftReads); + DUMP_VALUE(Ntfs, MftReadBytes); + DUMP_VALUE(Ntfs, MftWrites); + DUMP_VALUE(Ntfs, MftWriteBytes); + DUMP_VALUE(Ntfs, Mft2Writes); + DUMP_VALUE(Ntfs, Mft2WriteBytes); + DUMP_VALUE(Ntfs, RootIndexReads); + DUMP_VALUE(Ntfs, RootIndexReadBytes); + DUMP_VALUE(Ntfs, RootIndexWrites); + DUMP_VALUE(Ntfs, RootIndexWriteBytes); + DUMP_VALUE(Ntfs, BitmapReads); + DUMP_VALUE(Ntfs, BitmapReadBytes); + DUMP_VALUE(Ntfs, BitmapWrites); + DUMP_VALUE(Ntfs, BitmapWriteBytes); + DUMP_VALUE(Ntfs, MftBitmapReads); + DUMP_VALUE(Ntfs, MftBitmapReadBytes); + DUMP_VALUE(Ntfs, MftBitmapWrites); + DUMP_VALUE(Ntfs, MftBitmapWriteBytes); + DUMP_VALUE(Ntfs, UserIndexReads); + DUMP_VALUE(Ntfs, UserIndexReadBytes); + DUMP_VALUE(Ntfs, UserIndexWrites); + DUMP_VALUE(Ntfs, UserIndexWriteBytes); + DUMP_VALUE(Ntfs, LogFileReads); + DUMP_VALUE(Ntfs, LogFileReadBytes); + DUMP_VALUE(Ntfs, LogFileWrites); + DUMP_VALUE(Ntfs, LogFileWriteBytes); +} + +#define GET_NEXT(stats, length, iter, type) (type)((ULONG_PTR)stats + (length * iter)) +#define SUM_VALUE(stats, new, value) stats->value += new->value + +inline int +ValidateSizes(ULONG Length, DWORD ProcCount, DWORD BytesRead, DWORD SpecificSize) +{ + /* Check whether we could read our base length for every processor */ + if (Length * ProcCount > BytesRead) + { + _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %lu)\n"), BytesRead, Length * ProcCount); + return 1; + } + + /* Check whether this covers a specific entry and a generic entry for every processor */ + if ((sizeof(FILESYSTEM_STATISTICS) + SpecificSize) * ProcCount > BytesRead) + { + _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %lu)\n"), BytesRead, (sizeof(FILESYSTEM_STATISTICS) + SpecificSize)); + return 1; + } + + return 0; +} + +inline void +SumBase(PFILESYSTEM_STATISTICS Base, PFILESYSTEM_STATISTICS NextBase) +{ + /* Sum any entry in the generic structures */ + SUM_VALUE(Base, NextBase, UserFileReads); + SUM_VALUE(Base, NextBase, UserFileReadBytes); + SUM_VALUE(Base, NextBase, UserDiskReads); + SUM_VALUE(Base, NextBase, UserFileWrites); + SUM_VALUE(Base, NextBase, UserFileWriteBytes); + SUM_VALUE(Base, NextBase, UserDiskWrites); + SUM_VALUE(Base, NextBase, MetaDataReads); + SUM_VALUE(Base, NextBase, MetaDataReadBytes); + SUM_VALUE(Base, NextBase, MetaDataDiskReads); + SUM_VALUE(Base, NextBase, MetaDataWrites); + SUM_VALUE(Base, NextBase, MetaDataWriteBytes); + SUM_VALUE(Base, NextBase, MetaDataDiskWrites); +} + +static int +SumExFat(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PEXFAT_STATISTICS ExFat; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(EXFAT_STATISTICS))) + { + return 1; + } + + Base = Statistics; + ExFat = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PEXFAT_STATISTICS NextExFat; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextExFat = GET_NEXT(ExFat, Length, i, PEXFAT_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(ExFat, NextExFat, CreateHits); + SUM_VALUE(ExFat, NextExFat, SuccessfulCreates); + SUM_VALUE(ExFat, NextExFat, FailedCreates); + SUM_VALUE(ExFat, NextExFat, NonCachedReads); + SUM_VALUE(ExFat, NextExFat, NonCachedReadBytes); + SUM_VALUE(ExFat, NextExFat, NonCachedWrites); + SUM_VALUE(ExFat, NextExFat, NonCachedWriteBytes); + SUM_VALUE(ExFat, NextExFat, NonCachedDiskReads); + SUM_VALUE(ExFat, NextExFat, NonCachedDiskWrites); + } + + return 0; +} + +static int +SumFat(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PFAT_STATISTICS Fat; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(FAT_STATISTICS))) + { + return 1; + } + + Base = Statistics; + Fat = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PFAT_STATISTICS NextFat; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextFat = GET_NEXT(Fat, Length, i, PFAT_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(Fat, NextFat, CreateHits); + SUM_VALUE(Fat, NextFat, SuccessfulCreates); + SUM_VALUE(Fat, NextFat, FailedCreates); + SUM_VALUE(Fat, NextFat, NonCachedReads); + SUM_VALUE(Fat, NextFat, NonCachedReadBytes); + SUM_VALUE(Fat, NextFat, NonCachedWrites); + SUM_VALUE(Fat, NextFat, NonCachedWriteBytes); + SUM_VALUE(Fat, NextFat, NonCachedDiskReads); + SUM_VALUE(Fat, NextFat, NonCachedDiskWrites); + } + + return 0; +} + +static int +SumNtfs(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PNTFS_STATISTICS Ntfs; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(NTFS_STATISTICS))) + { + return 1; + } + + Base = Statistics; + Ntfs = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PNTFS_STATISTICS NextNtfs; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextNtfs = GET_NEXT(Ntfs, Length, i, PNTFS_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(Ntfs, NextNtfs, MftReads); + SUM_VALUE(Ntfs, NextNtfs, MftReadBytes); + SUM_VALUE(Ntfs, NextNtfs, MftWrites); + SUM_VALUE(Ntfs, NextNtfs, MftWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, Mft2Writes); + SUM_VALUE(Ntfs, NextNtfs, Mft2WriteBytes); + SUM_VALUE(Ntfs, NextNtfs, RootIndexReads); + SUM_VALUE(Ntfs, NextNtfs, RootIndexReadBytes); + SUM_VALUE(Ntfs, NextNtfs, RootIndexWrites); + SUM_VALUE(Ntfs, NextNtfs, RootIndexWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, BitmapReads); + SUM_VALUE(Ntfs, NextNtfs, BitmapReadBytes); + SUM_VALUE(Ntfs, NextNtfs, BitmapWrites); + SUM_VALUE(Ntfs, NextNtfs, BitmapWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapReads); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapReadBytes); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapWrites); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, UserIndexReads); + SUM_VALUE(Ntfs, NextNtfs, UserIndexReadBytes); + SUM_VALUE(Ntfs, NextNtfs, UserIndexWrites); + SUM_VALUE(Ntfs, NextNtfs, UserIndexWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, LogFileReads); + SUM_VALUE(Ntfs, NextNtfs, LogFileReadBytes); + SUM_VALUE(Ntfs, NextNtfs, LogFileWrites); + SUM_VALUE(Ntfs, NextNtfs, LogFileWriteBytes); + } + + return 0; +} + +static int +StatisticsMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + SYSTEM_INFO SystemInfo; + FILESYSTEM_STATISTICS Buffer; + PFILESYSTEM_STATISTICS Statistics; + DWORD BytesRead, Length, ProcCount; + /* +1 because 0 isn't assigned to a filesystem */ + void (*DumpFct[FILESYSTEM_STATISTICS_TYPE_EXFAT + 1])(PVOID, PVOID) = { NULL, DumpNtfs, DumpFat, DumpExFat }; + int (*SumFct[FILESYSTEM_STATISTICS_TYPE_EXFAT + 1])(PVOID, PVOID, ULONG, DWORD, DWORD) = { NULL, SumNtfs, SumFat, SumExFat }; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo statistics <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo statistics c:\n")); + return 1; + } + + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); + if (Volume == INVALID_HANDLE_VALUE) + { + return 1; + } + + /* And query the statistics status - this call is expected to fail */ + Statistics = &Buffer; + Length = sizeof(Buffer); + /* Assume we have a single proc for now */ + ProcCount = 1; + if (DeviceIoControl(Volume, FSCTL_FILESYSTEM_GET_STATISTICS, NULL, 0, Statistics, + Length, &BytesRead, NULL) == FALSE) + { + DWORD Error; + + /* Check we failed because we provided a too small buffer */ + Error = GetLastError(); + if (Error == ERROR_MORE_DATA) + { + /* Get proc count */ + GetSystemInfo(&SystemInfo); + ProcCount = SystemInfo.dwNumberOfProcessors; + /* Get the maximum size to allocate: it's the total size (generic + specific) for every proc */ + Length = Statistics->SizeOfCompleteStructure * ProcCount; + + Statistics = LocalAlloc(LPTR, Length); + if (Statistics == NULL) + { + _ftprintf(stderr, _T("Failed to allocate memory!\n")); + CloseHandle(Volume); + return 1; + } + + /* Reissue the FSCTL, it's supposed to succeed now! */ + if (DeviceIoControl(Volume, FSCTL_FILESYSTEM_GET_STATISTICS, NULL, 0, Statistics, + Length, &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + LocalFree(Statistics); + CloseHandle(Volume); + return 1; + } + } + else + { + PrintErrorMessage(GetLastError()); + CloseHandle(Volume); + return 1; + } + } + + /* No need to deal with the volume any longer */ + CloseHandle(Volume); + + /* We only support FAT, EXFAT and NTFS for now */ + if (Statistics->FileSystemType > FILESYSTEM_STATISTICS_TYPE_EXFAT || Statistics->FileSystemType < FILESYSTEM_STATISTICS_TYPE_NTFS) + { + _ftprintf(stderr, _T("Unrecognized file system type: %d\n"), Statistics->FileSystemType); + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 1; + } + + /* Sum all the statistics (both generic and specific) from all the processors in the first entry */ + if (SumFct[Statistics->FileSystemType](Statistics, (PVOID)((ULONG_PTR)Statistics + sizeof(FILESYSTEM_STATISTICS)), + Statistics->SizeOfCompleteStructure, ProcCount, BytesRead)) + { + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 1; + } + + /* And finally, display the statistics (both generic and specific) */ + DumpFct[Statistics->FileSystemType](Statistics, (PVOID)((ULONG_PTR)Statistics + sizeof(FILESYSTEM_STATISTICS))); + + /* If we allocated memory, release it */ + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 0; +} + static void PrintUsage(const TCHAR * Command) {

1 0

[pschweitzer] 75933: [PSDK] Define FSCTL_FILESYSTEM_GET_STATISTICS and its associated structures
by pschweitzer＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: pschweitzer Date: Sat Sep 23 20:13:54 2017 New Revision: 75933 URL: http://svn.reactos.org/svn/reactos?rev=75933&view=rev Log: [PSDK] Define FSCTL_FILESYSTEM_GET_STATISTICS and its associated structures Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Sat Sep 23 20:13:54 2017 @@ -631,6 +631,7 @@ #define _FILESYSTEMFSCTL_ #define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) #if (_WIN32_WINNT >= _WIN32_WINNT_NT4) #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif @@ -649,6 +650,130 @@ #define VOLUME_UPGRADE_SCHEDULED (0x00000002) #define VOLUME_SESSION_OPEN (0x00000004) #endif + +typedef struct _FILESYSTEM_STATISTICS { + USHORT FileSystemType; + USHORT Version; + ULONG SizeOfCompleteStructure; + ULONG UserFileReads; + ULONG UserFileReadBytes; + ULONG UserDiskReads; + ULONG UserFileWrites; + ULONG UserFileWriteBytes; + ULONG UserDiskWrites; + ULONG MetaDataReads; + ULONG MetaDataReadBytes; + ULONG MetaDataDiskReads; + ULONG MetaDataWrites; + ULONG MetaDataWriteBytes; + ULONG MetaDataDiskWrites; +} FILESYSTEM_STATISTICS, *PFILESYSTEM_STATISTICS; + +#define FILESYSTEM_STATISTICS_TYPE_NTFS 1 +#define FILESYSTEM_STATISTICS_TYPE_FAT 2 +#define FILESYSTEM_STATISTICS_TYPE_EXFAT 3 + +typedef struct _FAT_STATISTICS { + ULONG CreateHits; + ULONG SuccessfulCreates; + ULONG FailedCreates; + ULONG NonCachedReads; + ULONG NonCachedReadBytes; + ULONG NonCachedWrites; + ULONG NonCachedWriteBytes; + ULONG NonCachedDiskReads; + ULONG NonCachedDiskWrites; +} FAT_STATISTICS, *PFAT_STATISTICS; + +typedef struct _EXFAT_STATISTICS { + ULONG CreateHits; + ULONG SuccessfulCreates; + ULONG FailedCreates; + ULONG NonCachedReads; + ULONG NonCachedReadBytes; + ULONG NonCachedWrites; + ULONG NonCachedWriteBytes; + ULONG NonCachedDiskReads; + ULONG NonCachedDiskWrites; +} EXFAT_STATISTICS, *PEXFAT_STATISTICS; + +typedef struct _NTFS_STATISTICS { + ULONG LogFileFullExceptions; + ULONG OtherExceptions; + ULONG MftReads; + ULONG MftReadBytes; + ULONG MftWrites; + ULONG MftWriteBytes; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } MftWritesUserLevel; + USHORT MftWritesFlushForLogFileFull; + USHORT MftWritesLazyWriter; + USHORT MftWritesUserRequest; + ULONG Mft2Writes; + ULONG Mft2WriteBytes; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } Mft2WritesUserLevel; + USHORT Mft2WritesFlushForLogFileFull; + USHORT Mft2WritesLazyWriter; + USHORT Mft2WritesUserRequest; + ULONG RootIndexReads; + ULONG RootIndexReadBytes; + ULONG RootIndexWrites; + ULONG RootIndexWriteBytes; + ULONG BitmapReads; + ULONG BitmapReadBytes; + ULONG BitmapWrites; + ULONG BitmapWriteBytes; + USHORT BitmapWritesFlushForLogFileFull; + USHORT BitmapWritesLazyWriter; + USHORT BitmapWritesUserRequest; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + } BitmapWritesUserLevel; + ULONG MftBitmapReads; + ULONG MftBitmapReadBytes; + ULONG MftBitmapWrites; + ULONG MftBitmapWriteBytes; + USHORT MftBitmapWritesFlushForLogFileFull; + USHORT MftBitmapWritesLazyWriter; + USHORT MftBitmapWritesUserRequest; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } MftBitmapWritesUserLevel; + ULONG UserIndexReads; + ULONG UserIndexReadBytes; + ULONG UserIndexWrites; + ULONG UserIndexWriteBytes; + ULONG LogFileReads; + ULONG LogFileReadBytes; + ULONG LogFileWrites; + ULONG LogFileWriteBytes; + struct { + ULONG Calls; + ULONG Clusters; + ULONG Hints; + ULONG RunsReturned; + ULONG HintsHonored; + ULONG HintsClusters; + ULONG Cache; + ULONG CacheClusters; + ULONG CacheMiss; + ULONG CacheMissClusters; + } Allocate; +} NTFS_STATISTICS, *PNTFS_STATISTICS; #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) typedef struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {

1 0

[ekohl] 75932: [LSASRV] Add some comments and improve trace messages.
by ekohl＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: ekohl Date: Sat Sep 23 18:58:39 2017 New Revision: 75932 URL: http://svn.reactos.org/svn/reactos?rev=75932&view=rev Log: [LSASRV] Add some comments and improve trace messages. Modified: trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/database.c Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sat Sep 23 18:58:39 2017 @@ -22,7 +22,7 @@ LsapDeregisterLogonProcess(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { - TRACE("(%p %p)\n", RequestMsg, LogonContext); + TRACE("LsapDeregisterLogonProcess(%p %p)\n", RequestMsg, LogonContext); RemoveHeadList(&LogonContext->Entry); @@ -44,7 +44,7 @@ PLSAP_LOGON_CONTEXT Context = NULL; NTSTATUS Status; - TRACE("(%p)\n", RequestMsg); + TRACE("LsapCheckLogonProcess(%p)\n", RequestMsg); TRACE("Client ID: %p %p\n", RequestMsg->h.ClientId.UniqueProcess, RequestMsg->h.ClientId.UniqueThread); @@ -93,7 +93,7 @@ REMOTE_PORT_VIEW RemotePortView; NTSTATUS Status = STATUS_SUCCESS; - TRACE("(%p)\n", RequestMsg); + TRACE("LsapHandlePortConnection(%p)\n", RequestMsg); TRACE("Logon Process Name: %s\n", RequestMsg->ConnectInfo.LogonProcessNameBuffer); Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Sep 23 18:58:39 2017 @@ -299,21 +299,25 @@ if (!NT_SUCCESS(Status)) goto done; + /* Set the Primary Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, L"PolPrDmN", NULL, 0); + /* Set the Primary Domain SID attribute */ LsapSetObjectAttribute(PolicyObject, L"PolPrDmS", NULL, 0); + /* Set the Account Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAcDmN", NULL, 0); + /* Set the Account Domain SID attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAcDmS", AccountDomainSid,

1 0

[ekohl] 75931: [DATETIME] Invert the sort order of the timezone list. List the timezones from GMT-12:00 to GMT+13:00.
by ekohl＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: ekohl Date: Sat Sep 23 18:54:58 2017 New Revision: 75931 URL: http://svn.reactos.org/svn/reactos?rev=75931&view=rev Log: [DATETIME] Invert the sort order of the timezone list. List the timezones from GMT-12:00 to GMT+13:00. Modified: trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat Sep 23 18:54:58 2017 @@ -48,7 +48,7 @@ Entry = TimeZoneListHead; while (Entry != NULL) { - if (Entry->TimezoneInfo.Bias > Bias) + if (Entry->TimezoneInfo.Bias < Bias) return Entry; if (Entry->TimezoneInfo.Bias == Bias)

1 0

[ekohl] 75930: [TRANSLATION] Polish translation update. Patch by Adam Słaboń. CORE-13802
by ekohl＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: ekohl Date: Sat Sep 23 17:32:13 2017 New Revision: 75930 URL: http://svn.reactos.org/svn/reactos?rev=75930&view=rev Log: [TRANSLATION] Polish translation update. Patch by Adam Słaboń. CORE-13802 Added: trunk/reactos/base/applications/charmap_new/lang/pl-PL.rc (with props) trunk/reactos/base/applications/clipbrd/lang/pl-PL.rc (with props) trunk/reactos/base/system/services/lang/pl-PL.rc (with props) trunk/reactos/dll/cpl/openglcfg/lang/pl-PL.rc (with props) trunk/reactos/dll/shellext/ntobjshex/lang/pl-PL.rc (with props) trunk/reactos/dll/shellext/stobject/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/shutdown/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/shell/explorer/lang/pl-PL.rc trunk/reactos/base/system/services/services.rc trunk/reactos/base/system/subst/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/console/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/openglcfg/openglcfg.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/charmap_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/shutdown/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… Modified: trunk/reactos/base/shell/explorer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/p… Added: trunk/reactos/base/system/services/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/subst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/pl-… Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Added: trunk/reactos/dll/cpl/openglcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/openglcfg/lang/pl-… Modified: trunk/reactos/dll/cpl/openglcfg/openglcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/openglcfg/openglcf… Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… Modified: trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Added: trunk/reactos/dll/shellext/ntobjshex/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… Added: trunk/reactos/dll/shellext/stobject/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… Modified: trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/pl-P… Modified: trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pl… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/pl-P… Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang…

1 0

[tfaber] 75929: [DRIVERS][NTOS][EVTLIB][USER32] - Silence some debug spam
by tfaber＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: tfaber Date: Sat Sep 23 13:34:50 2017 New Revision: 75929 URL: http://svn.reactos.org/svn/reactos?rev=75929&view=rev Log: [DRIVERS][NTOS][EVTLIB][USER32] - Silence some debug spam Modified: trunk/reactos/drivers/filesystems/mup/dfs.c trunk/reactos/drivers/ksfilter/swenum/swenum.c trunk/reactos/drivers/network/ndisuio/main.c trunk/reactos/drivers/network/ndisuio/protocol.c trunk/reactos/ntoskrnl/wmi/wmi.c trunk/reactos/sdk/lib/evtlib/evtlib.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/drivers/filesystems/mup/dfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/df… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/dfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/dfs.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -90,7 +90,7 @@ /* We don't support DFS yet, so * fail to make sure it remains disabled */ - UNIMPLEMENTED; + DPRINT("DfsDriverEntry not implemented\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -425,7 +425,7 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; - DPRINT1("SWENUM loaded\n"); + DPRINT("SWENUM loaded\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/ma… ============================================================================== --- trunk/reactos/drivers/network/ndisuio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndisuio/main.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -8,7 +8,7 @@ #include "ndisuio.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> PDEVICE_OBJECT GlobalDeviceObject; Modified: trunk/reactos/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/pr… ============================================================================== --- trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -88,7 +88,7 @@ return NDIS_STATUS_SUCCESS; case NetEventBindsComplete: - DPRINT1("NetPnPEvent: BindsComplete\n"); + DPRINT("NetPnPEvent: BindsComplete\n"); return NDIS_STATUS_SUCCESS; case NetEventPnPCapabilities: Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=759… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -68,7 +68,7 @@ IoWMIRegistrationControl(IN PDEVICE_OBJECT DeviceObject, IN ULONG Action) { - DPRINT1("IoWMIRegistrationControl() called for DO %p, requesting %lu action, returning success\n", + DPRINT("IoWMIRegistrationControl() called for DO %p, requesting %lu action, returning success\n", DeviceObject, Action); return STATUS_SUCCESS; Modified: trunk/reactos/sdk/lib/evtlib/evtlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/evtlib/evtlib.c?re… ============================================================================== --- trunk/reactos/sdk/lib/evtlib/evtlib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/evtlib/evtlib.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -507,7 +507,7 @@ /* Is it an EVENTLOGEOF record? */ if (RtlCompareMemory(&EofRec, &EOFRecord, EVENTLOGEOF_SIZE_FIXED) == EVENTLOGEOF_SIZE_FIXED) { - DPRINT1("Found EOF record at %llx\n", FileOffset.QuadPart); + DPRINT("Found EOF record at %llx\n", FileOffset.QuadPart); /* Got it! Break the loop and continue */ break; @@ -695,8 +695,8 @@ // LogFile->Header.Flags |= ELF_LOGFILE_HEADER_WRAP; // } - DPRINT1("StartOffset = 0x%x, EndOffset = 0x%x\n", - LogFile->Header.StartOffset, LogFile->Header.EndOffset); + DPRINT("StartOffset = 0x%x, EndOffset = 0x%x\n", + LogFile->Header.StartOffset, LogFile->Header.EndOffset); /* * For non-read-only logs of size < MaxSize, reorganize the events @@ -816,7 +816,7 @@ if (NextOffset.QuadPart == LogFile->Header.EndOffset) { /* We have finished enumerating all the event records */ - DPRINT1("NextOffset.QuadPart == LogFile->Header.EndOffset, break\n"); + DPRINT("NextOffset.QuadPart == LogFile->Header.EndOffset, break\n"); break; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -359,7 +359,7 @@ // FIXME: Disabling this call is a HACK!! See also User32CallClientThreadSetupFromKernel... // return ClientThreadSetupHelper(FALSE); - UNIMPLEMENTED; + TRACE("ClientThreadSetup is not implemented\n"); return TRUE; }

1 0

[mjansen] 75928: [USER32][WIN32K] Make antialiased disabled font readable. Patch by Katayama Hirofumi MZ. CORE-7721
by mjansen＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: mjansen Date: Fri Sep 22 19:47:34 2017 New Revision: 75928 URL: http://svn.reactos.org/svn/reactos?rev=75928&view=rev Log: [USER32][WIN32K] Make antialiased disabled font readable. Patch by Katayama Hirofumi MZ. CORE-7721 Modified: trunk/reactos/win32ss/gdi/ntgdi/font.h trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.h [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -29,6 +29,7 @@ FT_Face Face; FT_BitmapGlyph BitmapGlyph; int Height; + FT_Render_Mode RenderMode; MATRIX mxWorldToDevice; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -1392,6 +1392,7 @@ switch (logfont->lfQuality) { case ANTIALIASED_QUALITY: + break; case NONANTIALIASED_QUALITY: return FT_RENDER_MODE_MONO; case DRAFT_QUALITY: @@ -2608,6 +2609,7 @@ FT_Face Face, INT GlyphIndex, INT Height, + FT_Render_Mode RenderMode, PMATRIX pmx) { PLIST_ENTRY CurrentEntry; @@ -2622,6 +2624,7 @@ if ((FontEntry->Face == Face) && (FontEntry->GlyphIndex == GlyphIndex) && (FontEntry->Height == Height) && + (FontEntry->RenderMode == RenderMode) && (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; CurrentEntry = CurrentEntry->Flink; @@ -2737,6 +2740,7 @@ NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; + NewEntry->RenderMode = RenderMode; NewEntry->mxWorldToDevice = *pmx; InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); @@ -3589,7 +3593,6 @@ else RenderMode = FT_RENDER_MODE_MONO; - /* Get the DC's world-to-device transformation matrix */ pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice); @@ -3607,8 +3610,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (EmuBold || EmuItalic || !realglyph) { @@ -5320,8 +5323,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -5543,8 +5546,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -6,6 +6,7 @@ * Copyright 2003 Andrew Greenwood * Copyright 2003 Filip Navara * Copyright 2009 Matthias Kupfer + * Copyright 2017 Katayama Hirofumi MZ * * Based on Wine code. * @@ -1242,6 +1243,8 @@ UINT opcode = flags & 0xf; INT len = wp; BOOL retval, tmp; + LOGFONTW lf; + HFONT hFontOriginal, hNaaFont = NULL; if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */ { @@ -1249,6 +1252,15 @@ len = lstrlenW((LPWSTR)lp); else len = lstrlenA((LPSTR)lp); + } + + hFontOriginal = GetCurrentObject(hdc, OBJ_FONT); + if (flags & (DSS_MONO | DSS_DISABLED)) + { + /* Create a non-antialiased font */ + GetObjectW(hFontOriginal, sizeof(lf), &lf); + lf.lfQuality = NONANTIALIASED_QUALITY; + hNaaFont = CreateFontIndirectW(&lf); } /* Find out what size the image has if not given by caller */ @@ -1332,7 +1344,10 @@ if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); - hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); + if (hNaaFont) + hfsave = (HFONT)SelectObject(memdc, hNaaFont); + else + hfsave = (HFONT)SelectObject(memdc, hFontOriginal); SetLayout( memdc, GetLayout( hdc )); /* DST_COMPLEX may draw text as well, @@ -1341,6 +1356,7 @@ if(!hfsave && (opcode <= DST_PREFIXTEXT)) goto cleanup; tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode); if(hfsave) SelectObject(memdc, hfsave); + if (hNaaFont) DeleteObject(hNaaFont); if(!tmp) goto cleanup; /* This state cause the image to be dithered */

1 0

[mjansen] 75927: [ACPPAGE] Work around a crash with BSTR's. CORE-13800 #resolve
by mjansen＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: mjansen Date: Fri Sep 22 19:42:08 2017 New Revision: 75927 URL: http://svn.reactos.org/svn/reactos?rev=75927&view=rev Log: [ACPPAGE] Work around a crash with BSTR's. CORE-13800 #resolve Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Fri Sep 22 19:42:08 2017 @@ -494,7 +494,7 @@ while (TRUE) { - CComBSTR str; + CComHeapPtr<OLECHAR> str; HRESULT hr = pList.Next(1, &str, NULL); if (hr != S_OK) break;

1 0

[ekohl] 75926: [DDK] Add all ide commands to make the storahci driver happy.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 17:45:04 2017 New Revision: 75926 URL: http://svn.reactos.org/svn/reactos?rev=75926&view=rev Log: [DDK] Add all ide commands to make the storahci driver happy. Modified: trunk/reactos/sdk/include/ddk/ata.h Modified: trunk/reactos/sdk/include/ddk/ata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ata.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] Fri Sep 22 17:45:04 2017 @@ -252,7 +252,50 @@ } IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA; #include <poppack.h> -#define IDE_COMMAND_FLUSH_CACHE 0xE7 -#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_LBA_MODE (1 << 6) + +#define IDE_COMMAND_NOP 0x00 +#define IDE_COMMAND_DATA_SET_MANAGEMENT 0x06 +#define IDE_COMMAND_ATAPI_RESET 0x08 +#define IDE_COMMAND_READ 0x20 +#define IDE_COMMAND_READ_EXT 0x24 +#define IDE_COMMAND_READ_DMA_EXT 0x25 +#define IDE_COMMAND_READ_DMA_QUEUED_EXT 0x26 +#define IDE_COMMAND_READ_MULTIPLE_EXT 0x29 +#define IDE_COMMAND_WRITE 0x30 +#define IDE_COMMAND_WRITE_EXT 0x34 +#define IDE_COMMAND_WRITE_DMA_EXT 0x35 +#define IDE_COMMAND_WRITE_DMA_QUEUED_EXT 0x36 +#define IDE_COMMAND_WRITE_MULTIPLE_EXT 0x39 +#define IDE_COMMAND_WRITE_DMA_FUA_EXT 0x3D +#define IDE_COMMAND_WRITE_DMA_QUEUED_FUA_EXT 0x3E +#define IDE_COMMAND_VERIFY 0x40 +#define IDE_COMMAND_VERIFY_EXT 0x42 +#define IDE_COMMAND_EXECUTE_DEVICE_DIAGNOSTIC 0x90 +#define IDE_COMMAND_SET_DRIVE_PARAMETERS 0x91 +#define IDE_COMMAND_ATAPI_PACKET 0xA0 +#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 +#define IDE_COMMAND_SMART 0xB0 +#define IDE_COMMAND_READ_MULTIPLE 0xC4 +#define IDE_COMMAND_WRITE_MULTIPLE 0xC5 +#define IDE_COMMAND_SET_MULTIPLE 0xC6 +#define IDE_COMMAND_READ_DMA 0xC8 +#define IDE_COMMAND_WRITE_DMA 0xCA +#define IDE_COMMAND_WRITE_DMA_QUEUED 0xCC +#define IDE_COMMAND_WRITE_MULTIPLE_FUA_EXT 0xCE +#define IDE_COMMAND_GET_MEDIA_STATUS 0xDA +#define IDE_COMMAND_DOOR_LOCK 0xDE +#define IDE_COMMAND_DOOR_UNLOCK 0xDF +#define IDE_COMMAND_STANDBY_IMMEDIATE 0xE0 +#define IDE_COMMAND_IDLE_IMMEDIATE 0xE1 +#define IDE_COMMAND_CHECK_POWER 0xE5 +#define IDE_COMMAND_SLEEP 0xE6 +#define IDE_COMMAND_FLUSH_CACHE 0xE7 +#define IDE_COMMAND_FLUSH_CACHE_EXT 0xEA +#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_COMMAND_MEDIA_EJECT 0xED +#define IDE_COMMAND_SET_FEATURE 0xEF +#define IDE_COMMAND_SECURITY_FREEZE_LOCK 0xF5 +#define IDE_COMMAND_NOT_VALID 0xFF #endif

1 0

[ekohl] 75925: [SAMSRV] Implement SamIFree_SAMPR_DISPLAY_INFO_BUFFER.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 12:29:53 2017 New Revision: 75925 URL: http://svn.reactos.org/svn/reactos?rev=75925&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_DISPLAY_INFO_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Fri Sep 22 12:29:53 2017 @@ -189,6 +189,103 @@ VOID NTAPI +SamIFree_SAMPR_DISPLAY_INFO_BUFFER( + PSAMPR_DISPLAY_INFO_BUFFER Ptr, + DOMAIN_DISPLAY_INFORMATION InformationClass) +{ + ULONG i; + + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case DomainDisplayUser: + if (Ptr->UserInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->UserInformation.EntriesRead; i++) + { + if (Ptr->UserInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->UserInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].AdminComment.Buffer); + + if (Ptr->UserInformation.Buffer[i].FullName.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].FullName.Buffer); + } + + MIDL_user_free(Ptr->UserInformation.Buffer); + } + break; + + case DomainDisplayMachine: + if (Ptr->MachineInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->MachineInformation.EntriesRead; i++) + { + if (Ptr->MachineInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->MachineInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->MachineInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->MachineInformation.Buffer[i].AdminComment.Buffer); + } + + MIDL_user_free(Ptr->MachineInformation.Buffer); + } + break; + + case DomainDisplayGroup: + if (Ptr->GroupInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->GroupInformation.EntriesRead; i++) + { + if (Ptr->GroupInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->GroupInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->GroupInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->GroupInformation.Buffer[i].AdminComment.Buffer); + } + + MIDL_user_free(Ptr->GroupInformation.Buffer); + } + break; + + case DomainDisplayOemUser: + if (Ptr->OemUserInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->OemUserInformation.EntriesRead; i++) + { + if (Ptr->OemUserInformation.Buffer[i].OemAccountName.Buffer != NULL) + MIDL_user_free(Ptr->OemUserInformation.Buffer[i].OemAccountName.Buffer); + } + + MIDL_user_free(Ptr->OemUserInformation.Buffer); + } + break; + + case DomainDisplayOemGroup: + if (Ptr->OemGroupInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->OemGroupInformation.EntriesRead; i++) + { + if (Ptr->OemGroupInformation.Buffer[i].OemAccountName.Buffer != NULL) + MIDL_user_free(Ptr->OemGroupInformation.Buffer[i].OemAccountName.Buffer); + } + + MIDL_user_free(Ptr->OemGroupInformation.Buffer); + } + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } +} + + +VOID +NTAPI SamIFree_SAMPR_DOMAIN_INFO_BUFFER( PSAMPR_DOMAIN_INFO_BUFFER Ptr, DOMAIN_INFORMATION_CLASS InformationClass) @@ -271,21 +368,21 @@ { ULONG i; - if (Ptr != NULL) - { - if (Ptr->Buffer != NULL) + if (Ptr == NULL) + return; + + if (Ptr->Buffer != NULL) + { + for (i = 0; i < Ptr->EntriesRead; i++) { - for (i = 0; i < Ptr->EntriesRead; i++) - { - if (Ptr->Buffer[i].Name.Buffer != NULL) - MIDL_user_free(Ptr->Buffer[i].Name.Buffer); - } - - MIDL_user_free(Ptr->Buffer); + if (Ptr->Buffer[i].Name.Buffer != NULL) + MIDL_user_free(Ptr->Buffer[i].Name.Buffer); } - MIDL_user_free(Ptr); - } + MIDL_user_free(Ptr->Buffer); + } + + MIDL_user_free(Ptr); } @@ -293,13 +390,13 @@ NTAPI SamIFree_SAMPR_GET_GROUPS_BUFFER(PSAMPR_GET_GROUPS_BUFFER Ptr) { - if (Ptr != NULL) - { - if (Ptr->Groups != NULL) - MIDL_user_free(Ptr->Groups); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->Groups != NULL) + MIDL_user_free(Ptr->Groups); + + MIDL_user_free(Ptr); } @@ -307,16 +404,16 @@ NTAPI SamIFree_SAMPR_GET_MEMBERS_BUFFER(PSAMPR_GET_MEMBERS_BUFFER Ptr) { - if (Ptr != NULL) - { - if (Ptr->Members != NULL) - MIDL_user_free(Ptr->Members); - - if (Ptr->Attributes != NULL) - MIDL_user_free(Ptr->Attributes); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->Members != NULL) + MIDL_user_free(Ptr->Members); + + if (Ptr->Attributes != NULL) + MIDL_user_free(Ptr->Attributes); + + MIDL_user_free(Ptr); } @@ -365,36 +462,36 @@ NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { - if (Ptr != NULL) - { - if (Ptr->Sids != NULL) + if (Ptr == NULL) + return; + + if (Ptr->Sids != NULL) + { + MIDL_user_free(Ptr->Sids); + } +} + + +VOID +NTAPI +SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr) +{ + ULONG i; + + if (Ptr == NULL) + return; + + if (Ptr->Element != NULL) + { + for (i = 0; i < Ptr->Count; i++) { - MIDL_user_free(Ptr->Sids); + if (Ptr->Element[i].Buffer != NULL) + MIDL_user_free(Ptr->Element[i].Buffer); } - } -} - - -VOID -NTAPI -SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr) -{ - ULONG i; - - if (Ptr != NULL) - { - if (Ptr->Element != NULL) - { - for (i = 0; i < Ptr->Count; i++) - { - if (Ptr->Element[i].Buffer != NULL) - MIDL_user_free(Ptr->Element[i].Buffer); - } - - MIDL_user_free(Ptr->Element); - Ptr->Element = NULL; - Ptr->Count = 0; - } + + MIDL_user_free(Ptr->Element); + Ptr->Element = NULL; + Ptr->Count = 0; } } @@ -403,13 +500,13 @@ NTAPI SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(PSAMPR_SR_SECURITY_DESCRIPTOR Ptr) { - if (Ptr != NULL) - { - if (Ptr->SecurityDescriptor != NULL) - MIDL_user_free(Ptr->SecurityDescriptor); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->SecurityDescriptor != NULL) + MIDL_user_free(Ptr->SecurityDescriptor); + + MIDL_user_free(Ptr); } @@ -417,14 +514,14 @@ NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr) { - if (Ptr != NULL) - { - if (Ptr->Element != NULL) - { - MIDL_user_free(Ptr->Element); - Ptr->Element = NULL; - Ptr->Count = 0; - } + if (Ptr == NULL) + return; + + if (Ptr->Element != NULL) + { + MIDL_user_free(Ptr->Element); + Ptr->Element = NULL; + Ptr->Count = 0; } } Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Fri Sep 22 12:29:53 2017 @@ -18,7 +18,7 @@ @ stub SamIFreeSidArray @ stdcall SamIFreeVoid(ptr) @ stdcall SamIFree_SAMPR_ALIAS_INFO_BUFFER(ptr long) -@ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER +@ stdcall SamIFree_SAMPR_DISPLAY_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_DOMAIN_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs