From 4b92f6c966f8158657422b3c8aa192107833e8b2 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Wed, 11 Mar 2009 10:28:20 -0500 Subject: [PATCH] twain_32: Revise internal documentation and one test slightly to bring into line with TWAIN 1.8 requirements. --- dlls/twain_32/tests/dsm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index e46b0e0277..835f09c5b1 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -668,7 +668,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) } } - /* For Twain 1.6, all sources must support: */ + /* All sources must support: */ ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not supported\n"); ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n"); if (capabilities[CAP_XFERCOUNT]) @@ -680,7 +680,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (source->SupportedGroups & DG_IMAGE) { - /* For Twain 1.6: + /* Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: */ @@ -701,9 +701,9 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) ok(capabilities[ICAP_PIXELFLAVOR], "ICAP_PIXELFLAVOR not supported\n"); if (capabilities[ICAP_PIXELFLAVOR]) test_onevalue_cap(appid, source, ICAP_PIXELFLAVOR, TWTY_UINT16, - TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT); - /* For Twain 1.6: + /* Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT, MSG_RESET and MSG_SET on: */ @@ -745,6 +745,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) test_supported_sizes(appid, source, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + /* Additional tests */ test_imagelayout(appid, source); }