winmm: Final split of mmsystem.

.gitignore

@@ -64,7 +64,6 @@ dlls/krnl386.exe16
 dlls/libd3dx9.def
 dlls/libwinspool.def
 dlls/libxinput.def
-dlls/mmsystem.dll16
 dlls/msdaps/msdaps.h
 dlls/msdaps/msdaps_i.c
 dlls/msdaps/msdaps_p.c

configure

@@ -15351,6 +15351,14 @@ dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/mmsystem.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mmsystem.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/mmsystem.dll16/Makefile: dlls/mmsystem.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/mmsystem.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/monodebg.vxd/Makefile"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	monodebg.vxd"
@@ -18937,6 +18945,7 @@ do
     "dlls/mlang/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;;
     "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;;
     "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;;
+    "dlls/mmsystem.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmsystem.dll16/Makefile" ;;
     "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;;
     "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;;
     "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;;

configure.ac

@@ -2305,6 +2305,7 @@ WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/mmsystem.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

dlls/Makefile.in

@@ -21,7 +21,6 @@ WIN16_FILES = \
 	commdlg.dll16 \
 	gdi.exe16 \
 	krnl386.exe16 \
-	mmsystem.dll16 \
 	user.exe16 \
 	wprocs.dll16
 
@@ -48,9 +47,6 @@ user.exe16:
 wprocs.dll16:
 	echo "winedos.dll" >$@
 
-mmsystem.dll16:
-	echo "winmm.dll" >$@
-
 # Import libraries
 
 STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)

dlls/mmsystem.dll16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mmsystem.dll16
+IMPORTS   = winmm user32 kernel32
+
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
+
+C_SRCS = \
+	mci16.c \
+	message16.c \
+	mmio16.c \
+	mmsystem.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/winmm/mmsystem.c → dlls/mmsystem.dll16/mmsystem.c

@@ -452,12 +452,12 @@ UINT16 WINAPI auxGetDevCaps16(UINT16 uDeviceID, LPAUXCAPS16 lpCaps, UINT16 uSize
     ret = auxGetDevCapsA(uDeviceID, &acA, sizeof(acA));
     if (ret == MMSYSERR_NOERROR) {
 	AUXCAPS16 ac16;
-	ac16.wMid           = acA.wMid; 
-	ac16.wPid           = acA.wPid; 
-	ac16.vDriverVersion = acA.vDriverVersion; 
-	strcpy(ac16.szPname, acA.szPname); 
-	ac16.wTechnology    = acA.wTechnology; 
-	ac16.dwSupport      = acA.dwSupport; 
+	ac16.wMid           = acA.wMid;
+	ac16.wPid           = acA.wPid;
+	ac16.vDriverVersion = acA.vDriverVersion;
+	strcpy(ac16.szPname, acA.szPname);
+	ac16.wTechnology    = acA.wTechnology;
+	ac16.dwSupport      = acA.dwSupport;
 	memcpy(lpCaps, &ac16, min(uSize, sizeof(ac16)));
     }
     return ret;

dlls/winmm/Makefile.in

@@ -17,15 +17,6 @@ C_SRCS = \
 	time.c \
 	winmm.c
 
-C_SRCS16 = \
-	mci16.c \
-	message16.c \
-	mmio16.c \
-	mmsystem.c
-
-SPEC_SRCS16 = \
-	mmsystem.spec
-
 RC_SRCS = \
 	winmm_Cs.rc \
 	winmm_Da.rc \