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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2b67a23fb0c35d87a9979c8110b935f8b07d4e9c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b67a23fb0c35d87a9979c8110...

Author: Alexandre Julliard 
Date:   Mon Mar 23 20:34:02 2009 +0100

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

---

.gitignore                                         |    1 -
 configure                                          |    9 +++++++++
 configure.ac                                       |    1 +
 dlls/Makefile.in                                   |    4 ----
 dlls/twain.dll16/Makefile.in                       |   15 +++++++++++++++
 .../twain16_main.c => twain.dll16/twain.c}         |    1 -
 .../twain.spec => twain.dll16/twain.dll16.spec}    |    0 
 dlls/twain_32/Makefile.in                          |    5 -----
 8 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5cf0b1..8b5e888 100644
--- a/.gitignore
+++ b/.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
diff --git a/configure b/configure
index 2e4b0df..fe3756a 100755
--- a/configure
+++ b/configure
@@ -27216,6 +27216,14 @@ 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 \
    twain_32"
@@ -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" ;;
diff --git a/configure.ac b/configure.ac
index d1b2729..7616588 100644
--- a/configure.ac
+++ b/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])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2022039..ac1767a 100644
--- a/dlls/Makefile.in
+++ b/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" >$@

diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in
new file mode 100644
index 0000000..ba8e564
--- /dev/null
+++ b/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
diff --git a/dlls/twain_32/twain16_main.c b/dlls/twain.dll16/twain.c
similarity index 98%
rename from dlls/twain_32/twain16_main.c
rename to dlls/twain.dll16/twain.c
index 0a874c3..92ebf57 100644
--- a/dlls/twain_32/twain16_main.c
+++ b/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);
diff --git a/dlls/twain_32/twain.spec b/dlls/twain.dll16/twain.dll16.spec
similarity index 100%
rename from dlls/twain_32/twain.spec
rename to dlls/twain.dll16/twain.dll16.spec
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index 3fc9776..17151c0 100644
--- a/dlls/twain_32/Makefile.in
+++ b/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