ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

twain_32: Return TWRC_FAILURE/TWCC_NODS when we have no sources.

This commit is contained in:
Jeremy White 2009-01-28 08:53:10 -06:00 committed by Alexandre Julliard
parent 768c06d3e5
commit 620e81a982
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/twain_32/dsm_ctrl.c
View File

@ -169,8 +169,8 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData)
twain_autodetect(); twain_autodetect();
if (!nrdevices) { if (!nrdevices) {
TRACE ("no entries found.\n"); TRACE ("no entries found.\n");
DSM_twCC = TWCC_SUCCESS; DSM_twCC = TWCC_NODS;
return TWRC_ENDOFLIST; return TWRC_FAILURE;
} }
DSM_currentDevice = 0; DSM_currentDevice = 0;
*pSourceIdentity = devices[DSM_currentDevice++].identity; *pSourceIdentity = devices[DSM_currentDevice++].identity;

9
dlls/twain_32/tests/dsm.c
View File

@ -150,12 +150,9 @@ static void test_sources(TW_IDENTITY *appid)
memset(&source, 0, sizeof(source)); memset(&source, 0, sizeof(source));
rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source);
get_condition_code(appid, NULL, &status); get_condition_code(appid, NULL, &status);
todo_wine ok( (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) ||
ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get first error code, rc %d, cc %d\n", rc, status.ConditionCode); (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS),
if (rc == TWRC_SUCCESS) "Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode);
ok(status.ConditionCode == TWCC_SUCCESS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode);
if (rc == TWRC_FAILURE)
ok(status.ConditionCode == TWCC_NODS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode);
while (rc == TWRC_SUCCESS) while (rc == TWRC_SUCCESS)
{ {