Eric Pouech : winmm: Final split of mmsystem.
Alexandre Julliard
julliard at winehq.org
Fri Oct 23 10:19:04 CDT 2009
Module: wine
Branch: master
Commit: a60dd6e9181abc6d94fce490152c0492597178c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60dd6e9181abc6d94fce490152c0492597178c4
Author: Eric Pouech <eric.pouech at orange.fr>
Date: Thu Oct 22 22:11:29 2009 +0200
winmm: Final split of mmsystem.
---
.gitignore | 1 -
configure | 9 +++++++++
configure.ac | 1 +
dlls/Makefile.in | 4 ----
dlls/mmsystem.dll16/Makefile.in | 18 ++++++++++++++++++
dlls/{winmm => mmsystem.dll16}/mci16.c | 0
dlls/{winmm => mmsystem.dll16}/message16.c | 0
dlls/{winmm => mmsystem.dll16}/mmio16.c | 0
dlls/{winmm => mmsystem.dll16}/mmsystem.c | 12 ++++++------
.../mmsystem.dll16.spec} | 0
dlls/{winmm => mmsystem.dll16}/winemm16.h | 0
dlls/winmm/Makefile.in | 9 ---------
12 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5d498c8..2ac3a69 100644
--- a/.gitignore
+++ b/.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
diff --git a/configure b/configure
index 1507ead..32e37b2 100755
--- a/configure
+++ b/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" ;;
diff --git a/configure.ac b/configure.ac
index 7fddf44..68f0f27 100644
--- a/configure.ac
+++ b/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])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 8dcfdab..92f129f 100644
--- a/dlls/Makefile.in
+++ b/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)
diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in
new file mode 100644
index 0000000..eb6c6f6
--- /dev/null
+++ b/dlls/mmsystem.dll16/Makefile.in
@@ -0,0 +1,18 @@
+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
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/winmm/mci16.c b/dlls/mmsystem.dll16/mci16.c
similarity index 100%
rename from dlls/winmm/mci16.c
rename to dlls/mmsystem.dll16/mci16.c
diff --git a/dlls/winmm/message16.c b/dlls/mmsystem.dll16/message16.c
similarity index 100%
rename from dlls/winmm/message16.c
rename to dlls/mmsystem.dll16/message16.c
diff --git a/dlls/winmm/mmio16.c b/dlls/mmsystem.dll16/mmio16.c
similarity index 100%
rename from dlls/winmm/mmio16.c
rename to dlls/mmsystem.dll16/mmio16.c
diff --git a/dlls/winmm/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c
similarity index 99%
rename from dlls/winmm/mmsystem.c
rename to dlls/mmsystem.dll16/mmsystem.c
index f258fee..a7578e7 100644
--- a/dlls/winmm/mmsystem.c
+++ b/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;
diff --git a/dlls/winmm/mmsystem.spec b/dlls/mmsystem.dll16/mmsystem.dll16.spec
similarity index 100%
rename from dlls/winmm/mmsystem.spec
rename to dlls/mmsystem.dll16/mmsystem.dll16.spec
diff --git a/dlls/winmm/winemm16.h b/dlls/mmsystem.dll16/winemm16.h
similarity index 100%
rename from dlls/winmm/winemm16.h
rename to dlls/mmsystem.dll16/winemm16.h
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 416b56b..0848ca5 100644
--- a/dlls/winmm/Makefile.in
+++ b/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 \
More information about the wine-cvs
mailing list