Bruno Jesus : mcicda: Use a helper to read the CD-ROM TOC.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9b13bb2296cfde41629ce87dcfcf9663cde57341
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9b13bb2296cfde41629ce87dcfcf9663cde57341

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Sat Jul 30 21:54:28 2016 -0300

mcicda: Use a helper to read the CD-ROM TOC.

Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mcicda/mcicda.c | 59 ++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c
index 234e4e1..18881ef 100644
--- a/dlls/mcicda/mcicda.c
+++ b/dlls/mcicda/mcicda.c
@@ -253,6 +253,18 @@ static void MCICDA_Notify(DWORD_PTR hWndCallBack, WINE_MCICDAUDIO* wmcda, UINT w
 }
 
 /**************************************************************************
+ * 				MCICDA_ReadTOC		[internal]
+ */
+static BOOL MCICDA_ReadTOC(WINE_MCICDAUDIO* wmcda, CDROM_TOC *toc, DWORD *br)
+{
+    if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, toc, sizeof(*toc), br, NULL)) {
+        WARN("error reading TOC !\n");
+        return FALSE;
+    }
+    return TRUE;
+}
+
+/**************************************************************************
  * 				MCICDA_GetStatus		[internal]
  */
 static	DWORD    MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda)
@@ -722,11 +734,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
             TRACE("CURRENT_TRACK=%lu\n", lpParms->dwReturn);
 	    break;
 	case MCI_STATUS_LENGTH:
-            if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                                 &toc, sizeof(toc), &br, NULL)) {
-                WARN("error reading TOC !\n");
+	    if (!MCICDA_ReadTOC(wmcda, &toc, &br))
                 return MCICDA_GetError(wmcda);
-	    }
+
 	    if (dwFlags & MCI_TRACK) {
 		TRACE("MCI_TRACK #%u LENGTH=??? !\n", lpParms->dwTrack);
 		if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack)
@@ -764,11 +774,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
 	    ret = MCI_RESOURCE_RETURNED;
 	    break;
 	case MCI_STATUS_NUMBER_OF_TRACKS:
-            if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                                 &toc, sizeof(toc), &br, NULL)) {
-                WARN("error reading TOC !\n");
+	    if (!MCICDA_ReadTOC(wmcda, &toc, &br))
                 return MCICDA_GetError(wmcda);
-	    }
+
 	    lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1;
             TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu\n", lpParms->dwReturn);
 	    if (lpParms->dwReturn == (WORD)-1)
@@ -777,20 +785,16 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
 	case MCI_STATUS_POSITION:
             switch (dwFlags & (MCI_STATUS_START | MCI_TRACK)) {
             case MCI_STATUS_START:
-                if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                                     &toc, sizeof(toc), &br, NULL)) {
-                    WARN("error reading TOC !\n");
+                if (!MCICDA_ReadTOC(wmcda, &toc, &br))
                     return MCICDA_GetError(wmcda);
-                }
+
 		lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack);
 		TRACE("get MCI_STATUS_START !\n");
                 break;
             case MCI_TRACK:
-                if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                                     &toc, sizeof(toc), &br, NULL)) {
-                    WARN("error reading TOC !\n");
+                if (!MCICDA_ReadTOC(wmcda, &toc, &br))
                     return MCICDA_GetError(wmcda);
-                }
+
 		if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack)
 		    return MCIERR_OUTOFRANGE;
 		lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack);
@@ -835,11 +839,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
 	    if (!(dwFlags & MCI_TRACK))
 		ret = MCIERR_MISSING_PARAMETER;
 	    else {
-                if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                                     &toc, sizeof(toc), &br, NULL)) {
-                    WARN("error reading TOC !\n");
+                if (!MCICDA_ReadTOC(wmcda, &toc, &br))
                     return MCICDA_GetError(wmcda);
-                }
+
 		if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack)
 		    ret = MCIERR_OUTOFRANGE;
 		else
@@ -867,11 +869,9 @@ static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame)
   int i;
   DWORD br;
   CDROM_TOC toc;
-  if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                      &toc, sizeof(toc), &br, NULL)) {
-    WARN("error reading TOC !\n");
+  if (!MCICDA_ReadTOC(wmcda, &toc, &br))
     return MCICDA_GetError(wmcda);
-  }
+
   if (*frame < FRAME_OF_TOC(toc,toc.FirstTrack) ||
       *frame >= FRAME_OF_TOC(toc,toc.LastTrack+1)) /* lead-out */
     return MCIERR_OUTOFRANGE;
@@ -914,11 +914,8 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
     if (wmcda == NULL)
 	return MCIERR_INVALID_DEVICE_ID;
 
-    if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                         &toc, sizeof(toc), &br, NULL)) {
-        WARN("error reading TOC !\n");
+    if (!MCICDA_ReadTOC(wmcda, &toc, &br))
         return MCICDA_GetError(wmcda);
-    }
 
     if (dwFlags & MCI_FROM) {
 	start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom);
@@ -1198,11 +1195,9 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
      * then only checks the position flags, then stops and seeks. */
     MCICDA_Stop(wDevID, MCI_WAIT, 0);
 
-    if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
-                         &toc, sizeof(toc), &br, NULL)) {
-        WARN("error reading TOC !\n");
+    if (!MCICDA_ReadTOC(wmcda, &toc, &br))
         return MCICDA_GetError(wmcda);
-    }
+
     switch (position) {
     case MCI_SEEK_TO_START:
 	TRACE("Seeking to start\n");