Module: wine Branch: master Commit: a0053ab9aa526ab2141e4655f97f796e386bbdf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0053ab9aa526ab2141e4655f9...
Author: Eric Pouech eric.pouech@orange.fr Date: Tue May 5 21:25:32 2009 +0200
user32: Make ddeml.dll into a stand-alone 16bit module.
---
.gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/ddeml.dll16/Makefile.in | 16 ++++++++++++++++ dlls/{user32/ddeml16.c => ddeml.dll16/ddeml.c} | 0 .../ddeml.spec => ddeml.dll16/ddeml.dll16.spec} | 0 dlls/user32/Makefile.in | 2 -- 8 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore index 96eb69d..3ce8388 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/commdlg.dll16 -dlls/ddeml.dll16 dlls/gdi.exe16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/configure b/configure index ce18e5c..e6459d6 100755 --- a/configure +++ b/configure @@ -24990,6 +24990,14 @@ dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dciman32/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/ddeml.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + ddeml.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ddeml.dll16/Makefile: dlls/ddeml.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ddeml.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/ddraw/Makefile" test "x$enable_ddraw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ ddraw" @@ -29027,6 +29035,7 @@ do "dlls/d3dxof/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/tests/Makefile" ;; "dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;; "dlls/dciman32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;; + "dlls/ddeml.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddeml.dll16/Makefile" ;; "dlls/ddraw/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddraw/Makefile" ;; "dlls/ddraw/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddraw/tests/Makefile" ;; "dlls/ddrawex/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ddrawex/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5f8b86f..7ab7077 100644 --- a/configure.ac +++ b/configure.ac @@ -1969,6 +1969,7 @@ WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ddeml.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 498cb65..a040570 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS)
WIN16_FILES = \ commdlg.dll16 \ - ddeml.dll16 \ gdi.exe16 \ krnl386.exe16 \ mmsystem.dll16 \ @@ -57,7 +56,7 @@ msvideo.dll16: setupx.dll16: echo "setupapi.dll" >$@
-ddeml.dll16 user.exe16: +user.exe16: echo "user32.dll" >$@
ver.dll16: diff --git a/dlls/ddeml.dll16/Makefile.in b/dlls/ddeml.dll16/Makefile.in new file mode 100644 index 0000000..b1eb6c9 --- /dev/null +++ b/dlls/ddeml.dll16/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ddeml.dll16 +IMPORTS = user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = ddeml.dll16.spec + +C_SRCS = ddeml.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/ddeml16.c b/dlls/ddeml.dll16/ddeml.c similarity index 100% rename from dlls/user32/ddeml16.c rename to dlls/ddeml.dll16/ddeml.c diff --git a/dlls/user32/ddeml.spec b/dlls/ddeml.dll16/ddeml.dll16.spec similarity index 100% rename from dlls/user32/ddeml.spec rename to dlls/ddeml.dll16/ddeml.dll16.spec diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index da8cb8c..2141822 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -9,7 +9,6 @@ IMPORTS = gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = imm32
SPEC_SRCS16 = \ - ddeml.spec \ user.exe.spec
C_SRCS = \ @@ -22,7 +21,6 @@ C_SRCS = \ dde_client.c \ dde_misc.c \ dde_server.c \ - ddeml16.c \ defdlg.c \ defwnd.c \ desktop.c \