[PATCH 0/1] MR9730: twain_32/tests: Test with twaindsm.dll at 64-bits.

[Bernhard Übelacker]

If I understand it right there is now no more a `twain_32.dll` at the 64-bit side. But currently the test still tries to load the function `DSM_Entry` from this dll. Therefore the 64-bit wine tests fail, as it uses a `win_skip`.

Therefore this patch makes the test use `twain_32.dll` with 32-bit and `twaindsm.dll` with 64-bit.

What do you think?

[Test pattern page](https://test.winehq.org/data/patterns.html#twain_32:dsm)

[Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=161218)

Followup to c7570143bf.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9730

[PATCH 1/1] twain_32/tests: Test with twaindsm.dll at 64-bits.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

Followup to c7570143bf.
---
 dlls/twain_32/tests/dsm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index f12110c664b..c4960672081 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -838,6 +838,11 @@ START_TEST(dsm)
     TW_UINT16 rc;
     HANDLE hwnd;
     HMODULE htwain;
+#ifdef __i386__
+    const char* twain_dll = "twain_32.dll";
+#else
+    const char* twain_dll = "twaindsm.dll";
+#endif
 
     if (!dsm_RegisterWindowClasses())
     {
@@ -845,10 +850,10 @@ START_TEST(dsm)
         return;
     }
 
-    htwain = LoadLibraryA("twain_32.dll");
+    htwain = LoadLibraryA(twain_dll);
     if (! htwain)
     {
-        win_skip("twain_32.dll not available, skipping tests\n");
+        win_skip("%s not available, skipping tests\n", twain_dll);
         return;
     }
     pDSM_Entry = (void*)GetProcAddress(htwain, "DSM_Entry");
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9730