Ignore MCI_OPEN_ELEMENT in CDAUDIO_mciOpen.

c697cc3d · Uwe Bonnes · Alexandre Julliard · 1077d0cd · c697cc3d
Commit c697cc3d authored Nov 14, 1999 by Uwe Bonnes Committed by Alexandre Julliard Nov 14, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

mcicda.c dlls/winmm/mcicda/mcicda.c +7 -2

No files found.
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -228,8 +228,13 @@ static DWORD CDAUDIO_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpe
 	wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE;
    }
    if (dwFlags & MCI_OPEN_ELEMENT) {
-	TRACE("MCI_OPEN_ELEMENT !\n");
+        if (dwFlags & MCI_OPEN_ELEMENT_ID) {
-	return MCIERR_NO_ELEMENT_ALLOWED;
+            WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort", (DWORD)lpOpenParms->lpstrElementName);
+            return MCIERR_NO_ELEMENT_ALLOWED;
+        }
+        WARN("MCI_OPEN_ELEMENT %s ignored\n",lpOpenParms->lpstrElementName);
+        /*return MCIERR_NO_ELEMENT_ALLOWED; 
+          bon 19991106 allows cdplayer.exe to run*/
    }
    wmcda->wNotifyDeviceID = dwDeviceID;