Merge pull request #11152 from akallabeth/smartcard-list-fix

[utils,smartcard] return proper list for smartcard listing
This commit is contained in:
Martin Fleisz
2025-02-11 08:20:03 +01:00
committed by GitHub

View File

@@ -350,7 +350,10 @@ static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream*
return SCARD_F_UNKNOWN_ERROR;
if (status != SCARD_S_SUCCESS)
return scard_log_status_error(TAG, "SCardListReadersA", status);
{
(void)scard_log_status_error(TAG, "SCardListReadersA", status);
return smartcard_pack_list_readers_return(out, &ret, FALSE);
}
cchReaders = filter_device_by_name_a(smartcard->names, &mszReaders, cchReaders);
ret.msz = (BYTE*)mszReaders;
@@ -400,7 +403,10 @@ static LONG smartcard_ListReadersW_Call(scard_call_context* smartcard, wStream*
return SCARD_F_UNKNOWN_ERROR;
if (status != SCARD_S_SUCCESS)
return scard_log_status_error(TAG, "SCardListReadersW", status);
{
(void)scard_log_status_error(TAG, "SCardListReadersW", status);
return smartcard_pack_list_readers_return(out, &ret, TRUE);
}
cchReaders = filter_device_by_name_w(smartcard->names, &mszReaders.pw, cchReaders);
ret.msz = mszReaders.pb;