From 3c8c47b1fb28b568cc16e6a125912a7cc123de15 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 1 Jul 2019 19:03:14 -0500 Subject: [PATCH] ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT. DataTransferLength specifies the number of bytes transferred, but sg_io_hdr_t.resid gives the number of bytes *not* transferred: https://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/x356.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47424 Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard (cherry picked from commit bf891f34af32839bf949e7ca4a1921754aa5e0d1) Signed-off-by: Michael Stefaniuc --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 066181b1d19..34d0a9bca13 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1661,7 +1661,7 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); @@ -1845,7 +1845,7 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io);