Zebediah Figura : ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT.
Alexandre Julliard
julliard at winehq.org
Mon Nov 25 09:12:25 CST 2019
Module: wine
Branch: stable
Commit: 3c8c47b1fb28b568cc16e6a125912a7cc123de15
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c8c47b1fb28b568cc16e6a125912a7cc123de15
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Jul 1 19:03:14 2019 -0500
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 <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit bf891f34af32839bf949e7ca4a1921754aa5e0d1)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 066181b1d1..34d0a9bca1 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);
More information about the wine-cvs
mailing list