Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [NTOS:PNP] Send removal IRPs to a file system device object for mounted devices
by Victor Perevertkin 27 Dec '20

27 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ee88d3bd5bb246442449… commit 8ee88d3bd5bb2464424490bcbca8510d2116df51 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Dec 27 18:40:33 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Dec 27 18:40:33 2020 +0300 [NTOS:PNP] Send removal IRPs to a file system device object for mounted devices If a DeviceObject has VPB attached, it should be treated in a special way CORE-16106 --- ntoskrnl/io/pnpmgr/devaction.c | 111 +++++++++++++++++++++++++++++------------ 1 file changed, 80 insertions(+), 31 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 4f5fb6b3884..34d71e18a2e 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1494,27 +1494,96 @@ IopStopDevice( /* PUBLIC FUNCTIONS **********************************************************/ +/** + * @brief Sends one of the remove IRPs to the device stack + * + * If there is a mounted VPB attached to a one of the stack devices, the IRP + * should be send to a VPB's DeviceObject first (which belongs to a FS driver). + * FS driver will then forward it down to the volume device. + * While walking the device stack, the function sets (or unsets) VPB_REMOVE_PENDING flag + * thus blocking all further mounts on a soon-to-be-removed devices + */ +static +NTSTATUS +PiIrpSendRemoveCheckVpb( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ UCHAR MinorFunction) +{ + KIRQL oldIrql; + + ASSERT(MinorFunction == IRP_MN_QUERY_REMOVE_DEVICE || + MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || + MinorFunction == IRP_MN_SURPRISE_REMOVAL || + MinorFunction == IRP_MN_REMOVE_DEVICE); + + PDEVICE_OBJECT vpbDevObj = DeviceObject, targetDevice = DeviceObject; + + // walk the device stack down, stop on a first mounted device + do + { + if (vpbDevObj->Vpb) + { + // two locks are needed here + KeWaitForSingleObject(&vpbDevObj->DeviceLock, Executive, KernelMode, FALSE, NULL); + IoAcquireVpbSpinLock(&oldIrql); + + if (MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE) + { + vpbDevObj->Vpb->Flags &= ~VPB_REMOVE_PENDING; + } + else + { + vpbDevObj->Vpb->Flags |= VPB_REMOVE_PENDING; + } + + BOOLEAN isMounted = (_Bool)(vpbDevObj->Vpb->Flags & VPB_MOUNTED); + + if (isMounted) + { + targetDevice = vpbDevObj->Vpb->DeviceObject; + } + + IoReleaseVpbSpinLock(oldIrql); + KeSetEvent(&vpbDevObj->DeviceLock, IO_NO_INCREMENT, FALSE); + + if (isMounted) + { + break; + } + } + + oldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); + vpbDevObj = vpbDevObj->AttachedDevice; + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, oldIrql); + } while (vpbDevObj); + + ASSERT(targetDevice); + + PVOID info; + IO_STACK_LOCATION stack = {.MajorFunction = IRP_MJ_PNP, .MinorFunction = MinorFunction}; + + return IopSynchronousCall(targetDevice, &stack, &info); +} + static VOID NTAPI IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) { - IO_STACK_LOCATION Stack; - PVOID Dummy; PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); /* Drop all our state for this device in case it isn't really going away */ DeviceNode->Flags &= DNF_ENUMERATED | DNF_PROCESSED; - RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); - Stack.MajorFunction = IRP_MJ_PNP; - Stack.MinorFunction = IRP_MN_REMOVE_DEVICE; - /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ - IopSynchronousCall(DeviceObject, &Stack, &Dummy); + PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_REMOVE_DEVICE); PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_REMOVE_COMPLETE, DeviceObject, NULL); - ObDereferenceObject(DeviceObject); + LONG_PTR refCount = ObDereferenceObject(DeviceObject); + if (refCount != 0) + { + DPRINT1("Leaking device %wZ, refCount = %d\n", &DeviceNode->InstancePath, (INT32)refCount); + } } static @@ -1562,15 +1631,8 @@ VOID NTAPI IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) { - IO_STACK_LOCATION Stack; - PVOID Dummy; - - RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); - Stack.MajorFunction = IRP_MJ_PNP; - Stack.MinorFunction = IRP_MN_SURPRISE_REMOVAL; - /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ - IopSynchronousCall(DeviceObject, &Stack, &Dummy); + PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_SURPRISE_REMOVAL); } static @@ -1578,15 +1640,8 @@ VOID NTAPI IopCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject) { - IO_STACK_LOCATION Stack; - PVOID Dummy; - - RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); - Stack.MajorFunction = IRP_MJ_PNP; - Stack.MinorFunction = IRP_MN_CANCEL_REMOVE_DEVICE; - /* Drivers should never fail a IRP_MN_CANCEL_REMOVE_DEVICE request */ - IopSynchronousCall(DeviceObject, &Stack, &Dummy); + PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_CANCEL_REMOVE_DEVICE); PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_REMOVE_CANCELLED, DeviceObject, NULL); } @@ -1669,8 +1724,6 @@ NTAPI IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); - IO_STACK_LOCATION Stack; - PVOID Dummy; NTSTATUS Status; ASSERT(DeviceNode); @@ -1678,11 +1731,7 @@ IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, &DeviceNode->InstancePath); - RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); - Stack.MajorFunction = IRP_MJ_PNP; - Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; - - Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); + Status = PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_QUERY_REMOVE_DEVICE); PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_QUERY_REMOVE, DeviceObject, NULL);

1 0

[reactos] 01/02: [MOUNTMGR] Do not handle device removal notification
by Victor Perevertkin 27 Dec '20

27 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62a4f9d42b6e43c1f84cb… commit 62a4f9d42b6e43c1f84cb5d999b6e79e5d5bbb2a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Dec 27 18:35:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Dec 27 18:35:52 2020 +0300 [MOUNTMGR] Do not handle device removal notification Do not treat target device change notification as DEVICE_INTERFACE_CHANGE_NOTIFICATION. The notification have to be unregistered while handling GUID_DEVICE_INTERFACE_REMOVAL, so GUID_TARGET_DEVICE_REMOVE_COMPLETE should never be sent to mountmgr in a normal case. CORE-16106 --- drivers/storage/mountmgr/notify.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/storage/mountmgr/notify.c b/drivers/storage/mountmgr/notify.c index 2c7a05dbc88..262f40ca565 100644 --- a/drivers/storage/mountmgr/notify.c +++ b/drivers/storage/mountmgr/notify.c @@ -231,21 +231,19 @@ MountMgrTargetDeviceNotification(IN PVOID NotificationStructure, { PDEVICE_EXTENSION DeviceExtension; PDEVICE_INFORMATION DeviceInformation; - PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification; + PTARGET_DEVICE_CUSTOM_NOTIFICATION Notification; DeviceInformation = Context; DeviceExtension = DeviceInformation->DeviceExtension; Notification = NotificationStructure; - /* If it's to signal that removal is complete, then, execute the function */ - if (IsEqualGUID(&(Notification->Event), &GUID_TARGET_DEVICE_REMOVE_COMPLETE)) - { - MountMgrMountedDeviceRemoval(DeviceExtension, Notification->SymbolicLinkName); - } + /* The notification have to be unregistered already (in device interface change handler) */ + ASSERT(!IsEqualGUID(&Notification->Event, &GUID_TARGET_DEVICE_REMOVE_COMPLETE)); + /* It it's to signal that a volume has been mounted * Verify if a database sync is required and execute it */ - else if (IsEqualGUID(&(Notification->Event), &GUID_IO_VOLUME_MOUNT)) + if (IsEqualGUID(&(Notification->Event), &GUID_IO_VOLUME_MOUNT)) { /* If we were already mounted, then mark us unmounted */ if (InterlockedCompareExchange(&(DeviceInformation->MountState),

1 0

[reactos] 09/09: [CONSRV] Less hardcoded magic values.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f36bcfc85183b520a94… commit 89f36bcfc85183b520a9426f7b86fa6381113176 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 27 00:38:36 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:52:01 2020 +0100 [CONSRV] Less hardcoded magic values. --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 2 +- win32ss/user/winsrv/consrv/frontends/input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 8770eca88ab..de9eea6053a 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -1903,7 +1903,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) if (GetKeyState(VK_CAPITAL) & KEY_TOGGLED) dwControlKeyState |= CAPSLOCK_ON; /* See WM_CHAR MSDN documentation for instance */ - if (lParam & 0x01000000) + if (HIWORD(lParam) & KF_EXTENDED) dwControlKeyState |= ENHANCED_KEY; /* Send a mouse event */ diff --git a/win32ss/user/winsrv/consrv/frontends/input.c b/win32ss/user/winsrv/consrv/frontends/input.c index 053e2006efb..5305e1091a2 100644 --- a/win32ss/user/winsrv/consrv/frontends/input.c +++ b/win32ss/user/winsrv/consrv/frontends/input.c @@ -50,7 +50,7 @@ ConioGetShiftState(PBYTE KeyState, LPARAM lParam) // if (KeyState[VK_MENU] & 0x80) { ... } /* See WM_CHAR MSDN documentation for instance */ - if (lParam & 0x01000000) + if (HIWORD(lParam) & KF_EXTENDED) ssOut |= ENHANCED_KEY; return ssOut; @@ -68,7 +68,7 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg) WCHAR UnicodeChar; UINT VirtualKeyCode; UINT VirtualScanCode; - BOOL Down = FALSE; + BOOL Down; BOOLEAN Fake; // Synthesized, not a real event BOOLEAN NotChar; // Message should not be used to return a character

1 0

[reactos] 08/09: [NTOS:IO] Fail if the driver name passed to NtLoadDriver() is an empty string.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a748350fc9c342149e7f8… commit a748350fc9c342149e7f8dc798a6c696f4ec9ef3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 27 00:33:32 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:52:00 2020 +0100 [NTOS:IO] Fail if the driver name passed to NtLoadDriver() is an empty string. Otherwise an assertion on the driver name is hit later on. Can be reproduced by calling NtLoadDriver with a valid UNICODE_STRING of Length == 0. --- ntoskrnl/io/iomgr/driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 9f7d5ed5aba..3b033f9ab32 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1251,7 +1251,7 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) DPRINT("IopUnloadDriver('%wZ', %u)\n", &CapturedServiceName, UnloadPnpDrivers); /* We need a service name */ - if (CapturedServiceName.Length == 0) + if (CapturedServiceName.Length == 0 || CapturedServiceName.Buffer == NULL) { ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); return STATUS_INVALID_PARAMETER; @@ -2161,6 +2161,13 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) DPRINT("NtLoadDriver('%wZ')\n", &CapturedServiceName); + /* We need a service name */ + if (CapturedServiceName.Length == 0 || CapturedServiceName.Buffer == NULL) + { + ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); + return STATUS_INVALID_PARAMETER; + } + /* Load driver and call its entry point */ DriverObject = NULL; Status = IopLoadUnloadDriver(&CapturedServiceName, &DriverObject);

1 0

[reactos] 07/09: [NTOS:IO] Minor formatting only.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44511f0809aa57051e1c9… commit 44511f0809aa57051e1c927f3090111ec663aaa6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 27 00:31:54 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:59 2020 +0100 [NTOS:IO] Minor formatting only. Making IopLoadUnloadDriver() looking similar to IopUnloadDriver(). --- ntoskrnl/io/iomgr/driver.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 6b3949a5189..9f7d5ed5aba 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1242,15 +1242,14 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) } /* Capture the service name */ - Status = ProbeAndCaptureUnicodeString(&CapturedServiceName, PreviousMode, DriverServiceName); + Status = ProbeAndCaptureUnicodeString(&CapturedServiceName, + PreviousMode, + DriverServiceName); if (!NT_SUCCESS(Status)) - { return Status; - } DPRINT("IopUnloadDriver('%wZ', %u)\n", &CapturedServiceName, UnloadPnpDrivers); - /* We need a service name */ if (CapturedServiceName.Length == 0) { @@ -2137,7 +2136,7 @@ IopLoadUnloadDriver( NTSTATUS NTAPI NtLoadDriver(IN PUNICODE_STRING DriverServiceName) { - UNICODE_STRING CapturedDriverServiceName = { 0, 0, NULL }; + UNICODE_STRING CapturedServiceName = { 0, 0, NULL }; KPROCESSOR_MODE PreviousMode; PDRIVER_OBJECT DriverObject; NTSTATUS Status; @@ -2146,32 +2145,27 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) PreviousMode = KeGetPreviousMode(); - /* - * Check security privileges - */ + /* Need the appropriate priviliege */ if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) { - DPRINT("Privilege not held\n"); + DPRINT1("No load privilege!\n"); return STATUS_PRIVILEGE_NOT_HELD; } - Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, + /* Capture the service name */ + Status = ProbeAndCaptureUnicodeString(&CapturedServiceName, PreviousMode, DriverServiceName); if (!NT_SUCCESS(Status)) - { return Status; - } - DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); + DPRINT("NtLoadDriver('%wZ')\n", &CapturedServiceName); /* Load driver and call its entry point */ DriverObject = NULL; - Status = IopLoadUnloadDriver(&CapturedDriverServiceName, &DriverObject); - - ReleaseCapturedUnicodeString(&CapturedDriverServiceName, - PreviousMode); + Status = IopLoadUnloadDriver(&CapturedServiceName, &DriverObject); + ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); return Status; }

