twain_32/tests: Link with twain_32.dll.

Francois Gouget fgouget at free.fr
Fri Feb 27 01:27:26 CST 2009


---

winetest can detect if twain_32.dll is there or not, and if it's missing 
there's nothing to test anyway. Note that make_makefiles will need to be 
run.

 dlls/twain_32/Makefile.in       |    1 +
 dlls/twain_32/tests/Makefile.in |    2 +-
 dlls/twain_32/tests/dsm.c       |    7 +------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index 3fc9776..6f9642c 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
+IMPORTLIB = twain_32
 IMPORTS   = kernel32
 
 C_SRCS = \
diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in
index 708fb6d..7ed58f8 100644
--- a/dlls/twain_32/tests/Makefile.in
+++ b/dlls/twain_32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = twain_32.dll
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = twain_32 user32 gdi32 kernel32
 
 CTESTS = \
 	dsm.c
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index 37ebf3b..44f59dd 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -576,12 +576,7 @@ START_TEST(dsm)
 
     if (!dsm_RegisterWindowClasses()) assert(0);
 
-    htwain = LoadLibraryA("twain_32.dll");
-    if (! htwain)
-    {
-        win_skip("twain_32.dll not available, skipping tests\n");
-        return;
-    }
+    htwain = GetModuleHandleA("twain_32.dll");
     pDSM_Entry = (void*)GetProcAddress(htwain, "DSM_Entry");
     ok(pDSM_Entry != NULL, "Unable to GetProcAddress DSM_Entry\n");
     if (! pDSM_Entry)
-- 
1.5.6.5




More information about the wine-patches mailing list