Moved mcicda to the top-level dlls directory.

configure.ac

@@ -1725,7 +1725,7 @@ dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile
 dlls/winmm/mcianim/Makefile
 dlls/winmm/mciavi/Makefile
-dlls/winmm/mcicda/Makefile
+dlls/mcicda/Makefile
 dlls/winmm/mciseq/Makefile
 dlls/winmm/mciwave/Makefile
 dlls/winmm/tests/Makefile

dlls/Makefile.in

@@ -70,6 +70,7 @@ BASEDIRS = \
 	kernel \
 	lzexpand \
 	mapi32 \
+	mcicda \
 	midimap \
 	mlang \
 	mmdevldr.vxd \
@@ -156,7 +157,6 @@ BASEDIRS = \
 	winmm/joystick \
 	winmm/mcianim \
 	winmm/mciavi \
-	winmm/mcicda \
 	winmm/mciseq \
 	winmm/mciwave \
 	winmm/wavemap \
@@ -318,7 +318,7 @@ SYMLINKS_SO = \
 	mapi32.dll.so \
 	mcianim.drv.so \
 	mciavi.drv.so \
-	mcicda.drv.so \
+	mcicda.dll.so \
 	mciseq.drv.so \
 	mciwave.drv.so \
 	midimap.dll.so \
@@ -651,8 +651,8 @@ mcianim.drv.so: winmm/mcianim/mcianim.drv.so
 mciavi.drv.so: winmm/mciavi/mciavi.drv.so
 	$(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@
 
-mcicda.drv.so: winmm/mcicda/mcicda.drv.so
-	$(RM) $@ && $(LN_S) winmm/mcicda/mcicda.drv.so $@
+mcicda.dll.so: mcicda/mcicda.dll.so
+	$(RM) $@ && $(LN_S) mcicda/mcicda.dll.so $@
 
 mciseq.drv.so: winmm/mciseq/mciseq.drv.so
 	$(RM) $@ && $(LN_S) winmm/mciseq/mciseq.drv.so $@
@@ -1667,7 +1667,7 @@ lzexpand/lz32.dll.so: lzexpand
 mapi32/mapi32.dll.so: mapi32
 winmm/mcianim/mcianim.drv.so: winmm/mcianim
 winmm/mciavi/mciavi.drv.so: winmm/mciavi
-winmm/mcicda/mcicda.drv.so: winmm/mcicda
+mcicda/mcicda.dll.so: mcicda
 winmm/mciseq/mciseq.drv.so: winmm/mciseq
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
 midimap/midimap.dll.so: midimap

dlls/winmm/mcicda/.cvsignore → dlls/mcicda/.cvsignore

 Makefile
-mcicda.drv.dbg.c
+mcicda.dll.dbg.c

dlls/winmm/mcicda/Makefile.in → dlls/mcicda/Makefile.in

 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = mcicda.drv
+MODULE    = mcicda.dll
 IMPORTS   = winmm user32 kernel32
 EXTRALIBS = $(LIBUNICODE)
 

dlls/winmm/mcicda/mcicda.c → dlls/mcicda/mcicda.c

-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
 /*
  * MCI driver for audio CD (MCICDA)
  *

dlls/mcicda/mcicda.spec

+@ stdcall -private DriverProc(long long long long long) MCICDA_DriverProc

dlls/winmm/mcicda/mcicda.drv.spec

-@ stdcall DriverProc(long long long long long) MCICDA_DriverProc

tools/winapi/win32.api

@@ -1813,7 +1813,7 @@ DWORD
 HDRVR
 LONG
 
-%%mcicda.drv
+%%mcicda.dll
 
 %long
 

tools/wine.inf

@@ -208,7 +208,7 @@ HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixel
 
 [MCI]
 HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv"
-HKLM,%Mci32Str%,"CDAudio",,"mcicda.drv"
+HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll"
 HKLM,%Mci32Str%,"Sequencer",,"mciseq.drv"
 HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv"
 
@@ -2065,7 +2065,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 system.ini, mci,,"MPEGVideo=mciqtz.drv" 
 system.ini, mci,,"MPEGVideo2=mciqtz.drv" 
 system.ini, mci,,"avivideo=mciavi.drv" 
-system.ini, mci,,"cdaudio=mcicda.drv" 
+system.ini, mci,,"cdaudio=mcicda.dll" 
 system.ini, mci,,"sequencer=mciseq.drv" 
 system.ini, mci,,"vcr=mcivisca.drv" 
 system.ini, mci,,"; videodisc=mcipionr.drv"