fix a number of char types that should be int, to make them immune to

[xonotic/darkplaces.git] / cd_win.c

diff --git a/cd_win.c b/cd_win.c
index a79a24d4ec7f1d92373ba6a3e99f3dd2277cb7ed..913aec31e4681488c5193632486d3f6692618d9f 100644 (file)
--- a/cd_win.c
+++ b/cd_win.c
@@ -20,11 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
+#include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 
-#include "quakedef.h"
 #include "cdaudio.h"
 
+#if _MSC_VER < 1300
+typedef DWORD DWORD_PTR;
+#endif
 
 extern HWND    mainwindow;
 
@@ -34,8 +38,8 @@ void CDAudio_SysEject(void)
 {
        DWORD   dwReturn;
 
-       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD)NULL)))
-               Con_Printf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn);
+       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD_PTR)NULL)))
+               Con_Printf("MCI_SET_DOOR_OPEN failed (%x)\n", (unsigned)dwReturn);
 }
 
 
@@ -43,8 +47,8 @@ void CDAudio_SysCloseDoor(void)
 {
        DWORD   dwReturn;
 
-       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD)NULL)))
-               Con_Printf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn);
+       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD_PTR)NULL)))
+               Con_Printf("MCI_SET_DOOR_CLOSED failed (%x)\n", (unsigned)dwReturn);
 }
 
 int CDAudio_SysGetAudioDiskInfo(void)
@@ -53,28 +57,28 @@ int CDAudio_SysGetAudioDiskInfo(void)
        MCI_STATUS_PARMS        mciStatusParms;
 
        mciStatusParms.dwItem = MCI_STATUS_READY;
-       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
+       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
        if (dwReturn)
        {
-               Con_Print("CDAudio: drive ready test - get status failed\n");
+               Con_Print("CDAudio_SysGetAudioDiskInfo: drive ready test - get status failed\n");
                return -1;
        }
        if (!mciStatusParms.dwReturn)
        {
-               Con_Print("CDAudio: drive not ready\n");
+               Con_Print("CDAudio_SysGetAudioDiskInfo: drive not ready\n");
                return -1;
        }
 
        mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
-       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
+       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
        if (dwReturn)
        {
-               Con_Print("CDAudio: get tracks - status failed\n");
+               Con_Print("CDAudio_SysGetAudioDiskInfo: get tracks - status failed\n");
                return -1;
        }
        if (mciStatusParms.dwReturn < 1)
        {
-               Con_Print("CDAudio: no music tracks\n");
+               Con_Print("CDAudio_SysGetAudioDiskInfo: no music tracks\n");
                return -1;
        }
 
@@ -95,7 +99,7 @@ void CDAudio_SysSetVolume (float volume)
 }
 
 
