February 2009 - Wine-commits

Jeremy White : sane.ds: Add support for CAP_UICONTROLLABLE.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 6320266e58de650bb0effc018acb8dbb19237394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6320266e58de650bb0effc018… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:01:39 2009 -0600 sane.ds: Add support for CAP_UICONTROLLABLE. --- dlls/sane.ds/capability.c | 27 ++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 9 +++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 84d6b40..45c3f88 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -125,7 +125,7 @@ static TW_UINT16 msg_get_enum(pTW_CAPABILITY pCapability, const TW_UINT32 *value static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; - static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, + static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, ICAP_XFERMECH, ICAP_PIXELTYPE }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); @@ -282,6 +282,27 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio return twCC; } +/* CAP_UICONTROLLABLE */ +static TW_UINT16 SANE_CAPUiControllable(pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("CAP_UICONTROLLABLE\n"); + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, TWQC_GET); + break; + + case MSG_GET: + twCC = set_onevalue(pCapability, TWTY_BOOL, TRUE); + break; + + } + return twCC; +} + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; @@ -301,6 +322,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_CAPXferCount (pCapability, action); break; + case CAP_UICONTROLLABLE: + twCC = SANE_CAPUiControllable (pCapability, action); + break; + case ICAP_PIXELTYPE: twCC = SANE_ICAPPixelType (pCapability, action); break; diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 92e322b..31843dc 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -95,7 +95,7 @@ static TW_HANDLE alloc_and_set_onevalue(TW_UINT32 val, TW_UINT16 type) return hcontainer; } -static void check_get(TW_CAPABILITY *pCapability, +static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support, TW_UINT32 orig_value, TW_UINT32 default_value, TW_UINT32 *suggested_set_value) { void *p; @@ -104,7 +104,7 @@ static void check_get(TW_CAPABILITY *pCapability, p = GlobalLock(pCapability->hContainer); if (p) { - if (pCapability->ConType == TWON_ONEVALUE) + if (pCapability->ConType == TWON_ONEVALUE && actual_support & TWQC_GETCURRENT) { TW_ONEVALUE *onev = (TW_ONEVALUE *) p; ok(onev->Item == orig_value, "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n", @@ -233,7 +233,7 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 get_condition_code(appid, source, &status); ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, "Error [rc %d|cc %d] doing MSG_GET for type 0x%x\n", rc, status.ConditionCode, captype); - check_get(&cap, orig_value, default_value, &new_value); + check_get(&cap, actual_support, orig_value, default_value, &new_value); if (rc == TWRC_SUCCESS) GlobalFree(cap.hContainer); } @@ -313,8 +313,9 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (capabilities[CAP_XFERCOUNT]) test_onevalue_cap(appid, source, CAP_XFERCOUNT, TWTY_INT16, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); - todo_wine ok(capabilities[CAP_UICONTROLLABLE], "CAP_UICONTROLLABLE not supported\n"); + if (capabilities[CAP_UICONTROLLABLE]) + test_onevalue_cap(appid, source, CAP_UICONTROLLABLE, TWTY_BOOL, TWQC_GET); if (source->SupportedGroups & DG_IMAGE) {

1 0

Jeremy White : twain_32: Change get requirements such that we require only a minimum level of support .
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 2fdd05cffc956dcae4536fc2930c3261ba368995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdd05cffc956dcae4536fc29… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:01:48 2009 -0600 twain_32: Change get requirements such that we require only a minimum level of support. --- dlls/twain_32/tests/dsm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 31843dc..fe1e3a4 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -159,7 +159,7 @@ static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support, } } -static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 captype, TW_UINT16 type, TW_INT32 expected_support) +static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 captype, TW_UINT16 type, TW_INT32 minimum_support) { TW_UINT16 rc; TW_UINT16 rtype; @@ -180,9 +180,9 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 "Error [rc %d|cc %d] doing MSG_QUERYSUPPORT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc != TWRC_SUCCESS) return; - ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x\n", captype); - ok(actual_support == expected_support, - "Error: expected support 0x%x for type 0x%x, got 0x%x\n", expected_support, + ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x", captype); + ok((actual_support & minimum_support) == minimum_support, + "Error: minimum support 0x%x for type 0x%x, got 0x%x\n", minimum_support, captype, actual_support);

1 0

Jeremy White : twain_32: Prevent an incorrect test warning message on get checks.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: e02528e6295a71dde7f47bc84cb24a6e60a7b2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02528e6295a71dde7f47bc84… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:01:57 2009 -0600 twain_32: Prevent an incorrect test warning message on get checks. --- 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 0

Jeremy White : sane.ds: Add stub support for ICAP_COMPRESSION.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: b0ec8880e20b8476fa8ece9b1a160efd78e478ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ec8880e20b8476fa8ece9b1… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:05 2009 -0600 sane.ds: Add stub support for ICAP_COMPRESSION. --- dlls/sane.ds/capability.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 4 ++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 45c3f88..66cc1e4 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_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); pCapability->ConType = TWON_ARRAY; @@ -303,6 +303,48 @@ static TW_UINT16 SANE_CAPUiControllable(pTW_CAPABILITY pCapability, TW_UINT16 ac return twCC; } +/* ICAP_COMPRESSION */ +static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + static const TW_UINT32 possible_values[] = { TWCP_NONE }; + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("ICAP_COMPRESSION\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, TWCP_NONE, TWCP_NONE); + FIXME("Partial stub: We don't attempt to support compression\n"); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWCP_NONE); + break; + + case MSG_RESET: + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWCP_NONE); + break; + } + return twCC; +} + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; @@ -333,6 +375,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) case ICAP_XFERMECH: twCC = SANE_ICAPXferMech (pCapability, action); break; + + case ICAP_COMPRESSION: + twCC = SANE_ICAPCompression(pCapability, action); + break; } /* Twain specifies that you should return a 0 in response to QUERYSUPPORT, diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f42add9..f0e5b4b 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -323,8 +323,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: */ - todo_wine ok(capabilities[ICAP_COMPRESSION], "ICAP_COMPRESSION not supported\n"); + if (capabilities[ICAP_COMPRESSION]) + test_onevalue_cap(appid, source, ICAP_COMPRESSION, TWTY_UINT16, + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT); todo_wine ok(capabilities[ICAP_PLANARCHUNKY], "ICAP_PLANARCHUNKY not supported\n"); todo_wine

1 0

Jeremy White : sane.ds: Return a 0 for MSG_QUERYSUPPORT even for capabilities we don't support.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 22bab0aa3dce10c84efb08bc01ada949b2a9da0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bab0aa3dce10c84efb08bc0… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:01:09 2009 -0600 sane.ds: Return a 0 for MSG_QUERYSUPPORT even for capabilities we don't support. --- dlls/sane.ds/capability.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 1755b6c..e68bc80 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -259,5 +259,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) break; } + /* Twain specifies that you should return a 0 in response to QUERYSUPPORT, + * even if you don't formally support the capability */ + if (twCC == TWCC_CAPUNSUPPORTED && action == MSG_QUERYSUPPORT) + twCC = set_onevalue(pCapability, 0, TWTY_INT32); + return twCC; }

