morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 16:34:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

[utils,smartcard] log all call failures

Browse Source 
Use GNU expression statement to log a call failure if the compiler
supports that extension.
This commit is contained in:
Armin Novak
2026-03-03 10:15:56 +01:00
parent 75d8f295b4
commit ba11055d66
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/utils/smartcard_call.c
View File

@@ -49,17 +49,30 @@
#if defined(WITH_SMARTCARD_EMULATE) #if defined(WITH_SMARTCARD_EMULATE)
#include <freerdp/emulate/scard/smartcard_emulate.h> #include <freerdp/emulate/scard/smartcard_emulate.h>
#define wrap(ctx, fkt, ...) \ #define wrap_raw(ctx, fkt, ...) \
ctx->useEmulatedCard ? Emulate_##fkt(ctx->emulation, ##__VA_ARGS__) \ ctx->useEmulatedCard ? Emulate_##fkt(ctx->emulation, ##__VA_ARGS__) \
: ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__)
#define wrap_ptr(ctx, fkt, ...) wrap(ctx, fkt, ##__VA_ARGS__) #define wrap_ptr(ctx, fkt, ...) wrap_raw(ctx, fkt, ##__VA_ARGS__)
#else #else
#define wrap(ctx, fkt, ...) \ #define wrap_raw(ctx, fkt, ...) \
ctx->useEmulatedCard ? SCARD_F_INTERNAL_ERROR : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) ctx->useEmulatedCard ? SCARD_F_INTERNAL_ERROR : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__)
#define wrap_ptr(ctx, fkt, ...) \ #define wrap_ptr(ctx, fkt, ...) \
ctx->useEmulatedCard ? nullptr : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) ctx->useEmulatedCard ? nullptr : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__)
#endif #endif
#if defined(_WIN32)
#define wrap(ctx, fkt, ...) wrap_raw(ctx, fkt, ##__VA_ARGS__)
#else
#define wrap(ctx, fkt, ...) \
__extension__({ \
LONG defstatus = wrap_raw(ctx, fkt, ##__VA_ARGS__); \
if (defstatus != SCARD_S_SUCCESS) \
WLog_Print(ctx->log, WLOG_TRACE, "[" #fkt "] failed with %s", \
SCardGetErrorString(defstatus)); \
defstatus; \
})
#endif
struct s_scard_call_context struct s_scard_call_context
{ {
BOOL useEmulatedCard; BOOL useEmulatedCard;
@@ -1999,7 +2012,7 @@ void smartcard_call_context_free(scard_call_context* ctx)
if (ctx->StartedEvent) if (ctx->StartedEvent)
{ {
WINPR_ASSERT(ctx->useEmulatedCard || ctx->pWinSCardApi); WINPR_ASSERT(ctx->useEmulatedCard || ctx->pWinSCardApi);
wrap(ctx, SCardReleaseStartedEvent); wrap_raw(ctx, SCardReleaseStartedEvent);
} }
if (ctx->useEmulatedCard) if (ctx->useEmulatedCard)