Module: wine Branch: master Commit: d43148222aaca1698c3899649d43278a9652eefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43148222aaca1698c3899649d...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 11 16:22:47 2009 +0100
msacm32: Make msacm.dll into a stand-alone 16-bit module.
---
.gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 4 ---- dlls/msacm.dll16/Makefile.in | 15 +++++++++++++++ dlls/{msacm32/msacm_main.c => msacm.dll16/msacm.c} | 4 ++-- .../msacm.spec => msacm.dll16/msacm.dll16.spec} | 2 +- dlls/{msacm32 => msacm.dll16}/wineacm16.h | 0 dlls/msacm32/Makefile.in | 5 ----- 9 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore index 87ad420..6ae5342 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ dlls/libd3dx9.def dlls/libwinspool.def dlls/libxinput.def dlls/mmsystem.dll16 -dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h dlls/msi/cond.tab.c diff --git a/configure b/configure index 67bde50..09152d8 100755 --- a/configure +++ b/configure @@ -3910,6 +3910,7 @@ then enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} + enable_msacm_dll16=${enable_msacm_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -26008,6 +26009,14 @@ dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mprapi/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/msacm.dll16/Makefile" +test "x$enable_msacm_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + msacm.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/msacm.dll16/Makefile: dlls/msacm.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/msacm.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/msacm32.drv/Makefile" test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ msacm32.drv" @@ -29096,6 +29105,7 @@ do "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;; + "dlls/msacm.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm.dll16/Makefile" ;; "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;; "dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;; "dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0989948..a664ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,7 @@ then enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} + enable_msacm_dll16=${enable_msacm_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -2081,6 +2082,7 @@ WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msacm.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 58582ce..1abd27d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -28,7 +28,6 @@ WIN16_FILES = \ imm.dll16 \ krnl386.exe16 \ mmsystem.dll16 \ - msacm.dll16 \ msvideo.dll16 \ ole2.dll16 \ ole2conv.dll16 \ @@ -85,9 +84,6 @@ imm.dll16: krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@
-msacm.dll16: - echo "msacm32.dll" >$@ - msvideo.dll16: echo "msvfw32.dll" >$@
diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in new file mode 100644 index 0000000..6bb17e6 --- /dev/null +++ b/dlls/msacm.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msacm.dll16 +IMPORTS = msacm32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,msacm32.dll + +SPEC_SRCS = msacm.dll16.spec + +C_SRCS = msacm.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msacm32/msacm_main.c b/dlls/msacm.dll16/msacm.c similarity index 98% rename from dlls/msacm32/msacm_main.c rename to dlls/msacm.dll16/msacm.c index 8eb20b1..48729f9 100644 --- a/dlls/msacm32/msacm_main.c +++ b/dlls/msacm.dll16/msacm.c @@ -39,8 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); * MSACM DLL entry point * */ -BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, - WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) +BOOL WINAPI DllEntryPoint16(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, + WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { return TRUE; } diff --git a/dlls/msacm32/msacm.spec b/dlls/msacm.dll16/msacm.dll16.spec similarity index 96% rename from dlls/msacm32/msacm.spec rename to dlls/msacm.dll16/msacm.dll16.spec index e49115f..8f37a65 100644 --- a/dlls/msacm32/msacm.spec +++ b/dlls/msacm.dll16/msacm.dll16.spec @@ -1,6 +1,6 @@ # 1 stub WEP 2 stub DRIVERPROC - 3 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint + 3 pascal DllEntryPoint(long word word word long word) DllEntryPoint16 4 stub ___EXPORTEDSTUB 7 pascal acmGetVersion() acmGetVersion16 8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16 diff --git a/dlls/msacm32/wineacm16.h b/dlls/msacm.dll16/wineacm16.h similarity index 100% rename from dlls/msacm32/wineacm16.h rename to dlls/msacm.dll16/wineacm16.h diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index 8724d3b..48a1d2b 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -15,11 +15,6 @@ C_SRCS = \ pcmconverter.c \ stream.c
-C_SRCS16 = \ - msacm_main.c - -SPEC_SRCS16 = msacm.spec - RC_SRCS = msacm.rc
@MAKE_DLL_RULES@