Skip to content

W
wine-cw
Commit cb7de15e authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

A workaround for missing struct request_sense on FreeBSD.

parent d494c3ab
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
dlls/ntdll/cdrom.c
View file @ cb7de15e
......@@ -1416,7 +1416,11 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP
if (pPacket->CdbLength > 16)
return STATUS_INVALID_PARAMETER;
#ifdef SENSEBUFLEN
if (pPacket->SenseInfoLength > SENSEBUFLEN)
#else
if (pPacket->SenseInfoLength > sizeof(struct request_sense))
#endif
return STATUS_INVALID_PARAMETER;
if (pPacket->DataTransferLength > 0 && !pPacket->DataBuffer)
......@@ -1531,7 +1535,11 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket)
if (pPacket->CdbLength > 16)
return STATUS_INVALID_PARAMETER;
#ifdef SENSEBUFLEN
if (pPacket->SenseInfoLength > SENSEBUFLEN)
#else
if (pPacket->SenseInfoLength > sizeof(struct request_sense))
#endif
return STATUS_INVALID_PARAMETER;
if (pPacket->DataTransferLength > 0 && pPacket->DataBufferOffset < sizeof(SCSI_PASS_THROUGH))
......@@ -1576,15 +1584,6 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket)
#elif defined HAVE_SCSIREQ_T_CMD
if (pPacket->Length < sizeof(SCSI_PASS_THROUGH))
return STATUS_BUFFER_TOO_SMALL;
if (pPacket->CdbLength > 12)
return STATUS_INVALID_PARAMETER;
if (pPacket->SenseInfoLength > SENSEBUFLEN)
return STATUS_INVALID_PARAMETER;
memset(&cmd, 0, sizeof(cmd));
memcpy(&(cmd.cmd), &(pPacket->Cdb), pPacket->CdbLength);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment