mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
[winpr,smartcard] fix warnings
This commit is contained in:
@@ -2510,8 +2510,8 @@ static LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWORD dwA
|
||||
return status;
|
||||
}
|
||||
|
||||
static LONG PCSC_ReadDeviceSystemName(SCARDCONTEXT hContext, SCARDHANDLE hCard, DWORD dwAttrId,
|
||||
LPBYTE pbAttr, LPDWORD pcbAttrLen)
|
||||
static LONG PCSC_ReadDeviceSystemName(WINPR_ATTR_UNUSED SCARDCONTEXT hContext, SCARDHANDLE hCard,
|
||||
DWORD dwAttrId, LPBYTE pbAttr, LPDWORD pcbAttrLen)
|
||||
{
|
||||
/* Get reader name from SCardStatus */
|
||||
CHAR* szReader = NULL;
|
||||
@@ -2531,7 +2531,7 @@ static LONG PCSC_ReadDeviceSystemName(SCARDCONTEXT hContext, SCARDHANDLE hCard,
|
||||
const PCSC_LONG rc = g_PCSC.pfnSCardStatus(hCard, (LPSTR)pbAttr, &cchReader, &dwState,
|
||||
&dwProtocol, NULL, &cbAtr);
|
||||
|
||||
*pcbAttrLen = cchReader;
|
||||
*pcbAttrLen = WINPR_ASSERTING_INT_CAST(DWORD, cchReader);
|
||||
status = WINPR_ASSERTING_INT_CAST(LONG, rc);
|
||||
if (status != SCARD_S_SUCCESS)
|
||||
return status;
|
||||
@@ -2552,7 +2552,7 @@ static LONG PCSC_ReadDeviceSystemName(SCARDCONTEXT hContext, SCARDHANDLE hCard,
|
||||
free(tmp);
|
||||
return SCARD_E_INSUFFICIENT_BUFFER;
|
||||
}
|
||||
*pcbAttrLen = MIN(wlen, cchReader) * sizeof(WCHAR);
|
||||
*pcbAttrLen = WINPR_ASSERTING_INT_CAST(DWORD, MIN(wlen, cchReader) * sizeof(WCHAR));
|
||||
memcpy(pbAttr, tmp, *pcbAttrLen);
|
||||
free(tmp);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user