Detlef Riekenberg : twain_32/tests: Avoid a Dialog from a DS when the scanner is not connected.

[Alexandre Julliard]

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

Author: Detlef Riekenberg 
Date:   Tue Sep 15 17:25:52 2009 +0200

twain_32/tests: Avoid a Dialog from a DS when the scanner is not connected.

---

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

diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index 0cc8220..f3b6f95 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -787,7 +787,8 @@ static void test_sources(TW_IDENTITY *appid)
         (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS),
             "Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode);

-    if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS)
+    /* A DS might display a Popup during MSG_OPENDS, when the scanner is not connected */
+    if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS && winetest_interactive)
     {
         rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source);
         get_condition_code(appid, NULL, &status);