Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [SDK] Make KdRosRegisterCliCallback() return status from KdSystemDebugControl().
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de8861159020249b6403e… commit de8861159020249b6403e547ea8e3a9f3c024bb6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 12:19:21 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 12:19:21 2018 +0200 [SDK] Make KdRosRegisterCliCallback() return status from KdSystemDebugControl(). --- sdk/include/reactos/kdros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/kdros.h b/sdk/include/reactos/kdros.h index 94aa5adc8f..30d85b64e6 100644 --- a/sdk/include/reactos/kdros.h +++ b/sdk/include/reactos/kdros.h @@ -47,11 +47,11 @@ KdRosDumpStackFrames( #if defined(KDBG) FORCEINLINE -VOID +ULONG KdRosRegisterCliCallback( PVOID Callback) { - KdSystemDebugControl('RbdK', Callback, FALSE, 0, 0, 0, 0); + return KdSystemDebugControl('RbdK', Callback, FALSE, 0, 0, 0, 0); } FORCEINLINE

1 0

01/01: [FASTFAT] Introduce a KDBG extension.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5a35ecd3761b9a4dbdc8… commit c5a35ecd3761b9a4dbdc87c66447b70fb9d4e785 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 28 09:34:10 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 12:15:11 2018 +0200 [FASTFAT] Introduce a KDBG extension. This is a PoC of what it's possible to realize thanks to an already existing hack in ntoskrnl :-). With this extension, on the kdb:> prompt, you're able to type in commands that will be handled by the FastFAT driver and not by the kernel, allowing internal debug, not possible otherwise. So far, three commands exist: - ?fat.vols: lists all the mounted volumes by FastFAT - ?fat.files: lists all the files on a specific volume (with their attributes) - ?fat.setdbgfile: allows watching on specifics files lifetime This is obviously only the begin and could be greatly improved. For instance, this is what allowed to debug CORE-14557 --- drivers/filesystems/fastfat/CMakeLists.txt | 1 + drivers/filesystems/fastfat/cleanup.c | 3 + drivers/filesystems/fastfat/close.c | 3 + drivers/filesystems/fastfat/fcb.c | 70 ++++++++++++- drivers/filesystems/fastfat/iface.c | 28 +++++ drivers/filesystems/fastfat/kdbg.c | 161 +++++++++++++++++++++++++++++ drivers/filesystems/fastfat/vfat.h | 35 ++++++- 7 files changed, 297 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 087f9e3f62..cc69334b01 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE flush.c fsctl.c iface.c + kdbg.c misc.c pnp.c rw.c diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index 580ed807a3..3ab4a101d1 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -138,6 +138,9 @@ VfatCleanupFile( } FileObject->Flags |= FO_CLEANUP_COMPLETE; +#ifdef KDBG + pFcb->Flags |= FCB_CLEANED_UP; +#endif ExReleaseResourceLite(&pFcb->PagingIoResource); ExReleaseResourceLite(&pFcb->MainResource); diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index b4e5fda308..992ccac4c2 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -48,6 +48,9 @@ VfatCloseFile( } else { +#ifdef KDBG + pFcb->Flags |= FCB_CLOSED; +#endif vfatReleaseFCB(DeviceExt, pFcb); } diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index f6734a675e..33124bc51b 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -24,6 +24,10 @@ #define TAG_FCB 'BCFV' +#ifdef KDBG +extern UNICODE_STRING DebugFile; +#endif + /* -------------------------------------------------------- PUBLICS */ static @@ -267,6 +271,13 @@ VOID vfatDestroyFCB( PVFATFCB pFCB) { +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &pFCB->LongNameU, FALSE, NULL)) + { + DPRINT1("Destroying: %p (%wZ) %d\n", pFCB, &pFCB->PathNameU, pFCB->RefCount); + } +#endif + FsRtlUninitializeFileLock(&pFCB->FileLock); if (!vfatFCBIsRoot(pFCB) && !BooleanFlagOn(pFCB->Flags, FCB_IS_FAT) && !BooleanFlagOn(pFCB->Flags, FCB_IS_VOLUME)) @@ -288,10 +299,28 @@ vfatFCBIsRoot( } VOID +#ifndef KDBG vfatGrabFCB( +#else +_vfatGrabFCB( +#endif PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB) + PVFATFCB pFCB +#ifdef KDBG + , + PCSTR File, + ULONG Line, + PCSTR Func +#endif +) { +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &pFCB->LongNameU, FALSE, NULL)) + { + DPRINT1("Inc ref count (%d, oc: %d) for: %p (%wZ) at: %s(%d) %s\n", pFCB->RefCount, pFCB->OpenHandleCount, pFCB, &pFCB->PathNameU, File, Line, Func); + } +#endif + ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); ASSERT(pFCB != pVCB->VolumeFcb); @@ -300,14 +329,32 @@ vfatGrabFCB( } VOID +#ifndef KDBG vfatReleaseFCB( +#else +_vfatReleaseFCB( +#endif PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB) + PVFATFCB pFCB +#ifdef KDBG + , + PCSTR File, + ULONG Line, + PCSTR Func +#endif +) { PVFATFCB tmpFcb; +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &pFCB->LongNameU, FALSE, NULL)) + { + DPRINT1("Dec ref count (%d, oc: %d) for: %p (%wZ) at: %s(%d) %s\n", pFCB->RefCount, pFCB->OpenHandleCount, pFCB, &pFCB->PathNameU, File, Line, Func); + } +#else DPRINT("releasing FCB at %p: %wZ, refCount:%d\n", pFCB, &pFCB->PathNameU, pFCB->RefCount); +#endif ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); @@ -605,6 +652,13 @@ vfatFCBInitializeCacheFromVolume( fileObject = IoCreateStreamFileObject (NULL, vcb->StorageDevice); +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &fcb->LongNameU, FALSE, NULL)) + { + DPRINT1("Attaching %p to %p (%d)\n", fcb, fileObject, fcb->RefCount); + } +#endif + newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { @@ -762,6 +816,13 @@ vfatAttachFCBToFileObject( UNREFERENCED_PARAMETER(vcb); +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &fcb->LongNameU, FALSE, NULL)) + { + DPRINT1("Attaching %p to %p (%d)\n", fcb, fileObject, fcb->RefCount); + } +#endif + newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { @@ -774,6 +835,11 @@ vfatAttachFCBToFileObject( fileObject->FsContext2 = newCCB; DPRINT("file open: fcb:%p PathName:%wZ\n", fcb, &fcb->PathNameU); +#ifdef KDBG + fcb->Flags &= ~FCB_CLEANED_UP; + fcb->Flags &= ~FCB_CLOSED; +#endif + return STATUS_SUCCESS; } diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index 02e570ea45..b73854dbcd 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -34,6 +34,24 @@ #pragma alloc_text(INIT, DriverEntry) #endif +#ifdef KDBG +NTSTATUS +NTAPI +KdSystemDebugControl(IN ULONG Command, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode); + +BOOLEAN +NTAPI +vfatKdbgHandler( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); +#endif /* GLOBALS *****************************************************************/ @@ -137,6 +155,16 @@ DriverEntry( ExInitializeResourceLite(&VfatGlobalData->VolumeListLock); InitializeListHead(&VfatGlobalData->VolumeListHead); IoRegisterFileSystem(DeviceObject); + +#ifdef KDBG + { + BOOLEAN Registered; + + Registered = KdSystemDebugControl('RbdK', vfatKdbgHandler, FALSE, NULL, 0, NULL, KernelMode); + DPRINT1("FastFAT KDBG extension registered: %s\n", (Registered ? "yes" : "no")); + } +#endif + return STATUS_SUCCESS; } diff --git a/drivers/filesystems/fastfat/kdbg.c b/drivers/filesystems/fastfat/kdbg.c new file mode 100644 index 0000000000..b278329299 --- /dev/null +++ b/drivers/filesystems/fastfat/kdbg.c @@ -0,0 +1,161 @@ +/* +* FILE: drivers/filesystems/fastfat/kdbg.c +* PURPOSE: KDBG extension. +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS kernel +* PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) +*/ + +/* ------------------------------------------------------- INCLUDES */ + +#include "vfat.h" + +#define NDEBUG +#include <debug.h> + +#include <stdio.h> + +/* -------------------------------------------------------- DEFINES */ + +#ifdef KDBG +UNICODE_STRING DebugFile = {0, 0, NULL}; + +BOOLEAN +NTAPI +vfatKdbgHandler( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]) +{ + ULONG Len; + + Len = strlen(Command); + if (Len < sizeof("?fat.")) + { + return FALSE; + } + + if (Command[0] != '?' || Command[1] != 'f' || + Command[2] != 'a' || Command[3] != 't' || + Command[4] != '.') + { + return FALSE; + } + + Command += (sizeof("?fat.") - sizeof(ANSI_NULL)); + if (strcmp(Command, "vols") == 0) + { + ULONG Count = 0; + PLIST_ENTRY ListEntry; + PDEVICE_EXTENSION DeviceExt; + + for (ListEntry = VfatGlobalData->VolumeListHead.Flink; + ListEntry != &VfatGlobalData->VolumeListHead; + ListEntry = ListEntry->Flink) + { + DeviceExt = CONTAINING_RECORD(ListEntry, DEVICE_EXTENSION, VolumeListEntry); + DPRINT1("Volume: %p with VCB: %p\n", DeviceExt->VolumeDevice, DeviceExt); + ++Count; + } + + if (Count == 0) + { + DPRINT1("No volume found\n"); + } + } + else if (strcmp(Command, "files") == 0) + { + if (Argc != 2) + { + DPRINT1("Please provide a volume or a VCB!\n"); + } + else + { + PLIST_ENTRY ListEntry; + PDEVICE_EXTENSION DeviceExt; + + for (ListEntry = VfatGlobalData->VolumeListHead.Flink; + ListEntry != &VfatGlobalData->VolumeListHead; + ListEntry = ListEntry->Flink) + { + CHAR Volume[17]; + + DeviceExt = CONTAINING_RECORD(ListEntry, DEVICE_EXTENSION, VolumeListEntry); + sprintf(Volume, "%p", DeviceExt); + if (strcmp(Volume, Argv[1]) == 0) + { + break; + } + + sprintf(Volume, "%p", DeviceExt->VolumeDevice); + if (strcmp(Volume, Argv[1]) == 0) + { + break; + } + + DeviceExt = NULL; + } + + if (DeviceExt == NULL) + { + DPRINT1("No volume %s found!\n", Argv[1]); + } + else + { + PVFATFCB Fcb; + + for (ListEntry = DeviceExt->FcbListHead.Flink; + ListEntry != &DeviceExt->FcbListHead; + ListEntry = ListEntry->Flink) + { + Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); + DPRINT1("FCB %p (ref: %d, oc: %d %s %s) for FO %p with path: %.*S\n", + Fcb, Fcb->RefCount, Fcb->OpenHandleCount, + ((Fcb->Flags & FCB_CLEANED_UP) ? "U" : "NU"), + ((Fcb->Flags & FCB_CLOSED) ? "C" : "NC"), + Fcb->FileObject, Fcb->PathNameU.Length, Fcb->PathNameU.Buffer); + } + } + } + } + else if (strcmp(Command, "setdbgfile") == 0) + { + if (Argc < 2) + { + if (DebugFile.Buffer != NULL) + { + ExFreePool(DebugFile.Buffer); + DebugFile.Length = 0; + DebugFile.MaximumLength = 0; + } + + DPRINT1("Debug file reset\n"); + } + else + { + NTSTATUS Status; + ANSI_STRING Source; + + if (DebugFile.Buffer != NULL) + { + ExFreePool(DebugFile.Buffer); + DebugFile.Length = 0; + DebugFile.MaximumLength = 0; + } + + RtlInitAnsiString(&Source, Argv[1]); + Status = RtlAnsiStringToUnicodeString(&DebugFile, &Source, TRUE); + if (NT_SUCCESS(Status)) + { + DPRINT1("Debug file set to: %.*S\n", DebugFile.Length, DebugFile.Buffer); + } + } + } + else + { + DPRINT1("Unknown command: %s\n", Command); + } + + return TRUE; +} +#endif diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 429120c804..0de6a486a0 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -409,6 +409,10 @@ extern PVFAT_GLOBAL_DATA VfatGlobalData; #define FCB_IS_PAGE_FILE 0x0008 #define FCB_IS_VOLUME 0x0010 #define FCB_IS_DIRTY 0x0020 +#ifdef KDBG +#define FCB_CLEANED_UP 0x0040 +#define FCB_CLOSED 0x0080 +#endif #define NODE_TYPE_FCB ((CSHORT)0x0502) @@ -898,14 +902,41 @@ vfatDestroyCCB( PVFATCCB pCcb); VOID +#ifndef KDBG vfatGrabFCB( +#else +_vfatGrabFCB( +#endif PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); + PVFATFCB pFCB +#ifdef KDBG + , + PCSTR File, + ULONG Line, + PCSTR Func +#endif + ); VOID +#ifndef KDBG vfatReleaseFCB( +#else +_vfatReleaseFCB( +#endif PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); + PVFATFCB pFCB +#ifdef KDBG + , + PCSTR File, + ULONG Line, + PCSTR Func +#endif + ); + +#ifdef KDBG +#define vfatGrabFCB(v, f) _vfatGrabFCB(v, f, __FILE__, __LINE__, __FUNCTION__) +#define vfatReleaseFCB(v, f) _vfatReleaseFCB(v, f, __FILE__, __LINE__, __FUNCTION__) +#endif PVFATFCB vfatGrabFCBFromTable(

1 0

01/01: [WINLOGON] Usability enhancement for the RPC SystemShutdown functionality.
by Hermès Bélusca-Maïto 28 Apr '18

28 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb20bf8c903f42b64bb39… commit cb20bf8c903f42b64bb397477b857b5cf4e4eb71 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 28 18:14:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 01:02:05 2018 +0200 [WINLOGON] Usability enhancement for the RPC SystemShutdown functionality. - Perform an immediate system shutdown if the timeout is zero, otherwise display the countdown shutdown dialog. - Cleanup pShutdownParams->pszMessage as soon as the dialog goes away. - It actually appears (tested on Windows 2000 and 2003) that sending WM_CLOSE messages from a user-mode app to the shutdown dialog really do nothing (and in particular does not cancel the shutdown!), so modify the code to take this fact into account. --- base/system/winlogon/shutdown.c | 98 +++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 42452ca067..d3b86aa140 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -30,7 +30,6 @@ typedef struct _SYS_SHUTDOWN_PARAMS BOOLEAN bForceAppsClosed; DWORD dwReason; - HWND hShutdownDialog; BOOLEAN bShuttingDown; } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; @@ -42,6 +41,36 @@ SYS_SHUTDOWN_PARAMS g_ShutdownParams; /* FUNCTIONS *****************************************************************/ +static +BOOL +DoSystemShutdown( + IN PSYS_SHUTDOWN_PARAMS pShutdownParams) +{ + BOOL Success; + + if (pShutdownParams->pszMessage) + { + HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage); + pShutdownParams->pszMessage = NULL; + } + + /* If shutdown has been cancelled, bail out now */ + if (!pShutdownParams->bShuttingDown) + return TRUE; + + Success = ExitWindowsEx((pShutdownParams->bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (pShutdownParams->bForceAppsClosed ? EWX_FORCE : 0), + pShutdownParams->dwReason); + if (!Success) + { + /* Something went wrong, cancel shutdown */ + pShutdownParams->bShuttingDown = FALSE; + } + + return Success; +} + + static VOID OnTimer( @@ -51,6 +80,13 @@ OnTimer( WCHAR szBuffer[12]; INT iSeconds, iMinutes, iHours, iDays; + if (!pShutdownParams->bShuttingDown) + { + /* Shutdown has been cancelled, close the dialog and bail out */ + EndDialog(hwndDlg, 0); + return; + } + if (pShutdownParams->dwTimeout < SECONDS_PER_DAY) { iSeconds = (INT)pShutdownParams->dwTimeout; @@ -64,17 +100,17 @@ OnTimer( else { iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); - swprintf(szBuffer, L"%d days", iDays); + swprintf(szBuffer, L"%d days", iDays); // FIXME: Localize } SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer); if (pShutdownParams->dwTimeout == 0) { - PostMessage(hwndDlg, WM_CLOSE, 0, 0); - ExitWindowsEx((pShutdownParams->bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | - (pShutdownParams->bForceAppsClosed ? EWX_FORCE : 0), - pShutdownParams->dwReason); + /* Close the dialog and perform the system shutdown */ + EndDialog(hwndDlg, 0); + DoSystemShutdown(pShutdownParams); + return; } pShutdownParams->dwTimeout--; @@ -97,11 +133,10 @@ ShutdownDialogProc( switch (uMsg) { case WM_INITDIALOG: + { pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams); - pShutdownParams->hShutdownDialog = hwndDlg; - if (pShutdownParams->pszMessage) { SetDlgItemTextW(hwndDlg, @@ -109,26 +144,17 @@ ShutdownDialogProc( pShutdownParams->pszMessage); } - RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); + DeleteMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); PostMessage(hwndDlg, WM_TIMER, 0, 0); SetTimer(hwndDlg, SHUTDOWN_TIMER_ID, 1000, NULL); break; + } - case WM_CLOSE: - pShutdownParams->hShutdownDialog = NULL; - pShutdownParams->bShuttingDown = FALSE; - + /* NOTE: Do not handle WM_CLOSE */ + case WM_DESTROY: KillTimer(hwndDlg, SHUTDOWN_TIMER_ID); - - if (pShutdownParams->pszMessage) - { - HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage); - pShutdownParams->pszMessage = NULL; - } - - EndDialog(hwndDlg, 0); break; case WM_TIMER: @@ -159,10 +185,6 @@ InitiateSystemShutdownThread( NULL, ShutdownDialogProc, (LPARAM)pShutdownParams); - if (status >= 0) - { - return ERROR_SUCCESS; - } if (pShutdownParams->pszMessage) { @@ -170,8 +192,10 @@ InitiateSystemShutdownThread( pShutdownParams->pszMessage = NULL; } - pShutdownParams->bShuttingDown = FALSE; + if (status >= 0) + return ERROR_SUCCESS; + pShutdownParams->bShuttingDown = FALSE; return GetLastError(); } @@ -179,10 +203,10 @@ InitiateSystemShutdownThread( DWORD TerminateSystemShutdown(VOID) { - if (g_ShutdownParams.bShuttingDown == FALSE) + if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, FALSE, TRUE) == FALSE) return ERROR_NO_SHUTDOWN_IN_PROGRESS; - return PostMessage(g_ShutdownParams.hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); + return ERROR_SUCCESS; } @@ -228,11 +252,20 @@ StartSystemShutdown( g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; g_ShutdownParams.dwReason = dwReason; - hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, (PVOID)&g_ShutdownParams, 0, NULL); - if (hThread) + /* If dwTimeout is zero perform an immediate system shutdown, otherwise display the countdown shutdown dialog */ + if (g_ShutdownParams.dwTimeout == 0) { - CloseHandle(hThread); - return ERROR_SUCCESS; + if (DoSystemShutdown(&g_ShutdownParams)) + return ERROR_SUCCESS; + } + else + { + hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, (PVOID)&g_ShutdownParams, 0, NULL); + if (hThread) + { + CloseHandle(hThread); + return ERROR_SUCCESS; + } } if (g_ShutdownParams.pszMessage) @@ -242,7 +275,6 @@ StartSystemShutdown( } g_ShutdownParams.bShuttingDown = FALSE; - return GetLastError(); }

1 0

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

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