Changeset 9976 for trunk/src/winmm/mcicda

Timestamp:

Apr 2, 2003, 2:59:24 PM (23 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/winmm/mcicda

Files:

• cdrom.h (modified) (1 diff)
• os2cdrom.cpp (modified) (15 diffs)

trunk/src/winmm/mcicda/cdrom.h

@@ -93 +93 @@
 BOOL    CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda);
 
-HFILE os2CDOpen(char *drive);
+HANDLE os2CDOpen(char *drive);
 ULONG os2CDClose(ULONG hfOS2Handle);
-int os2GetNumTracks(HFILE hfOS2Handle,ULONG *ulLeadOut);
-BOOL os2GetCDStatus(HFILE hfOS2Handle, ULONG  *ulStatus);
-BOOL os2GetCDAudioStatus(HFILE hfOS2Handle, USHORT  *usStatus);
-ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack, BOOL *flAudio);
-BOOL os2CDEject(HFILE hfDrive);
-BOOL os2CDCloseTray(HFILE hfDrive);
-BOOL os2CDStop(HFILE hfDrive);
-BOOL os2CDPlayRange(HFILE hfDrive ,ULONG ulFrom, ULONG ulTo);
-BOOL  os2CDResume(HFILE hfDrive);
-BOOL os2CDGetHeadLocation(HFILE hfOS2Handle, ULONG  *ulHeadLocation);
-BOOL os2CDSeek(HFILE hfOS2Handle, ULONG  ulTo);
-BOOL os2CDQueryCurTrack(HFILE hfOS2Handle, UINT  * uiCurTrack);
+int os2GetNumTracks(HANDLE hfOS2Handle,ULONG *ulLeadOut);
+BOOL os2GetCDStatus(HANDLE hfOS2Handle, ULONG  *ulStatus);
+BOOL os2GetCDAudioStatus(HANDLE hfOS2Handle, USHORT  *usStatus);
+ULONG  os2CDQueryTrackStartSector( HANDLE hfDrive, ULONG numTrack, BOOL *flAudio);
+BOOL os2CDEject(HANDLE hfDrive);
+BOOL os2CDCloseTray(HANDLE hfDrive);
+BOOL os2CDStop(HANDLE hfDrive);
+BOOL os2CDPlayRange(HANDLE hfDrive ,ULONG ulFrom, ULONG ulTo);
+BOOL  os2CDResume(HANDLE hfDrive);
+BOOL os2CDGetHeadLocation(HANDLE hfOS2Handle, ULONG  *ulHeadLocation);
+BOOL os2CDSeek(HANDLE hfOS2Handle, ULONG  ulTo);
+BOOL os2CDQueryCurTrack(HANDLE hfOS2Handle, UINT  * uiCurTrack);
 BOOL os2CDQueryCDDrives(int *iNumCD, char * cFirstDrive);
 

trunk/src/winmm/mcicda/os2cdrom.cpp

@@ -15 +15 @@
 
 #include <os2wrap.h>
+#include <win32type.h>
 //#include <cdrom.h>
 
@@ -103 +104 @@
 
 
-HFILE os2CDOpen(char *drive)
-{
-    HFILE hfDrive = 0;
+HANDLE os2CDOpen(char *drive)
+{
+    HANDLE hfDrive = 0;
     ULONG ulAction;
     ULONG rc;
@@ -131 +132 @@
          other: # Audio tracks */
 /******************************************/
-int os2GetNumTracks(HFILE hfOS2Handle, ULONG *ulLeadOut)
+int os2GetNumTracks(HANDLE hfOS2Handle, ULONG *ulLeadOut)
 {
     ULONG ulParamLen;
@@ -180 +181 @@
 }       
 
-BOOL os2GetCDStatus(HFILE hfOS2Handle, ULONG  *ulStatus)
+BOOL os2GetCDStatus(HANDLE hfOS2Handle, ULONG  *ulStatus)
 {
     ULONG ulParamLen;
@@ -203 +204 @@
 }
 
-BOOL os2GetCDAudioStatus(HFILE hfOS2Handle, USHORT  *usStatus)
+BOOL os2GetCDAudioStatus(HANDLE hfOS2Handle, USHORT  *usStatus)
 {
     AUDIOSTATUS asStatus;
@@ -229 +230 @@
 /* Returns sector info of track #numTrack */
 /* Starting with track 0 */
-ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack, BOOL *pflAudio)
+ULONG  os2CDQueryTrackStartSector( HANDLE hfDrive, ULONG numTrack, BOOL *pflAudio)
 {       
     ULONG ulParamLen;
@@ -281 +282 @@
 
 
-BOOL os2CDEject(HFILE hfDrive)
+BOOL os2CDEject(HANDLE hfDrive)
 {
     ULONG ulParamLen;
@@ -303 +304 @@
 #endif
 
-BOOL os2CDCloseTray(HFILE hfDrive)
+BOOL os2CDCloseTray(HANDLE hfDrive)
 {
     ULONG ulParamLen;
@@ -321 +322 @@
 }
 
-BOOL os2CDStop(HFILE hfDrive)
+BOOL os2CDStop(HANDLE hfDrive)
 {
     ULONG ulParamLen;
@@ -350 +351 @@
 /*                                       */
 /*****************************************/
-BOOL os2CDPlayRange(HFILE hfDrive ,ULONG ulFrom, ULONG ulTo)
+BOOL os2CDPlayRange(HANDLE hfDrive ,ULONG ulFrom, ULONG ulTo)
 {
     ULONG ulParamLen;
@@ -384 +385 @@
 }
 
-BOOL  os2CDResume(HFILE hfDrive)
+BOOL  os2CDResume(HANDLE hfDrive)
 {
     ULONG ulParamLen;
@@ -403 +404 @@
 }
 
-BOOL os2CDGetHeadLocation(HFILE hfOS2Handle, ULONG  *ulHeadLocation)
+BOOL os2CDGetHeadLocation(HANDLE hfOS2Handle, ULONG  *ulHeadLocation)
 {
     UCHAR ucParam[5]={0};
@@ -437 +438 @@
 }
 
-BOOL os2CDSeek(HFILE hfOS2Handle, ULONG  ulTo)
+BOOL os2CDSeek(HANDLE hfOS2Handle, ULONG  ulTo)
 {
     SEEKPARAM sp={0};
@@ -466 +467 @@
 }
 
-BOOL os2CDQueryCurTrack(HFILE hfOS2Handle, UINT  * uiCurTrack)
+BOOL os2CDQueryCurTrack(HANDLE hfOS2Handle, UINT  * uiCurTrack)
 {
     ULONG ulParamLen;
@@ -503 +504 @@
 BOOL os2CDQueryCDDrives(int *iNumCD, char * cFirstDrive)
 {
-  HFILE hfDevice;
+  HANDLE hfDevice;
   ULONG ulAction;
   ULONG ulLen;