Author: akhaldi Date: Mon May 11 17:23:38 2015 New Revision: 67667
URL: http://svn.reactos.org/svn/reactos?rev=67667&view=rev Log: [CDROM_NEW] Fix MSVC build.
Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/storage/class/cdrom_new/mmc.c
Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] Mon May 11 17:23:38 2015 @@ -537,8 +537,10 @@ { 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 @@
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 @@ 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 @@ ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset;
- PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); - - SCSI_REQUEST_BLOCK srb; - PCDB cdb = (PCDB)srb.Cdb; + //PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); + + //SCSI_REQUEST_BLOCK srb; + //PCDB cdb = (PCDB)srb.Cdb; //NTSTATUS status;
PAGED_CODE(); @@ -3388,7 +3392,7 @@ 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 @@ ) { PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; - BOOLEAN queryCapabilities = FALSE; + //BOOLEAN queryCapabilities = FALSE;
if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) {
Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Mon May 11 17:23:38 2015 @@ -71,11 +71,11 @@ 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 @@
if (NT_SUCCESS(status)) {
- BOOLEAN b = FALSE; + //BOOLEAN b = FALSE;
switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) { @@ -3204,7 +3204,7 @@ { 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 @@ 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 @@ 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;
Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] Mon May 11 17:23:38 2015 @@ -854,7 +854,7 @@ ) { 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 @@ ) { 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;
-
akhaldi＠svn.reactos.org