Changeset 6053 for trunk/src


Ignore:
Timestamp:
Jun 20, 2001, 10:51:59 PM (24 years ago)
Author:
sandervl
Message:

added cdrom ioctl stubs

Location:
trunk/src/kernel32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/hmdisk.cpp

    r6049 r6053  
    1 /* $Id: hmdisk.cpp,v 1.10 2001-06-19 10:50:24 sandervl Exp $ */
     1/* $Id: hmdisk.cpp,v 1.11 2001-06-20 20:51:57 sandervl Exp $ */
    22
    33/*
    … …  
    281281        msg = "IOCTL_IDE_PASS_THROUGH";
    282282        break;
     283    case IOCTL_CDROM_UNLOAD_DRIVER:
     284        msg = "IOCTL_CDROM_UNLOAD_DRIVER";
     285        break;
     286    case IOCTL_CDROM_READ_TOC:
     287        msg = "IOCTL_CDROM_READ_TOC";
     288        break;
     289    case IOCTL_CDROM_GET_CONTROL:
     290        msg = "IOCTL_CDROM_GET_CONTROL";
     291        break;
     292    case IOCTL_CDROM_PLAY_AUDIO_MSF:
     293        msg = "IOCTL_CDROM_PLAY_AUDIO_MSF";
     294        break;
     295    case IOCTL_CDROM_SEEK_AUDIO_MSF:
     296        msg = "IOCTL_CDROM_SEEK_AUDIO_MSF";
     297        break;
     298    case IOCTL_CDROM_STOP_AUDIO:
     299        msg = "IOCTL_CDROM_STOP_AUDIO";
     300        break;
     301    case IOCTL_CDROM_PAUSE_AUDIO:
     302        msg = "IOCTL_CDROM_PAUSE_AUDIO";
     303        break;
     304    case IOCTL_CDROM_RESUME_AUDIO:
     305        msg = "IOCTL_CDROM_RESUME_AUDIO";
     306        break;
     307    case IOCTL_CDROM_GET_VOLUME:
     308        msg = "IOCTL_CDROM_GET_VOLUME";
     309        break;
     310    case IOCTL_CDROM_SET_VOLUME:
     311        msg = "IOCTL_CDROM_SET_VOLUME";
     312        break;
     313    case IOCTL_CDROM_READ_Q_CHANNEL:
     314        msg = "IOCTL_CDROM_READ_Q_CHANNEL";
     315        break;
     316    case IOCTL_CDROM_GET_LAST_SESSION:
     317        msg = "IOCTL_CDROM_GET_LAST_SESSION";
     318        break;
     319    case IOCTL_CDROM_RAW_READ:
     320        msg = "IOCTL_CDROM_RAW_READ";
     321        break;
     322    case IOCTL_CDROM_DISK_TYPE:
     323        msg = "IOCTL_CDROM_DISK_TYPE";
     324        break;
     325    case IOCTL_CDROM_GET_DRIVE_GEOMETRY:
     326        msg = "IOCTL_CDROM_GET_DRIVE_GEOMETRY";
     327        break;
     328    case IOCTL_CDROM_CHECK_VERIFY:
     329        msg = "IOCTL_CDROM_CHECK_VERIFY";
     330        break;
     331    case IOCTL_CDROM_MEDIA_REMOVAL:
     332        msg = "IOCTL_CDROM_MEDIA_REMOVAL";
     333        break;
     334    case IOCTL_CDROM_EJECT_MEDIA:
     335        msg = "IOCTL_CDROM_EJECT_MEDIA";
     336        break;
     337    case IOCTL_CDROM_LOAD_MEDIA:
     338        msg = "IOCTL_CDROM_LOAD_MEDIA";
     339        break;
     340    case IOCTL_CDROM_RESERVE:
     341        msg = "IOCTL_CDROM_RESERVE";
     342        break;
     343    case IOCTL_CDROM_RELEASE:
     344        msg = "IOCTL_CDROM_RELEASE";
     345        break;
     346    case IOCTL_CDROM_FIND_NEW_DEVICES:
     347        msg = "IOCTL_CDROM_FIND_NEW_DEVICES";
     348        break;
    283349    }
    284350    if(msg) {
    … …  
    319385            *lpBytesReturned = 0;
    320386        }
    321         if(OSLibDosGetDiskGeometry(pHMHandleData->dwUserData, pGeom) == FALSE) {
     387        if(OSLibDosGetDiskGeometry(pHMHandleData->hHMHandle, pHMHandleData->dwUserData, pGeom) == FALSE) {
    322388            return FALSE;
    323389        }
    … …  
    340406        break;
    341407
     408    case IOCTL_CDROM_UNLOAD_DRIVER:
     409    case IOCTL_CDROM_READ_TOC:
     410    case IOCTL_CDROM_GET_CONTROL:
     411    case IOCTL_CDROM_PLAY_AUDIO_MSF:
     412    case IOCTL_CDROM_SEEK_AUDIO_MSF:
     413    case IOCTL_CDROM_STOP_AUDIO:
     414    case IOCTL_CDROM_PAUSE_AUDIO:
     415    case IOCTL_CDROM_RESUME_AUDIO:
     416    case IOCTL_CDROM_GET_VOLUME:
     417    case IOCTL_CDROM_SET_VOLUME:
     418    case IOCTL_CDROM_READ_Q_CHANNEL:
     419    case IOCTL_CDROM_GET_LAST_SESSION:
     420    case IOCTL_CDROM_RAW_READ:
     421    case IOCTL_CDROM_DISK_TYPE:
     422    case IOCTL_CDROM_GET_DRIVE_GEOMETRY:
     423    case IOCTL_CDROM_CHECK_VERIFY:
     424    case IOCTL_CDROM_MEDIA_REMOVAL:
     425    case IOCTL_CDROM_EJECT_MEDIA:
     426    case IOCTL_CDROM_LOAD_MEDIA:
     427    case IOCTL_CDROM_RESERVE:
     428    case IOCTL_CDROM_RELEASE:
     429    case IOCTL_CDROM_FIND_NEW_DEVICES:
     430        break;
     431
    342432    case IOCTL_STORAGE_CHECK_VERIFY:
    343433        if(lpBytesReturned) {
    … …  
    374464
    375465        if(nOutBufferSize < sizeof(SCSI_PASS_THROUGH_DIRECT) ||
    376            !pPacket || pPacket->Length < sizeof(SCSI_PASS_THROUGH_DIRECT)) 
     466           !pPacket || pPacket->Length < sizeof(SCSI_PASS_THROUGH_DIRECT))
    377467        {
    378468            SetLastError(ERROR_INSUFFICIENT_BUFFER);

  • trunk/src/kernel32/hmstd.cpp

    r5557 r6053  
    1 /* $Id: hmstd.cpp,v 1.3 2001-04-21 09:10:14 sandervl Exp $ */
     1/* $Id: hmstd.cpp,v 1.4 2001-06-20 20:51:57 sandervl Exp $ */
    22
    33/*
    … …  
    174174  }
    175175  memcpy(lpLowMemBuffer, lpBuffer, nNumberOfBytesToWrite);
     176#ifdef DEBUG
     177//  if(pHMHandleData->dwUserData == STD_ERROR_HANDLE) {
     178     dprintf(("STDERR: %s", lpLowMemBuffer));
     179//  }
     180#endif
    176181  return O32_WriteFile(pHMHandleData->hHMHandle, lpLowMemBuffer, nNumberOfBytesToWrite,
    177182                       lpNumberOfBytesWritten, lpOverlapped);

  • trunk/src/kernel32/oslibdos.cpp

    r6049 r6053  
    1 /* $Id: oslibdos.cpp,v 1.66 2001-06-19 10:50:25 sandervl Exp $ */
     1/* $Id: oslibdos.cpp,v 1.67 2001-06-20 20:51:58 sandervl Exp $ */
    22/*
    33 * Wrappers for OS/2 Dos* API
    … …  
    23412341//******************************************************************************
    23422342//******************************************************************************
    2343 BOOL  OSLibDosGetDiskGeometry(DWORD cDisk, PVOID pdiskgeom)
     2343BOOL  OSLibDosGetDiskGeometry(HANDLE hDisk, DWORD cDisk, PVOID pdiskgeom)
    23442344{
    23452345   PDISK_GEOMETRY pGeom = (PDISK_GEOMETRY)pdiskgeom;
    2346    BYTE  param[2] = {0, 0};
     2346   BYTE  param[2] = {1, 0};
    23472347   ULONG parsize = 2;
    23482348   BIOSPARAMETERBLOCK bpb;
    … …  
    23512351
    23522352   param[1] = cDisk - 'A';
    2353    rc = DosDevIOCtl(-1, IOCTL_DISK, DSK_GETDEVICEPARAMS, param, 2, &parsize, &bpb, sizeof(bpb), &datasize);
     2353   rc = DosDevIOCtl((hDisk) ? hDisk : -1, IOCTL_DISK, DSK_GETDEVICEPARAMS, param, 2, &parsize, &bpb, sizeof(bpb), &datasize);
    23542354   if(rc == 0)
    23552355   {

  • trunk/src/kernel32/oslibdos.h

    r6049 r6053  
    1 /* $Id: oslibdos.h,v 1.31 2001-06-19 10:50:26 sandervl Exp $ */
     1/* $Id: oslibdos.h,v 1.32 2001-06-20 20:51:59 sandervl Exp $ */
    22
    33/*
    … …  
    223223ULONG OSLibDosQueryCurrentDisk();
    224224
    225 BOOL  OSLibDosGetDiskGeometry(DWORD cDisk, void *pGeom);
     225BOOL  OSLibDosGetDiskGeometry(HANDLE hDisk, DWORD cDisk, void *pGeom);
    226226
    227227#ifdef OS2DEF_INCLUDED
Note: See TracChangeset for help on using the changeset viewer.