Jeremy White : sane.ds: Implement stub support for ICAP_PIXELFLAVOR.
Alexandre Julliard
julliard at winehq.org
Mon Feb 16 09:35:01 CST 2009
Module: wine
Branch: master
Commit: 9bb24b8f7e746357bb0e7cf6858b413842cd70b1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb24b8f7e746357bb0e7cf6858b413842cd70b1
Author: Jeremy White <jwhite at codeweavers.com>
Date: Fri Feb 13 13:14:45 2009 -0600
sane.ds: Implement stub support for ICAP_PIXELFLAVOR.
---
dlls/sane.ds/capability.c | 50 ++++++++++++++++++++++++++++++++++++++++++++-
dlls/twain_32/tests/dsm.c | 4 ++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c
index b66624c..ad2d7ba 100644
--- a/dlls/sane.ds/capability.c
+++ b/dlls/sane.ds/capability.c
@@ -126,7 +126,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability)
{
TW_ARRAY *a;
static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE,
- ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION };
+ ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION, ICAP_PIXELFLAVOR };
pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] ));
pCapability->ConType = TWON_ARRAY;
@@ -345,6 +345,50 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act
return twCC;
}
+/* ICAP_PIXELFLAVOR */
+static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 action)
+{
+ static const TW_UINT32 possible_values[] = { TWPF_CHOCOLATE, TWPF_VANILLA };
+ TW_UINT32 val;
+ TW_UINT16 twCC = TWCC_BADCAP;
+
+ TRACE("ICAP_PIXELFLAVOR\n");
+
+ switch (action)
+ {
+ case MSG_QUERYSUPPORT:
+ twCC = set_onevalue(pCapability, TWTY_INT32,
+ TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET );
+ break;
+
+ case MSG_GET:
+ twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]),
+ TWTY_UINT16, TWPF_CHOCOLATE, TWPF_CHOCOLATE);
+ break;
+
+ case MSG_SET:
+ twCC = msg_set(pCapability, &val);
+ if (twCC == TWCC_SUCCESS)
+ {
+ FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val);
+ }
+ break;
+
+ case MSG_GETDEFAULT:
+ twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE);
+ break;
+
+ case MSG_RESET:
+ /* .. fall through intentional .. */
+
+ case MSG_GETCURRENT:
+ twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE);
+ break;
+ }
+ return twCC;
+}
+
+
TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action)
{
TW_UINT16 twCC = TWCC_CAPUNSUPPORTED;
@@ -376,6 +420,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action)
twCC = SANE_ICAPXferMech (pCapability, action);
break;
+ case ICAP_PIXELFLAVOR:
+ twCC = SANE_ICAPPixelFlavor (pCapability, action);
+ break;
+
case ICAP_COMPRESSION:
twCC = SANE_ICAPCompression(pCapability, action);
break;
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index 4e3d7ce..1c38824 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -333,8 +333,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source)
ok(capabilities[ICAP_PHYSICALHEIGHT], "ICAP_PHYSICALHEIGHT not supported\n");
todo_wine
ok(capabilities[ICAP_PHYSICALWIDTH], "ICAP_PHYSICALWIDTH not supported\n");
- todo_wine
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);
/* For Twain 1.6:
Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY /
More information about the wine-cvs
mailing list