1 0

Jeremy White : sane.ds: More correctly stub CAP_XFERCOUNT, and tests.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 333ef6a09823103c1c7dedeef1e221425667ffb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333ef6a09823103c1c7dedeef… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:00:57 2009 -0600 sane.ds: More correctly stub CAP_XFERCOUNT, and tests. --- dlls/sane.ds/capability.c | 46 +++++++++++++++++++++++++++++++++++++++++--- dlls/twain_32/tests/dsm.c | 4 ++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 5738a6e..bc6a8d3 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -125,7 +125,7 @@ static TW_UINT16 msg_get_enum(pTW_CAPABILITY pCapability, const TW_UINT32 *value static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; - static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, ICAP_XFERMECH }; + static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, ICAP_XFERMECH }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); pCapability->ConType = TWON_ARRAY; @@ -195,6 +195,46 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action } +/* CAP_XFERCOUNT */ +static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("CAP_XFERCOUNT\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 = set_onevalue(pCapability, TWTY_INT16, -1); + FIXME("Partial Stub: Reporting only support for transfer all\n"); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + FIXME("Partial Stub: XFERCOUNT set to %d, but ignored\n", val); + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_INT16, -1); + break; + + case MSG_RESET: + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_INT16, -1); + break; + } + return twCC; +} + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; @@ -211,9 +251,7 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) break; case CAP_XFERCOUNT: - /* This is a required capability that every source needs to - support but we haven't implemented it yet. */ - twCC = TWCC_SUCCESS; + twCC = SANE_CAPXferCount (pCapability, action); break; case ICAP_XFERMECH: diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 78b4c85..231edff 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -309,8 +309,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) /* For Twain 1.6, all sources must support: */ ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not supported\n"); - todo_wine ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n"); + if (capabilities[CAP_XFERCOUNT]) + test_onevalue_cap(appid, source, CAP_XFERCOUNT, TWTY_INT16, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); todo_wine ok(capabilities[CAP_UICONTROLLABLE], "CAP_UICONTROLLABLE not supported\n");

