Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CDROM_NEW] Fix MSVC build.

Browse source 
svn path=/trunk/; revision=67667
This commit is contained in:
Amine Khaldi 2015-05-11 17:23:38 +00:00
parent 442e80cb84
commit 4e7c96a96e
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/drivers/storage/class/cdrom_new/cdrom.c
View file

@ -537,8 +537,10 @@ Return Value:
{ {
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension;
PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension;
#if 0
PCLASS_DRIVER_EXTENSION driverExtension = ClassGetDriverExtension( PCLASS_DRIVER_EXTENSION driverExtension = ClassGetDriverExtension(
Fdo->DriverObject); Fdo->DriverObject);
#endif
PVOID senseData = NULL; PVOID senseData = NULL;
@ -2760,8 +2762,10 @@ CdRomStartIo(
case IOCTL_CDROM_READ_Q_CHANNEL: { case IOCTL_CDROM_READ_Q_CHANNEL: {
#if 0
PSUB_Q_CHANNEL_DATA userChannelData = PSUB_Q_CHANNEL_DATA userChannelData =
Irp->AssociatedIrp.SystemBuffer; Irp->AssociatedIrp.SystemBuffer;
#endif
PCDROM_SUB_Q_DATA_FORMAT inputBuffer = PCDROM_SUB_Q_DATA_FORMAT inputBuffer =
Irp->AssociatedIrp.SystemBuffer; Irp->AssociatedIrp.SystemBuffer;
@ -2951,7 +2955,7 @@ CdRomStartIo(
case IOCTL_CDROM_GET_CONTROL: { case IOCTL_CDROM_GET_CONTROL: {
//PAUDIO_OUTPUT audioOutput; //PAUDIO_OUTPUT audioOutput;
PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer; //PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer;
// //
// Allocate buffer for volume control information. // Allocate buffer for volume control information.
@ -3317,10 +3321,10 @@ Return Value:
ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length;
LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; 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; //SCSI_REQUEST_BLOCK srb;
PCDB cdb = (PCDB)srb.Cdb; //PCDB cdb = (PCDB)srb.Cdb;
//NTSTATUS status; //NTSTATUS status;
PAGED_CODE(); PAGED_CODE();
@ -3388,7 +3392,7 @@ CdRomSwitchModeCompletion(
PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension;
PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData);
PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); 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; ULONG retryCount;
// //
@ -6444,7 +6448,7 @@ CdRomMmcErrorHandler(
) )
{ {
PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension;
BOOLEAN queryCapabilities = FALSE; //BOOLEAN queryCapabilities = FALSE;
if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) { if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) {

12
reactos/drivers/storage/class/cdrom_new/ioctl.c
View file

@ -71,11 +71,11 @@ Return Value:
PIO_STACK_LOCATION nextStack; PIO_STACK_LOCATION nextStack;
PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); 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; SCSI_REQUEST_BLOCK srb;
PCDB cdb = (PCDB)srb.Cdb; PCDB cdb = (PCDB)srb.Cdb;
//PVOID outputBuffer; //PVOID outputBuffer;
ULONG bytesTransferred = 0; //ULONG bytesTransferred = 0;
NTSTATUS status; NTSTATUS status;
//NTSTATUS status2; //NTSTATUS status2;
KIRQL irql; KIRQL irql;
@ -2276,7 +2276,7 @@ CdRomDeviceControlCompletion(
if (NT_SUCCESS(status)) { if (NT_SUCCESS(status)) {
BOOLEAN b = FALSE; //BOOLEAN b = FALSE;
switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) { switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) {
@ -3204,7 +3204,7 @@ Return Value:
{ {
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; 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; PDVD_SESSION_ID sessionId = Irp->AssociatedIrp.SystemBuffer;
@ -3630,7 +3630,7 @@ CdRomDeviceControlDvdEndSession(
IN PSCSI_REQUEST_BLOCK Srb IN PSCSI_REQUEST_BLOCK Srb
) )
{ {
PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); //PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp);
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension;
PCDB cdb = (PCDB)Srb->Cdb; PCDB cdb = (PCDB)Srb->Cdb;
@ -3822,7 +3822,7 @@ CdRomDeviceControlDvdSendKey(
IN PSCSI_REQUEST_BLOCK Srb IN PSCSI_REQUEST_BLOCK Srb
) )
{ {
PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp); //PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(OriginalIrp);
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension;
PCDB cdb = (PCDB)Srb->Cdb; PCDB cdb = (PCDB)Srb->Cdb;

4
reactos/drivers/storage/class/cdrom_new/mmc.c
View file

@ -854,7 +854,7 @@ CdRomUpdateMmcDriveCapabilitiesCompletion(
) )
{ {
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; 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_DATA cdData = fdoExtension->CommonExtension.DriverData;
PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc); PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc);
PSCSI_REQUEST_BLOCK srb = &(mmcData->CapabilitiesSrb); PSCSI_REQUEST_BLOCK srb = &(mmcData->CapabilitiesSrb);
@ -980,7 +980,7 @@ CdRomPrepareUpdateCapabilitiesIrp(
) )
{ {
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; 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_DATA cdData = fdoExtension->CommonExtension.DriverData;
PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc); PCDROM_MMC_EXTENSION mmcData = &(cdData->Mmc);
PIO_STACK_LOCATION nextStack; PIO_STACK_LOCATION nextStack;