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

.gitignore

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

configure

@@ -27215,6 +27215,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/traffic/Makefile: dlls/traffic/Makefile.in dlls/Makedll.rules"
 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 \\
 	dlls/twain_32/Makefile"
 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/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/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/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;;
     "dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;;

configure.ac

@@ -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/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/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/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])

dlls/Makefile.in

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

dlls/twain.dll16/Makefile.in

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

dlls/twain.dll16/twain.c

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

dlls/twain_32/Makefile.in

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