Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DISK_NEW] Various small fixes

Browse source 
- Silence a (possibly wrong) assert in DiskShutdownFlush
- Fix build with GCC and MSVC amd64

CORE-17129
This commit is contained in:
Victor Perevertkin 2020-12-05 19:19:25 +03:00
parent e1523dd28e
commit eb682bbfab
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/storage/class/disk_new/disk.c
View file

@ -1258,7 +1258,11 @@ Return Value:
InsertTailList(&diskData->FlushContext.CurrList, listEntry);
}
#ifndef __REACTOS__
// ReactOS hits this assert, because CurrIrp can already be freed at this point
// and it's possible that NextIrp has the same pointer value
NT_ASSERT(diskData->FlushContext.CurrIrp != diskData->FlushContext.NextIrp);
#endif
diskData->FlushContext.CurrIrp = diskData->FlushContext.NextIrp;
diskData->FlushContext.NextIrp = NULL;
@ -1678,7 +1682,7 @@ Return Value:
irpSp->MajorFunction = IRP_MJ_SCSI;
irpSp->Parameters.Scsi.Srb = srb;
IoSetCompletionRoutine(FlushContext->CurrIrp, DiskFlushComplete, (PVOID)SyncCacheStatus, TRUE, TRUE, TRUE);
IoSetCompletionRoutine(FlushContext->CurrIrp, DiskFlushComplete, (PVOID)(ULONG_PTR)SyncCacheStatus, TRUE, TRUE, TRUE);
TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_SCSI, "DiskFlushDispatch: sending srb flush on irp %p\n", FlushContext->CurrIrp));
@ -1728,7 +1732,7 @@ Return Value:
#ifdef _MSC_VER
#pragma warning(suppress:4311) // pointer truncation from 'PVOID' to 'NTSTATUS'
#endif
NTSTATUS SyncCacheStatus = (NTSTATUS) Context;
NTSTATUS SyncCacheStatus = (NTSTATUS)(ULONG_PTR)Context;
TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_GENERAL, "DiskFlushComplete: %p %p\n", Fdo, Irp));

2
drivers/storage/class/disk_new/pnp.c
View file

@ -132,7 +132,9 @@ Return Value:
queryTable[0].EntryContext = &(rootPartitionMountable);
queryTable[0].DefaultType = (REG_DWORD << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT) | REG_NONE;
#ifdef _MSC_VER
#pragma prefast(suppress:6309, "We don't have QueryRoutine so Context doesn't make any sense")
#endif
status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE,
diskKey,
queryTable,