1 0

[reactos] 06/09: [SAC] Fix the HeadlessInformation.PortType checks in DriverEntry().
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8be5f73255b1a3a5a3715… commit 8be5f73255b1a3a5a3715842be1b912725ae0117 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 17 01:29:02 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:58 2020 +0100 [SAC] Fix the HeadlessInformation.PortType checks in DriverEntry(). --- drivers/sac/driver/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/sac/driver/init.c b/drivers/sac/driver/init.c index d11e6948a3f..2a2ff4d0667 100644 --- a/drivers/sac/driver/init.c +++ b/drivers/sac/driver/init.c @@ -32,8 +32,8 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0, &HeadlessInformation, &InfoSize); - if ((HeadlessInformation.Serial.TerminalType != HeadlessUndefinedPortType) && - ((HeadlessInformation.Serial.TerminalType != HeadlessSerialPort) || + if ((HeadlessInformation.PortType != HeadlessUndefinedPortType) && + ((HeadlessInformation.PortType != HeadlessSerialPort) || (HeadlessInformation.Serial.TerminalAttached))) { /* It is, so create the device */

1 0

[reactos] 05/09: [SAC] Use NULL for null pointer in last argument in HeadlessDispatch() calls.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5214d2fab70f46d590997… commit 5214d2fab70f46d590997f5f1c241a8af39d687b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 17 01:12:32 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:58 2020 +0100 [SAC] Use NULL for null pointer in last argument in HeadlessDispatch() calls. --- drivers/sac/driver/conmgr.c | 2 +- drivers/sac/driver/data.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/sac/driver/conmgr.c b/drivers/sac/driver/conmgr.c index 86b445eeb61..681c1baec77 100644 --- a/drivers/sac/driver/conmgr.c +++ b/drivers/sac/driver/conmgr.c @@ -507,7 +507,7 @@ ConMgrProcessInputLine(VOID) &EnablePaging, sizeof(EnablePaging), NULL, - 0); + NULL); if (!NT_SUCCESS(Status)) SAC_DBG(SAC_DBG_INIT, "SAC Display Log failed.\n"); } else if (!strncmp(InputBuffer, "cmd", 3)) diff --git a/drivers/sac/driver/data.c b/drivers/sac/driver/data.c index 3dcb70ef429..d7f1ae09d09 100644 --- a/drivers/sac/driver/data.c +++ b/drivers/sac/driver/data.c @@ -247,7 +247,7 @@ InitializeDeviceData(IN PDEVICE_OBJECT DeviceObject) &EnableData, sizeof(EnableData), NULL, - 0); + NULL); if (!NT_SUCCESS(Status)) { /* Bail out if we couldn't even get this far */ @@ -332,7 +332,7 @@ InitializeDeviceData(IN PDEVICE_OBJECT DeviceObject) &EnableData, sizeof(EnableData), NULL, - 0); + NULL); if (!NT_SUCCESS(Status)) SAC_DBG(SAC_DBG_INIT, "Failed dispatch\n"); /* Bail out */

