Module: wine Branch: master Commit: 7511d674472890a0f3008fe7a2ccc073f560e36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7511d674472890a0f3008fe7a2...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 11 16:53:06 2009 +0100
ole32: Make ole2nls.dll into a stand-alone 16-bit module.
---
.gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/ole2nls.dll16/Makefile.in | 19 +++++++++++++++++++ dlls/{ole32 => ole2nls.dll16}/ole2nls.c | 0 .../ole2nls.dll16.spec} | 0 .../version16.rc => ole2nls.dll16/version.rc} | 0 dlls/ole32/Makefile.in | 10 ---------- 9 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore index cffe7f5..b329f23 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ dlls/msvideo.dll16 dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 dlls/ole2disp.dll16 -dlls/ole2nls.dll16 dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h diff --git a/configure b/configure index 3db54ea..0c2dd7a 100755 --- a/configure +++ b/configure @@ -3912,6 +3912,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} @@ -26486,6 +26487,14 @@ dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/ole2nls.dll16/Makefile" +test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + ole2nls.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2nls.dll16/Makefile: dlls/ole2nls.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2nls.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/ole2prox.dll16/Makefile" test "x$enable_ole2prox_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ ole2prox.dll16" @@ -29209,6 +29218,7 @@ do "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; + "dlls/ole2nls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2nls.dll16/Makefile" ;; "dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.dll16/Makefile" ;; "dlls/ole2thk.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2thk.dll16/Makefile" ;; "dlls/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; diff --git a/configure.ac b/configure.ac index a123504..c855f27 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} @@ -2146,6 +2147,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole2nls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d4f465a..46a79f0 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,7 +31,6 @@ WIN16_FILES = \ msvideo.dll16 \ ole2.dll16 \ ole2disp.dll16 \ - ole2nls.dll16 \ rasapi16.dll16 \ setupx.dll16 \ shell.dll16 \ @@ -82,7 +81,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@
-compobj.dll16 ole2.dll16 ole2nls.dll16 storage.dll16: +compobj.dll16 ole2.dll16 storage.dll16: echo "ole32.dll" >$@
ole2disp.dll16 typelib.dll16: diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in new file mode 100644 index 0000000..54fac81 --- /dev/null +++ b/dlls/ole2nls.dll16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2nls.dll16 +IMPORTS = kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = ole2nls.dll16.spec + +C_SRCS = ole2nls.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c similarity index 100% rename from dlls/ole32/ole2nls.c rename to dlls/ole2nls.dll16/ole2nls.c diff --git a/dlls/ole32/ole2nls.spec b/dlls/ole2nls.dll16/ole2nls.dll16.spec similarity index 100% rename from dlls/ole32/ole2nls.spec rename to dlls/ole2nls.dll16/ole2nls.dll16.spec diff --git a/dlls/ole32/version16.rc b/dlls/ole2nls.dll16/version.rc similarity index 100% rename from dlls/ole32/version16.rc rename to dlls/ole2nls.dll16/version.rc diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index d3e8198..618b197 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -50,19 +50,15 @@ C_SRCS16 = \ memlockbytes16.c \ ole16.c \ ole2_16.c \ - ole2nls.c \ storage.c
SPEC_SRCS16 = \ compobj.spec \ ole2.spec \ - ole2nls.spec \ storage.spec
RC_SRCS = ole32res.rc
-RC_SRCS16 = version16.rc - IDL_C_SRCS = \ irot.idl
@@ -76,10 +72,4 @@ EXTRA_OBJS = dlldata.o
@MAKE_DLL_RULES@
-ole2nls.spec.o: ole2nls.spec version16.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --dll-name ole2nls --main-module $(MODULE) --res version16.res --export $(SRCDIR)/ole2nls.spec - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - @DEPENDENCIES@ # everything below this line is overwritten by make depend
-
Alexandre Julliard