ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Alexandre Julliard 2009-03-11 17:36:40 +01:00
parent 8a7089570d
commit d5a4a6635e
9 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -58,7 +58,6 @@ dlls/mstask/mstask_local.h
dlls/mstask/mstask_local_i.c dlls/mstask/mstask_local_i.c
dlls/msvideo.dll16 dlls/msvideo.dll16
dlls/msxml3/msxml3_v1.tlb dlls/msxml3/msxml3_v1.tlb
dlls/ole2disp.dll16
dlls/ole32/dcom.h dlls/ole32/dcom.h
dlls/ole32/dcom_p.c dlls/ole32/dcom_p.c
dlls/ole32/irot.h dlls/ole32/irot.h

10
configure vendored
View File

@ -3914,6 +3914,7 @@ then
enable_msacm_dll16=${enable_msacm_dll16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_ole2_dll16=${enable_ole2_dll16:-no} enable_ole2_dll16=${enable_ole2_dll16:-no}
enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
enable_ole2thk_dll16=${enable_ole2thk_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" dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile" 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 \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/ole2nls.dll16/Makefile" dlls/ole2nls.dll16/Makefile"
test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ 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/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;;
"dlls/ole2.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2.dll16/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/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/ole2nls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2nls.dll16/Makefile" ;;
"dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.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/ole2thk.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2thk.dll16/Makefile" ;;

2
configure.ac
View File

@ -151,6 +151,7 @@ then
enable_msacm_dll16=${enable_msacm_dll16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_ole2_dll16=${enable_ole2_dll16:-no} enable_ole2_dll16=${enable_ole2_dll16:-no}
enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
enable_ole2thk_dll16=${enable_ole2thk_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/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/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/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/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/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/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

4
dlls/Makefile.in
View File

@ -28,7 +28,6 @@ WIN16_FILES = \
krnl386.exe16 \ krnl386.exe16 \
mmsystem.dll16 \ mmsystem.dll16 \
msvideo.dll16 \ msvideo.dll16 \
ole2disp.dll16 \
rasapi16.dll16 \ rasapi16.dll16 \
setupx.dll16 \ setupx.dll16 \
shell.dll16 \ shell.dll16 \
@ -77,9 +76,6 @@ krnl386.exe16 system.drv16 toolhelp.dll16:
msvideo.dll16: msvideo.dll16:
echo "msvfw32.dll" >$@ echo "msvfw32.dll" >$@
ole2disp.dll16:
echo "oleaut32.dll" >$@
rasapi16.dll16: rasapi16.dll16:
echo "rasapi32.dll" >$@ echo "rasapi32.dll" >$@

15
dlls/ole2disp.dll16/Makefile.in Normal file
View File

@ -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

0
dlls/oleaut32/ole2disp.c → dlls/ole2disp.dll16/ole2disp.c
View File

0
dlls/oleaut32/ole2disp.spec → dlls/ole2disp.dll16/ole2disp.dll16.spec
View File

0
dlls/oleaut32/ole2disp.h → dlls/ole2disp.dll16/ole2disp.h
View File

6
dlls/oleaut32/Makefile.in
View File

@ -29,12 +29,6 @@ C_SRCS = \
variant.c \ variant.c \
vartype.c vartype.c
C_SRCS16 = \
ole2disp.c
SPEC_SRCS16 = \
ole2disp.spec
RC_SRCS = oleaut32.rc RC_SRCS = oleaut32.rc
IDL_P_SRCS = \ IDL_P_SRCS = \