1 0

[reactos] 04/09: [FREELDR] EMS boot options: Parse NT kernel load options in a consistent manner. Addendum to d887308b.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dd0b32799cf1303786ae… commit 5dd0b32799cf1303786aea2a48d995046837b632 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 13 21:49:59 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:57 2020 +0100 [FREELDR] EMS boot options: Parse NT kernel load options in a consistent manner. Addendum to d887308b. In particular the parsing should not care about the letter case. --- boot/freeldr/freeldr/ntldr/headless.c | 64 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/headless.c b/boot/freeldr/freeldr/ntldr/headless.c index 161e66420ae..911e08cb2e5 100644 --- a/boot/freeldr/freeldr/ntldr/headless.c +++ b/boot/freeldr/freeldr/ntldr/headless.c @@ -10,6 +10,7 @@ #include <freeldr.h> #include <cportlib/cportlib.h> +#include "ntldropts.h" /* Note: Move these to some smbios.h header */ #define SYSID_TYPE_UUID "_UUID_" @@ -206,7 +207,7 @@ WinLdrInitializeHeadlessPort(VOID) { ULONG PortNumber, BaudRate; PUCHAR PortAddress; - PCHAR AnsiReset = "\x1B[m"; + PCSTR AnsiReset = "\x1B[m"; ULONG i; PortNumber = LoaderRedirectionInformation.PortNumber; @@ -267,13 +268,11 @@ WinLdrInitializeHeadlessPort(VOID) /* Call arch code to initialize the port */ PortAddress = LoaderRedirectionInformation.PortAddress; - WinLdrTerminalConnected = WinLdrPortInitialize( - BaudRate, - PortNumber, - PortAddress, - WinLdrTerminalConnected, - &WinLdrTerminalDeviceId); - + WinLdrTerminalConnected = WinLdrPortInitialize(BaudRate, + PortNumber, + PortAddress, + WinLdrTerminalConnected, + &WinLdrTerminalDeviceId); if (WinLdrTerminalConnected) { /* Port seems usable, set it up and get the BIOS GUID */ @@ -302,55 +301,54 @@ WinLdrInitializeHeadlessPort(VOID) VOID WinLdrSetupEms(IN PCSTR BootOptions) { - PCHAR Settings, RedirectPort; + PCSTR Option; /* Start fresh */ RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK)); LoaderRedirectionInformation.PciDeviceId = PCI_INVALID_VENDORID; /* Use a direction port if one was given, or use ACPI to detect one instead */ - Settings = strstr(BootOptions, "/redirect="); - if (Settings) + Option = NtLdrGetOption(BootOptions, "redirect="); + if (Option) { - RedirectPort = strstr(Settings, "com"); - if (RedirectPort) + Option += 9; + if (_strnicmp(Option, "com", 3) == 0) + { + Option += 3; + LoaderRedirectionInformation.PortNumber = atoi(Option); + LoaderRedirectionInformation.TerminalType = 1; // VT100+ + } + else if (_strnicmp(Option, "usebiossettings", 15) == 0) { - RedirectPort += sizeof("com") - 1; - LoaderRedirectionInformation.PortNumber = atoi(RedirectPort); - LoaderRedirectionInformation.TerminalType = 1; // HeadlessSerialPort + // FIXME: TODO! + UiDrawStatusText("ACPI SRT/SPCR Table Not Supported..."); + return; } else { - RedirectPort = strstr(Settings, "usebiossettings"); - if (RedirectPort) - { - UiDrawStatusText("ACPI SRT Table Not Supported..."); - return; - } - else + LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(Option, 0, 16); + if (LoaderRedirectionInformation.PortAddress) { - LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(Settings, 0, 16); - if (LoaderRedirectionInformation.PortAddress) - { - LoaderRedirectionInformation.PortNumber = 3; - } + LoaderRedirectionInformation.PortNumber = 3; } } } /* Use a direction baudrate if one was given */ - Settings = strstr(BootOptions, "/redirectbaudrate="); - if (Settings) + Option = NtLdrGetOption(BootOptions, "redirectbaudrate="); + if (Option) { - if (strstr(Settings, "115200")) + Option += 17; + // LoaderRedirectionInformation.BaudRate = atoi(Option); + if (strncmp(Option, "115200", 6) == 0) { LoaderRedirectionInformation.BaudRate = 115200; } - else if (strstr(Settings, "57600")) + else if (strncmp(Option, "57600", 5) == 0) { LoaderRedirectionInformation.BaudRate = 57600; } - else if (strstr(Settings, "19200")) + else if (strncmp(Option, "19200", 5) == 0) { LoaderRedirectionInformation.BaudRate = 19200; }

