Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/03: [WIN32K] Fix DBG_PRINT macro.
by Hermès Bélusca-Maïto 10 Jun '18

10 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d3d5e464d78921240c69… commit 9d3d5e464d78921240c695dca09491fbb2b1c457 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 10 00:48:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 10 04:00:06 2018 +0200 [WIN32K] Fix DBG_PRINT macro. --- win32ss/user/ntuser/msgqueue.c | 4 ++-- win32ss/user/ntuser/win32kdebug.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index bba976ad2b..446895915c 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -751,7 +751,7 @@ MsqCreateMessage(LPMSG Msg) VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { - TRACE("Post Destroy %d\n",PostMsgCount) + TRACE("Post Destroy %d\n",PostMsgCount); if (Message->pti == NULL) { ERR("Double Free Message\n"); @@ -1151,7 +1151,7 @@ co_MsqSendMessage(PTHREADINFO ptirec, } Timeout.QuadPart = Int32x32To64(-10000,uTimeout); // Pass SMTO test with a TO of 0x80000000. - TRACE("Timeout val %lld\n",Timeout.QuadPart) + TRACE("Timeout val %lld\n",Timeout.QuadPart); Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; diff --git a/win32ss/user/ntuser/win32kdebug.h b/win32ss/user/ntuser/win32kdebug.h index c83f3fdb2c..dd58b75b85 100644 --- a/win32ss/user/ntuser/win32kdebug.h +++ b/win32ss/user/ntuser/win32kdebug.h @@ -134,10 +134,11 @@ #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) - #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ - if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ - DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ - }while(0); + #define DBG_PRINT(ppi,ch,level,fmt, ...) \ + do { \ + if ((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ + DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ + } while (0) #define ERR(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, ERR_LEVEL,"err: " fmt, ##__VA_ARGS__) #define FIXME(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, FIXME_LEVEL,"fixme: " fmt, ##__VA_ARGS__)

1 0

01/01: [FASTFAT] Don't add an extra \, when renaming a file at root.
by Pierre Schweitzer 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52f0f80a83dfd1f751c3d… commit 52f0f80a83dfd1f751c3d6228a2c246606078974 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 9 22:17:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 9 22:17:17 2018 +0200 [FASTFAT] Don't add an extra \, when renaming a file at root. This fixes failures to rename a file where destination is the root of a FAT volume. CORE-10503 --- drivers/filesystems/fastfat/finfo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 517d7381d6..a19c21db55 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -787,8 +787,12 @@ VfatSetRenameInformation( } RtlCopyUnicodeString(&NewName, &((PVFATFCB)TargetFileObject->FsContext)->PathNameU); - NewName.Buffer[NewName.Length / sizeof(WCHAR)] = L'\\'; - NewName.Length += sizeof(WCHAR); + /* If \, it's already backslash terminated, don't add it */ + if (!vfatFCBIsRoot(TargetFileObject->FsContext)) + { + NewName.Buffer[NewName.Length / sizeof(WCHAR)] = L'\\'; + NewName.Length += sizeof(WCHAR); + } RtlAppendUnicodeStringToString(&NewName, &TargetFileObject->FileName); }

1 0

01/01: [FASTFAT] Use the FastFAT mechanism for counting clusters already implemented
by Pierre Schweitzer 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6aa4beeefb2c2fbb025c5… commit 6aa4beeefb2c2fbb025c5fb97cc74cd799c6622b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 9 18:21:32 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 9 18:23:07 2018 +0200 [FASTFAT] Use the FastFAT mechanism for counting clusters already implemented This allows us having more accurate statistics regarding available clusters count. Even though FastFAT and chkdsk still don't agree! CORE-3877 --- drivers/filesystems/fastfat/dirwr.c | 12 +++++++----- drivers/filesystems/fastfat/fat.c | 23 +++++++++++------------ drivers/filesystems/fastfat/finfo.c | 8 ++------ drivers/filesystems/fastfat/fsctl.c | 1 + drivers/filesystems/fastfat/rw.c | 5 ----- drivers/filesystems/fastfat/vfat.h | 4 +--- 6 files changed, 22 insertions(+), 31 deletions(-) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index ac1b7a5549..b4a2a94b59 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -670,6 +670,11 @@ FATAddEntry( } return STATUS_DISK_FULL; } + + if (DeviceExt->FatInfo.FatType == FAT32) + { + FAT32UpdateFreeClustersCount(DeviceExt); + } } else { @@ -1021,20 +1026,17 @@ FATDelEntry( /* In case of moving, don't delete data */ if (MoveContext == NULL) { - ULONG ClusterCount = 0; - while (CurrentCluster && CurrentCluster != 0xffffffff) { GetNextCluster(DeviceExt, CurrentCluster, &NextCluster); /* FIXME: check status */ WriteCluster(DeviceExt, CurrentCluster, 0); CurrentCluster = NextCluster; - ClusterCount++; } - if (ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) + if (DeviceExt->FatInfo.FatType == FAT32) { - FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, TRUE); + FAT32UpdateFreeClustersCount(DeviceExt); } } diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index b291ff2843..5842091a30 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -557,7 +557,10 @@ CountAvailableClusters( else Status = FAT32CountAvailableClusters(DeviceExt); } - Clusters->QuadPart = DeviceExt->AvailableClusters; + if (Clusters != NULL) + { + Clusters->QuadPart = DeviceExt->AvailableClusters; + } ExReleaseResourceLite (&DeviceExt->FatResource); return Status; @@ -1214,9 +1217,7 @@ FAT32SetDirtyStatus( NTSTATUS FAT32UpdateFreeClustersCount( - PDEVICE_EXTENSION DeviceExt, - ULONG Count, - BOOLEAN Freed) + PDEVICE_EXTENSION DeviceExt) { LARGE_INTEGER Offset; ULONG Length; @@ -1227,6 +1228,11 @@ FAT32UpdateFreeClustersCount( #endif struct _FsInfoSector * Sector; + if (!DeviceExt->AvailableClustersValid) + { + return STATUS_INVALID_PARAMETER; + } + /* We'll read (and then write) the fsinfo sector */ Offset.QuadPart = DeviceExt->FatInfo.FSInfoSector * DeviceExt->FatInfo.BytesPerSector; Length = DeviceExt->FatInfo.BytesPerSector; @@ -1275,14 +1281,7 @@ FAT32UpdateFreeClustersCount( } /* Update the free clusters count */ - if (Freed) - { - Sector->FreeCluster += Count; - } - else - { - Sector->FreeCluster -= Count; - } + Sector->FreeCluster = InterlockedCompareExchange((PLONG)&DeviceExt->AvailableClusters, 0, 0); #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT /* Mark FSINFO sector dirty so that it gets written to the disk */ diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 2840b1369b..517d7381d6 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -1344,8 +1344,6 @@ VfatSetAllocationSizeInformation( } else if (NewSize + ClusterSize <= Fcb->RFCB.AllocationSize.u.LowPart) { - ULONG ClusterCount; - DPRINT("Check for the ability to set file size\n"); if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, (PLARGE_INTEGER)AllocationSize)) @@ -1393,18 +1391,16 @@ VfatSetAllocationSizeInformation( Status = STATUS_SUCCESS; } - ClusterCount = 0; while (NT_SUCCESS(Status) && 0xffffffff != Cluster && Cluster > 1) { Status = NextCluster(DeviceExt, FirstCluster, &NCluster, FALSE); WriteCluster(DeviceExt, Cluster, 0); Cluster = NCluster; - ClusterCount++; } - if (ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) + if (DeviceExt->FatInfo.FatType == FAT32) { - FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, TRUE); + FAT32UpdateFreeClustersCount(DeviceExt); } } else diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 486535d129..b849bf4119 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -737,6 +737,7 @@ VfatMount( _SEH2_END; DeviceExt->LastAvailableCluster = 2; + CountAvailableClusters(DeviceExt, NULL); ExInitializeResourceLite(&DeviceExt->FatResource); InitializeListHead(&DeviceExt->FcbListHead); diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index d78054eced..60713e104c 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -540,11 +540,6 @@ VfatWriteFileData( } } - if (NT_SUCCESS(Status) && ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) - { - FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, FALSE); - } - return Status; } diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 64a96796a0..bec3dc8394 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -931,9 +931,7 @@ FAT32SetDirtyStatus( NTSTATUS FAT32UpdateFreeClustersCount( - PDEVICE_EXTENSION DeviceExt, - ULONG Count, - BOOLEAN Freed); + PDEVICE_EXTENSION DeviceExt); /* fcb.c */

1 0

03/03: [RAPPS] Fix command line handling
by Mark Jansen 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f133d01f20855a27fc5f7… commit f133d01f20855a27fc5f7afb0abeef807d6aa53a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Jun 5 22:08:18 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 9 17:14:06 2018 +0200 [RAPPS] Fix command line handling --- base/applications/rapps/available.cpp | 2 +- base/applications/rapps/unattended.cpp | 10 +++++----- base/applications/rapps/winmain.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 61c5a16e5e..c6ee68f7f2 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -402,7 +402,7 @@ CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppNa while (CurrentListPosition != NULL) { info = m_InfoList.GetNext(CurrentListPosition); - if (info->m_szName == szAppName) + if (info->m_szName.CompareNoCase(szAppName) == 0) { return info; } diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 06f8537999..7f7f3510f6 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -11,7 +11,7 @@ #include <setupapi.h> -#define MIN_ARGS 2 +#define MIN_ARGS 3 BOOL UseCmdParameters(LPWSTR lpCmdLine) { @@ -25,17 +25,17 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) // TODO: use DB filenames as names because they're shorter ATL::CSimpleArray<ATL::CStringW> arrNames; - if (!StrCmpW(argv[0], CMD_KEY_INSTALL)) + if (!StrCmpIW(argv[1], CMD_KEY_INSTALL)) { - for (INT i = 1; i < argc; ++i) + for (INT i = 2; i < argc; ++i) { arrNames.Add(argv[i]); } } else - if (!StrCmpW(argv[0], CMD_KEY_SETUP)) + if (!StrCmpIW(argv[1], CMD_KEY_SETUP)) { - HINF InfHandle = SetupOpenInfFileW(argv[1], NULL, INF_STYLE_WIN4, NULL); + HINF InfHandle = SetupOpenInfFileW(argv[2], NULL, INF_STYLE_WIN4, NULL); if (InfHandle == INVALID_HANDLE_VALUE) { return FALSE; diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 386023785e..98f44a19e0 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -160,7 +160,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi InitCommonControls(); // skip window creation if there were some keys - if (!UseCmdParameters(lpCmdLine)) + if (!UseCmdParameters(GetCommandLineW())) { if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) CAvailableApps::ForceUpdateAppsDB();

1 0

02/03: [ATL] Add CString.CompareNoCase
by Mark Jansen 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f8dc9c26663ea6d6721a… commit 4f8dc9c26663ea6d6721a96366cd90961f7b05c3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jun 6 00:21:06 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 9 17:14:06 2018 +0200 [ATL] Add CString.CompareNoCase --- sdk/lib/atl/cstringt.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index 5d278c5a0a..87ac52aac6 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -133,6 +133,13 @@ public: return ::wcscmp(psz1, psz2); } + static int __cdecl CompareNoCase( + _In_z_ LPCWSTR psz1, + _In_z_ LPCWSTR psz2) + { + return ::_wcsicmp(psz1, psz2); + } + static int __cdecl FormatV( _In_opt_z_ LPWSTR pszDest, _In_z_ LPCWSTR pszFormat, @@ -265,6 +272,13 @@ public: return ::strcmp(psz1, psz2); } + static int __cdecl CompareNoCase( + _In_z_ LPCSTR psz1, + _In_z_ LPCSTR psz2) + { + return ::_stricmp(psz1, psz2); + } + static int __cdecl FormatV( _In_opt_z_ LPSTR pszDest, _In_z_ LPCSTR pszFormat, @@ -593,6 +607,10 @@ public: return StringTraits::Compare(CThisSimpleString::GetString(), psz); } + int CompareNoCase(_In_z_ PCXSTR psz) const + { + return StringTraits::CompareNoCase(CThisSimpleString::GetString(), psz); + } CStringT Mid(int iFirst, int nCount) const {

1 0

01/03: [RAPPS] Select the search bar with ctrl+f
by Mark Jansen 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ec08818b5dfe401afaf4… commit 0ec08818b5dfe401afaf4778b861f67eae0cb2f1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Jun 5 22:07:39 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 9 17:14:06 2018 +0200 [RAPPS] Select the search bar with ctrl+f --- base/applications/rapps/gui.cpp | 4 ++++ base/applications/rapps/include/resource.h | 1 + base/applications/rapps/rapps.rc | 1 + 3 files changed, 6 insertions(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index ed2c3b8264..1b715b6d8b 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1456,6 +1456,10 @@ private: PostMessageW(WM_CLOSE, 0, 0); break; + case ID_SEARCH: + ::SetFocus(m_SearchBar->m_hWnd); + break; + case ID_INSTALL: if (IsAvailableEnum(SelectedEnumType)) { diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 7d5a9b9ebf..fcd1502f1a 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -79,6 +79,7 @@ #define ID_REGREMOVE 560 #define ID_RESETDB 561 #define ID_CHECK_ALL 562 +#define ID_SEARCH 563 /* Strings */ #define IDS_APPTITLE 100 diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc index 4d4c796c2e..296b99b6b4 100644 --- a/base/applications/rapps/rapps.rc +++ b/base/applications/rapps/rapps.rc @@ -50,6 +50,7 @@ HOTKEYS ACCELERATORS VK_F5, ID_RESETDB, CONTROL, VIRTKEY VK_DELETE, ID_UNINSTALL, CONTROL, VIRTKEY VK_RETURN, ID_INSTALL, CONTROL, VIRTKEY + "F", ID_SEARCH, CONTROL, VIRTKEY } #include <reactos/manifest_exe.rc>

1 0

01/01: [USERSRV] HardError: Free WindowTitleU buffer only if we really allocated it.
by Hermès Bélusca-Maïto 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cb411e88fa68419c2cce… commit 7cb411e88fa68419c2cce8a3eb544945bd4af095 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 9 15:37:54 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 9 15:37:54 2018 +0200 [USERSRV] HardError: Free WindowTitleU buffer only if we really allocated it. --- win32ss/user/winsrv/usersrv/harderror.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 7cc3a67ca4..85ef9fe23d 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -641,8 +641,10 @@ UserpFormatMessages( CaptionStringU->Length = (USHORT)(wcslen(CaptionStringU->Buffer) * sizeof(WCHAR)); /* Free the strings if needed */ - if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); - if (hProcess) RtlFreeUnicodeString(&FileNameU); + if (WindowTitleU.Buffer && (WindowTitleU.MaximumLength != 0)) + RtlFreeUnicodeString(&WindowTitleU); + if (hProcess) + RtlFreeUnicodeString(&FileNameU); Format2A.Buffer = NULL;

1 0

02/02: [FASTFAT] Start implementing FAT32 statistics support
by Pierre Schweitzer 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=704baed2df04470ab134c… commit 704baed2df04470ab134cef207847764e3d95e2e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 9 12:36:43 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 9 12:36:43 2018 +0200 [FASTFAT] Start implementing FAT32 statistics support Not fully perfect yet, chkdsk still complains. CORE-3877 --- drivers/filesystems/fastfat/dirwr.c | 8 ++++ drivers/filesystems/fastfat/fat.c | 85 +++++++++++++++++++++++++++++++++++++ drivers/filesystems/fastfat/finfo.c | 9 ++++ drivers/filesystems/fastfat/rw.c | 6 +++ drivers/filesystems/fastfat/vfat.h | 6 +++ 5 files changed, 114 insertions(+) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index ab5d9b3ee4..ac1b7a5549 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -1021,12 +1021,20 @@ FATDelEntry( /* In case of moving, don't delete data */ if (MoveContext == NULL) { + ULONG ClusterCount = 0; + while (CurrentCluster && CurrentCluster != 0xffffffff) { GetNextCluster(DeviceExt, CurrentCluster, &NextCluster); /* FIXME: check status */ WriteCluster(DeviceExt, CurrentCluster, 0); CurrentCluster = NextCluster; + ClusterCount++; + } + + if (ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) + { + FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, TRUE); } } diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index 95ef6958d5..b291ff2843 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -1212,4 +1212,89 @@ FAT32SetDirtyStatus( #endif } +NTSTATUS +FAT32UpdateFreeClustersCount( + PDEVICE_EXTENSION DeviceExt, + ULONG Count, + BOOLEAN Freed) +{ + LARGE_INTEGER Offset; + ULONG Length; +#ifdef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + NTSTATUS Status; +#else + PVOID Context; +#endif + struct _FsInfoSector * Sector; + + /* We'll read (and then write) the fsinfo sector */ + Offset.QuadPart = DeviceExt->FatInfo.FSInfoSector * DeviceExt->FatInfo.BytesPerSector; + Length = DeviceExt->FatInfo.BytesPerSector; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Go through Cc for this */ + _SEH2_TRY + { + CcPinRead(DeviceExt->VolumeFcb->FileObject, &Offset, Length, PIN_WAIT, &Context, (PVOID *)&Sector); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; +#else + /* No Cc, do it the old way: + * - Allocate a big enough buffer + * - And read the disk + */ + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + if (Sector == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; + } +#endif + + /* Make sure we have a FSINFO sector */ + if (Sector->ExtBootSignature2 != 0x41615252 || + Sector->FSINFOSignature != 0x61417272 || + Sector->Signatur2 != 0xaa550000) + { + ASSERT(FALSE); +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Update the free clusters count */ + if (Freed) + { + Sector->FreeCluster += Count; + } + else + { + Sector->FreeCluster -= Count; + } + +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Mark FSINFO sector dirty so that it gets written to the disk */ + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + return STATUS_SUCCESS; +#else + /* Write back the FSINFO sector to the disk */ + Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; +#endif +} + /* EOF */ diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index af2e1ce62a..2840b1369b 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -1344,6 +1344,8 @@ VfatSetAllocationSizeInformation( } else if (NewSize + ClusterSize <= Fcb->RFCB.AllocationSize.u.LowPart) { + ULONG ClusterCount; + DPRINT("Check for the ability to set file size\n"); if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, (PLARGE_INTEGER)AllocationSize)) @@ -1391,11 +1393,18 @@ VfatSetAllocationSizeInformation( Status = STATUS_SUCCESS; } + ClusterCount = 0; while (NT_SUCCESS(Status) && 0xffffffff != Cluster && Cluster > 1) { Status = NextCluster(DeviceExt, FirstCluster, &NCluster, FALSE); WriteCluster(DeviceExt, Cluster, 0); Cluster = NCluster; + ClusterCount++; + } + + if (ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) + { + FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, TRUE); } } else diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 043bafef6c..d78054eced 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -539,6 +539,12 @@ VfatWriteFileData( Status = IrpContext->Irp->IoStatus.Status; } } + + if (NT_SUCCESS(Status) && ClusterCount != 0 && DeviceExt->FatInfo.FatType == FAT32) + { + FAT32UpdateFreeClustersCount(DeviceExt, ClusterCount, FALSE); + } + return Status; } diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index fcb22b9c5a..64a96796a0 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -929,6 +929,12 @@ FAT32SetDirtyStatus( PDEVICE_EXTENSION DeviceExt, BOOLEAN DirtyStatus); +NTSTATUS +FAT32UpdateFreeClustersCount( + PDEVICE_EXTENSION DeviceExt, + ULONG Count, + BOOLEAN Freed); + /* fcb.c */ PVFATFCB

1 0

01/02: [FASTFAT] Save the FSINFO sector location
by Pierre Schweitzer 09 Jun '18

09 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04640f9264c752a80da87… commit 04640f9264c752a80da87d519b6a8c369f07f611 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 9 12:11:43 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 9 12:11:43 2018 +0200 [FASTFAT] Save the FSINFO sector location --- drivers/filesystems/fastfat/fsctl.c | 1 + drivers/filesystems/fastfat/vfat.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index f7eaf0c774..486535d129 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -232,6 +232,7 @@ VfatHasFileSystem( FatInfo.RootCluster = ((struct _BootSector32*) Boot)->RootCluster; FatInfo.rootStart = FatInfo.dataStart + ((FatInfo.RootCluster - 2) * FatInfo.SectorsPerCluster); FatInfo.VolumeID = ((struct _BootSector32*) Boot)->VolumeID; + FatInfo.FSInfoSector = ((struct _BootSector32*) Boot)->FSInfoSector; RtlCopyMemory(&FatInfo.VolumeLabel, &((struct _BootSector32*)Boot)->VolumeLabel, sizeof(FatInfo.VolumeLabel)); } else diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 8148d2fc14..fcb22b9c5a 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -263,6 +263,7 @@ typedef struct ULONG FatType; ULONG Sectors; BOOLEAN FixedMedia; + ULONG FSInfoSector; } FATINFO, *PFATINFO; struct _VFATFCB;

1 0

01/01: [AUTOCHK] Let the timeout for disk repair to be configured
by Pierre Schweitzer 08 Jun '18

08 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2149c3d0d04f4baa9338a… commit 2149c3d0d04f4baa9338a4a7cc243d8d1815a13c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 9 00:18:21 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 9 00:19:09 2018 +0200 [AUTOCHK] Let the timeout for disk repair to be configured --- base/system/autochk/autochk.c | 44 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 918d709878..5a71ae7d36 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -160,7 +160,8 @@ OpenKeyboard(VOID) } static NTSTATUS -WaitForKeyboard(VOID) +WaitForKeyboard( + IN LONG TimeOut) { NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; @@ -180,8 +181,8 @@ WaitForKeyboard(VOID) NULL); if (Status == STATUS_PENDING) { - /* Wait 3s */ - Timeout.QuadPart = (LONG)-3*1000*1000*10; + /* Wait TimeOut seconds */ + Timeout.QuadPart = TimeOut * -10000000; Status = NtWaitForSingleObject(KeyboardHandle, FALSE, &Timeout); /* The user didn't enter anything, cancel the read */ if (Status == STATUS_TIMEOUT) @@ -338,7 +339,8 @@ ChkdskCallback( static NTSTATUS CheckVolume( - IN PWCHAR DrivePath) + IN PWCHAR DrivePath, + IN LONG TimeOut) { WCHAR FileSystem[128]; WCHAR NtDrivePath[64]; @@ -390,10 +392,10 @@ CheckVolume( /* Let the user decide whether to repair */ PrintString(" %S needs to be checked\r\n", DrivePath); PrintString(" You can skip it, but be advised it is not recommanded\r\n"); - PrintString(" To skip disk checking press any key in 3 seconds\r\n", DrivePath); + PrintString(" To skip disk checking press any key in %d second(s)\r\n", TimeOut); /* Timeout == fix it! */ - WaitStatus = WaitForKeyboard(); + WaitStatus = WaitForKeyboard(TimeOut); if (WaitStatus == STATUS_TIMEOUT) { Status = FileSystems[Count].ChkdskFunc(&DrivePathU, @@ -421,6 +423,29 @@ CheckVolume( return Status; } +static VOID +QueryTimeout( + IN OUT PLONG TimeOut) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = L"AutoChkTimeOut"; + QueryTable[0].EntryContext = TimeOut; + + RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, L"Session Manager", QueryTable, NULL, NULL); + /* See: https://docs.microsoft.com/en-us/windows-server/administration/windows-comm… */ + if (*TimeOut > 259200) + { + *TimeOut = 259200; + } + else if (*TimeOut < 0) + { + *TimeOut = 0; + } +} + /* Native image's entry point */ int _cdecl @@ -433,6 +458,7 @@ _main(int argc, ULONG i; NTSTATUS Status; WCHAR DrivePath[128]; + LONG TimeOut; // Win2003 passes the only param - "*". Probably means to check all drives /* @@ -441,6 +467,10 @@ _main(int argc, DPRINT("Param %d: %s\n", i, argv[i]); */ + /* Query timeout */ + TimeOut = 3; + QueryTimeout(&TimeOut); + /* FIXME: We should probably use here the mount manager to be * able to check volumes which don't have a drive letter. */ @@ -471,7 +501,7 @@ _main(int argc, && (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) { swprintf(DrivePath, L"%c:\\", L'A'+i); - CheckVolume(DrivePath); + CheckVolume(DrivePath, TimeOut); } }

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