From 9a8ead96233960930d65de42ab7aa999a0ba6829 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 13 Feb 2004 09:37:11 +0000 Subject: [PATCH] - Eliminate function pointer typecasts in csqtest - Move the csq.h header to the right place - Added .cvsignore files svn path=/trunk/; revision=8163 --- reactos/drivers/lib/csq/.cvsignore | 5 +++++ reactos/drivers/test/csqtest/.cvsignore | 5 +++++ reactos/drivers/test/csqtest/csqtest.c | 18 +++++++++--------- reactos/{drivers/lib/csq => include/ddk}/csq.h | 0 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 reactos/drivers/lib/csq/.cvsignore create mode 100644 reactos/drivers/test/csqtest/.cvsignore rename reactos/{drivers/lib/csq => include/ddk}/csq.h (100%) diff --git a/reactos/drivers/lib/csq/.cvsignore b/reactos/drivers/lib/csq/.cvsignore new file mode 100644 index 00000000000..77f6c717865 --- /dev/null +++ b/reactos/drivers/lib/csq/.cvsignore @@ -0,0 +1,5 @@ +*.coff +*.sym +*.sys +*.o +*.map diff --git a/reactos/drivers/test/csqtest/.cvsignore b/reactos/drivers/test/csqtest/.cvsignore new file mode 100644 index 00000000000..77f6c717865 --- /dev/null +++ b/reactos/drivers/test/csqtest/.cvsignore @@ -0,0 +1,5 @@ +*.coff +*.sym +*.sys +*.o +*.map diff --git a/reactos/drivers/test/csqtest/csqtest.c b/reactos/drivers/test/csqtest/csqtest.c index 4b6b22ec1ea..3a6c217eb21 100644 --- a/reactos/drivers/test/csqtest/csqtest.c +++ b/reactos/drivers/test/csqtest/csqtest.c @@ -182,16 +182,16 @@ NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING Registry UNICODE_STRING NtName; UNICODE_STRING DosName; - DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)DispatchCreateCloseCleanup; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)DispatchCreateCloseCleanup; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)DispatchCreateCloseCleanup; - DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)DispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)DispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)DispatchIoctl; - DriverObject->DriverUnload = (PDRIVER_UNLOAD)Unload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchCreateCloseCleanup; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchCreateCloseCleanup; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCreateCloseCleanup; + DriverObject->MajorFunction[IRP_MJ_READ] = DispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = DispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchIoctl; + DriverObject->DriverUnload = Unload; - Status = IoCsqInitialize(&Csq, (PIO_CSQ_INSERT_IRP)CsqInsertIrp, CsqRemoveIrp, CsqPeekNextIrp, - CsqAcquireLock, (PIO_CSQ_RELEASE_LOCK)CsqReleaseLock, CsqCompleteCancelledIrp); + Status = IoCsqInitialize(&Csq, CsqInsertIrp, CsqRemoveIrp, CsqPeekNextIrp, + CsqAcquireLock, CsqReleaseLock, CsqCompleteCancelledIrp); if(Status != STATUS_SUCCESS) KdPrint(("csqtest: IoCsqInitalize failed: 0x%x\n", Status)); diff --git a/reactos/drivers/lib/csq/csq.h b/reactos/include/ddk/csq.h similarity index 100% rename from reactos/drivers/lib/csq/csq.h rename to reactos/include/ddk/csq.h