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

Fixed verbose CD-ROM serial number warnings and some spelling errors.

This commit is contained in:
Andreas Mohr 2000-08-29 23:56:20 +00:00 committed by Alexandre Julliard
parent 5b6bf34067
commit 2951862be2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/winmm/mcicda/mcicda.c
View File

@ -503,7 +503,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn)); TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn));
ret = MCI_RESOURCE_RETURNED; ret = MCI_RESOURCE_RETURNED;
break; break;
case 4001: /* FIXME: for boggus FullCD */ case 4001: /* FIXME: for bogus FullCD */
case MCI_CDA_STATUS_TYPE_TRACK: case MCI_CDA_STATUS_TYPE_TRACK:
if (!(dwFlags & MCI_TRACK)) if (!(dwFlags & MCI_TRACK))
ret = MCIERR_MISSING_PARAMETER; ret = MCIERR_MISSING_PARAMETER;
@ -711,7 +711,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
/* /*
TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat); TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat);
TRACE("dwAudio=%08lX\n", lpParms->dwAudio); TRACE("dwAudio=%08lX\n", lpParms->dwAudio);

16
misc/cdrom.c
View File

@ -362,13 +362,13 @@ BOOL CDROM_Audio_GetCDStatus(WINE_CDAUDIO* wcda)
wcda->sc.what.position.absaddr.msf.frame; wcda->sc.what.position.absaddr.msf.frame;
#endif #endif
#ifdef linux #ifdef linux
TRACE("%02u-%02u:%02u:%02u \n", TRACE("%02u-%02u:%02u:%02u\n",
wcda->sc.cdsc_trk, wcda->sc.cdsc_trk,
wcda->sc.cdsc_absaddr.msf.minute, wcda->sc.cdsc_absaddr.msf.minute,
wcda->sc.cdsc_absaddr.msf.second, wcda->sc.cdsc_absaddr.msf.second,
wcda->sc.cdsc_absaddr.msf.frame); wcda->sc.cdsc_absaddr.msf.frame);
#else #else
TRACE("%02u-%02u:%02u:%02u \n", TRACE("%02u-%02u:%02u:%02u\n",
wcda->sc.what.position.track_number, wcda->sc.what.position.track_number,
wcda->sc.what.position.absaddr.msf.minute, wcda->sc.what.position.absaddr.msf.minute,
wcda->sc.what.position.absaddr.msf.second, wcda->sc.what.position.absaddr.msf.second,
@ -588,9 +588,9 @@ DWORD CDROM_Audio_GetSerial(WINE_CDAUDIO* wcda)
/* /*
* wMagic collects the wFrames from track 1 * wMagic collects the wFrames from track 1
* dwStart, dwEnd collect the begining and end of the disc respectively, in * dwStart, dwEnd collect the beginning and end of the disc respectively, in
* frames. * frames.
* There is is collected for correcting the serial when there are less than * There it is collected for correcting the serial when there are less than
* 3 tracks. * 3 tracks.
*/ */
wMagic = 0; wMagic = 0;
@ -676,9 +676,9 @@ DWORD CDROM_GetSerial(int drive)
WINE_CDAUDIO wcda; WINE_CDAUDIO wcda;
DWORD serial = 0; DWORD serial = 0;
/* EXPIRES 01.01.2001 */ /* EXPIRES 01.01.2002 */
FIXME("CD-ROM serial number calculation might fail.\n"); WARN("CD-ROM serial number calculation might fail.\n");
FIXME("Please test with as many exotic CDs as possible !\n"); WARN("Please test with as many exotic CDs as possible !\n");
if (!(CDROM_Open(&wcda, drive))) if (!(CDROM_Open(&wcda, drive)))
{ {
@ -706,7 +706,7 @@ DWORD CDROM_GetSerial(int drive)
p = (media == CDS_AUDIO) ? "Audio " : p = (media == CDS_AUDIO) ? "Audio " :
(media > CDS_AUDIO) ? "Data " : ""; (media > CDS_AUDIO) ? "Data " : "";
if (serial) if (serial)
FIXME("%sCD serial number is %04x-%04x.\n", TRACE("%sCD serial number is %04x-%04x.\n",
p, HIWORD(serial), LOWORD(serial)); p, HIWORD(serial), LOWORD(serial));
else else
ERR("couldn't get %sCD serial !\n", p); ERR("couldn't get %sCD serial !\n", p);