From 2951862be2378e298318e50f341f50053036c8bc Mon Sep 17 00:00:00 2001
From: Andreas Mohr <a.mohr@mailto.de>
Date: Tue, 29 Aug 2000 23:56:20 +0000
Subject: [PATCH] Fixed verbose CD-ROM serial number warnings and some spelling
 errors.

---
 dlls/winmm/mcicda/mcicda.c |  4 ++--
 misc/cdrom.c               | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index c3566453f30..6fc6597a2dd 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -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));
 	    ret = MCI_RESOURCE_RETURNED;
 	    break;
-	case 4001: /* FIXME: for boggus FullCD */
+	case 4001: /* FIXME: for bogus FullCD */
 	case MCI_CDA_STATUS_TYPE_TRACK:
 	    if (!(dwFlags & MCI_TRACK)) 
 		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);
     
     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("dwAudio=%08lX\n", lpParms->dwAudio);
diff --git a/misc/cdrom.c b/misc/cdrom.c
index e3fea31c793..224026ce9cb 100644
--- a/misc/cdrom.c
+++ b/misc/cdrom.c
@@ -362,13 +362,13 @@ BOOL CDROM_Audio_GetCDStatus(WINE_CDAUDIO* wcda)
 	wcda->sc.what.position.absaddr.msf.frame;
 #endif
 #ifdef linux
-    TRACE("%02u-%02u:%02u:%02u \n",
+    TRACE("%02u-%02u:%02u:%02u\n",
 	  wcda->sc.cdsc_trk,
 	  wcda->sc.cdsc_absaddr.msf.minute,
 	  wcda->sc.cdsc_absaddr.msf.second,
 	  wcda->sc.cdsc_absaddr.msf.frame);
 #else
-    TRACE("%02u-%02u:%02u:%02u \n",
+    TRACE("%02u-%02u:%02u:%02u\n",
 	  wcda->sc.what.position.track_number,
 	  wcda->sc.what.position.absaddr.msf.minute,
 	  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
-	 * 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.
-	 * 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.
 	 */
 	wMagic = 0;
@@ -676,9 +676,9 @@ DWORD CDROM_GetSerial(int drive)
     WINE_CDAUDIO wcda;
     DWORD serial = 0;
 
-    /* EXPIRES 01.01.2001 */
-    FIXME("CD-ROM serial number calculation might fail.\n");
-    FIXME("Please test with as many exotic CDs as possible !\n");
+    /* EXPIRES 01.01.2002 */
+    WARN("CD-ROM serial number calculation might fail.\n");
+    WARN("Please test with as many exotic CDs as possible !\n");
 
     if (!(CDROM_Open(&wcda, drive)))
     {
@@ -706,7 +706,7 @@ DWORD CDROM_GetSerial(int drive)
 	p = (media == CDS_AUDIO) ? "Audio " :
 	    (media > CDS_AUDIO) ? "Data " : "";
 	if (serial)
-	    FIXME("%sCD serial number is %04x-%04x.\n",
+	    TRACE("%sCD serial number is %04x-%04x.\n",
 		p, HIWORD(serial), LOWORD(serial));
 	else
 	    ERR("couldn't get %sCD serial !\n", p);