diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 346aad3c371..16bffc39ff5 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -156,6 +156,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) if (!nrdevices) return TWRC_FAILURE; *pSourceIdentity = devices[0].identity; + DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 7ac37392f82..8f3c7bf7d2c 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -174,15 +174,9 @@ static void test_sources(TW_IDENTITY *appid) memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &source); get_condition_code(appid, NULL, &status); - ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get default error code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_SUCCESS) - { - todo_wine - ok(status.ConditionCode == TWCC_SUCCESS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); - } - - if (rc == TWRC_FAILURE) - ok(status.ConditionCode == TWCC_NODS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + ok( (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) || + (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS), + "Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) {