giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minidriver additionl fixes

Browse Source 
Use __FUNCTION__ as defind in log.h so will compile with any compiler.
logprint additional handles as size_t

Add check in reader-pcsc.c pcsc_user_reader for minidriver only.

 On branch minidriver-5
 Changes to be committed:
	modified:   src/libopensc/reader-pcsc.c
	modified:   src/minidriver/minidriver.c
This commit is contained in:
Doug Engert 2019-11-09 18:50:15 -06:00 committed by Frank Morgner
parent 111246f1d2
commit 0fd77d642c
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libopensc/reader-pcsc.c
View File

@ -2411,8 +2411,13 @@ int pcsc_use_reader(sc_context_t *ctx, void * pcsc_context_handle, void * pcsc_c
goto out;
}
if (!gpriv->cardmod) {
ret = SC_ERROR_INTERNAL;
goto out;
}
/* Only minidriver calls this and only uses one reader */
/* if we already have a reader, use it*/
/* if we already have a reader, update it */
if (sc_ctx_get_reader_count(ctx) > 0) {
sc_log(ctx, "Reusing the reader");
sc_reader_t *reader = list_get_at(&ctx->readers, 0);

24
src/minidriver/minidriver.c
View File

@ -70,7 +70,7 @@
#include "cardmod.h"
#define MD_FUNC_CALLED(pCardData, level) do { \
logprintf(pCardData, level, "MD_Function:%s:%d called\n",__func__, __LINE__); \
logprintf(pCardData, level, "MD_Function:%s:%d called\n",__FUNCTION__, __LINE__); \
} while(0)
@ -78,13 +78,13 @@
logprintf(pCardData, level, "\nP:%lu T:%lu MD_Function:%s:%d called\n", \
(unsigned long)GetCurrentProcessId(),\
(unsigned long)GetCurrentThreadId(), \
__func__, __LINE__); \
__FUNCTION__, __LINE__); \
} while(0)
#define MD_FUNC_RETURN(pCardData, level, ...) do { \
DWORD _ret = __VA_ARGS__; \
logprintf(pCardData, level,\
"MD_Function:%s:%d returning with: 0x%08X\n", __func__, __LINE__, _ret); \
"MD_Function:%s:%d returning with: 0x%08X\n", __FUNCTION__, __LINE__, _ret); \
return _ret; \
} while(0)
@ -3205,11 +3205,11 @@ DWORD WINAPI CardDeleteContext(__inout PCARD_DATA pCardData)
MD_FUNC_RETURN(pCardData, 1, SCARD_E_INVALID_PARAMETER);
logprintf(pCardData, 1,
"\nP:%lu T:%lu pCardData:%p hScard=0x%08X hSCardCtx=0x%08X CardDeleteContext\n",
"\nP:%lu T:%lu pCardData:%p hScard=0x%08"SC_FORMAT_LEN_SIZE_T"X hSCardCtx=0x%08"SC_FORMAT_LEN_SIZE_T"X CardDeleteContext\n",
(unsigned long)GetCurrentProcessId(),
(unsigned long)GetCurrentThreadId(), pCardData,
(unsigned int)pCardData->hScard,
(unsigned int)pCardData->hSCardCtx);
(size_t)pCardData->hScard,
(size_t)pCardData->hSCardCtx);
vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
if(!vs)
@ -4948,11 +4948,11 @@ DWORD WINAPI CardSignData(__in PCARD_DATA pCardData, __inout PCARD_SIGNING_INFO
}
logprintf(pCardData, 3,
"CardSignData, dwVersion=%lu, name=%S, hScard=0x%08X, hSCardCtx=0x%08X\n",
"CardSignData, dwVersion=%lu, name=%S, hScard=0x%08"SC_FORMAT_LEN_SIZE_T"X, hSCardCtx=0x%08"SC_FORMAT_LEN_SIZE_T"X\n",
(unsigned long)pCardData->dwVersion,
NULLWSTR(pCardData->pwszCardName),
(unsigned int)pCardData->hScard,
(unsigned int)pCardData->hSCardCtx);
(size_t)pCardData->hScard,
(size_t)pCardData->hSCardCtx);
err:
unlock(pCardData);
@ -6902,11 +6902,11 @@ DWORD WINAPI CardAcquireContext(__inout PCARD_DATA pCardData, __in DWORD dwFlags
(unsigned long)GetCurrentProcessId(),
(unsigned long)GetCurrentThreadId(), pCardData);
logprintf(pCardData, 1,
"CardAcquireContext, dwVersion=%lu, name=%S,hScard=0x%08X, hSCardCtx=0x%08X\n",
"CardAcquireContext, dwVersion=%lu, name=%S,hScard=0x%08"SC_FORMAT_LEN_SIZE_T"X, hSCardCtx=0x%08"SC_FORMAT_LEN_SIZE_T"X\n",
(unsigned long)pCardData->dwVersion,
NULLWSTR(pCardData->pwszCardName),
(unsigned int)pCardData->hScard,
(unsigned int)pCardData->hSCardCtx);
(size_t)pCardData->hScard,
(size_t)pCardData->hSCardCtx);
vs->hScard = pCardData->hScard;
vs->hSCardCtx = pCardData->hSCardCtx;