Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 03/06: [SPEC2DEF] Work-around a bug in MS linker handling of extern forwarders

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5387a7ccb2ed0dc5bc39e… commit 5387a7ccb2ed0dc5bc39ed3d946c0f761bcce37b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Nov 25 14:26:53 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [SPEC2DEF] Work-around a bug in MS linker handling of extern forwarders --- sdk/tools/spec2def/spec2def.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 9fc4d8cda45..8eb12c1d84d 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -244,6 +244,18 @@ OutputLine_stub(FILE *file, EXPORT *pexp) int bRelay = 0; int bInPrototype = 0; + /* Workaround for forwarded externs. See here for an explanation: + * https://stackoverflow.com/questions/4060143/forwarding-data-in-a-dll */ + if (gbMSComp && + (pexp->nCallingConvention == CC_EXTERN) && + (pexp->strTarget.buf != NULL) && + (!!ScanToken(pexp->strTarget.buf, '.'))) + { + fprintf(file, "#pragma comment(linker,\"/export:%s%.*s=%.*s,DATA\")\n\n", + gpszUnderscore, pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); + return 0; + } + if (pexp->nCallingConvention != CC_STUB && (pexp->uFlags & FL_STUB) == 0) { @@ -736,6 +748,15 @@ OutputLine_def(FILE *fileDest, EXPORT *pexp) DbgPrint("OutputLine_def: skipping private export '%.*s'...\n", pexp->strName.len, pexp->strName.buf); return 1; } + + /* For MS linker, forwarded externs are managed via #pragma comment(linker,"/export:_data=org.data,DATA") */ + if (gbMSComp && !gbImportLib && (pexp->nCallingConvention == CC_EXTERN) && + (pexp->strTarget.buf != NULL) && !!ScanToken(pexp->strTarget.buf, '.')) + { + DbgPrint("OutputLine_def: skipping forwarded extern export '%.*s' ->'%.*s'...\n", + pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); + return 1; + } DbgPrint("OutputLine_def: '%.*s'...\n", pexp->strName.len, pexp->strName.buf); fprintf(fileDest, " ");

3 years, 8 months

[reactos] 02/06: [MSVCRT_WINETEST] Unconditionally link against oldnames

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d53b03e676e5c9f846182… commit d53b03e676e5c9f846182c7e77ec7fb71c09e678 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 2 10:49:24 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [MSVCRT_WINETEST] Unconditionally link against oldnames --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 0574e646adf..2c4e7d581b0 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -36,9 +36,9 @@ endif() set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32) +target_link_libraries(msvcrt_winetest oldnames) if(MSVC) - target_link_libraries(msvcrt_winetest oldnames) add_importlibs(msvcrt_winetest ntdll) endif()

3 years, 8 months

[reactos] 01/06: [FTP] Always link agains oldnames

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fcd9f318413550eaff4c… commit 6fcd9f318413550eaff4ce4f5c81de6ce959e11b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 2 10:47:44 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [FTP] Always link agains oldnames --- base/applications/network/ftp/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/network/ftp/CMakeLists.txt b/base/applications/network/ftp/CMakeLists.txt index 2c52f4d4974..7609b313c35 100644 --- a/base/applications/network/ftp/CMakeLists.txt +++ b/base/applications/network/ftp/CMakeLists.txt @@ -1,6 +1,4 @@ -add_definitions(-Dlint) - list(APPEND SOURCE cmds.c cmdtab.c @@ -12,12 +10,14 @@ list(APPEND SOURCE precomp.h) add_executable(ftp ${SOURCE} ftp.rc) +target_compile_definitions(ftp PRIVATE lint) + set_module_type(ftp win32cui) add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) +target_link_libraries(ftp oldnames) add_pch(ftp precomp.h SOURCE) if(MSVC) - target_link_libraries(ftp oldnames) add_importlibs(ftp ntdll) endif()

3 years, 8 months

[reactos] 02/02: [NTOS:PNP] Send removal IRPs to a file system device object for mounted devices

by Victor Perevertkin

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);

3 years, 8 months

[reactos] 01/02: [MOUNTMGR] Do not handle device removal notification

by Victor Perevertkin

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),

3 years, 8 months

[reactos] 09/09: [CONSRV] Less hardcoded magic values.

by Hermès Bélusca-Maïto

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

3 years, 8 months

[reactos] 08/09: [NTOS:IO] Fail if the driver name passed to NtLoadDriver() is an empty string.

by Hermès Bélusca-Maïto

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);

3 years, 8 months

[reactos] 07/09: [NTOS:IO] Minor formatting only.

by Hermès Bélusca-Maïto

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; }

3 years, 8 months

[reactos] 06/09: [SAC] Fix the HeadlessInformation.PortType checks in DriverEntry().

by Hermès Bélusca-Maïto

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 */

3 years, 8 months

[reactos] 05/09: [SAC] Use NULL for null pointer in last argument in HeadlessDispatch() calls.

by Hermès Bélusca-Maïto

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 */

3 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2020