-int CDAudio_SysPlay (qbyte track)
+int CDAudio_SysPlay (int track)
 {
        DWORD                           dwReturn;
        MCI_PLAY_PARMS          mciPlayParms;
@@ -104,15 +108,15 @@ int CDAudio_SysPlay (qbyte track)
        // don't try to play a non-audio track
        mciStatusParms.dwItem = MCI_CDA_STATUS_TYPE_TRACK;
        mciStatusParms.dwTrack = track;
-       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
+       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
        if (dwReturn)
        {
-               Con_Printf("MCI_STATUS failed (%i)\n", dwReturn);
+               Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
        if (mciStatusParms.dwReturn != MCI_CDA_TRACK_AUDIO)
        {
-               Con_Printf("CDAudio: track %i is not audio\n", track);
+               Con_Printf("CDAudio_SysPlay: track %i is not audio\n", track);
                return -1;
        }
 
@@ -122,20 +126,20 @@ int CDAudio_SysPlay (qbyte track)
        // get the length of the track to be played
        mciStatusParms.dwItem = MCI_STATUS_LENGTH;
        mciStatusParms.dwTrack = track;
-       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
+       dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
        if (dwReturn)
        {
-               Con_Printf("MCI_STATUS failed (%i)\n", dwReturn);
+               Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
 
        mciPlayParms.dwFrom = MCI_MAKE_TMSF(track, 0, 0, 0);
        mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track;
-       mciPlayParms.dwCallback = (DWORD)mainwindow;
-       dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD)(LPVOID) &mciPlayParms);
+       mciPlayParms.dwCallback = (DWORD_PTR)mainwindow;
+       dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)(LPVOID) &mciPlayParms);
        if (dwReturn)
        {
-               Con_Printf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
+               Con_Printf("CDAudio_SysPlay: MCI_PLAY failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
 
@@ -147,9 +151,9 @@ int CDAudio_SysStop (void)
 {
        DWORD   dwReturn;
 
-       if ((dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD)NULL)))
+       if ((dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD_PTR)NULL)))
        {
-               Con_Printf("MCI_STOP failed (%i)\n", dwReturn);
+               Con_Printf("MCI_STOP failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
        return 0;
@@ -160,10 +164,10 @@ int CDAudio_SysPause (void)
        DWORD                           dwReturn;
        MCI_GENERIC_PARMS       mciGenericParms;
 
-       mciGenericParms.dwCallback = (DWORD)mainwindow;
-       if ((dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD)(LPVOID) &mciGenericParms)))
+       mciGenericParms.dwCallback = (DWORD_PTR)mainwindow;
+       if ((dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD_PTR)(LPVOID) &mciGenericParms)))
        {
-               Con_Printf("MCI_PAUSE failed (%i)\n", dwReturn);
+               Con_Printf("MCI_PAUSE failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
        return 0;
@@ -177,14 +181,14 @@ int CDAudio_SysResume (void)
 
        mciPlayParms.dwFrom = MCI_MAKE_TMSF(cdPlayTrack, 0, 0, 0);
        mciPlayParms.dwTo = MCI_MAKE_TMSF(cdPlayTrack + 1, 0, 0, 0);
-       mciPlayParms.dwCallback = (DWORD)mainwindow;
-       dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD)(LPVOID) &mciPlayParms);
+       mciPlayParms.dwCallback = (DWORD_PTR)mainwindow;
+       dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD_PTR)(LPVOID) &mciPlayParms);
        if (dwReturn)
        {
-               Con_Printf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
+               Con_Printf("CDAudio_SysResume: MCI_PLAY failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
-       return 0;       
+       return 0;
 }
 
 LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -238,19 +242,19 @@ int CDAudio_SysStartup (void)
        MCI_SET_PARMS   mciSetParms;
 
        mciOpenParms.lpstrDeviceType = "cdaudio";
-       if ((dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD) (LPVOID) &mciOpenParms)))
+       if ((dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD_PTR) (LPVOID) &mciOpenParms)))
        {
-               Con_Printf("CDAudio_Init: MCI_OPEN failed (%i)\n", dwReturn);
+               Con_Printf("CDAudio_SysStartup: MCI_OPEN failed (%x)\n", (unsigned)dwReturn);
                return -1;
        }
        wDeviceID = mciOpenParms.wDeviceID;
 
        // Set the time format to track/minute/second/frame (TMSF).
        mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF;
-       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)(LPVOID) &mciSetParms)))
+       if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR)(LPVOID) &mciSetParms)))
        {
-               Con_Printf("MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn);
-               mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD)NULL);
+               Con_Printf("CDAudio_SysStartup: MCI_SET_TIME_FORMAT failed (%x)\n", (unsigned)dwReturn);
+               mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD_PTR)NULL);
                return -1;
        }
 
@@ -259,6 +263,6 @@ int CDAudio_SysStartup (void)
 
 void CDAudio_SysShutdown (void)
 {
-       if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD)NULL))
-               Con_Print("CDAudio_Shutdown: MCI_CLOSE failed\n");
+       if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)NULL))
+               Con_Print("CDAudio_SysShutdown: MCI_CLOSE failed\n");
 }