Moved midimap to the top-level dlls directory.

configure.ac

@@ -1612,6 +1612,7 @@ dlls/lzexpand/Makefile
 dlls/lzexpand/tests/Makefile
 dlls/mapi32/Makefile
 dlls/mapi32/tests/Makefile
+dlls/midimap/Makefile
 dlls/mlang/Makefile
 dlls/mlang/tests/Makefile
 dlls/mmdevldr.vxd/Makefile
@@ -1724,7 +1725,6 @@ dlls/winmm/mciavi/Makefile
 dlls/winmm/mcicda/Makefile
 dlls/winmm/mciseq/Makefile
 dlls/winmm/mciwave/Makefile
-dlls/winmm/midimap/Makefile
 dlls/winmm/tests/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/winealsa/Makefile

dlls/Makefile.in

@@ -70,6 +70,7 @@ BASEDIRS = \
 	kernel \
 	lzexpand \
 	mapi32 \
+	midimap \
 	mlang \
 	mmdevldr.vxd \
 	monodebg.vxd \
@@ -156,7 +157,6 @@ BASEDIRS = \
 	winmm/mcicda \
 	winmm/mciseq \
 	winmm/mciwave \
-	winmm/midimap \
 	winmm/wavemap \
 	winmm/winealsa \
 	winmm/winearts \
@@ -319,7 +319,7 @@ SYMLINKS_SO = \
 	mcicda.drv.so \
 	mciseq.drv.so \
 	mciwave.drv.so \
-	midimap.drv.so \
+	midimap.dll.so \
 	mlang.dll.so \
 	mmdevldr.vxd.so \
 	monodebg.vxd.so \
@@ -656,8 +656,8 @@ mciseq.drv.so: winmm/mciseq/mciseq.drv.so
 mciwave.drv.so: winmm/mciwave/mciwave.drv.so
 	$(RM) $@ && $(LN_S) winmm/mciwave/mciwave.drv.so $@
 
-midimap.drv.so: winmm/midimap/midimap.drv.so
+midimap.dll.so: midimap/midimap.dll.so
-	$(RM) $@ && $(LN_S) winmm/midimap/midimap.drv.so $@
+	$(RM) $@ && $(LN_S) midimap/midimap.dll.so $@
 
 mlang.dll.so: mlang/mlang.dll.so
 	$(RM) $@ && $(LN_S) mlang/mlang.dll.so $@
@@ -1720,7 +1720,7 @@ winmm/mciavi/mciavi.drv.so: winmm/mciavi
 winmm/mcicda/mcicda.drv.so: winmm/mcicda
 winmm/mciseq/mciseq.drv.so: winmm/mciseq
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
-winmm/midimap/midimap.drv.so: winmm/midimap
+midimap/midimap.dll.so: midimap
 mlang/mlang.dll.so: mlang
 mmdevldr.vxd/mmdevldr.vxd.so: mmdevldr.vxd
 monodebg.vxd/monodebg.vxd.so: monodebg.vxd

dlls/midimap/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+midimap.dll.dbg.c

dlls/midimap/Makefile.in

@@ -1,8 +1,8 @@
 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = midimap.drv
+MODULE    = midimap.dll
 IMPORTS   = winmm user32 advapi32 kernel32
 
 C_SRCS = \

dlls/midimap/midimap.c

@@ -1,4 +1,3 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
 /*
  * Wine MIDI mapper driver
  *

dlls/midimap/midimap.spec

@@ -1,2 +1,3 @@
 @ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
 @ stdcall modMessage(long long long long long) MIDIMAP_modMessage
+@ stub modmCallback

dlls/winmm/midimap/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-midimap.drv.dbg.c

dlls/winmm/winemm.h

@@ -30,7 +30,7 @@
 
 #define WINE_DEFAULT_WINMM_DRIVER     "oss"
 #define WINE_DEFAULT_WINMM_MAPPER     "msacm.drv"
-#define WINE_DEFAULT_WINMM_MIDI       "midimap.drv"
+#define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"
 
 typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 typedef DWORD (WINAPI *MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);

tools/winapi/win32.api

@@ -1830,7 +1830,7 @@ DWORD
 HDRVR
 LONG
 
-%%midimap.drv
+%%midimap.dll
 
 %long