ole32: Make ole2conv.dll into a stand-alone 16-bit module.

diff --git a/.gitignore b/.gitignore
index cc679a7c5b8b27f53d296729e8f7dcb9e3fd965a..6a808dab1c2828de7008a0fa5a176df824f1756e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ dlls/mstask/mstask_local_i.c
 dlls/msvideo.dll16
 dlls/msxml3/msxml3_v1.tlb
 dlls/ole2.dll16
-dlls/ole2conv.dll16
 dlls/ole2disp.dll16
 dlls/ole2nls.dll16
 dlls/ole2prox.dll16

diff --git a/configure b/configure
index 0a7eb83c5ef9363d23a7cdc6bc4a1086f242f51c..e826699ec8223b6d0408720a355f2b8533e67c9d 100755 (executable)
--- a/configure
+++ b/configure
@@ -3911,6 +3911,7 @@ then
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
     enable_mouse_drv16=${enable_mouse_drv16:-no}
     enable_msacm_dll16=${enable_msacm_dll16:-no}
+    enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
     enable_olecli_dll16=${enable_olecli_dll16:-no}
     enable_olesvr_dll16=${enable_olesvr_dll16:-no}
     enable_stress_dll16=${enable_stress_dll16:-no}
@@ -26474,6 +26475,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+       dlls/ole2conv.dll16/Makefile"
+test "x$enable_ole2conv_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+       ole2conv.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+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/ole32/Makefile"
 test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@@ -29181,6 +29190,7 @@ do
     "dlls/odbc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbc32/Makefile" ;;
     "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/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;;
     "dlls/ole32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/tests/Makefile" ;;
     "dlls/oleacc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleacc/Makefile" ;;

diff --git a/configure.ac b/configure.ac
index e4e28f60f6a30fb8328322b2e6b2b5d917196e4f..584f43c2f5930001bef84c473f74053d14fe4f03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ then
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
     enable_mouse_drv16=${enable_mouse_drv16:-no}
     enable_msacm_dll16=${enable_msacm_dll16:-no}
+    enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
     enable_olecli_dll16=${enable_olecli_dll16:-no}
     enable_olesvr_dll16=${enable_olesvr_dll16:-no}
     enable_stress_dll16=${enable_stress_dll16:-no}
@@ -2142,6 +2143,7 @@ WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
 WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 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/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index f3b80e63c179d3b7b8900853ed5478676da41686..d3dcf3f54616acdba4b3882f11ddd24dd4f9fd22 100644 (file)
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -30,7 +30,6 @@ WIN16_FILES = \
        mmsystem.dll16 \
        msvideo.dll16 \
        ole2.dll16 \
-       ole2conv.dll16 \
        ole2disp.dll16 \
        ole2nls.dll16 \
        ole2prox.dll16 \
@@ -85,7 +84,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16:
 msvideo.dll16:
        echo "msvfw32.dll" >$@
 
-compobj.dll16 ole2.dll16 ole2conv.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16:
+compobj.dll16 ole2.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16:
        echo "ole32.dll" >$@
 
 ole2disp.dll16 typelib.dll16:

diff --git a/dlls/ole2conv.dll16/Makefile.in b/dlls/ole2conv.dll16/Makefile.in
new file mode 100644 (file)
index 0000000..8e132fb
--- /dev/null
+++ b/dlls/ole2conv.dll16/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ole2conv.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+
+SPEC_SRCS = ole2conv.dll16.spec
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

diff --git a/dlls/ole32/ole2conv.spec b/dlls/ole2conv.dll16/ole2conv.dll16.spec
similarity index 100%
rename from dlls/ole32/ole2conv.spec
rename to dlls/ole2conv.dll16/ole2conv.dll16.spec

diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index f8d7481823460b8c7abc19510bd49f739022572b..ccdd8c345ef9b606f22463a159222b92ea177ee8 100644 (file)
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -56,7 +56,6 @@ C_SRCS16 = \
 SPEC_SRCS16 = \
        compobj.spec \
        ole2.spec \
-       ole2conv.spec \
        ole2nls.spec \
        ole2prox.spec \
        ole2thk.spec \