From 4e7c96a96ea00f0bf596b2334bcea268b59c5308 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 11 May 2015 17:23:38 +0000 Subject: [PATCH] [CDROM_NEW] Fix MSVC build. svn path=/trunk/; revision=67667 --- reactos/drivers/storage/class/cdrom_new/cdrom.c | 16 ++++++++++------ reactos/drivers/storage/class/cdrom_new/ioctl.c | 12 ++++++------ reactos/drivers/storage/class/cdrom_new/mmc.c | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/reactos/drivers/storage/class/cdrom_new/cdrom.c b/reactos/drivers/storage/class/cdrom_new/cdrom.c index 055e602d35f..10404ee0071 100644 --- a/reactos/drivers/storage/class/cdrom_new/cdrom.c +++ b/reactos/drivers/storage/class/cdrom_new/cdrom.c @@ -537,8 +537,10 @@ Return Value: { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; +#if 0 PCLASS_DRIVER_EXTENSION driverExtension = ClassGetDriverExtension( Fdo->DriverObject); +#endif PVOID senseData = NULL; @@ -2760,8 +2762,10 @@ CdRomStartIo( case IOCTL_CDROM_READ_Q_CHANNEL: { +#if 0 PSUB_Q_CHANNEL_DATA userChannelData = Irp->AssociatedIrp.SystemBuffer; +#endif PCDROM_SUB_Q_DATA_FORMAT inputBuffer = Irp->AssociatedIrp.SystemBuffer; @@ -2951,7 +2955,7 @@ CdRomStartIo( case IOCTL_CDROM_GET_CONTROL: { //PAUDIO_OUTPUT audioOutput; - PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer; + //PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer; // // Allocate buffer for volume control information. @@ -3317,10 +3321,10 @@ Return Value: ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; - PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); + //PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); - SCSI_REQUEST_BLOCK srb; - PCDB cdb = (PCDB)srb.Cdb; + //SCSI_REQUEST_BLOCK srb; + //PCDB cdb = (PCDB)srb.Cdb; //NTSTATUS status; PAGED_CODE(); @@ -3388,7 +3392,7 @@ CdRomSwitchModeCompletion( PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); + //BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); ULONG retryCount; // @@ -6444,7 +6448,7 @@ CdRomMmcErrorHandler( ) { PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; - BOOLEAN queryCapabilities = FALSE; + //BOOLEAN queryCapabilities = FALSE; if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) { diff --git a/reactos/drivers/storage/class/cdrom_new/ioctl.c b/reactos/drivers/storage/class/cdrom_new/ioctl.c index 0c0d4e31b19..c078156b7f9 100644 --- a/reactos/drivers/storage/class/cdrom_new/ioctl.c +++ b/reactos/drivers/storage/class/cdrom_new/ioctl.c @@ -71,11 +71,11 @@ Return Value: PIO_STACK_LOCATION nextStack; PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); - BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); + //BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); SCSI_REQUEST_BLOCK srb; PCDB cdb = (PCDB)srb.Cdb; //PVOID outputBuffer; - ULONG bytesTransferred = 0; + //ULONG bytesTransferred = 0; NTSTATUS status; //NTSTATUS status2; KIRQL irql; @@ -2276,7 +2276,7 @@ CdRomDeviceControlCompletion( if (NT_SUCCESS(status)) { - BOOLEAN b = FALSE; + //BOOLEAN b = FALSE; switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) { @@ -3204,7 +3204,7 @@ Return Value: { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp); + //PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp); PDVD_SESSION_ID sessionId = Irp->AssociatedIrp.SystemBuffer; @@ -3630,7 +3630,7 @@ CdRomDeviceControlDvdEndSession( IN PSCSI_REQUEST_BLOCK Srb ) { - PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); + //PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PCDB cdb = (PCDB)Srb->Cdb; @@ -3822,7 +3822,7 @@ CdRomDeviceControlDvdSendKey( IN PSCSI_REQUEST_BLOCK Srb ) { - PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); + //PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PCDB cdb = (PCDB)Srb->Cdb; diff --git a/reactos/drivers/storage/class/cdrom_new/mmc.c b/reactos/drivers/storage/class/cdrom_new/mmc.c index 59232d4c011..f3710879aef 100644 --- a/reactos/drivers/storage/class/cdrom_new/mmc.c +++ b/reactos/drivers/storage/class/cdrom_new/mmc.c @@ -854,7 +854,7 @@ CdRomUpdateMmcDriveCapabilitiesCompletion( ) { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PCDROM_DATA cdData = fdoExtension->CommonExtension.DriverData; PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc); PSCSI_REQUEST_BLOCK srb = &(mmcData->CapabilitiesSrb); @@ -980,7 +980,7 @@ CdRomPrepareUpdateCapabilitiesIrp( ) { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PCDROM_DATA cdData = fdoExtension->CommonExtension.DriverData; PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc); PIO_STACK_LOCATION nextStack;