Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

03/03: [CMD] Improve how the command prompt displays when one presses Ctrl-C/break after having pressed ENTER, or after a command has been run.
by Hermès Bélusca-Maïto 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03c233bcd09bb378f9561… commit 03c233bcd09bb378f9561968b9cbf4f45d140f09 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 00:57:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 00:57:16 2018 +0200 [CMD] Improve how the command prompt displays when one presses Ctrl-C/break after having pressed ENTER, or after a command has been run. --- base/shell/cmd/cmd.c | 8 +++----- base/shell/cmd/cmdinput.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 25ddae0c6f..bc92e70e6c 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1418,16 +1418,14 @@ ReadLine(TCHAR *commandline, BOOL bMore) return FALSE; } - if (CheckCtrlBreak(BREAK_INPUT)) - { + if (readline[0] == _T('\0')) ConOutChar(_T('\n')); + + if (CheckCtrlBreak(BREAK_INPUT)) return FALSE; - } if (readline[0] == _T('\0')) - { return FALSE; - } ip = readline; } diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c index 9257cb6dda..481a04350d 100644 --- a/base/shell/cmd/cmdinput.c +++ b/base/shell/cmd/cmdinput.c @@ -453,8 +453,14 @@ BOOL ReadCommand(LPTSTR str, INT maxlen) if ((ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) { - /* A CTRL-C. Don't clear the the command line, - * but return an empty string in str. */ + /* Ignore the Ctrl-C key event if it has already been handled */ + if (!bCtrlBreak) + break; + + /* + * A Ctrl-C. Do not clear the command line, + * but return an empty string in str. + */ str[0] = _T('\0'); curx = orgx; cury = orgy;

1 0

02/03: [CMD] Don't reset bCtrlBreak too early.
by Hermès Bélusca-Maïto 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3b36f8d3ec420169ff5e… commit a3b36f8d3ec420169ff5e7bde505ce3275ef1f9f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 00:53:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 00:53:49 2018 +0200 [CMD] Don't reset bCtrlBreak too early. This allows to break commands such as: C:\ReactOS\system32> for %f in (*.*) do dir as one would expect: stop the currently running 'dir' and the 'for'. "bCtrlBreak" doesn't need to be volatile too. --- base/shell/cmd/cmd.c | 7 +++++-- base/shell/cmd/cmd.h | 2 +- base/shell/cmd/misc.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index d8414e0043..25ddae0c6f 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -151,7 +151,7 @@ typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, BOOL bExit = FALSE; /* indicates EXIT was typed */ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */ -volatile BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ +BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ static BOOL bWaitForCommand = FALSE; /* When we are executing something passed on the commandline after /c or /k */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ @@ -1448,6 +1448,9 @@ ProcessInput(VOID) while (!bCanExit || !bExit) { + /* Reset the Ctrl-Break / Ctrl-C state */ + bCtrlBreak = FALSE; + Cmd = ParseCommand(NULL); if (!Cmd) continue; @@ -1500,7 +1503,7 @@ BOOL WINAPI BreakHandler(DWORD dwCtrlType) /* FIXME: Handle batch files */ - //ConOutPrintf(_T("^C")); + // ConOutPrintf(_T("^C")); return TRUE; } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 285916c74c..6a2f680a68 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -47,7 +47,7 @@ extern LPTSTR lpOriginalEnvironment; extern WORD wColor; extern WORD wDefColor; -extern volatile BOOL bCtrlBreak; +extern BOOL bCtrlBreak; extern BOOL bIgnoreEcho; extern BOOL bExit; extern BOOL bDisableBatchEcho; diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index d7d7af3133..a6d2f54559 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -129,7 +129,7 @@ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) * Check if Ctrl-Break was pressed during the last calls */ -BOOL CheckCtrlBreak (INT mode) +BOOL CheckCtrlBreak(INT mode) { static BOOL bLeaveAll = FALSE; /* leave all batch files */ TCHAR options[4]; /* Yes, No, All */ @@ -138,10 +138,11 @@ BOOL CheckCtrlBreak (INT mode) switch (mode) { case BREAK_OUTOFBATCH: - bLeaveAll = 0; + bLeaveAll = FALSE; return FALSE; case BREAK_BATCHFILE: + { if (bLeaveAll) return TRUE; @@ -160,11 +161,15 @@ BOOL CheckCtrlBreak (INT mode) ConOutChar(_T('\n')); if (c == options[1]) - return bCtrlBreak = FALSE; /* ignore */ + { + bCtrlBreak = FALSE; /* ignore */ + return FALSE; + } /* leave all batch files */ bLeaveAll = ((c == options[2]) || (c == _T('\3'))); break; + } case BREAK_INPUT: if (!bCtrlBreak) @@ -173,7 +178,6 @@ BOOL CheckCtrlBreak (INT mode) } /* state processed */ - bCtrlBreak = FALSE; return TRUE; }

1 0

01/03: [CMD] Use CheckCtrlBreak().
by Hermès Bélusca-Maïto 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dd27bd46799b9f5ad71c… commit 6dd27bd46799b9f5ad71c06652fd69223ad077b0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 00:50:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 00:50:40 2018 +0200 [CMD] Use CheckCtrlBreak(). --- base/shell/cmd/dir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index 1d2cb357e2..07d14d6f93 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -870,7 +870,7 @@ DirPrintNewList(PDIRFINDINFO ptrFiles[], /* [IN]Files' Info */ ULARGE_INTEGER u64FileSize; PDIRFINDSTREAMNODE ptrCurStream; - for (i = 0; i < dwCount && !bCtrlBreak; i++) + for (i = 0; i < dwCount && !CheckCtrlBreak(BREAK_INPUT); i++) { /* Calculate size */ if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) @@ -983,7 +983,7 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ /* Calculate the lines that will be printed */ iLines = (USHORT)((dwCount + iColumns - 1) / iColumns); - for (i = 0; i < iLines && !bCtrlBreak; i++) + for (i = 0; i < iLines && !CheckCtrlBreak(BREAK_INPUT); i++) { for (j = 0; j < iColumns; j++) { @@ -1033,7 +1033,7 @@ DirPrintOldList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ int iSizeFormat; /* The format of size field */ ULARGE_INTEGER u64FileSize; /* The file size */ - for (i = 0; i < dwCount && !bCtrlBreak; i++) + for (i = 0; i < dwCount && !CheckCtrlBreak(BREAK_INPUT); i++) { /* Broke 8.3 format */ if (*ptrFiles[i]->stFindInfo.cAlternateFileName ) @@ -1092,7 +1092,7 @@ DirPrintBareList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ { DWORD i; - for (i = 0; i < dwCount && !bCtrlBreak; i++) + for (i = 0; i < dwCount && !CheckCtrlBreak(BREAK_INPUT); i++) { if ((_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T(".")) == 0) || (_tcscmp(ptrFiles[i]->stFindInfo.cFileName, _T("..")) == 0))

1 0

03/03: [CMD] Use _T() rather than L to initialise TCHARS.
by James Woodcock 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b72fce3e14d09b0de303… commit 8b72fce3e14d09b0de303f7cabafb085e479574b Author: James Woodcock <james_woodcock(a)yahoo.co.uk> AuthorDate: Fri Apr 27 19:01:17 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 28 22:16:59 2018 +0200 [CMD] Use _T() rather than L to initialise TCHARS. --- base/shell/cmd/cmd.c | 2 +- base/shell/cmd/cmdinput.c | 2 +- base/shell/cmd/start.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 90dc6f1806..d8414e0043 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1424,7 +1424,7 @@ ReadLine(TCHAR *commandline, BOOL bMore) return FALSE; } - if (readline[0] == L'\0') + if (readline[0] == _T('\0')) { return FALSE; } diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c index 09e5853608..9257cb6dda 100644 --- a/base/shell/cmd/cmdinput.c +++ b/base/shell/cmd/cmdinput.c @@ -455,7 +455,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen) { /* A CTRL-C. Don't clear the the command line, * but return an empty string in str. */ - str[0] = L'\0'; + str[0] = _T('\0'); curx = orgx; cury = orgy; current = charcount = 0; diff --git a/base/shell/cmd/start.c b/base/shell/cmd/start.c index 5fe830787f..190ed39a6a 100644 --- a/base/shell/cmd/start.c +++ b/base/shell/cmd/start.c @@ -70,7 +70,7 @@ INT cmd_start (LPTSTR Rest) lpTitle = GetParameter(&Rest); StripQuotes(lpTitle); } - else if (*Rest == L'/') + else if (*Rest == _T('/')) { LPTSTR option; Rest++;

1 0

02/03: [CMD] Fix CTRL-C handling.
by James Woodcock 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7e71357dc01fd62eec0a… commit d7e71357dc01fd62eec0a7ece04c76cdd643e822 Author: James Woodcock <james_woodcock(a)yahoo.co.uk> AuthorDate: Fri Apr 27 16:15:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 28 22:16:58 2018 +0200 [CMD] Fix CTRL-C handling. Using CTRL-C to cancel command line input would leave the prompt in a state where the next command would be ignored. For example: dir<CTRL-C> dir would cause cmd.exe to ignore the second dir command. --- base/shell/cmd/cmd.c | 11 +++++++++-- base/shell/cmd/cmd.h | 2 +- base/shell/cmd/cmdinput.c | 17 ++++++++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 89a2b1b699..90dc6f1806 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -151,7 +151,7 @@ typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, BOOL bExit = FALSE; /* indicates EXIT was typed */ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */ -BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ +volatile BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ static BOOL bWaitForCommand = FALSE; /* When we are executing something passed on the commandline after /c or /k */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ @@ -1423,6 +1423,12 @@ ReadLine(TCHAR *commandline, BOOL bMore) ConOutChar(_T('\n')); return FALSE; } + + if (readline[0] == L'\0') + { + return FALSE; + } + ip = readline; } else @@ -1476,6 +1482,8 @@ BOOL WINAPI BreakHandler(DWORD dwCtrlType) LeaveCriticalSection(&ChildProcessRunningLock); } + bCtrlBreak = TRUE; + rec.EventType = KEY_EVENT; rec.Event.KeyEvent.bKeyDown = TRUE; rec.Event.KeyEvent.wRepeatCount = 1; @@ -1490,7 +1498,6 @@ BOOL WINAPI BreakHandler(DWORD dwCtrlType) 1, &dwWritten); - bCtrlBreak = TRUE; /* FIXME: Handle batch files */ //ConOutPrintf(_T("^C")); diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 6a2f680a68..285916c74c 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -47,7 +47,7 @@ extern LPTSTR lpOriginalEnvironment; extern WORD wColor; extern WORD wDefColor; -extern BOOL bCtrlBreak; +extern volatile BOOL bCtrlBreak; extern BOOL bIgnoreEcho; extern BOOL bExit; extern BOOL bDisableBatchEcho; diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c index 5276d0d8af..09e5853608 100644 --- a/base/shell/cmd/cmdinput.c +++ b/base/shell/cmd/cmdinput.c @@ -450,12 +450,23 @@ BOOL ReadCommand(LPTSTR str, INT maxlen) break; case _T('C'): - bCharInput = TRUE; - if (!(ir.Event.KeyEvent.dwControlKeyState & + if ((ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) { - break; + /* A CTRL-C. Don't clear the the command line, + * but return an empty string in str. */ + str[0] = L'\0'; + curx = orgx; + cury = orgy; + current = charcount = 0; + bReturn = TRUE; } + else + { + /* Just a normal 'C' character */ + bCharInput = TRUE; + } + break; case VK_RETURN: /* end input, return to main */

1 0

01/03: [CMD] Don't pass CTRL-C to child processes. CORE-11677
by James Woodcock 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23de2099e017a7514d10a… commit 23de2099e017a7514d10a5bc88fce9bac4003654 Author: James Woodcock <james_woodcock(a)yahoo.co.uk> AuthorDate: Fri Apr 27 16:12:23 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 28 22:16:50 2018 +0200 [CMD] Don't pass CTRL-C to child processes. CORE-11677 The standard Win32 Console Control Handler will give CTRL-C events to processes spawned from cmd.exe. If cmd.exe calls GenerateConsolCtrlEvent() then the child process will receive two CTRL-C events. --- base/shell/cmd/cmd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index d9a03a265e..89a2b1b699 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -429,7 +429,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) NULL, NULL, TRUE, - 0, /* CREATE_NEW_PROCESS_GROUP */ + 0, NULL, NULL, &stui, @@ -1459,26 +1459,16 @@ BOOL WINAPI BreakHandler(DWORD dwCtrlType) { DWORD dwWritten; INPUT_RECORD rec; - static BOOL SelfGenerated = FALSE; if ((dwCtrlType != CTRL_C_EVENT) && (dwCtrlType != CTRL_BREAK_EVENT)) { return FALSE; } - else - { - if (SelfGenerated) - { - SelfGenerated = FALSE; - return TRUE; - } - } if (!TryEnterCriticalSection(&ChildProcessRunningLock)) { - SelfGenerated = TRUE; - GenerateConsoleCtrlEvent (dwCtrlType, 0); + /* Child process is running and will have received the control event */ return TRUE; } else

1 0

01/01: [FASTFAT] Don't leak directories FILE_OBJECT, FCB and cache entries.
by Pierre Schweitzer 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94ead99e0c503faa40b33… commit 94ead99e0c503faa40b33b813cce296ea5c0bc0c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Apr 26 18:25:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Apr 28 18:33:14 2018 +0200 [FASTFAT] Don't leak directories FILE_OBJECT, FCB and cache entries. Once a directory is crossed (opened or a child is opened), associated FCB structure is created in FastFAT, but also a stream FO for caching. Up to now, due to an extra reference taken by the stream file object, even when the directory was no longer used, the directory was kept in memory: the FCB was never deleted, the file object was never dereferenced, and the cache never released. The immediate effect of this bug is that our FAT driver was leaking every directory that was used affecting the whole OS situation. In case of directories intensive operation (like extraction the ReactOS source code in ReactOS ;-)), we were just killin the whole OS RAM without any way to release it and recover. The other side effects: IOs were faster as half of the FS was always permanant in RAM. This commit fixes the issue by forcing the FSD to release the FO, and the cache when a directory is no longer used, leading to its destruction in RAM. Downside: on IO intensive operation, expect slowdowns, obviously, there's less caching now. But more efficient! CORE-14557 --- drivers/filesystems/fastfat/cleanup.c | 1 + drivers/filesystems/fastfat/fcb.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index 0a12fd70f8..580ed807a3 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -107,6 +107,7 @@ VfatCleanupFile( { pFcb->FileObject = NULL; CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + ClearFlag(pFcb->Flags, FCB_CACHE_INITIALIZED); ObDereferenceObject(tmpFileObject); } diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index f96a3178ba..f6734a675e 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -313,10 +313,24 @@ vfatReleaseFCB( while (pFCB) { + ULONG RefCount; + ASSERT(pFCB != pVCB->VolumeFcb); ASSERT(pFCB->RefCount > 0); - pFCB->RefCount--; - if (pFCB->RefCount == 0) + RefCount = --pFCB->RefCount; + + if (RefCount == 1 && BooleanFlagOn(pFCB->Flags, FCB_CACHE_INITIALIZED)) + { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFCB->FileObject; + + pFCB->FileObject = NULL; + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + ClearFlag(pFCB->Flags, FCB_CACHE_INITIALIZED); + ObDereferenceObject(tmpFileObject); + } + + if (RefCount == 0) { ASSERT(pFCB->OpenHandleCount == 0); tmpFcb = pFCB->parentFcb; @@ -623,7 +637,7 @@ vfatFCBInitializeCacheFromVolume( _SEH2_END; vfatGrabFCB(vcb, fcb); - fcb->Flags |= FCB_CACHE_INITIALIZED; + SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); return STATUS_SUCCESS; }

1 0

01/01: [NTOSKRNL] Also try to extract name from FCB when leaking VACB
by Pierre Schweitzer 27 Apr '18

27 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ea6de8a42c19e1fab98c… commit 2ea6de8a42c19e1fab98c50927ec3515749d87a9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Apr 27 19:01:35 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Apr 27 19:01:35 2018 +0200 [NTOSKRNL] Also try to extract name from FCB when leaking VACB --- ntoskrnl/cc/view.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0432f73a99..c2b8913132 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1143,6 +1143,13 @@ CcRosDeleteFileCache ( { DPRINT1("File was: %wZ\n", &FileObject->FileName); } + else if (FileObject->FsContext != NULL && + ((PFSRTL_COMMON_FCB_HEADER)(FileObject->FsContext))->NodeTypeCode == 0x0502 && + ((PFSRTL_COMMON_FCB_HEADER)(FileObject->FsContext))->NodeByteSize == 0x1F8 && + ((PUNICODE_STRING)(((PUCHAR)FileObject->FsContext) + 0x100))->Length != 0) + { + DPRINT1("File was: %wZ (FastFAT)\n", (PUNICODE_STRING)(((PUCHAR)FileObject->FsContext) + 0x100)); + } else { DPRINT1("No name for the file\n");

1 0

02/02: [NTOSKRNL] In !filecache, try to display FCB name
by Pierre Schweitzer 27 Apr '18

27 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43836b0fbb1d67e6909dd… commit 43836b0fbb1d67e6909dd6b97b5bb8b824733f37 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Apr 27 18:57:30 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Apr 27 18:57:30 2018 +0200 [NTOSKRNL] In !filecache, try to display FCB name When no name is set in the file object, try to read the name from the FCB. We only support FastFAT (ours) FCB for now. This is clearly a hack, but for a kdbg command, so ;-) --- ntoskrnl/cc/view.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index a0f0867080..0432f73a99 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1463,6 +1463,7 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) ULONG Valid = 0, Dirty = 0; PROS_SHARED_CACHE_MAP SharedCacheMap; PUNICODE_STRING FileName; + PWSTR Extra = L""; SharedCacheMap = CONTAINING_RECORD(ListEntry, ROS_SHARED_CACHE_MAP, SharedCacheMapLinks); @@ -1489,13 +1490,22 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) { FileName = &SharedCacheMap->FileObject->FileName; } + else if (SharedCacheMap->FileObject != NULL && + SharedCacheMap->FileObject->FsContext != NULL && + ((PFSRTL_COMMON_FCB_HEADER)(SharedCacheMap->FileObject->FsContext))->NodeTypeCode == 0x0502 && + ((PFSRTL_COMMON_FCB_HEADER)(SharedCacheMap->FileObject->FsContext))->NodeByteSize == 0x1F8 && + ((PUNICODE_STRING)(((PUCHAR)SharedCacheMap->FileObject->FsContext) + 0x100))->Length != 0) + { + FileName = (PUNICODE_STRING)(((PUCHAR)SharedCacheMap->FileObject->FsContext) + 0x100); + Extra = L" (FastFAT)"; + } else { FileName = &NoName; } /* And print */ - KdbpPrint("%p\t%d\t%d\t%wZ\n", SharedCacheMap, Valid, Dirty, FileName); + KdbpPrint("%p\t%d\t%d\t%wZ%S\n", SharedCacheMap, Valid, Dirty, FileName, Extra); } return TRUE;

1 0

01/02: [FASTFAT] When allocating a FCB, set its node type code.
by Pierre Schweitzer 27 Apr '18

27 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=315f9a13d45752cad14b3… commit 315f9a13d45752cad14b38a828a81c6e108e1ab5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Apr 27 18:56:31 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Apr 27 18:56:31 2018 +0200 [FASTFAT] When allocating a FCB, set its node type code. We set the same value as MS FastFAT driver for consistency. --- drivers/filesystems/fastfat/fcb.c | 3 +++ drivers/filesystems/fastfat/vfat.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index 4a103b0666..f96a3178ba 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -98,6 +98,9 @@ vfatInitFcb( KeBugCheckEx(FAT_FILE_SYSTEM, (ULONG_PTR)Fcb, (ULONG_PTR)NameU, 0, 0); } + Fcb->RFCB.NodeTypeCode = NODE_TYPE_FCB; + Fcb->RFCB.NodeByteSize = sizeof(VFATFCB); + Fcb->PathNameU.Length = 0; Fcb->PathNameU.Buffer = Fcb->PathNameBuffer; Fcb->PathNameU.MaximumLength = PathNameBufferLength; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 487b5f9ab2..429120c804 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -410,6 +410,8 @@ extern PVFAT_GLOBAL_DATA VfatGlobalData; #define FCB_IS_VOLUME 0x0010 #define FCB_IS_DIRTY 0x0020 +#define NODE_TYPE_FCB ((CSHORT)0x0502) + typedef struct _VFATFCB { /* FCB header required by ROS/NT */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018