Jeremy White : twain_32: Revise internal documentation and one test slightly to bring into line with TWAIN 1 .8 requirements.
Alexandre Julliard
julliard at winehq.org
Thu Mar 12 09:54:20 CDT 2009
Module: wine
Branch: master
Commit: 4b92f6c966f8158657422b3c8aa192107833e8b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b92f6c966f8158657422b3c8aa192107833e8b2
Author: Jeremy White <jwhite at codeweavers.com>
Date: Wed Mar 11 10:28:20 2009 -0500
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 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index e46b0e0..835f09c 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);
}
More information about the wine-cvs
mailing list