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

libwinpr-smartcard: fix AccessStartedEvent

Browse Source
This commit is contained in:
Marc-André Moreau 2014-05-11 01:53:47 -04:00
parent d04430cb02
commit fda492c58d
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/smartcard/client/smartcard_operations.c
View File

@ -224,7 +224,10 @@ static UINT32 smartcard_IsValidContext(SMARTCARD_DEVICE* smartcard, IRP* irp)
hContext = smartcard_scard_context_native_from_redir(smartcard, &(call.hContext)); hContext = smartcard_scard_context_native_from_redir(smartcard, &(call.hContext));
status = ret.ReturnCode = SCardIsValidContext(hContext); if (!ListDictionary_Contains(smartcard->rgSCardContextList, (void*) hContext))
status = ret.ReturnCode = SCARD_E_INVALID_HANDLE;
else
status = ret.ReturnCode = SCardIsValidContext(hContext);
smartcard_trace_long_return(smartcard, &ret, "IsValidContext"); smartcard_trace_long_return(smartcard, &ret, "IsValidContext");
@ -970,6 +973,8 @@ static UINT32 smartcard_AccessStartedEvent(SMARTCARD_DEVICE* smartcard, IRP* irp
Stream_Seek(irp->input, 4); /* Unused (4 bytes) */ Stream_Seek(irp->input, 4); /* Unused (4 bytes) */
status = ret.ReturnCode = SCARD_S_SUCCESS;
if (!smartcard->StartedEvent) if (!smartcard->StartedEvent)
smartcard->StartedEvent = SCardAccessStartedEvent(); smartcard->StartedEvent = SCardAccessStartedEvent();

7
winpr/libwinpr/smartcard/smartcard_pcsc.c
View File

@ -811,7 +811,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReaders_Internal(SCARDCONTEXT hContext,
} }
else else
{ {
status = (LONG) g_PCSC.pfnSCardListReaders(hContext, NULL, mszReaders, &pcsc_cchReaders); status = (LONG) g_PCSC.pfnSCardListReaders(hContext, mszGroups, mszReaders, &pcsc_cchReaders);
} }
status = PCSC_MapErrorCodeToWinSCard(status); status = PCSC_MapErrorCodeToWinSCard(status);
@ -1194,6 +1194,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext
if (!g_PCSC.pfnSCardGetStatusChange) if (!g_PCSC.pfnSCardGetStatusChange)
return SCARD_E_NO_SERVICE; return SCARD_E_NO_SERVICE;
if (!cReaders)
return SCARD_S_SUCCESS;
/** /**
* Apple's SmartCard Services (not vanilla pcsc-lite) appears to have trouble with the * Apple's SmartCard Services (not vanilla pcsc-lite) appears to have trouble with the
* "\\\\?PnP?\\Notification" reader name. I am always getting EXC_BAD_ACCESS with it. * "\\\\?PnP?\\Notification" reader name. I am always getting EXC_BAD_ACCESS with it.
@ -1204,7 +1207,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext
* The "\\\\?PnP?\\Notification" string cannot be found anywhere in the sources, * The "\\\\?PnP?\\Notification" string cannot be found anywhere in the sources,
* while this string is present in the vanilla pcsc-lite sources. * while this string is present in the vanilla pcsc-lite sources.
* *
* To work around this apparently lack of "\\\\?PnP?\\Notification" support, * To work around this apparent lack of "\\\\?PnP?\\Notification" support,
* we have to filter rgReaderStates to exclude the special PnP reader name. * we have to filter rgReaderStates to exclude the special PnP reader name.
*/ */

6
winpr/libwinpr/smartcard/smartcard_pcsc.h
View File

@ -71,9 +71,9 @@ typedef long PCSC_LONG;
#define PCSC_SCARD_AUTOALLOCATE (PCSC_DWORD)(-1) #define PCSC_SCARD_AUTOALLOCATE (PCSC_DWORD)(-1)
#define PCSC_SCARD_PCI_T0 (&g_PCSC_rgSCardT0Pci) #define PCSC_SCARD_PCI_T0 (&g_PCSC_rgSCardT0Pci)
#define PCSC_SCARD_PCI_T1 (&g_PCSC_rgSCardT1Pci) #define PCSC_SCARD_PCI_T1 (&g_PCSC_rgSCardT1Pci)
#define PCSC_SCARD_PCI_RAW (&g_PCSC_rgSCardRawPci) #define PCSC_SCARD_PCI_RAW (&g_PCSC_rgSCardRawPci)
#define PCSC_SCARD_CTL_CODE(code) (0x42000000 + (code)) #define PCSC_SCARD_CTL_CODE(code) (0x42000000 + (code))
#define PCSC_CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400) #define PCSC_CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400)