mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-23 11:33:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BATTC] Fix comparisons when choosing to complete the status IRP

Browse Source 
They were reversed, which meant to immediately complete the IRP
if conditions were NOT satisfied.

Remove a now useless/invalid call to QueryStatus, to return the
status which lead to IRP completion.
This commit is contained in:
Hervé Poussineau 2024-11-16 23:26:51 +01:00
parent 9dedcb67e9
commit 997b1797f4
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/battery/battc/battc.c
View File

@ -112,9 +112,9 @@ BatteryClassStatusNotify(PVOID ClassData)
ExAcquireFastMutex(&BattClass->Mutex);
if (!(BattWait->PowerState & BattStatus.PowerState) ||
(BattWait->HighCapacity > BattStatus.Capacity) ||
(BattWait->LowCapacity < BattStatus.Capacity))
if (BattWait->PowerState != BattStatus.PowerState ||
BattWait->HighCapacity < BattStatus.Capacity ||
BattWait->LowCapacity > BattStatus.Capacity)
{
KeSetEvent(&BattClass->WaitEvent, IO_NO_INCREMENT, FALSE);
}
@ -274,16 +274,15 @@ BatteryClassIoctl(PVOID ClassData,
Timeout.QuadPart = Int32x32To64(BattWait.Timeout, -1000);
BattStatus = Irp->AssociatedIrp.SystemBuffer;
Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context,
BattWait.BatteryTag,
(PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer);
BattStatus = Irp->AssociatedIrp.SystemBuffer;
BattStatus);
if (!NT_SUCCESS(Status) ||
((BattWait.PowerState & BattStatus->PowerState) &&
(BattWait.HighCapacity <= BattStatus->Capacity) &&
(BattWait.LowCapacity >= BattStatus->Capacity)))
(BattWait.PowerState == BattStatus->PowerState &&
BattWait.HighCapacity >= BattStatus->Capacity &&
BattWait.LowCapacity <= BattStatus->Capacity))
{
BattNotify.PowerState = BattWait.PowerState;
BattNotify.HighCapacity = BattWait.HighCapacity;
@ -304,25 +303,14 @@ BatteryClassIoctl(PVOID ClassData,
KernelMode,
FALSE,
BattWait.Timeout != -1 ? &Timeout : NULL);
if (Status == STATUS_TIMEOUT)
Status = STATUS_SUCCESS;
ExAcquireFastMutex(&BattClass->Mutex);
BattClass->Waiting = FALSE;
ExReleaseFastMutex(&BattClass->Mutex);
BattClass->MiniportInfo.DisableStatusNotify(BattClass->MiniportInfo.Context);
if (Status == STATUS_SUCCESS)
{
Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context,
BattWait.BatteryTag,
(PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer);
if (NT_SUCCESS(Status))
Irp->IoStatus.Information = sizeof(ULONG);
}
else
{
Status = STATUS_NO_SUCH_DEVICE;
}
}
else
{