Alexandre Julliard : oleaut32: Make ole2disp. dll into a stand-alone 16-bit module.
Alexandre Julliard
julliard at winehq.org
Thu Mar 12 09:54:19 CDT 2009
Module: wine
Branch: master
Commit: d5a4a6635e0b934cd7b6c75fe3f325a2fe1866c9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a4a6635e0b934cd7b6c75fe3f325a2fe1866c9
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 11 17:36:40 2009 +0100
oleaut32: Make ole2disp.dll into a stand-alone 16-bit module.
---
.gitignore | 1 -
configure | 10 ++++++++++
configure.ac | 2 ++
dlls/Makefile.in | 4 ----
dlls/ole2disp.dll16/Makefile.in | 15 +++++++++++++++
dlls/{oleaut32 => ole2disp.dll16}/ole2disp.c | 0
.../ole2disp.dll16.spec} | 0
dlls/{oleaut32 => ole2disp.dll16}/ole2disp.h | 0
dlls/oleaut32/Makefile.in | 6 ------
9 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index ac61c48..50ce7fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ dlls/mstask/mstask_local.h
dlls/mstask/mstask_local_i.c
dlls/msvideo.dll16
dlls/msxml3/msxml3_v1.tlb
-dlls/ole2disp.dll16
dlls/ole32/dcom.h
dlls/ole32/dcom_p.c
dlls/ole32/irot.h
diff --git a/configure b/configure
index e9e3b50..4ccd3bf 100755
--- a/configure
+++ b/configure
@@ -3914,6 +3914,7 @@ then
enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_ole2_dll16=${enable_ole2_dll16:-no}
enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
+ enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
enable_ole2thk_dll16=${enable_ole2thk_dll16:-no}
@@ -26507,6 +26508,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/ole2disp.dll16/Makefile"
+test "x$enable_ole2disp_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ ole2disp.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/ole2disp.dll16/Makefile: dlls/ole2disp.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/ole2disp.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/ole2nls.dll16/Makefile"
test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
ole2nls.dll16"
@@ -29256,6 +29265,7 @@ do
"dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;;
"dlls/ole2.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2.dll16/Makefile" ;;
"dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;;
+ "dlls/ole2disp.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2disp.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" ;;
diff --git a/configure.ac b/configure.ac
index 56ee6ae..590ca4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,7 @@ then
enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_ole2_dll16=${enable_ole2_dll16:-no}
enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
+ enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
enable_ole2thk_dll16=${enable_ole2thk_dll16:-no}
@@ -2153,6 +2154,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/ole2.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ole2disp.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])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index f5cdd1e..c08ce74 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -28,7 +28,6 @@ WIN16_FILES = \
krnl386.exe16 \
mmsystem.dll16 \
msvideo.dll16 \
- ole2disp.dll16 \
rasapi16.dll16 \
setupx.dll16 \
shell.dll16 \
@@ -77,9 +76,6 @@ krnl386.exe16 system.drv16 toolhelp.dll16:
msvideo.dll16:
echo "msvfw32.dll" >$@
-ole2disp.dll16:
- echo "oleaut32.dll" >$@
-
rasapi16.dll16:
echo "rasapi32.dll" >$@
diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in
new file mode 100644
index 0000000..0a056b1
--- /dev/null
+++ b/dlls/ole2disp.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = ole2disp.dll16
+IMPORTS = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
+
+SPEC_SRCS = ole2disp.dll16.spec
+
+C_SRCS = ole2disp.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c
similarity index 100%
rename from dlls/oleaut32/ole2disp.c
rename to dlls/ole2disp.dll16/ole2disp.c
diff --git a/dlls/oleaut32/ole2disp.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec
similarity index 100%
rename from dlls/oleaut32/ole2disp.spec
rename to dlls/ole2disp.dll16/ole2disp.dll16.spec
diff --git a/dlls/oleaut32/ole2disp.h b/dlls/ole2disp.dll16/ole2disp.h
similarity index 100%
rename from dlls/oleaut32/ole2disp.h
rename to dlls/ole2disp.dll16/ole2disp.h
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 4ea761d..cbc1ca1 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -29,12 +29,6 @@ C_SRCS = \
variant.c \
vartype.c
-C_SRCS16 = \
- ole2disp.c
-
-SPEC_SRCS16 = \
- ole2disp.spec
-
RC_SRCS = oleaut32.rc
IDL_P_SRCS = \
More information about the wine-cvs
mailing list