[twain 09/14] Prevent an incorrect test warning message on get checks.
Jeremy White
jwhite at winehq.org
Mon Feb 9 13:01:57 CST 2009
---
dlls/twain_32/tests/dsm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index fe1e3a4..f42add9 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -104,10 +104,10 @@ static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support,
p = GlobalLock(pCapability->hContainer);
if (p)
{
- if (pCapability->ConType == TWON_ONEVALUE && actual_support & TWQC_GETCURRENT)
+ if (pCapability->ConType == TWON_ONEVALUE)
{
TW_ONEVALUE *onev = (TW_ONEVALUE *) p;
- ok(onev->Item == orig_value, "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n",
+ ok(onev->Item == orig_value || !(actual_support & TWQC_GETCURRENT), "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n",
pCapability->Cap, onev->Item, orig_value);
}
else if (pCapability->ConType == TWON_ENUMERATION)
--
1.5.6.3
More information about the wine-patches
mailing list