1 0

Jeremy White : sane.ds: Eliminate incorrect TWRC_FAILURE return.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 8dee7519c6e1612ee4bdfd624f0c1150af0c65b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dee7519c6e1612ee4bdfd624… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:01:03 2009 -0600 sane.ds: Eliminate incorrect TWRC_FAILURE return. --- dlls/sane.ds/capability.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index bc6a8d3..1755b6c 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -257,10 +257,6 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) case ICAP_XFERMECH: twCC = SANE_ICAPXferMech (pCapability, action); break; - - default: - twCC = TWRC_FAILURE; - } return twCC;

1 0

Michael Stefaniuc : wineesd.drv: Remove superfluous pointer casts.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 2486357f34a6c29a1eae8ae33a798abdafd19879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2486357f34a6c29a1eae8ae33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 10 10:03:22 2009 +0100 wineesd.drv: Remove superfluous pointer casts. --- dlls/wineesd.drv/audio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index e59b711..9bcc3b0 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -244,8 +244,8 @@ static const char *wodPlayerCmdString[] = { static void volume_effect16(void *bufin, void* bufout, int length, int left, int right, int nChannels) { - short *d_out = (short *)bufout; - short *d_in = (short *)bufin; + short *d_out = bufout; + short *d_in = bufin; int i, v; /* @@ -270,8 +270,8 @@ static void volume_effect16(void *bufin, void* bufout, int length, int left, static void volume_effect8(void *bufin, void* bufout, int length, int left, int right, int nChannels) { - BYTE *d_out = (BYTE *)bufout; - BYTE *d_in = (BYTE *)bufin; + BYTE *d_out = bufout; + BYTE *d_in = bufin; int i, v; /* @@ -1133,8 +1133,8 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo) */ static DWORD CALLBACK wodPlayer(LPVOID pmt) { - WORD uDevID = (DWORD)pmt; - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)&WOutDev[uDevID]; + WORD uDevID = (DWORD)pmt; + WINE_WAVEOUT* wwo = &WOutDev[uDevID]; DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ DWORD dwSleepTime; @@ -1679,7 +1679,7 @@ static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize) static DWORD CALLBACK widRecorder(LPVOID pmt) { WORD uDevID = (DWORD)pmt; - WINE_WAVEIN* wwi = (WINE_WAVEIN*)&WInDev[uDevID]; + WINE_WAVEIN* wwi = &WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; int bytesRead;

1 0

Jeremy White : sane.ds: Simplify SANE_SaneCapability.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: c739edf6aa2a72132894dc1506439fae64a41e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c739edf6aa2a72132894dc150… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 12:59:15 2009 -0600 sane.ds: Simplify SANE_SaneCapability. --- dlls/sane.ds/capability.c | 122 +------------------------------------------- 1 files changed, 3 insertions(+), 119 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 6ecabb3..caff3fd 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -36,7 +36,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability); TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { - TW_UINT16 twCC = TWCC_SUCCESS; + TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; TRACE("capability=%d action=%d\n", pCapability->Cap, action); @@ -49,132 +49,16 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = TWCC_BADVALUE; break; - case CAP_DEVICEEVENT: - case CAP_ALARMS: - case CAP_ALARMVOLUME: - case ACAP_AUDIOFILEFORMAT: - case ACAP_XFERMECH: - case ICAP_AUTOMATICBORDERDETECTION: - case ICAP_AUTOMATICDESKEW: - case ICAP_AUTODISCARDBLANKPAGES: - case ICAP_AUTOMATICROTATE: - case ICAP_FLIPROTATION: - case CAP_AUTOMATICCAPTURE: - case CAP_TIMEBEFOREFIRSTCAPTURE: - case CAP_TIMEBETWEENCAPTURES: - case CAP_AUTOSCAN: - case CAP_CLEARBUFFERS: - case CAP_MAXBATCHBUFFERS: - case ICAP_BARCODEDETECTIONENABLED: - case ICAP_SUPPORTEDBARCODETYPES: - case ICAP_BARCODEMAXSEARCHPRIORITIES: - case ICAP_BARCODESEARCHPRIORITIES: - case ICAP_BARCODESEARCHMODE: - case ICAP_BARCODEMAXRETRIES: - case ICAP_BARCODETIMEOUT: - case CAP_EXTENDEDCAPS: - case ICAP_FILTER: - case ICAP_GAMMA: - case ICAP_PLANARCHUNKY: - case ICAP_BITORDERCODES: - case ICAP_CCITTKFACTOR: - case ICAP_COMPRESSION: - case ICAP_JPEGPIXELTYPE: - /*case ICAP_JPEGQUALITY:*/ - case ICAP_PIXELFLAVORCODES: - case ICAP_TIMEFILL: - case CAP_DEVICEONLINE: - case CAP_DEVICETIMEDATE: - case CAP_SERIALNUMBER: - case ICAP_EXPOSURETIME: - case ICAP_FLASHUSED2: - case ICAP_IMAGEFILTER: - case ICAP_LAMPSTATE: - case ICAP_LIGHTPATH: - case ICAP_NOISEFILTER: - case ICAP_OVERSCAN: - case ICAP_PHYSICALHEIGHT: - case ICAP_PHYSICALWIDTH: - case ICAP_UNITS: - case ICAP_ZOOMFACTOR: - case CAP_PRINTER: - case CAP_PRINTERENABLED: - case CAP_PRINTERINDEX: - case CAP_PRINTERMODE: - case CAP_PRINTERSTRING: - case CAP_PRINTERSUFFIX: - case CAP_AUTHOR: - case CAP_CAPTION: - case CAP_TIMEDATE: - case ICAP_AUTOBRIGHT: - case ICAP_BRIGHTNESS: - case ICAP_CONTRAST: - case ICAP_HIGHLIGHT: - case ICAP_ORIENTATION: - case ICAP_ROTATION: - case ICAP_SHADOW: - case ICAP_XSCALING: - case ICAP_YSCALING: - case ICAP_BITDEPTH: - case ICAP_BITDEPTHREDUCTION: - case ICAP_BITORDER: - case ICAP_CUSTHALFTONE: - case ICAP_HALFTONES: - case ICAP_PIXELFLAVOR: - case ICAP_PIXELTYPE: - case ICAP_THRESHOLD: - case CAP_LANGUAGE: - case ICAP_FRAMES: - case ICAP_MAXFRAMES: - case ICAP_SUPPORTEDSIZES: - case CAP_AUTOFEED: - case CAP_CLEARPAGE: - case CAP_FEEDERALIGNMENT: - case CAP_FEEDERENABLED: - case CAP_FEEDERLOADED: - case CAP_FEEDERORDER: - case CAP_FEEDPAGE: - case CAP_PAPERBINDING: - case CAP_PAPERDETECTABLE: - case CAP_REACQUIREALLOWED: - case CAP_REWINDPAGE: - case ICAP_PATCHCODEDETECTIONENABLED: - case ICAP_SUPPORTEDPATCHCODETYPES: - case ICAP_PATCHCODEMAXSEARCHPRIORITIES: - case ICAP_PATCHCODESEARCHPRIORITIES: - case ICAP_PATCHCODESEARCHMODE: - case ICAP_PATCHCODEMAXRETRIES: - case ICAP_PATCHCODETIMEOUT: - case CAP_BATTERYMINUTES: - case CAP_BATTERYPERCENTAGE: - case CAP_POWERDOWNTIME: - case CAP_POWERSUPPLY: - case ICAP_XNATIVERESOLUTION: - case ICAP_XRESOLUTION: - case ICAP_YNATIVERESOLUTION: - case ICAP_YRESOLUTION: - twCC = TWCC_CAPUNSUPPORTED; - break; case CAP_XFERCOUNT: /* This is a required capability that every source needs to support but we haven't implemented it yet. */ twCC = TWCC_SUCCESS; break; - /*case ICAP_COMPRESSION:*/ - case ICAP_IMAGEFILEFORMAT: - case ICAP_TILES: - twCC = TWCC_CAPUNSUPPORTED; - break; + case ICAP_XFERMECH: twCC = SANE_ICAPXferMech (pCapability, action); break; - case ICAP_UNDEFINEDIMAGESIZE: - case CAP_CAMERAPREVIEWUI: - case CAP_ENABLEDSUIONLY: - case CAP_INDICATORS: - case CAP_UICONTROLLABLE: - twCC = TWCC_CAPUNSUPPORTED; - break; + default: twCC = TWRC_FAILURE;

1 0

Jeremy White : sane.ds: Rearrange function position to avoid the need for forward function declarations .
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 25d5953cd8ac92ae6df1e3303b336374ea5b6c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d5953cd8ac92ae6df1e3303… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:00:47 2009 -0600 sane.ds: Rearrange function position to avoid the need for forward function declarations. --- dlls/sane.ds/capability.c | 71 +++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 37 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index caff3fd..5738a6e 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -31,43 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action); -static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability); - -TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) -{ - TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; - - TRACE("capability=%d action=%d\n", pCapability->Cap, action); - - switch (pCapability->Cap) - { - case CAP_SUPPORTEDCAPS: - if (action == MSG_GET) - twCC = TWAIN_GetSupportedCaps(pCapability); - else - twCC = TWCC_BADVALUE; - break; - - case CAP_XFERCOUNT: - /* This is a required capability that every source needs to - support but we haven't implemented it yet. */ - twCC = TWCC_SUCCESS; - break; - - case ICAP_XFERMECH: - twCC = SANE_ICAPXferMech (pCapability, action); - break; - - default: - twCC = TWRC_FAILURE; - - } - - return twCC; -} - - static TW_UINT16 get_onevalue(pTW_CAPABILITY pCapability, TW_UINT16 *type, TW_UINT32 *value) { if (pCapability->hContainer) @@ -230,3 +193,37 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action } return twCC; } + + +TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; + + TRACE("capability=%d action=%d\n", pCapability->Cap, action); + + switch (pCapability->Cap) + { + case CAP_SUPPORTEDCAPS: + if (action == MSG_GET) + twCC = TWAIN_GetSupportedCaps(pCapability); + else + twCC = TWCC_BADVALUE; + break; + + case CAP_XFERCOUNT: + /* This is a required capability that every source needs to + support but we haven't implemented it yet. */ + twCC = TWCC_SUCCESS; + break; + + case ICAP_XFERMECH: + twCC = SANE_ICAPXferMech (pCapability, action); + break; + + default: + twCC = TWRC_FAILURE; + + } + + return twCC; +}

1 0