Alexandre Julliard : winmm: Make sound.drv into a stand-alone 16-bit module .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b0530a5fbdba9d4661c34ed8d773ab7128a1d431
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0530a5fbdba9d4661c34ed8d7...

Author: Alexandre Julliard 
Date:   Mon Mar 23 20:35:00 2009 +0100

winmm: Make sound.drv into a stand-alone 16-bit module.

---

.gitignore                                         |    1 -
 configure                                          |    9 +++++++++
 configure.ac                                       |    1 +
 dlls/Makefile.in                                   |    3 +--
 dlls/sound.drv16/Makefile.in                       |   15 +++++++++++++++
 dlls/{winmm/sound16.c => sound.drv16/sound.c}      |    0 
 .../sound.drv16.spec}                              |    0 
 dlls/winmm/Makefile.in                             |    6 ++----
 8 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 76e57f5..3619da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,6 @@ dlls/rpcrt4/tests/server_s.c
 dlls/setupx.dll16
 dlls/shdocvw/shdocvw_v1.tlb
 dlls/shell.dll16
-dlls/sound.drv16
 dlls/stdole2.tlb/std_ole_v2.tlb
 dlls/stdole32.tlb/std_ole_v1.tlb
 dlls/system.drv16
diff --git a/configure b/configure
index 7cd8973..2b50abf 100755
--- a/configure
+++ b/configure
@@ -27128,6 +27128,14 @@ dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/softpub/Makefile"

ALL_MAKEFILES="$ALL_MAKEFILES \
+	dlls/sound.drv16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \
+	sound.drv16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/sound.drv16/Makefile: dlls/sound.drv16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/sound.drv16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \
    dlls/spoolss/Makefile"
 test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \
    spoolss"
@@ -29374,6 +29382,7 @@ do
     "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;;
     "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;;
     "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;;
+    "dlls/sound.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sound.drv16/Makefile" ;;
     "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;;
     "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;;
     "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b1c7377..c3f7008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2205,6 +2205,7 @@ WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI
 WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sound.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 928b6c3..bf7bcc0 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -27,7 +27,6 @@ WIN16_FILES = \
    msvideo.dll16 \
    setupx.dll16 \
    shell.dll16 \
-	sound.drv16 \
    system.drv16 \
    toolhelp.dll16 \
    user.exe16 \
@@ -84,7 +83,7 @@ wprocs.dll16:
 wineps16.drv16:
    echo "wineps.drv" >$@

-mmsystem.dll16 sound.drv16:
+mmsystem.dll16:
    echo "winmm.dll" >$@

winnls.dll16:
diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in
new file mode 100644
index 0000000..e61efec
--- /dev/null
+++ b/dlls/sound.drv16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = sound.drv16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
+
+SPEC_SRCS = sound.drv16.spec
+
+C_SRCS = sound.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winmm/sound16.c b/dlls/sound.drv16/sound.c
similarity index 100%
rename from dlls/winmm/sound16.c
rename to dlls/sound.drv16/sound.c
diff --git a/dlls/winmm/sound.drv.spec b/dlls/sound.drv16/sound.drv16.spec
similarity index 100%
rename from dlls/winmm/sound.drv.spec
rename to dlls/sound.drv16/sound.drv16.spec
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index bb92807..a8ebc62 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -19,12 +19,10 @@ C_SRCS = \

C_SRCS16 = \
    message16.c \
-	mmsystem.c \
-	sound16.c
+	mmsystem.c

SPEC_SRCS16 = \
-	mmsystem.spec \
-	sound.drv.spec
+	mmsystem.spec

RC_SRCS = winmm_res.rc