Commit d4314822 authored by Alexandre Julliard's avatar Alexandre Julliard

msacm32: Make msacm.dll into a stand-alone 16-bit module.

parent 96b47ff7
...@@ -46,7 +46,6 @@ dlls/libd3dx9.def ...@@ -46,7 +46,6 @@ dlls/libd3dx9.def
dlls/libwinspool.def dlls/libwinspool.def
dlls/libxinput.def dlls/libxinput.def
dlls/mmsystem.dll16 dlls/mmsystem.dll16
dlls/msacm.dll16
dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml.tlb/mshtml_tlb.tlb
dlls/mshtml/nsiface.h dlls/mshtml/nsiface.h
dlls/msi/cond.tab.c dlls/msi/cond.tab.c
......
...@@ -3910,6 +3910,7 @@ then ...@@ -3910,6 +3910,7 @@ then
enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no}
enable_mouse_drv16=${enable_mouse_drv16:-no} enable_mouse_drv16=${enable_mouse_drv16:-no}
enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no}
...@@ -26008,6 +26009,14 @@ dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules" ...@@ -26008,6 +26009,14 @@ dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/mprapi/Makefile" ac_config_files="$ac_config_files dlls/mprapi/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ 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" dlls/msacm32.drv/Makefile"
test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
msacm32.drv" msacm32.drv"
...@@ -29096,6 +29105,7 @@ do ...@@ -29096,6 +29105,7 @@ do
"dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;;
"dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;;
"dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/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.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;;
"dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;; "dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;;
"dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;; "dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;;
......
...@@ -147,6 +147,7 @@ then ...@@ -147,6 +147,7 @@ then
enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no}
enable_mouse_drv16=${enable_mouse_drv16:-no} enable_mouse_drv16=${enable_mouse_drv16:-no}
enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_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 ...@@ -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/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/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/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.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/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
......
...@@ -28,7 +28,6 @@ WIN16_FILES = \ ...@@ -28,7 +28,6 @@ WIN16_FILES = \
imm.dll16 \ imm.dll16 \
krnl386.exe16 \ krnl386.exe16 \
mmsystem.dll16 \ mmsystem.dll16 \
msacm.dll16 \
msvideo.dll16 \ msvideo.dll16 \
ole2.dll16 \ ole2.dll16 \
ole2conv.dll16 \ ole2conv.dll16 \
...@@ -85,9 +84,6 @@ imm.dll16: ...@@ -85,9 +84,6 @@ imm.dll16:
krnl386.exe16 system.drv16 toolhelp.dll16: krnl386.exe16 system.drv16 toolhelp.dll16:
echo "kernel32.dll" >$@ echo "kernel32.dll" >$@
msacm.dll16:
echo "msacm32.dll" >$@
msvideo.dll16: msvideo.dll16:
echo "msvfw32.dll" >$@ echo "msvfw32.dll" >$@
......
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
...@@ -39,8 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); ...@@ -39,8 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm);
* MSACM DLL entry point * MSACM DLL entry point
* *
*/ */
BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, BOOL WINAPI DllEntryPoint16(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds,
WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) WORD wHeapSize, DWORD dwReserved1, WORD wReserved2)
{ {
return TRUE; return TRUE;
} }
......
# 1 stub WEP # 1 stub WEP
2 stub DRIVERPROC 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 4 stub ___EXPORTEDSTUB
7 pascal acmGetVersion() acmGetVersion16 7 pascal acmGetVersion() acmGetVersion16
8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16 8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16
......
...@@ -15,11 +15,6 @@ C_SRCS = \ ...@@ -15,11 +15,6 @@ C_SRCS = \
pcmconverter.c \ pcmconverter.c \
stream.c stream.c
C_SRCS16 = \
msacm_main.c
SPEC_SRCS16 = msacm.spec
RC_SRCS = msacm.rc RC_SRCS = msacm.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment