From 2668e057484e8e06cbaa4bb4843dc02dec283006 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Sat, 28 Nov 2015 13:17:46 -0800 Subject: [PATCH] sys: WIP --- src/sys/cleanup.c | 2 +- src/sys/close.c | 2 +- src/sys/create.c | 2 +- src/sys/devctl.c | 2 +- src/sys/dirctl.c | 2 +- src/sys/driver.c | 38 ++++++++++++++++---------------- src/sys/driver.h | 55 +++++++++++++++++++++++----------------------- src/sys/ea.c | 4 ++-- src/sys/fileinfo.c | 4 ++-- src/sys/flush.c | 2 +- src/sys/fsctl.c | 6 ++--- src/sys/iop.c | 14 ++++++------ src/sys/ioq.c | 14 ++++++------ src/sys/lockctl.c | 2 +- src/sys/read.c | 2 +- src/sys/security.c | 4 ++-- src/sys/shutdown.c | 2 +- src/sys/volinfo.c | 4 ++-- src/sys/write.c | 2 +- 19 files changed, 81 insertions(+), 82 deletions(-) diff --git a/src/sys/cleanup.c b/src/sys/cleanup.c index 8148254b..702b29df 100644 --- a/src/sys/cleanup.c +++ b/src/sys/cleanup.c @@ -13,7 +13,7 @@ static NTSTATUS FspFsvrtCleanup( static NTSTATUS FspFsvolCleanup( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspCleanup; -FSP_IOPROC_DISPATCH FspCleanupComplete; +FSP_IOCMPL_DISPATCH FspCleanupComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsctlCleanup) diff --git a/src/sys/close.c b/src/sys/close.c index 46cdce84..86eabd18 100644 --- a/src/sys/close.c +++ b/src/sys/close.c @@ -13,7 +13,7 @@ static NTSTATUS FspFsvrtClose( static NTSTATUS FspFsvolClose( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspClose; -FSP_IOPROC_DISPATCH FspCloseComplete; +FSP_IOCMPL_DISPATCH FspCloseComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsctlClose) diff --git a/src/sys/create.c b/src/sys/create.c index 888fdd46..50f4ef96 100644 --- a/src/sys/create.c +++ b/src/sys/create.c @@ -13,7 +13,7 @@ static NTSTATUS FspFsvrtCreate( static NTSTATUS FspFsvolCreate( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspCreate; -FSP_IOPROC_DISPATCH FspCreateComplete; +FSP_IOCMPL_DISPATCH FspCreateComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsctlCreate) diff --git a/src/sys/devctl.c b/src/sys/devctl.c index 08d16cdd..9b892362 100644 --- a/src/sys/devctl.c +++ b/src/sys/devctl.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspDeviceControl; -FSP_IOPROC_DISPATCH FspDeviceControlComplete; +FSP_IOCMPL_DISPATCH FspDeviceControlComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolDeviceControl) diff --git a/src/sys/dirctl.c b/src/sys/dirctl.c index 5af6d116..c0e7772c 100644 --- a/src/sys/dirctl.c +++ b/src/sys/dirctl.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolDirectoryControl( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspDirectoryControl; -FSP_IOPROC_DISPATCH FspDirectoryControlComplete; +FSP_IOCMPL_DISPATCH FspDirectoryControlComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolDirectoryControl) diff --git a/src/sys/driver.c b/src/sys/driver.c index 85628e31..acdb0195 100644 --- a/src/sys/driver.c +++ b/src/sys/driver.c @@ -65,25 +65,25 @@ NTSTATUS DriverEntry( DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = FspSetSecurity; /* setup the I/O completion functions */ - FspIoProcessFunction[IRP_MJ_CREATE] = FspCreateComplete; - FspIoProcessFunction[IRP_MJ_CLOSE] = FspCloseComplete; - FspIoProcessFunction[IRP_MJ_READ] = FspReadComplete; - FspIoProcessFunction[IRP_MJ_WRITE] = FspWriteComplete; - FspIoProcessFunction[IRP_MJ_QUERY_INFORMATION] = FspQueryInformationComplete; - FspIoProcessFunction[IRP_MJ_SET_INFORMATION] = FspSetInformationComplete; - FspIoProcessFunction[IRP_MJ_QUERY_EA] = FspQueryEaComplete; - FspIoProcessFunction[IRP_MJ_SET_EA] = FspSetEaComplete; - FspIoProcessFunction[IRP_MJ_FLUSH_BUFFERS] = FspFlushBuffersComplete; - FspIoProcessFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = FspQueryVolumeInformationComplete; - FspIoProcessFunction[IRP_MJ_SET_VOLUME_INFORMATION] = FspSetVolumeInformationComplete; - FspIoProcessFunction[IRP_MJ_DIRECTORY_CONTROL] = FspDirectoryControlComplete; - FspIoProcessFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FspFileSystemControlComplete; - FspIoProcessFunction[IRP_MJ_DEVICE_CONTROL] = FspDeviceControlComplete; - FspIoProcessFunction[IRP_MJ_SHUTDOWN] = FspShutdownComplete; - FspIoProcessFunction[IRP_MJ_LOCK_CONTROL] = FspLockControlComplete; - FspIoProcessFunction[IRP_MJ_CLEANUP] = FspCleanupComplete; - FspIoProcessFunction[IRP_MJ_QUERY_SECURITY] = FspQuerySecurityComplete; - FspIoProcessFunction[IRP_MJ_SET_SECURITY] = FspSetSecurityComplete; + FspIopCompleteFunction[IRP_MJ_CREATE] = FspCreateComplete; + FspIopCompleteFunction[IRP_MJ_CLOSE] = FspCloseComplete; + FspIopCompleteFunction[IRP_MJ_READ] = FspReadComplete; + FspIopCompleteFunction[IRP_MJ_WRITE] = FspWriteComplete; + FspIopCompleteFunction[IRP_MJ_QUERY_INFORMATION] = FspQueryInformationComplete; + FspIopCompleteFunction[IRP_MJ_SET_INFORMATION] = FspSetInformationComplete; + FspIopCompleteFunction[IRP_MJ_QUERY_EA] = FspQueryEaComplete; + FspIopCompleteFunction[IRP_MJ_SET_EA] = FspSetEaComplete; + FspIopCompleteFunction[IRP_MJ_FLUSH_BUFFERS] = FspFlushBuffersComplete; + FspIopCompleteFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = FspQueryVolumeInformationComplete; + FspIopCompleteFunction[IRP_MJ_SET_VOLUME_INFORMATION] = FspSetVolumeInformationComplete; + FspIopCompleteFunction[IRP_MJ_DIRECTORY_CONTROL] = FspDirectoryControlComplete; + FspIopCompleteFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FspFileSystemControlComplete; + FspIopCompleteFunction[IRP_MJ_DEVICE_CONTROL] = FspDeviceControlComplete; + FspIopCompleteFunction[IRP_MJ_SHUTDOWN] = FspShutdownComplete; + FspIopCompleteFunction[IRP_MJ_LOCK_CONTROL] = FspLockControlComplete; + FspIopCompleteFunction[IRP_MJ_CLEANUP] = FspCleanupComplete; + FspIopCompleteFunction[IRP_MJ_QUERY_SECURITY] = FspQuerySecurityComplete; + FspIopCompleteFunction[IRP_MJ_SET_SECURITY] = FspSetSecurityComplete; /* setup fast I/O and resource acquisition */ static FAST_IO_DISPATCH FspFastIoDispatch = { 0 }; diff --git a/src/sys/driver.h b/src/sys/driver.h index bb8452d6..d168cf5d 100644 --- a/src/sys/driver.h +++ b/src/sys/driver.h @@ -107,12 +107,12 @@ { \ /* this can only happen if the Ioq was stopped */\ ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));\ - FspCompleteRequest(Irp, STATUS_ACCESS_DENIED);\ + FspIopCompleteRequest(Irp, STATUS_ACCESS_DENIED);\ } \ } \ } \ else \ - FspCompleteRequest(Irp, Result);\ + FspIopCompleteRequest(Irp, Result);\ ); \ return Result #define FSP_ENTER_IOC(...) \ @@ -130,7 +130,7 @@ __VA_ARGS__, \ NtStatusSym(Result), \ (LONGLONG)Irp->IoStatus.Information);\ - FspCompleteRequest(Irp, Result);\ + FspIopCompleteRequest(Irp, Result);\ ) #define FSP_ENTER_BOOL(...) \ BOOLEAN Result = TRUE; FSP_ENTER_(__VA_ARGS__) @@ -185,27 +185,27 @@ _Dispatch_type_(IRP_MJ_WRITE) FSP_DRIVER_DISPATCH FspWrite; /* I/O process functions */ _IRQL_requires_max_(APC_LEVEL) _IRQL_requires_same_ -typedef VOID FSP_IOPROC_DISPATCH( +typedef VOID FSP_IOCMPL_DISPATCH( _Inout_ PIRP Irp, _In_ const FSP_FSCTL_TRANSACT_RSP *Response); -FSP_IOPROC_DISPATCH FspCleanupComplete; -FSP_IOPROC_DISPATCH FspCloseComplete; -FSP_IOPROC_DISPATCH FspCreateComplete; -FSP_IOPROC_DISPATCH FspDeviceControlComplete; -FSP_IOPROC_DISPATCH FspDirectoryControlComplete; -FSP_IOPROC_DISPATCH FspFileSystemControlComplete; -FSP_IOPROC_DISPATCH FspFlushBuffersComplete; -FSP_IOPROC_DISPATCH FspLockControlComplete; -FSP_IOPROC_DISPATCH FspQueryEaComplete; -FSP_IOPROC_DISPATCH FspQueryInformationComplete; -FSP_IOPROC_DISPATCH FspQuerySecurityComplete; -FSP_IOPROC_DISPATCH FspQueryVolumeInformationComplete; -FSP_IOPROC_DISPATCH FspReadComplete; -FSP_IOPROC_DISPATCH FspSetEaComplete; -FSP_IOPROC_DISPATCH FspSetInformationComplete; -FSP_IOPROC_DISPATCH FspSetSecurityComplete; -FSP_IOPROC_DISPATCH FspSetVolumeInformationComplete; -FSP_IOPROC_DISPATCH FspShutdownComplete; -FSP_IOPROC_DISPATCH FspWriteComplete; +FSP_IOCMPL_DISPATCH FspCleanupComplete; +FSP_IOCMPL_DISPATCH FspCloseComplete; +FSP_IOCMPL_DISPATCH FspCreateComplete; +FSP_IOCMPL_DISPATCH FspDeviceControlComplete; +FSP_IOCMPL_DISPATCH FspDirectoryControlComplete; +FSP_IOCMPL_DISPATCH FspFileSystemControlComplete; +FSP_IOCMPL_DISPATCH FspFlushBuffersComplete; +FSP_IOCMPL_DISPATCH FspLockControlComplete; +FSP_IOCMPL_DISPATCH FspQueryEaComplete; +FSP_IOCMPL_DISPATCH FspQueryInformationComplete; +FSP_IOCMPL_DISPATCH FspQuerySecurityComplete; +FSP_IOCMPL_DISPATCH FspQueryVolumeInformationComplete; +FSP_IOCMPL_DISPATCH FspReadComplete; +FSP_IOCMPL_DISPATCH FspSetEaComplete; +FSP_IOCMPL_DISPATCH FspSetInformationComplete; +FSP_IOCMPL_DISPATCH FspSetSecurityComplete; +FSP_IOCMPL_DISPATCH FspSetVolumeInformationComplete; +FSP_IOCMPL_DISPATCH FspShutdownComplete; +FSP_IOCMPL_DISPATCH FspWriteComplete; /* fast I/O */ FAST_IO_CHECK_IF_POSSIBLE FspFastIoCheckIfPossible; @@ -282,12 +282,11 @@ FSP_FSVOL_DEVICE_EXTENSION *FspFsvolDeviceExtension(PDEVICE_OBJECT DeviceObject) return DeviceObject->DeviceExtension; } -/* I/O completion */ -VOID FspCompleteRequest(PIRP Irp, NTSTATUS Result); -VOID FspDispatchProcessedIrp(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); +/* I/O processing */ +VOID FspIopCompleteRequest(PIRP Irp, NTSTATUS Result); +VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); /* misc */ -VOID FspCompleteRequest(PIRP Irp, NTSTATUS Result); NTSTATUS FspCreateGuid(GUID *Guid); NTSTATUS FspSecuritySubjectContextAccessCheck( PSECURITY_DESCRIPTOR SecurityDescriptor, ACCESS_MASK DesiredAccess, KPROCESSOR_MODE AccessMode); @@ -304,6 +303,6 @@ const char *IoctlCodeSym(ULONG ControlCode); /* extern */ extern PDEVICE_OBJECT FspFsctlDiskDeviceObject; extern PDEVICE_OBJECT FspFsctlNetDeviceObject; -extern FSP_IOPROC_DISPATCH *FspIoProcessFunction[]; +extern FSP_IOCMPL_DISPATCH *FspIopCompleteFunction[]; #endif diff --git a/src/sys/ea.c b/src/sys/ea.c index c10ed63c..d1511cc0 100644 --- a/src/sys/ea.c +++ b/src/sys/ea.c @@ -12,8 +12,8 @@ static NTSTATUS FspFsvolSetEa( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspQueryEa; FSP_DRIVER_DISPATCH FspSetEa; -FSP_IOPROC_DISPATCH FspQueryEaComplete; -FSP_IOPROC_DISPATCH FspSetEaComplete; +FSP_IOCMPL_DISPATCH FspQueryEaComplete; +FSP_IOCMPL_DISPATCH FspSetEaComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolQueryEa) diff --git a/src/sys/fileinfo.c b/src/sys/fileinfo.c index 8503d255..72d0385d 100644 --- a/src/sys/fileinfo.c +++ b/src/sys/fileinfo.c @@ -12,8 +12,8 @@ static NTSTATUS FspFsvolSetInformation( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspQueryInformation; FSP_DRIVER_DISPATCH FspSetInformation; -FSP_IOPROC_DISPATCH FspQueryInformationComplete; -FSP_IOPROC_DISPATCH FspSetInformationComplete; +FSP_IOCMPL_DISPATCH FspQueryInformationComplete; +FSP_IOCMPL_DISPATCH FspSetInformationComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolQueryInformation) diff --git a/src/sys/flush.c b/src/sys/flush.c index 9f69d451..181b7153 100644 --- a/src/sys/flush.c +++ b/src/sys/flush.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolFlushBuffers( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspFlushBuffers; -FSP_IOPROC_DISPATCH FspFlushBuffersComplete; +FSP_IOCMPL_DISPATCH FspFlushBuffersComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolFlushBuffers) diff --git a/src/sys/fsctl.c b/src/sys/fsctl.c index 17996f7c..fb6f2b33 100644 --- a/src/sys/fsctl.c +++ b/src/sys/fsctl.c @@ -19,7 +19,7 @@ static NTSTATUS FspFsvrtFileSystemControl( static NTSTATUS FspFsvolFileSystemControl( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspFileSystemControl; -FSP_IOPROC_DISPATCH FspFileSystemControlComplete; +FSP_IOCMPL_DISPATCH FspFileSystemControlComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsctlCreateVolume) @@ -153,7 +153,7 @@ static NTSTATUS FspFsvrtTransact( /* either IRP was canceled or a bogus Hint was provided */ continue; - FspDispatchProcessedIrp(ProcessIrp, Response); + FspIopDispatchComplete(ProcessIrp, Response); Response = NextResponse; } @@ -190,7 +190,7 @@ static NTSTATUS FspFsvrtTransact( * also cancel the PendingIrp we have in our hands. */ ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq)); - FspCompleteRequest(PendingIrp, STATUS_CANCELLED); + FspIopCompleteRequest(PendingIrp, STATUS_CANCELLED); return STATUS_CANCELLED; } diff --git a/src/sys/iop.c b/src/sys/iop.c index e3eec069..85d741ba 100644 --- a/src/sys/iop.c +++ b/src/sys/iop.c @@ -6,13 +6,13 @@ #include -VOID FspDispatchProcessedIrp(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); +VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response); #ifdef ALLOC_PRAGMA -#pragma alloc_text(PAGE, FspDispatchProcessedIrp) +#pragma alloc_text(PAGE, FspIopDispatchComplete) #endif -VOID FspCompleteRequest(PIRP Irp, NTSTATUS Result) +VOID FspIopCompleteRequest(PIRP Irp, NTSTATUS Result) { // !PAGED_CODE(); @@ -30,16 +30,16 @@ VOID FspCompleteRequest(PIRP Irp, NTSTATUS Result) IoCompleteRequest(Irp, FSP_IO_INCREMENT); } -VOID FspDispatchProcessedIrp(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response) +VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response) { PAGED_CODE(); PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(IRP_MJ_MAXIMUM_FUNCTION >= IrpSp->MajorFunction); - ASSERT(0 != FspIoProcessFunction[IrpSp->MajorFunction]); + ASSERT(0 != FspIopCompleteFunction[IrpSp->MajorFunction]); - FspIoProcessFunction[IrpSp->MajorFunction](Irp, Response); + FspIopCompleteFunction[IrpSp->MajorFunction](Irp, Response); } -FSP_IOPROC_DISPATCH *FspIoProcessFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; +FSP_IOCMPL_DISPATCH *FspIopCompleteFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; diff --git a/src/sys/ioq.c b/src/sys/ioq.c index 50cae9fb..598a396b 100644 --- a/src/sys/ioq.c +++ b/src/sys/ioq.c @@ -83,15 +83,15 @@ static PIRP FspIoqPendingPeekNextIrp(PIO_CSQ IoCsq, PIRP Irp, PVOID PeekContext) PLIST_ENTRY Entry = 0 == Irp ? Head->Flink : Irp->Tail.Overlay.ListEntry.Flink; return Head != Entry ? CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry) : 0; } - -_IRQL_raises_(DISPATCH_LEVEL) + +_IRQL_raises_(DISPATCH_LEVEL) static VOID FspIoqPendingAcquireLock(PIO_CSQ IoCsq, _At_(*PIrql, _IRQL_saves_) PKIRQL PIrql) { FSP_IOQ *Ioq = CONTAINING_RECORD(IoCsq, FSP_IOQ, PendingIoCsq); KeAcquireSpinLock(&Ioq->SpinLock, PIrql); } -_IRQL_requires_(DISPATCH_LEVEL) +_IRQL_requires_(DISPATCH_LEVEL) static VOID FspIoqPendingReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql) { FSP_IOQ *Ioq = CONTAINING_RECORD(IoCsq, FSP_IOQ, PendingIoCsq); @@ -100,7 +100,7 @@ static VOID FspIoqPendingReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql) static VOID FspIoqPendingCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp) { - FspCompleteRequest(Irp, STATUS_CANCELLED); + FspIopCompleteRequest(Irp, STATUS_CANCELLED); } static NTSTATUS FspIoqProcessInsertIrpEx(PIO_CSQ IoCsq, PIRP Irp, PVOID InsertContext) @@ -135,14 +135,14 @@ static PIRP FspIoqProcessPeekNextIrp(PIO_CSQ IoCsq, PIRP Irp, PVOID PeekContext) return 0; } -_IRQL_raises_(DISPATCH_LEVEL) +_IRQL_raises_(DISPATCH_LEVEL) static VOID FspIoqProcessAcquireLock(PIO_CSQ IoCsq, _At_(*PIrql, _IRQL_saves_) PKIRQL PIrql) { FSP_IOQ *Ioq = CONTAINING_RECORD(IoCsq, FSP_IOQ, ProcessIoCsq); KeAcquireSpinLock(&Ioq->SpinLock, PIrql); } -_IRQL_requires_(DISPATCH_LEVEL) +_IRQL_requires_(DISPATCH_LEVEL) static VOID FspIoqProcessReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql) { FSP_IOQ *Ioq = CONTAINING_RECORD(IoCsq, FSP_IOQ, ProcessIoCsq); @@ -151,7 +151,7 @@ static VOID FspIoqProcessReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql) static VOID FspIoqProcessCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp) { - FspCompleteRequest(Irp, STATUS_CANCELLED); + FspIopCompleteRequest(Irp, STATUS_CANCELLED); } VOID FspIoqInitialize(FSP_IOQ *Ioq) diff --git a/src/sys/lockctl.c b/src/sys/lockctl.c index 2f51cf91..bf1f03b9 100644 --- a/src/sys/lockctl.c +++ b/src/sys/lockctl.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolLockControl( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspLockControl; -FSP_IOPROC_DISPATCH FspLockControlComplete; +FSP_IOCMPL_DISPATCH FspLockControlComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolLockControl) diff --git a/src/sys/read.c b/src/sys/read.c index fa813f8e..f6bc6976 100644 --- a/src/sys/read.c +++ b/src/sys/read.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolRead( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspRead; -FSP_IOPROC_DISPATCH FspReadComplete; +FSP_IOCMPL_DISPATCH FspReadComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolRead) diff --git a/src/sys/security.c b/src/sys/security.c index f885cd1e..117e1f7c 100644 --- a/src/sys/security.c +++ b/src/sys/security.c @@ -12,8 +12,8 @@ static NTSTATUS FspFsvolSetSecurity( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspQuerySecurity; FSP_DRIVER_DISPATCH FspSetSecurity; -FSP_IOPROC_DISPATCH FspQuerySecurityComplete; -FSP_IOPROC_DISPATCH FspSetSecurityComplete; +FSP_IOCMPL_DISPATCH FspQuerySecurityComplete; +FSP_IOCMPL_DISPATCH FspSetSecurityComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolQuerySecurity) diff --git a/src/sys/shutdown.c b/src/sys/shutdown.c index d73419a5..c9d117dd 100644 --- a/src/sys/shutdown.c +++ b/src/sys/shutdown.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolShutdown( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspShutdown; -FSP_IOPROC_DISPATCH FspShutdownComplete; +FSP_IOCMPL_DISPATCH FspShutdownComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolShutdown) diff --git a/src/sys/volinfo.c b/src/sys/volinfo.c index 2878651f..2f0e2b7c 100644 --- a/src/sys/volinfo.c +++ b/src/sys/volinfo.c @@ -12,8 +12,8 @@ static NTSTATUS FspFsvolSetVolumeInformation( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspQueryVolumeInformation; FSP_DRIVER_DISPATCH FspSetVolumeInformation; -FSP_IOPROC_DISPATCH FspQueryVolumeInformationComplete; -FSP_IOPROC_DISPATCH FspSetVolumeInformationComplete; +FSP_IOCMPL_DISPATCH FspQueryVolumeInformationComplete; +FSP_IOCMPL_DISPATCH FspSetVolumeInformationComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolQueryVolumeInformation) diff --git a/src/sys/write.c b/src/sys/write.c index 794f52b6..947247ce 100644 --- a/src/sys/write.c +++ b/src/sys/write.c @@ -9,7 +9,7 @@ static NTSTATUS FspFsvolWrite( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); FSP_DRIVER_DISPATCH FspWrite; -FSP_IOPROC_DISPATCH FspWriteComplete; +FSP_IOCMPL_DISPATCH FspWriteComplete; #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FspFsvolWrite)