Changeset 21841 for branches/gcc-kmk/src/winmm/mcicda/os2cdrom.cpp

Timestamp:

Dec 1, 2011, 10:19:11 PM (14 years ago)

Author:

dmik

Message:

Port WINMM, MCICDA and MCIWAVE DLLs to GCC/kBuild.

File:

• branches/gcc-kmk/src/winmm/mcicda/os2cdrom.cpp (modified) (9 diffs)

branches/gcc-kmk/src/winmm/mcicda/os2cdrom.cpp

@@ -148 +148 @@
         
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
-                     "CD01", 4, &ulParamLen, &cdInfo,
+                     (void*)"CD01", 4, &ulParamLen, &cdInfo,
                      sizeof(cdInfo), &ulDataLen);
 
@@ -194 +194 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMDISK, CDROMDISK_DEVICESTATUS,
-                     "CD01", 4, &ulParamLen, &ulDeviceStatus,
+                     (void*)"CD01", 4, &ulParamLen, &ulDeviceStatus,
                      sizeof(ulDeviceStatus), &ulDataLen);               
     if(rc) {
@@ -218 +218 @@
     /* Get information */
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIOSTATUS,
-                     "CD01", 4, &ulParamLen, &asStatus,
+                     (void*)"CD01", 4, &ulParamLen, &asStatus,
                      sizeof(asStatus), &ulDataLen);
     if(rc) {
@@ -247 +247 @@
         ulParamLen=4;
         rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
-                         "CD01", 4, &ulParamLen, &cdInfo,
+                         (void*)"CD01", 4, &ulParamLen, &cdInfo,
                          sizeof(cdInfo), &ulDataLen);           
         if(rc)
@@ -292 +292 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMDISK, CDROMDISK_EJECTDISK,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -314 +314 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMDISK, CDROMDISK_CLOSETRAY,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -335 +335 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_STOPAUDIO,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -396 +396 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_RESUMEAUDIO,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -484 +484 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETSUBCHANNELQ,
-                     "CD01", 4, &ulParamLen, &scq,
+                     (void*)"CD01", 4, &ulParamLen, &scq,
                      sizeof(scq), &ulDataLen);          
     if(rc) {