niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

twain_32: Make twain.dll into a stand-alone 16-bit module.

Browse source
This commit is contained in:
Alexandre Julliard 2009-03-23 20:34:02 +01:00
parent a2ae7dd06c
commit 2b67a23fb0
8 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -92,7 +92,6 @@ dlls/stdole2.tlb/std_ole_v2.tlb
dlls/stdole32.tlb/std_ole_v1.tlb dlls/stdole32.tlb/std_ole_v1.tlb
dlls/system.drv16 dlls/system.drv16
dlls/toolhelp.dll16 dlls/toolhelp.dll16
dlls/twain.dll16
dlls/user.exe16 dlls/user.exe16
dlls/ver.dll16 dlls/ver.dll16
dlls/w32sys.dll16 dlls/w32sys.dll16

9
configure vendored
View file

@ -27215,6 +27215,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/traffic/Makefile: dlls/traffic/Makefile.in dlls/Makedll.rules" dlls/traffic/Makefile: dlls/traffic/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/traffic/Makefile" ac_config_files="$ac_config_files dlls/traffic/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/twain.dll16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
twain.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/twain.dll16/Makefile: dlls/twain.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/twain.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/twain_32/Makefile" dlls/twain_32/Makefile"
test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@ -29369,6 +29377,7 @@ do
"dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;;
"dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;;
"dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;;
"dlls/twain.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain.dll16/Makefile" ;;
"dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;;
"dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;;
"dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;; "dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;;

1
configure.ac
View file

@ -2216,6 +2216,7 @@ WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/twain.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

4
dlls/Makefile.in
View file

@ -31,7 +31,6 @@ WIN16_FILES = \
sound.drv16 \ sound.drv16 \
system.drv16 \ system.drv16 \
toolhelp.dll16 \ toolhelp.dll16 \
twain.dll16 \
user.exe16 \ user.exe16 \
ver.dll16 \ ver.dll16 \
w32sys.dll16 \ w32sys.dll16 \
@ -74,9 +73,6 @@ setupx.dll16:
shell.dll16: shell.dll16:
echo "shell32.dll" >$@ echo "shell32.dll" >$@
twain.dll16:
echo "twain_32.dll" >$@
ddeml.dll16 user.exe16: ddeml.dll16 user.exe16:
echo "user32.dll" >$@ echo "user32.dll" >$@

15
dlls/twain.dll16/Makefile.in Normal file
View file

@ -0,0 +1,15 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = twain.dll16
IMPORTS = kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,twain_32.dll
SPEC_SRCS = twain.dll16.spec
C_SRCS = twain.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

1
dlls/twain_32/twain16_main.c → dlls/twain.dll16/twain.c
View file

@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "twain.h" #include "twain.h"
#include "twain_i.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(twain); WINE_DEFAULT_DEBUG_CHANNEL(twain);

0
dlls/twain_32/twain.spec → dlls/twain.dll16/twain.dll16.spec
View file

5
dlls/twain_32/Makefile.in
View file

@ -9,11 +9,6 @@ C_SRCS = \
dsm_ctrl.c \ dsm_ctrl.c \
twain32_main.c twain32_main.c
C_SRCS16 = \
twain16_main.c
SPEC_SRCS16 = twain.spec
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend