[PATCH 3/3] dlls/sane.ds: when opening a DS, return the identitity information of the opened device to the caller. Matches windows behaviour and neccessary for the change in dsm_ctrl.c to work

[Bernd Herd]

From: Bernd Herd

---
 dlls/sane.ds/unixlib.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dlls/sane.ds/unixlib.c b/dlls/sane.ds/unixlib.c
index 69f085450a8..b319079b624 100644
--- a/dlls/sane.ds/unixlib.c
+++ b/dlls/sane.ds/unixlib.c
@@ -264,10 +264,20 @@ static NTSTATUS open_ds( void *args )
         return STATUS_DEVICE_NOT_CONNECTED;
     }
     status = sane_open( device_list[i]->name, &device_handle );
-    if (status == SANE_STATUS_GOOD) return STATUS_SUCCESS;
+    if (status != SANE_STATUS_GOOD) {
+	ERR("sane_open(%s): %s\n", device_list[i]->name, sane_strstatus (status));
+	return STATUS_DEVICE_NOT_CONNECTED;
+    }
+
+    /* return the Identity of the device opened to the caller */
+    id->ProtocolMajor = TWON_PROTOCOLMAJOR;
+    id->ProtocolMinor = TWON_PROTOCOLMINOR;
+    id->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2;
+    copy_sane_short_name(device_list[i]->name, id->ProductName, sizeof(id->ProductName) - 1);
+    lstrcpynA (id->Manufacturer, device_list[i]->vendor, sizeof(id->Manufacturer) - 1);
+    lstrcpynA (id->ProductFamily, device_list[i]->model, sizeof(id->ProductFamily) - 1);

-    ERR("sane_open(%s): %s\n", device_list[i]->name, sane_strstatus (status));
-    return STATUS_DEVICE_NOT_CONNECTED;
+    return STATUS_SUCCESS;
 }

static NTSTATUS close_ds( void *args )