Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/15: [COMPBATT] Use the non-constant variant of UNICODE_STRING for the battery name
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6bdbefdc42e282b584a3… commit c6bdbefdc42e282b584a3c04a1b0e4fb88cec83d Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 22:09:10 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:20:07 2025 +0100 [COMPBATT] Use the non-constant variant of UNICODE_STRING for the battery name --- drivers/bus/acpi/compbatt/comppnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 31b05030b4f..819badf5843 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -225,7 +225,7 @@ CompBattAddNewBattery( NTSTATUS NTAPI CompBattRemoveBattery( - _In_ PCUNICODE_STRING BatteryName, + _In_ PUNICODE_STRING BatteryName, _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PCOMPBATT_BATTERY_DATA BatteryData;

1 0

[reactos] 05/15: [COMPBATT] Assign a memory allocation tag for the I/O remove lock
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28bb8c6ff7b82b8216dfa… commit 28bb8c6ff7b82b8216dfa6bfb052f1d169959062 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 21:52:24 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:20:07 2025 +0100 [COMPBATT] Assign a memory allocation tag for the I/O remove lock IoInitializeRemoveLock expects an allocation tag to be provided when it allocates debug data in the kernel. Passing 0 leads to a bunch of ASSERTs in the kernel as such data is allocated by ExAllocatePoolWithTag of which a tag has to be supplied, it's not optional. --- drivers/bus/acpi/compbatt/comppnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 7e8523537ae..31b05030b4f 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -177,7 +177,7 @@ CompBattAddNewBattery( ExReleaseFastMutex(&DeviceExtension->Lock); /* Initialize the work item and delete lock */ - IoInitializeRemoveLock(&BatteryData->RemoveLock, 0, 0, 0); + IoInitializeRemoveLock(&BatteryData->RemoveLock, COMPBATT_TAG, 0, 0); ExInitializeWorkItem(&BatteryData->WorkItem, (PVOID)CompBattMonitorIrpCompleteWorker, BatteryData);

1 0

[reactos] 04/15: [COMPBATT] Pass NULL for the work item context, not 0
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3346301777edabab3f947… commit 3346301777edabab3f947d8260e5e0ce10b03043 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 21:43:56 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:20:06 2025 +0100 [COMPBATT] Pass NULL for the work item context, not 0 It expects an arbitrary pointer, do the right thing! --- drivers/bus/acpi/compbatt/comppnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index efc40e9f62e..7e8523537ae 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -183,7 +183,7 @@ CompBattAddNewBattery( BatteryData); /* Setup the IRP work entry */ - CompBattMonitorIrpComplete(BatteryData->DeviceObject, Irp, 0); + CompBattMonitorIrpComplete(BatteryData->DeviceObject, Irp, NULL); Status = STATUS_SUCCESS; } else

1 0

[reactos] 03/15: [COMPBATT] Annotate all functions with SAL2
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b5423aa601b214532284… commit 8b5423aa601b2145322841d4923bf95e2d06d2be Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 21:36:49 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:20:06 2025 +0100 [COMPBATT] Annotate all functions with SAL2 --- drivers/bus/acpi/compbatt/compbatt.c | 87 +++++++++++++++++++++--------------- drivers/bus/acpi/compbatt/compmisc.c | 24 +++++----- drivers/bus/acpi/compbatt/comppnp.c | 43 +++++++++++------- 3 files changed, 90 insertions(+), 64 deletions(-) diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/bus/acpi/compbatt/compbatt.c index 2c947910c29..313780d2d34 100644 --- a/drivers/bus/acpi/compbatt/compbatt.c +++ b/drivers/bus/acpi/compbatt/compbatt.c @@ -20,8 +20,9 @@ ULONG CompBattDebug; NTSTATUS NTAPI -CompBattOpenClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +CompBattOpenClose( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { PAGED_CODE(); if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING OpenClose\n"); @@ -38,8 +39,9 @@ CompBattOpenClose(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI -CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +CompBattSystemControl( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; @@ -67,17 +69,19 @@ CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI -CompBattMonitorIrpComplete(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PKEVENT Event) +CompBattMonitorIrpComplete( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -NTSTATUS +VOID NTAPI -CompBattMonitorIrpCompleteWorker(IN PCOMPBATT_BATTERY_DATA BatteryData) +CompBattMonitorIrpCompleteWorker( + _In_ PCOMPBATT_BATTERY_DATA BatteryData) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -85,7 +89,8 @@ CompBattMonitorIrpCompleteWorker(IN PCOMPBATT_BATTERY_DATA BatteryData) VOID NTAPI -CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattRecalculateTag( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PCOMPBATT_BATTERY_DATA BatteryData; ULONG Tag; @@ -122,8 +127,9 @@ CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) NTSTATUS NTAPI -CompBattIoctl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +CompBattIoctl( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; @@ -146,8 +152,9 @@ CompBattIoctl(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI -CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - OUT PULONG Tag) +CompBattQueryTag( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _Out_ PULONG Tag) { NTSTATUS Status; PAGED_CODE(); @@ -181,7 +188,8 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, NTSTATUS NTAPI -CompBattDisableStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattDisableStatusNotify( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PCOMPBATT_BATTERY_DATA BatteryData; PLIST_ENTRY ListHead, NextEntry; @@ -208,9 +216,10 @@ CompBattDisableStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) NTSTATUS NTAPI -CompBattSetStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG BatteryTag, - IN PBATTERY_NOTIFY BatteryNotify) +CompBattSetStatusNotify( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG BatteryTag, + _In_ PBATTERY_NOTIFY BatteryNotify) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -218,9 +227,10 @@ CompBattSetStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, NTSTATUS NTAPI -CompBattQueryStatus(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG Tag, - IN PBATTERY_STATUS BatteryStatus) +CompBattQueryStatus( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG Tag, + _Out_ PBATTERY_STATUS BatteryStatus) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -228,8 +238,9 @@ CompBattQueryStatus(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, NTSTATUS NTAPI -CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattGetBatteryInformation( + _Out_ PBATTERY_INFORMATION BatteryInfo, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status = STATUS_SUCCESS; BATTERY_QUERY_INFORMATION InputBuffer; @@ -384,8 +395,9 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, NTSTATUS NTAPI -CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattGetBatteryGranularity( + _Out_ PBATTERY_REPORTING_SCALE ReportingScale, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status = STATUS_SUCCESS; BATTERY_QUERY_INFORMATION InputBuffer; @@ -470,8 +482,9 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, NTSTATUS NTAPI -CompBattGetEstimatedTime(OUT PULONG Time, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattGetEstimatedTime( + _Out_ PULONG Time, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -479,13 +492,14 @@ CompBattGetEstimatedTime(OUT PULONG Time, NTSTATUS NTAPI -CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG Tag, - IN BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, - IN OPTIONAL LONG AtRate, - IN PVOID Buffer, - IN ULONG BufferLength, - OUT PULONG ReturnedLength) +CompBattQueryInformation( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG Tag, + _In_ BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, + _In_opt_ LONG AtRate, + _In_ PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnedLength) { BATTERY_INFORMATION BatteryInfo; BATTERY_REPORTING_SCALE BatteryGranularity[4]; @@ -593,8 +607,9 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, NTSTATUS NTAPI -DriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) { /* Register add device routine */ DriverObject->DriverExtension->AddDevice = CompBattAddDevice; diff --git a/drivers/bus/acpi/compbatt/compmisc.c b/drivers/bus/acpi/compbatt/compmisc.c index e84a2512706..5992273863a 100644 --- a/drivers/bus/acpi/compbatt/compmisc.c +++ b/drivers/bus/acpi/compbatt/compmisc.c @@ -14,13 +14,14 @@ NTSTATUS NTAPI -BatteryIoctl(IN ULONG IoControlCode, - IN PDEVICE_OBJECT DeviceObject, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - IN PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN BOOLEAN InternalDeviceIoControl) +BatteryIoctl( + _In_ ULONG IoControlCode, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_ PVOID OutputBuffer, + _Inout_ ULONG OutputBufferLength, + _In_ BOOLEAN InternalDeviceIoControl) { IO_STATUS_BLOCK IoStatusBlock; KEVENT Event; @@ -71,10 +72,11 @@ BatteryIoctl(IN ULONG IoControlCode, NTSTATUS NTAPI -CompBattGetDeviceObjectPointer(IN PUNICODE_STRING DeviceName, - IN ACCESS_MASK DesiredAccess, - OUT PFILE_OBJECT *FileObject, - OUT PDEVICE_OBJECT *DeviceObject) +CompBattGetDeviceObjectPointer( + _In_ PUNICODE_STRING DeviceName, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PFILE_OBJECT *FileObject, + _Out_ PDEVICE_OBJECT *DeviceObject) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index f16bfd2ed3d..efc40e9f62e 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -16,8 +16,9 @@ NTSTATUS NTAPI -CompBattPowerDispatch(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +CompBattPowerDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; if (CompBattDebug & 1) DbgPrint("CompBatt: PowerDispatch received power IRP.\n"); @@ -32,8 +33,9 @@ CompBattPowerDispatch(IN PDEVICE_OBJECT DeviceObject, PCOMPBATT_BATTERY_DATA NTAPI -RemoveBatteryFromList(IN PCUNICODE_STRING BatteryName, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +RemoveBatteryFromList( + _In_ PCUNICODE_STRING BatteryName, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PLIST_ENTRY ListHead, NextEntry; PCOMPBATT_BATTERY_DATA BatteryData; @@ -74,8 +76,9 @@ RemoveBatteryFromList(IN PCUNICODE_STRING BatteryName, BOOLEAN NTAPI -IsBatteryAlreadyOnList(IN PCUNICODE_STRING BatteryName, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +IsBatteryAlreadyOnList( + _In_ PCUNICODE_STRING BatteryName, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PLIST_ENTRY ListHead, NextEntry; PCOMPBATT_BATTERY_DATA BatteryData; @@ -110,8 +113,9 @@ IsBatteryAlreadyOnList(IN PCUNICODE_STRING BatteryName, NTSTATUS NTAPI -CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattAddNewBattery( + _In_ PUNICODE_STRING BatteryName, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status = STATUS_SUCCESS; PCOMPBATT_BATTERY_DATA BatteryData; @@ -220,8 +224,9 @@ CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, NTSTATUS NTAPI -CompBattRemoveBattery(IN PCUNICODE_STRING BatteryName, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattRemoveBattery( + _In_ PCUNICODE_STRING BatteryName, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PCOMPBATT_BATTERY_DATA BatteryData; if (CompBattDebug & 1) DbgPrint("CompBatt: RemoveBattery\n"); @@ -245,7 +250,8 @@ CompBattRemoveBattery(IN PCUNICODE_STRING BatteryName, NTSTATUS NTAPI -CompBattGetBatteries(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattGetBatteries( + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { PWCHAR p; NTSTATUS Status; @@ -286,8 +292,9 @@ CompBattGetBatteries(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) NTSTATUS NTAPI -CompBattPnpEventHandler(IN PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +CompBattPnpEventHandler( + _In_ PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING PnpEventHandler\n"); if (CompBattDebug & 2) DbgPrint("CompBatt: Received device interface change notification\n"); @@ -319,8 +326,9 @@ CompBattPnpEventHandler(IN PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification, NTSTATUS NTAPI -CompBattAddDevice(IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PdoDeviceObject) +CompBattAddDevice( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT PdoDeviceObject) { NTSTATUS Status; UNICODE_STRING DeviceName; @@ -402,8 +410,9 @@ CompBattAddDevice(IN PDRIVER_OBJECT DriverObject, NTSTATUS NTAPI -CompBattPnpDispatch(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +CompBattPnpDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status;

1 0

[reactos] 02/15: [COMPBATT] Remove the useless WaitFlag field in the code which is never used
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9ea9220d8612368be66d… commit f9ea9220d8612368be66db2182ebb6837ac68306 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 23:07:18 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:20:06 2025 +0100 [COMPBATT] Remove the useless WaitFlag field in the code which is never used --- drivers/bus/acpi/compbatt/comppnp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 141ec2ebbe4..f16bfd2ed3d 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -165,7 +165,6 @@ CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, /* Set IRP data */ IoSetNextIrpStackLocation(Irp); Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; - BatteryData->WaitFlag = 0; /* Insert this battery in the list */ ExAcquireFastMutex(&DeviceExtension->Lock);

1 0

[reactos] 01/15: [COMPBATT] Prepare the base foundation for the header file
by George Bișoc 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04cd478035a1d1cab2d1d… commit 04cd478035a1d1cab2d1dde391f8ffc633bde6ec Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 14 20:36:09 2024 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jan 8 23:19:56 2025 +0100 [COMPBATT] Prepare the base foundation for the header file - Introduce some new constructs - Annotate the function prototypes with SAL2 - Re-structure & remove some useless fields in COMPBATT_DEVICE_EXTENSION and COMPBATT_BATTERY_DATA --- drivers/bus/acpi/compbatt/compbatt.h | 175 +++++++++++++++++++++++++---------- 1 file changed, 127 insertions(+), 48 deletions(-) diff --git a/drivers/bus/acpi/compbatt/compbatt.h b/drivers/bus/acpi/compbatt/compbatt.h index 950e5a5f7dd..1b8c1fb49d1 100644 --- a/drivers/bus/acpi/compbatt/compbatt.h +++ b/drivers/bus/acpi/compbatt/compbatt.h @@ -1,20 +1,81 @@ /* - * PROJECT: ReactOS Composite Battery Driver - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/drivers/bus/acpi/compbatt/compbatt.h - * PURPOSE: Main Header File - * PROGRAMMERS: ReactOS Portable Systems Group + * PROJECT: ReactOS Composite Battery Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Composite battery main header file + * COPYRIGHT: Copyright 2010 ReactOS Portable Systems Group + * Copyright 2024 George Bișoc <george.bisoc(a)reactos.org> */ +/* INCLUDES *******************************************************************/ + #ifndef _COMPBATT_PCH_ #define _COMPBATT_PCH_ #include <wdm.h> #include <batclass.h> +/* DEFINES ********************************************************************/ + +// +// I/O remove lock allocate tag +// +#define COMPBATT_TAG 'aBoC' + +// +// Composite battery flags +// #define COMPBATT_BATTERY_INFORMATION_PRESENT 0x04 +#define COMPBATT_STATUS_NOTIFY_SET 0x10 #define COMPBATT_TAG_ASSIGNED 0x80 +// +// IRP complete worker mode states +// +#define COMPBATT_QUERY_TAG 1 +#define COMPBATT_READ_STATUS 2 + +// +// Low/High capacity wait constants +// +#define COMPBATT_WAIT_MIN_LOW_CAPACITY 0 +#define COMPBATT_WAIT_MAX_HIGH_CAPACITY 0x7FFFFFFF + +// +// One hour in seconds, used to calculate the total rate of each battery for time estimation +// +#define COMPBATT_ATRATE_HOUR_IN_SECS 3600 + +// +// Time constant of which the battery status data is considered fresh (50000000 * 100ns == 5s) +// +#define COMPBATT_FRESH_STATUS_TIME 50000000 + +// +// Macro that calculates the delta of a battery's capacity +// +#define COMPUTE_BATT_CAP_DELTA(LowDiff, Batt, TotalRate) \ + ((ULONG)(((LONGLONG)LowDiff * (Batt)->BatteryStatus.Rate) / TotalRate)) + +// +// Macro that calculates the "At Rate" time drain of the battery +// +#define COMPUTE_ATRATE_DRAIN(Batt, Time) \ + ((LONG)((Batt)->BatteryStatus.Capacity) * COMPBATT_ATRATE_HOUR_IN_SECS / Time) + +// +// Composite battery debug levels +// +#define COMPBATT_DEBUG_INFO 0x1 +#define COMPBATT_DEBUG_TRACE 0x2 +#define COMPBATT_DEBUG_WARN 0x4 +#define COMPBATT_DEBUG_ERR 0x10 +#define COMPBATT_DEBUG_ALL_LEVELS (COMPBATT_DEBUG_INFO | COMPBATT_DEBUG_TRACE | COMPBATT_DEBUG_WARN | COMPBATT_DEBUG_ERR) + +/* STRUCTURES *****************************************************************/ + +// +// Individual ACPI battery data +// typedef struct _COMPBATT_BATTERY_DATA { LIST_ENTRY BatteryLink; @@ -22,13 +83,14 @@ typedef struct _COMPBATT_BATTERY_DATA PDEVICE_OBJECT DeviceObject; PIRP Irp; WORK_QUEUE_ITEM WorkItem; - BOOLEAN WaitFlag; + UCHAR Mode; BATTERY_WAIT_STATUS WaitStatus; union { BATTERY_WAIT_STATUS WorkerWaitStatus; BATTERY_STATUS WorkerStatus; - }; + ULONG WorkerTag; + } WorkerBuffer; ULONG Tag; ULONG Flags; BATTERY_INFORMATION BatteryInformation; @@ -37,6 +99,9 @@ typedef struct _COMPBATT_BATTERY_DATA UNICODE_STRING BatteryName; } COMPBATT_BATTERY_DATA, *PCOMPBATT_BATTERY_DATA; +// +// Composite battery device extension data +// typedef struct _COMPBATT_DEVICE_EXTENSION { PVOID ClassData; @@ -47,110 +112,124 @@ typedef struct _COMPBATT_DEVICE_EXTENSION ULONG Flags; BATTERY_INFORMATION BatteryInformation; BATTERY_STATUS BatteryStatus; + BATTERY_WAIT_STATUS WaitNotifyStatus; ULONGLONG InterruptTime; - POWER_STATE PowerState; - ULONG LowCapacity; - ULONG HighCapacity; PDEVICE_OBJECT AttachedDevice; PDEVICE_OBJECT DeviceObject; PVOID NotificationEntry; } COMPBATT_DEVICE_EXTENSION, *PCOMPBATT_DEVICE_EXTENSION; +/* PROTOTYPES *****************************************************************/ + NTSTATUS NTAPI CompBattAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PdoDeviceObject + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT PdoDeviceObject ); NTSTATUS NTAPI CompBattPowerDispatch( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp ); NTSTATUS NTAPI CompBattPnpDispatch( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp ); NTSTATUS NTAPI CompBattQueryInformation( - IN PCOMPBATT_DEVICE_EXTENSION FdoExtension, - IN ULONG Tag, - IN BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, - IN OPTIONAL LONG AtRate, - IN PVOID Buffer, - IN ULONG BufferLength, - OUT PULONG ReturnedLength + _In_ PCOMPBATT_DEVICE_EXTENSION FdoExtension, + _In_ ULONG Tag, + _In_ BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, + _In_opt_ LONG AtRate, + _In_ PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnedLength ); NTSTATUS NTAPI CompBattQueryStatus( - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG Tag, - IN PBATTERY_STATUS BatteryStatus + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG Tag, + _Out_ PBATTERY_STATUS BatteryStatus +); + +NTSTATUS +NTAPI +CompBattGetEstimatedTime( + _Out_ PULONG Time, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension ); NTSTATUS NTAPI CompBattSetStatusNotify( - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG BatteryTag, - IN PBATTERY_NOTIFY BatteryNotify + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG BatteryTag, + _In_ PBATTERY_NOTIFY BatteryNotify ); NTSTATUS NTAPI CompBattDisableStatusNotify( - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension ); NTSTATUS NTAPI CompBattQueryTag( - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - OUT PULONG Tag + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + _Out_ PULONG Tag ); NTSTATUS NTAPI CompBattMonitorIrpComplete( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PKEVENT Event + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context ); -NTSTATUS +VOID NTAPI CompBattMonitorIrpCompleteWorker( - IN PCOMPBATT_BATTERY_DATA BatteryData + _In_ PCOMPBATT_BATTERY_DATA BatteryData ); NTSTATUS NTAPI CompBattGetDeviceObjectPointer( - IN PUNICODE_STRING DeviceName, - IN ACCESS_MASK DesiredAccess, - OUT PFILE_OBJECT *FileObject, - OUT PDEVICE_OBJECT *DeviceObject + _In_ PUNICODE_STRING DeviceName, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PFILE_OBJECT *FileObject, + _Out_ PDEVICE_OBJECT *DeviceObject ); NTSTATUS NTAPI BatteryIoctl( - IN ULONG IoControlCode, - IN PDEVICE_OBJECT DeviceObject, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - IN PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN BOOLEAN InternalDeviceIoControl + _In_ ULONG IoControlCode, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_ PVOID OutputBuffer, + _Inout_ ULONG OutputBufferLength, + _In_ BOOLEAN InternalDeviceIoControl +); + +NTSTATUS +NTAPI +CompBattRemoveBattery( + _In_ PUNICODE_STRING BatteryName, + _In_ PCOMPBATT_DEVICE_EXTENSION DeviceExtension ); extern ULONG CompBattDebug;

1 0

[reactos] 01/01: [PSDK] Add structures and enumeration describing radio power state (#7596)
by Vitaly Orekhov 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ff9c476a067367fad166… commit 3ff9c476a067367fad1662a1990153cd9910ffce Author: Vitaly Orekhov <vkvo2000(a)vivaldi.net> AuthorDate: Wed Jan 8 14:28:46 2025 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 8 12:28:46 2025 +0100 [PSDK] Add structures and enumeration describing radio power state (#7596) This piece of data is returned by WlanQueryInterface(). Used by `WlanQueryInterface` with the `wlan_intf_opcode_radio_state` opcode. CORE-6905 --- sdk/include/psdk/wlanapi.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sdk/include/psdk/wlanapi.h b/sdk/include/psdk/wlanapi.h index e16089372a8..a0675f49e6c 100644 --- a/sdk/include/psdk/wlanapi.h +++ b/sdk/include/psdk/wlanapi.h @@ -31,6 +31,16 @@ extern "C" { /* Enumerations */ +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _DOT11_RADIO_STATE { +#else +typedef enum _DOT11_RADIO_STATE { +#endif + dot11_radio_state_unknown = 0, + dot11_radio_state_on, + dot11_radio_state_off +} DOT11_RADIO_STATE; /* HACK: WIDL is broken, *PDOT11_RADIO_STATE; */ + #if defined(__midl) || defined(__WIDL__) typedef [v1_enum] enum _WLAN_OPCODE_VALUE_TYPE { #else @@ -175,6 +185,17 @@ typedef struct _WLAN_INTERFACE_CAPABILITY { /* enum32 */ long dot11PhyTypes[WLAN_MAX_PHY_INDEX]; } WLAN_INTERFACE_CAPABILITY, *PWLAN_INTERFACE_CAPABILITY; +typedef struct _WLAN_PHY_RADIO_STATE { + DWORD dwPhyIndex; + DOT11_RADIO_STATE dot11SoftwareRadioState; + DOT11_RADIO_STATE dot11HardwareRadioState; +} WLAN_PHY_RADIO_STATE, *PWLAN_PHY_RADIO_STATE; + +typedef struct _WLAN_RADIO_STATE { + DWORD dwNumberOfPhys; + WLAN_PHY_RADIO_STATE PhyRadioState[WLAN_MAX_PHY_INDEX]; +} WLAN_RADIO_STATE, *PWLAN_RADIO_STATE; + typedef struct _WLAN_RAW_DATA { DWORD dwDataSize; #if defined(__midl) || defined(__WIDL__)

1 0

[reactos] 01/01: [SHELL32] Clone properties IDataObject for unlimited lifetime (#7601)
by Whindmar Saksit 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03ee0756b872a8a487876… commit 03ee0756b872a8a487876a97e5152fffbd524c73 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Jan 8 12:22:34 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 8 14:22:34 2025 +0300 [SHELL32] Clone properties IDataObject for unlimited lifetime (#7601) Because SHOpenPropSheetW() is modal, there is no way for us to keep COM alive on the original thread until the dialog completes, so a cloned data object is used instead so that the property sheet handlers may access the object even after ShellExecute() has returned (this is only relevant for callers like Taskmgr that does not initialize COM even though MSDN says they should). Addendum to afc130ff3f5 (PR #7571). CORE-19933 --- dll/win32/shell32/dialogs/item_prop.cpp | 15 +++++++++------ dll/win32/shell32/precomp.h | 1 + dll/win32/shell32/shldataobject.cpp | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/dialogs/item_prop.cpp b/dll/win32/shell32/dialogs/item_prop.cpp index bcc6473144d..75039293c3c 100644 --- a/dll/win32/shell32/dialogs/item_prop.cpp +++ b/dll/win32/shell32/dialogs/item_prop.cpp @@ -27,7 +27,7 @@ struct ShellPropSheetDialog HKEY *hKeys, UINT *cKeys); static HRESULT Show(const CLSID *pClsidDefault, IDataObject *pDO, - PFNINITIALIZE InitFunc, LPCWSTR InitString, HANDLE hEvent = NULL) + PFNINITIALIZE InitFunc, LPCWSTR InitString) { HRESULT hr; CRegKeyHandleArray keys; @@ -36,8 +36,6 @@ struct ShellPropSheetDialog WCHAR szCaption[MAX_PATH], *pszCaption = NULL; if (SUCCEEDED(SHELL_GetCaptionFromDataObject(pDO, szCaption, _countof(szCaption)))) pszCaption = szCaption; - if (hEvent) - SetEvent(hEvent); hr = SHOpenPropSheetW(pszCaption, keys, keys, pClsidDefault, pDO, NULL, NULL) ? S_OK : E_FAIL; return hr; } @@ -96,7 +94,8 @@ struct ShellPropSheetDialog if (hEvent) { DWORD index; - // Pump COM messages until InitFunc is done (for CORE-19933) + // Pump COM messages until the thread can create its own IDataObject (for CORE-19933). + // SHOpenPropSheetW is modal and we cannot wait for it to complete. CoWaitForMultipleHandles(COWAIT_DEFAULT, INFINITE, 1, &hEvent, &index); CloseHandle(hEvent); } @@ -111,10 +110,14 @@ struct ShellPropSheetDialog static DWORD CALLBACK ShowPropertiesThread(LPVOID Param) { DATA *pData = (DATA*)Param; - CComPtr<IDataObject> pDO; + CComPtr<IDataObject> pDO, pLocalDO; if (pData->pObjStream) CoGetInterfaceAndReleaseStream(pData->pObjStream, IID_PPV_ARG(IDataObject, &pDO)); - Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString, pData->hEvent); + if (pDO && SUCCEEDED(SHELL_CloneDataObject(pDO, &pLocalDO))) + pDO = pLocalDO; + if (pData->hEvent) + SetEvent(pData->hEvent); + Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString); FreeData(pData); return 0; } diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 48c636fe9f1..6d65aeac056 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -297,6 +297,7 @@ HRESULT SHILAppend(_Inout_ LPITEMIDLIST pidl, _Inout_ LPITEMIDLIST *ppidl); PIDLIST_ABSOLUTE SHELL_CIDA_ILCloneFull(_In_ const CIDA *pCIDA, _In_ UINT Index); PIDLIST_ABSOLUTE SHELL_DataObject_ILCloneFullItem(_In_ IDataObject *pDO, _In_ UINT Index); +HRESULT SHELL_CloneDataObject(_In_ IDataObject *pDO, _Out_ IDataObject **ppDO); EXTERN_C HRESULT IUnknown_InitializeCommand( diff --git a/dll/win32/shell32/shldataobject.cpp b/dll/win32/shell32/shldataobject.cpp index 3a7d651424f..728cca0dbf3 100644 --- a/dll/win32/shell32/shldataobject.cpp +++ b/dll/win32/shell32/shldataobject.cpp @@ -111,3 +111,22 @@ PIDLIST_ABSOLUTE SHELL_DataObject_ILCloneFullItem(_In_ IDataObject *pDO, _In_ UI CDataObjectHIDA cida(pDO); return SUCCEEDED(cida.hr()) ? SHELL_CIDA_ILCloneFull(cida, Index) : NULL; } + +HRESULT SHELL_CloneDataObject(_In_ IDataObject *pDO, _Out_ IDataObject **ppDO) +{ + *ppDO = NULL; + CDataObjectHIDA cida(pDO); + HRESULT hr = cida.hr(); + if (SUCCEEDED(hr)) + { + PCUITEMID_CHILD items = HIDA_GetPIDLItem(cida, 0); + hr = SHCreateFileDataObject(HIDA_GetPIDLFolder(cida), cida->cidl, &items, NULL, ppDO); + if (SUCCEEDED(hr)) + { + POINT pt; + if (SUCCEEDED(DataObject_GetOffset(pDO, &pt))) + DataObject_SetOffset(*ppDO, &pt); + } + } + return hr; +}

1 0

[reactos] 01/01: [WINLOGON] Add WLSESSION logon timestamp (#7590)
by Thamatip Chitpong 08 Jan '25

08 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dfba2a699d76c7974d6e… commit 1dfba2a699d76c7974d6ec874c64f6c1f86914ec Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Jan 8 08:28:24 2025 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 8 08:28:24 2025 +0700 [WINLOGON] Add WLSESSION logon timestamp (#7590) Remove startup sound hack. CORE-13951 --- base/system/winlogon/sas.c | 62 ++++++++++++++++++++++++----------------- base/system/winlogon/winlogon.h | 19 +++++++++++++ 2 files changed, 55 insertions(+), 26 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 8b169f73df6..17c7778e13a 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -46,6 +46,12 @@ static BOOL ExitReactOSInProgress = FALSE; LUID LuidNone = {0, 0}; +typedef struct tagLOGON_SOUND_DATA +{ + HANDLE UserToken; + BOOL IsStartup; +} LOGON_SOUND_DATA, *PLOGON_SOUND_DATA; + /* FUNCTIONS ****************************************************************/ static BOOL @@ -286,26 +292,12 @@ PlaySoundRoutine( } static -BOOL -IsFirstLogon(VOID) -{ - /* FIXME: All of this is a HACK, designed specifically for PlayLogonSoundThread. - * Don't call IsFirstLogon multiple times inside the same function. And please - * note that this function is not thread-safe. */ - static BOOL bFirstLogon = TRUE; - if (bFirstLogon) - { - bFirstLogon = FALSE; - return TRUE; - } - return FALSE; -} - DWORD WINAPI PlayLogonSoundThread( - IN LPVOID lpParameter) + _In_ LPVOID lpParameter) { + PLOGON_SOUND_DATA SoundData = (PLOGON_SOUND_DATA)lpParameter; SERVICE_STATUS_PROCESS Info; DWORD dwSize; ULONG Index = 0; @@ -316,7 +308,7 @@ PlayLogonSoundThread( if (!hSCManager) { ERR("OpenSCManager failed (%x)\n", GetLastError()); - return 0; + goto Cleanup; } /* Open the wdmaud service */ @@ -326,7 +318,7 @@ PlayLogonSoundThread( /* The service is not installed */ TRACE("Failed to open wdmaud service (%x)\n", GetLastError()); CloseServiceHandle(hSCManager); - return 0; + goto Cleanup; } /* Wait for wdmaud to start */ @@ -352,35 +344,50 @@ PlayLogonSoundThread( if (Info.dwCurrentState != SERVICE_RUNNING) { WARN("wdmaud has not started!\n"); - return 0; + goto Cleanup; } /* Sound subsystem is running. Play logon sound. */ - TRACE("Playing logon sound\n"); - if (!ImpersonateLoggedOnUser((HANDLE)lpParameter)) + TRACE("Playing %s sound\n", SoundData->IsStartup ? "startup" : "logon"); + if (!ImpersonateLoggedOnUser(SoundData->UserToken)) { ERR("ImpersonateLoggedOnUser failed (%x)\n", GetLastError()); } else { - PlaySoundRoutine(IsFirstLogon() ? L"SystemStart" : L"WindowsLogon", + PlaySoundRoutine(SoundData->IsStartup ? L"SystemStart" : L"WindowsLogon", TRUE, SND_ALIAS | SND_NODEFAULT); RevertToSelf(); } + +Cleanup: + HeapFree(GetProcessHeap(), 0, SoundData); return 0; } static VOID PlayLogonSound( - IN OUT PWLSESSION Session) + _In_ PWLSESSION Session) { + PLOGON_SOUND_DATA SoundData; HANDLE hThread; - hThread = CreateThread(NULL, 0, PlayLogonSoundThread, (PVOID)Session->UserToken, 0, NULL); - if (hThread) - CloseHandle(hThread); + SoundData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGON_SOUND_DATA)); + if (!SoundData) + return; + + SoundData->UserToken = Session->UserToken; + SoundData->IsStartup = IsFirstLogon(Session); + + hThread = CreateThread(NULL, 0, PlayLogonSoundThread, SoundData, 0, NULL); + if (!hThread) + { + HeapFree(GetProcessHeap(), 0, SoundData); + return; + } + CloseHandle(hThread); } static @@ -571,6 +578,9 @@ HandleLogon( /* Logon has succeeded. Play sound. */ PlayLogonSound(Session); + /* NOTE: The logon timestamp has to be set after calling PlayLogonSound + * to correctly detect the startup event (first logon) */ + SetLogonTimestamp(Session); ret = TRUE; cleanup: diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 3dcf6fda0c3..4df8e00e632 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -41,6 +41,7 @@ #include <winwlx.h> #include <ndk/rtlfuncs.h> #include <ndk/exfuncs.h> +#include <ndk/kefuncs.h> #include <strsafe.h> /* PSEH for SEH Support */ @@ -233,6 +234,7 @@ typedef struct _WLSESSION HANDLE hProfileInfo; LOGON_STATE LogonState; DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ + LARGE_INTEGER LastLogon; /* Screen-saver informations */ #ifndef USE_GETLASTINPUTINFO @@ -285,6 +287,23 @@ extern PWLSESSION WLSession; ((Status) == WLX_SAS_ACTION_SHUTDOWN_HIBERNATE) \ ) +FORCEINLINE +VOID +SetLogonTimestamp( + _Inout_ PWLSESSION Session) +{ + NtQuerySystemTime(&Session->LastLogon); +} + +FORCEINLINE +BOOL +IsFirstLogon( + _In_ PWLSESSION Session) +{ + /* The WLSESSION::LastLogon is initialized to 0 so this is OK */ + return (Session->LastLogon.QuadPart == 0); +} + /* environment.c */ BOOL CreateUserEnvironment(IN PWLSESSION Session);

1 0

[reactos] 02/02: [NTOS:IO] Fix special case in IopQueryNameInternal() (#7592)
by Hermès Bélusca-Maïto 06 Jan '25

06 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6363f7820dbe6a7a3b3f4… commit 6363f7820dbe6a7a3b3f4e73d5e0bbc30d787a4b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 29 22:16:34 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 6 21:30:18 2025 +0100 [NTOS:IO] Fix special case in IopQueryNameInternal() (#7592) CORE-13525 This case is invoked from NtQueryObject(ObjectNameInformation). --- ntoskrnl/io/iomgr/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index bfe11ab295b..865cd52fc78 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2108,10 +2108,11 @@ IopQueryNameInternal(IN PVOID ObjectBody, _SEH2_LEAVE; } - /* In such case, zero output */ + /* In such case, zero the output and reset the status */ LocalReturnLength = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); LocalFileInfo->FileNameLength = 0; LocalFileInfo->FileName[0] = OBJ_NAME_PATH_SEPARATOR; + Status = STATUS_SUCCESS; } else {

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