mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 20:23:38 +00:00
msacm32: Make msacm.dll into a stand-alone 16-bit module.
This commit is contained in:
parent
96b47ff78a
commit
d43148222a
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -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
|
||||
|
|
10
configure
vendored
10
configure
vendored
|
@ -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}
|
||||
|
@ -26007,6 +26008,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
|
|||
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 \\
|
||||
|
@ -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" ;;
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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" >$@
|
||||
|
||||
|
|
15
dlls/msacm.dll16/Makefile.in
Normal file
15
dlls/msacm.dll16/Makefile.in
Normal file
|
@ -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
|
|
@ -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;
|
||||
}
|
|
@ -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
|
|
@ -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@
|
||||
|
|
Loading…
Reference in a new issue