oleaut32: Make ole2disp.dll into a stand-alone 16-bit module.

diff --git a/.gitignore b/.gitignore
index ac61c4851b83620987aaff4efce9d5e7b761a07a..50ce7fc96d34eb7117848015feeb11441df2c062 100644 (file)
--- 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 e9e3b506f52bc2ea584d1ceb94a84557c2be3b83..4ccd3bfb74a66dfc0de814b31e069b3248126207 100755 (executable)
--- 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}
@@ -26506,6 +26507,14 @@ 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/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 \\
@@ -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 56ee6aeb7b4b066c8e91245cb3e4638d2b887abb..590ca4e1c4d678875f68dedccb638919a845e92d 100644 (file)
--- 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 f5cdd1ec0af05e375dc8c762cf016ff408e72b98..c08ce74f1da9fbbeaaddb12883001239897dddfa 100644 (file)
--- 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 (file)
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
+
+@MAKE_DLL_RULES@
+
+@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 4ea761d258117b14805e294aea7c4b7688fe43fd..cbc1ca12403aeb142027cecf1c818d97d0ba65e9 100644 (file)
--- 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 = \