1 0

[reactos] 03/09: [PSDK][XDK] Add newer FILE_DEVICE_xxx DEVICE_TYPE defines.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb9d8e52392f102ff7f94… commit fb9d8e52392f102ff7f941a18f901a8a456c6985 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 13 18:07:45 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:57 2020 +0100 [PSDK][XDK] Add newer FILE_DEVICE_xxx DEVICE_TYPE defines. --- sdk/include/psdk/winioctl.h | 31 ++++++++++++++++++++++++++++++- sdk/include/xdk/iotypes.h | 35 ++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/sdk/include/psdk/winioctl.h b/sdk/include/psdk/winioctl.h index f10c4b41678..b0061baf42e 100644 --- a/sdk/include/psdk/winioctl.h +++ b/sdk/include/psdk/winioctl.h @@ -103,6 +103,7 @@ extern "C" { #define _DEVIOCTL_ #define DEVICE_TYPE DWORD + #define FILE_DEVICE_BEEP 1 #define FILE_DEVICE_CD_ROM 2 #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 3 @@ -142,7 +143,7 @@ extern "C" { #define FILE_DEVICE_WAVE_IN 37 #define FILE_DEVICE_WAVE_OUT 38 #define FILE_DEVICE_8042_PORT 39 -#define FILE_DEVICE_NETWORK_REDIRECTOR 40 +#define FILE_DEVICE_NETWORK_REDIRECTOR 40 #define FILE_DEVICE_BATTERY 41 #define FILE_DEVICE_BUS_EXTENDER 42 #define FILE_DEVICE_MODEM 43 @@ -160,6 +161,34 @@ extern "C" { #define FILE_DEVICE_SERENUM 55 #define FILE_DEVICE_TERMSRV 56 #define FILE_DEVICE_KSEC 57 +#define FILE_DEVICE_FIPS 58 +#define FILE_DEVICE_INFINIBAND 59 +#define FILE_DEVICE_VMBUS 62 +#define FILE_DEVICE_CRYPT_PROVIDER 63 +#define FILE_DEVICE_WPD 64 +#define FILE_DEVICE_BLUETOOTH 65 +#define FILE_DEVICE_MT_COMPOSITE 66 +#define FILE_DEVICE_MT_TRANSPORT 67 +#define FILE_DEVICE_BIOMETRIC 68 +#define FILE_DEVICE_PMI 69 +#define FILE_DEVICE_EHSTOR 70 +#define FILE_DEVICE_DEVAPI 71 +#define FILE_DEVICE_GPIO 72 +#define FILE_DEVICE_USBEX 73 +#define FILE_DEVICE_CONSOLE 80 +#define FILE_DEVICE_NFP 81 +#define FILE_DEVICE_SYSENV 82 +#define FILE_DEVICE_VIRTUAL_BLOCK 83 +#define FILE_DEVICE_POINT_OF_SERVICE 84 +#define FILE_DEVICE_STORAGE_REPLICATION 85 +#define FILE_DEVICE_TRUST_ENV 86 +#define FILE_DEVICE_UCM 87 +#define FILE_DEVICE_UCMTCPCI 88 +#define FILE_DEVICE_PERSISTENT_MEMORY 89 +#define FILE_DEVICE_NVDIMM 90 +#define FILE_DEVICE_HOLOGRAPHIC 91 +#define FILE_DEVICE_SDFXHCI 92 +#define FILE_DEVICE_UCMUCSI 93 /* Also in ddk/winddk.h */ #define FILE_ANY_ACCESS 0x00000000 diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d1392e0857a..db056814088 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -45,6 +45,9 @@ $if (_WDMDDK_) $endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) +/* DEVICE_OBJECT.DeviceType */ +#define DEVICE_TYPE ULONG + #define FILE_DEVICE_BEEP 0x00000001 #define FILE_DEVICE_CD_ROM 0x00000002 #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 @@ -102,16 +105,34 @@ $if (_WDMDDK_ || _DEVIOCTL_) #define FILE_DEVICE_SERENUM 0x00000037 #define FILE_DEVICE_TERMSRV 0x00000038 #define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003A -#define FILE_DEVICE_INFINIBAND 0x0000003B -#define FILE_DEVICE_VMBUS 0x0000003E -#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003F +#define FILE_DEVICE_FIPS 0x0000003a +#define FILE_DEVICE_INFINIBAND 0x0000003b +#define FILE_DEVICE_VMBUS 0x0000003e +#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003f #define FILE_DEVICE_WPD 0x00000040 #define FILE_DEVICE_BLUETOOTH 0x00000041 #define FILE_DEVICE_MT_COMPOSITE 0x00000042 #define FILE_DEVICE_MT_TRANSPORT 0x00000043 #define FILE_DEVICE_BIOMETRIC 0x00000044 #define FILE_DEVICE_PMI 0x00000045 +#define FILE_DEVICE_EHSTOR 0x00000046 +#define FILE_DEVICE_DEVAPI 0x00000047 +#define FILE_DEVICE_GPIO 0x00000048 +#define FILE_DEVICE_USBEX 0x00000049 +#define FILE_DEVICE_CONSOLE 0x00000050 +#define FILE_DEVICE_NFP 0x00000051 +#define FILE_DEVICE_SYSENV 0x00000052 +#define FILE_DEVICE_VIRTUAL_BLOCK 0x00000053 +#define FILE_DEVICE_POINT_OF_SERVICE 0x00000054 +#define FILE_DEVICE_STORAGE_REPLICATION 0x00000055 +#define FILE_DEVICE_TRUST_ENV 0x00000056 +#define FILE_DEVICE_UCM 0x00000057 +#define FILE_DEVICE_UCMTCPCI 0x00000058 +#define FILE_DEVICE_PERSISTENT_MEMORY 0x00000059 +#define FILE_DEVICE_NVDIMM 0x0000005a +#define FILE_DEVICE_HOLOGRAPHIC 0x0000005b +#define FILE_DEVICE_SDFXHCI 0x0000005c +#define FILE_DEVICE_UCMUCSI 0x0000005d $endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) @@ -261,12 +282,8 @@ $if (_WDMDDK_) #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff -$endif (_NTDDK_) -$if (_WDMDDK_ || _DEVIOCTL_) -/* DEVICE_OBJECT.DeviceType */ -#define DEVICE_TYPE ULONG +$endif (_WDMDDK_) -$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) typedef struct DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) _DEVICE_OBJECT { CSHORT Type;

1 0

[reactos] 02/09: [USETUP] Free allocated memory after loading the new text-mode font from the .CAB file.
by Hermès Bélusca-Maïto 26 Dec '20

26 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8c9a73bb8ec6f3a2102a… commit e8c9a73bb8ec6f3a2102a171926fd503cd83a963 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 12 01:33:56 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 27 00:51:56 2020 +0100 [USETUP] Free allocated memory after loading the new text-mode font from the .CAB file. --- base/setup/usetup/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 57b396aafde..ab3587eb52e 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -733,8 +733,11 @@ SetConsoleOutputCP( if (CabStatus != CAB_STATUS_SUCCESS) { DPRINT("CabinetLoadFile('%S', '%S') returned 0x%08x\n", FontFile, FontName, CabStatus); + if (ConsoleCabinetContext.Data) + RtlFreeHeap(ProcessHeap, 0, ConsoleCabinetContext.Data); return FALSE; } + ASSERT(ConsoleCabinetContext.Data); Status = NtDeviceIoControlFile(hConsoleOutput, NULL, @@ -746,6 +749,9 @@ SetConsoleOutputCP( ConsoleCabinetContext.Size, NULL, 0); + + RtlFreeHeap(ProcessHeap, 0, ConsoleCabinetContext.Data); + if (!NT_SUCCESS(Status)) return FALSE;

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