ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Partially implement CDROM_GetControl() on Mac OS. 

Only the speed is returned.
This commit is contained in:
Charles Davis 2009-10-19 12:15:11 -06:00 committed by Alexandre Julliard
parent 122ed40c2b
commit d22abc20a3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/ntdll/cdrom.c
View File

@ -670,10 +670,20 @@ static NTSTATUS CDROM_GetStatusCode(int io)
* CDROM_GetControl * CDROM_GetControl
* *
*/ */
static NTSTATUS CDROM_GetControl(int dev, CDROM_AUDIO_CONTROL* cac) static NTSTATUS CDROM_GetControl(int dev, int fd, CDROM_AUDIO_CONTROL* cac)
{ {
cac->LbaFormat = 0; /* FIXME */ #ifdef __APPLE__
uint16_t speed;
int io = ioctl( fd, DKIOCCDGETSPEED, &speed );
if (io != 0) return CDROM_GetStatusCode( io );
/* DKIOCCDGETSPEED returns the speed in kilobytes per second,
* so convert to logical blocks (assumed to be ~2 KB).
*/
cac->LogicalBlocksPerSecond = speed/2;
#else
cac->LogicalBlocksPerSecond = 1; /* FIXME */ cac->LogicalBlocksPerSecond = 1; /* FIXME */
#endif
cac->LbaFormat = 0; /* FIXME */
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
@ -2762,7 +2772,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice,
sz = sizeof(CDROM_AUDIO_CONTROL); sz = sizeof(CDROM_AUDIO_CONTROL);
if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER;
else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL;
else status = CDROM_GetControl(dev, lpOutBuffer); else status = CDROM_GetControl(dev, fd, lpOutBuffer);
break; break;
case IOCTL_CDROM_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: