mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[scard] allow INFINITE timeout

Browse Source
This commit is contained in:
Armin Novak 2023-11-16 16:42:53 +01:00 committed by akallabeth
parent dd8fce1c9e
commit 1048ad4003
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/emu/scard/smartcard_emulate.c
View File

@ -1355,9 +1355,6 @@ LONG WINAPI Emulate_SCardGetStatusChangeA(SmartcardEmulationContext* smartcard,
WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetStatusChangeA { hContext: %p",
(void*)hContext);
if (dwTimeout == INFINITE)
dwTimeout = 60000;
if (status == SCARD_S_SUCCESS)
{
const DWORD diff = 100;
@ -1413,7 +1410,8 @@ LONG WINAPI Emulate_SCardGetStatusChangeA(SmartcardEmulationContext* smartcard,
break;
}
Sleep(diff);
dwTimeout -= MIN(dwTimeout, diff);
if (dwTimeout != INFINITE)
dwTimeout -= MIN(dwTimeout, diff);
} while (dwTimeout > 0);
}
@ -1433,9 +1431,6 @@ LONG WINAPI Emulate_SCardGetStatusChangeW(SmartcardEmulationContext* smartcard,
WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetStatusChangeW { hContext: %p",
(void*)hContext);
if (dwTimeout == INFINITE)
dwTimeout = 60000;
if (status == SCARD_S_SUCCESS)
{
const DWORD diff = 100;
@ -1490,7 +1485,8 @@ LONG WINAPI Emulate_SCardGetStatusChangeW(SmartcardEmulationContext* smartcard,
break;
}
Sleep(diff);
dwTimeout -= MIN(dwTimeout, diff);
if (dwTimeout != INFINITE)
dwTimeout -= MIN(dwTimeout, diff);
} while (dwTimeout > 0);
}

14
libfreerdp/utils/smartcard_call.c
View File

@ -59,8 +59,6 @@
ctx->useEmulatedCard ? NULL : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__)
#endif
#define SCARD_MAX_TIMEOUT 60000
struct s_scard_call_context
{
BOOL useEmulatedCard;
@ -905,8 +903,6 @@ static LONG smartcard_GetStatusChangeA_Call(scard_call_context* smartcard, wStre
call = &operation->call.getStatusChangeA;
dwTimeOut = call->dwTimeOut;
if ((dwTimeOut == INFINITE) || (dwTimeOut > SCARD_MAX_TIMEOUT))
dwTimeOut = SCARD_MAX_TIMEOUT;
if (call->cReaders > 0)
{
@ -917,7 +913,7 @@ static LONG smartcard_GetStatusChangeA_Call(scard_call_context* smartcard, wStre
goto fail;
}
for (x = 0; x < MAX(1, dwTimeOut); x += dwTimeStep)
for (x = 0; x < MAX(1, dwTimeOut);)
{
if (call->cReaders > 0)
memcpy(rgReaderStates, call->rgReaderStates,
@ -928,6 +924,8 @@ static LONG smartcard_GetStatusChangeA_Call(scard_call_context* smartcard, wStre
break;
if (WaitForSingleObject(smartcard->stopEvent, 0) == WAIT_OBJECT_0)
break;
if (dwTimeOut != INFINITE)
x += dwTimeStep;
}
scard_log_status_error(TAG, "SCardGetStatusChangeA", ret.ReturnCode);
@ -968,8 +966,6 @@ static LONG smartcard_GetStatusChangeW_Call(scard_call_context* smartcard, wStre
call = &operation->call.getStatusChangeW;
dwTimeOut = call->dwTimeOut;
if ((dwTimeOut == INFINITE) || (dwTimeOut > SCARD_MAX_TIMEOUT))
dwTimeOut = SCARD_MAX_TIMEOUT;
if (call->cReaders > 0)
{
@ -980,7 +976,7 @@ static LONG smartcard_GetStatusChangeW_Call(scard_call_context* smartcard, wStre
goto fail;
}
for (x = 0; x < MAX(1, dwTimeOut); x += dwTimeStep)
for (x = 0; x < MAX(1, dwTimeOut);)
{
if (call->cReaders > 0)
memcpy(rgReaderStates, call->rgReaderStates,
@ -993,6 +989,8 @@ static LONG smartcard_GetStatusChangeW_Call(scard_call_context* smartcard, wStre
break;
if (WaitForSingleObject(smartcard->stopEvent, 0) == WAIT_OBJECT_0)
break;
if (dwTimeOut != INFINITE)
x += dwTimeStep;
}
scard_log_status_error(TAG, "SCardGetStatusChangeW", ret.ReturnCode);