mciwave: Renamed mciwave.drv to mciwave.dll, and moved the directory to the top-level.

configure.ac

@@ -1600,6 +1600,7 @@ dlls/mapi32/tests/Makefile
 dlls/mciavi32/Makefile
 dlls/mcicda/Makefile
 dlls/mciseq/Makefile
+dlls/mciwave/Makefile
 dlls/midimap/Makefile
 dlls/mlang/Makefile
 dlls/mlang/tests/Makefile
@@ -1721,7 +1722,6 @@ dlls/wininet/Makefile
 dlls/wininet/tests/Makefile
 dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile
-dlls/winmm/mciwave/Makefile
 dlls/winmm/tests/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/winealsa/Makefile

dlls/Makefile.in

@@ -76,6 +76,7 @@ BASEDIRS = \
 	mciavi32 \
 	mcicda \
 	mciseq \
+	mciwave \
 	midimap \
 	mlang \
 	mmdevldr.vxd \
@@ -164,7 +165,6 @@ BASEDIRS = \
 	wininet \
 	winmm \
 	winmm/joystick \
-	winmm/mciwave \
 	winmm/wavemap \
 	winmm/winealsa \
 	winmm/winearts \
@@ -270,7 +270,6 @@ SYMLINKS_SO = \
 	gdi32.dll.so \
 	joystick.drv.so \
 	kernel32.dll.so \
-	mciwave.drv.so \
 	msacm.drv.so \
 	msisys.ocx.so \
 	user32.dll.so \
@@ -311,9 +310,6 @@ joystick.drv.so: winmm/joystick/joystick.drv.so
 kernel32.dll.so: kernel/kernel32.dll.so
 	$(RM) $@ && $(LN_S) kernel/kernel32.dll.so $@
 
-mciwave.drv.so: winmm/mciwave/mciwave.drv.so
-	$(RM) $@ && $(LN_S) winmm/mciwave/mciwave.drv.so $@
-
 msacm.drv.so: winmm/wavemap/msacm.drv.so
 	$(RM) $@ && $(LN_S) winmm/wavemap/msacm.drv.so $@
 
@@ -926,7 +922,6 @@ ddraw/ddraw.dll.so: ddraw
 gdi/gdi32.dll.so: gdi
 winmm/joystick/joystick.drv.so: winmm/joystick
 kernel/kernel32.dll.so: kernel
-winmm/mciwave/mciwave.drv.so: winmm/mciwave
 winmm/wavemap/msacm.drv.so: winmm/wavemap
 msisys/msisys.ocx.so: msisys
 user/user32.dll.so: user

dlls/winmm/mciwave/Makefile.in → dlls/mciwave/Makefile.in

 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = mciwave.drv
+MODULE    = mciwave
 IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \

tools/wine.inf

@@ -245,7 +245,7 @@ HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixel
 HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll"
 HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll"
 HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll"
-HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv"
+HKLM,%Mci32Str%,"WaveAudio",,"mciwave.dll"
 
 HKLM,%MciExtStr%,"aifc",,"MPEGVideo"
 HKLM,%MciExtStr%,"asf",,"MPEGVideo"
@@ -2150,7 +2150,7 @@ system.ini, mci,,"cdaudio=mcicda.dll"
 system.ini, mci,,"sequencer=mciseq.dll" 
 system.ini, mci,,"vcr=mcivisca.drv" 
 system.ini, mci,,"; videodisc=mcipionr.drv" 
-system.ini, mci,,"waveaudio=mciwave.drv" 
+system.ini, mci,,"waveaudio=mciwave.dll" 
 
 system.ini, drivers32,,"MSACM.imaadpcm=imaadp32.acm" 
 system.ini, drivers32,,"MSACM.msadpcm=msadp32.acm"