[twain_32 5/7] Implement CAP_SUPPORTEDCAPS

[Jeremy White]

---
  dlls/sane.ds/capability.c |   35 ++++++++++++++++++++++++++++++++++-
  dlls/twain_32/tests/dsm.c |    3 ---
  2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c
index 615e4cb..667d0a6 100644
--- a/dlls/sane.ds/capability.c
+++ b/dlls/sane.ds/capability.c
@@ -32,6 +32,7 @@
  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)
  {
@@ -41,6 +42,13 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY 
pCapability, TW_UINT16 action)

      switch (pCapability->Cap)
      {
+        case CAP_SUPPORTEDCAPS:
+            if (action == MSG_GET)
+                twCC = TWAIN_GetSupportedCaps(pCapability);
+            else
+                twCC = TWCC_BADVALUE;
+            break;
+
          case CAP_DEVICEEVENT:
          case CAP_ALARMS:
          case CAP_ALARMVOLUME:
@@ -65,7 +73,6 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY 
pCapability, TW_UINT16 action)
          case ICAP_BARCODEMAXRETRIES:
          case ICAP_BARCODETIMEOUT:
          case CAP_EXTENDEDCAPS:
-        case CAP_SUPPORTEDCAPS:
          case ICAP_FILTER:
          case ICAP_GAMMA:
          case ICAP_PLANARCHUNKY:
@@ -176,6 +183,32 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY 
pCapability, TW_UINT16 action)
      return twCC;
  }

+static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability)
+{
+    TW_ARRAY *a;
+    UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, ICAP_XFERMECH };
+
+    pCapability->hContainer = GlobalAlloc (0, sizeof(*a) - 
sizeof(a->ItemList) + sizeof(supported_caps));
+    pCapability->ConType = TWON_ARRAY;
+
+    if (pCapability->hContainer)
+    {
+        UINT16 *u;
+        int i;
+        a = GlobalLock (pCapability->hContainer);
+        a->ItemType = TWTY_UINT16;
+        a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]);
+        u = (UINT16 *) a->ItemList;
+        for (i = 0; i < a->NumItems; i++)
+            u[i] = supported_caps[i];
+        GlobalUnlock (pCapability->hContainer);
+        return TWCC_SUCCESS;
+    }
+    else
+        return TWCC_LOWMEMORY;
+}
+
+
  static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, 
TW_UINT32 value)
  {
      pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE));
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index 0b36549..7ac3739 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -70,7 +70,6 @@ static void test_single_source(TW_IDENTITY *appid, 
TW_IDENTITY *source)

      rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, 
MSG_GET, &cap);
      get_condition_code(appid, source, &status);
-    todo_wine
      ok(rc == TWRC_SUCCESS || status.ConditionCode == TWCC_SUCCESS,
              "Error obtaining CAP_SUPPORTEDCAPS\n");

@@ -98,7 +97,6 @@ static void test_single_source(TW_IDENTITY *appid, 
TW_IDENTITY *source)
      }

      /* For Twain 1.6, all sources must support: */
-    todo_wine
      ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not 
supported\n");
      todo_wine
      ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n");
@@ -134,7 +132,6 @@ static void test_single_source(TW_IDENTITY *appid, 
TW_IDENTITY *source)
          ok(capabilities[ICAP_PIXELTYPE], "ICAP_PIXELTYPE not 
supported\n");
          todo_wine
          ok(capabilities[ICAP_UNITS], "ICAP_UNITS not supported\n");
-        todo_wine
          ok(capabilities[ICAP_XFERMECH], "ICAP_XFERMECH not supported\n");
          todo_wine
          ok(capabilities[ICAP_XRESOLUTION], "ICAP_XRESOLUTION not 
supported\n");
-- 
1.5.6.5