Merge pull request #5738 from akallabeth/hide_unexported_functions

Do not export functions that are purely internal.
This commit is contained in:
Martin Fleisz 2019-11-21 08:29:00 +01:00 committed by GitHub
commit b176fdeff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 347 additions and 375 deletions

View File

@ -38,8 +38,8 @@ static PSCardApiFunctionTable g_SCardApi = NULL;
* Standard Windows Smart Card API * Standard Windows Smart Card API
*/ */
WINSCARDAPI LONG WINAPI Inspect_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, static LONG WINAPI Inspect_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPSCARDCONTEXT phContext) LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
{ {
LONG status; LONG status;
@ -54,7 +54,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardEstablishContext(DWORD dwScope, LPCVOID pvR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardReleaseContext(SCARDCONTEXT hContext) static LONG WINAPI Inspect_SCardReleaseContext(SCARDCONTEXT hContext)
{ {
LONG status; LONG status;
@ -68,7 +68,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardReleaseContext(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIsValidContext(SCARDCONTEXT hContext) static LONG WINAPI Inspect_SCardIsValidContext(SCARDCONTEXT hContext)
{ {
LONG status; LONG status;
@ -82,8 +82,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIsValidContext(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups, static LONG WINAPI Inspect_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups) LPDWORD pcchGroups)
{ {
LONG status; LONG status;
@ -97,8 +97,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReaderGroupsA(SCARDCONTEXT hContext, LP
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR mszGroups, static LONG WINAPI Inspect_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR mszGroups,
LPDWORD pcchGroups) LPDWORD pcchGroups)
{ {
LONG status; LONG status;
@ -112,8 +112,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReaderGroupsW(SCARDCONTEXT hContext, LP
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups, static LONG WINAPI Inspect_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups,
LPSTR mszReaders, LPDWORD pcchReaders) LPSTR mszReaders, LPDWORD pcchReaders)
{ {
LONG status; LONG status;
@ -127,8 +127,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups, static LONG WINAPI Inspect_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups,
LPWSTR mszReaders, LPDWORD pcchReaders) LPWSTR mszReaders, LPDWORD pcchReaders)
{ {
LONG status; LONG status;
@ -142,9 +142,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, static LONG WINAPI Inspect_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr,
LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
CHAR* mszCards, LPDWORD pcchCards) CHAR* mszCards, LPDWORD pcchCards)
{ {
LONG status; LONG status;
@ -159,9 +159,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE p
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, static LONG WINAPI Inspect_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr,
LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
WCHAR* mszCards, LPDWORD pcchCards) WCHAR* mszCards, LPDWORD pcchCards)
{ {
LONG status; LONG status;
@ -176,9 +176,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE p
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard, static LONG WINAPI Inspect_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard,
LPGUID pguidInterfaces, LPGUID pguidInterfaces, LPDWORD pcguidInterfaces)
LPDWORD pcguidInterfaces)
{ {
LONG status; LONG status;
@ -193,9 +192,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListInterfacesA(SCARDCONTEXT hContext, LPCS
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard, static LONG WINAPI Inspect_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard,
LPGUID pguidInterfaces, LPGUID pguidInterfaces, LPDWORD pcguidInterfaces)
LPDWORD pcguidInterfaces)
{ {
LONG status; LONG status;
@ -210,8 +208,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListInterfacesW(SCARDCONTEXT hContext, LPCW
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard, static LONG WINAPI Inspect_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard,
LPGUID pguidProviderId) LPGUID pguidProviderId)
{ {
LONG status; LONG status;
@ -225,8 +223,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCST
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard, static LONG WINAPI Inspect_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard,
LPGUID pguidProviderId) LPGUID pguidProviderId)
{ {
LONG status; LONG status;
@ -240,10 +238,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWS
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName,
LPCSTR szCardName, DWORD dwProviderId, DWORD dwProviderId, CHAR* szProvider,
CHAR* szProvider, LPDWORD pcchProvider)
LPDWORD pcchProvider)
{ {
LONG status; LONG status;
@ -258,10 +255,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetCardTypeProviderNameA(SCARDCONTEXT hCont
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCWSTR szCardName, DWORD dwProviderId, WCHAR* szProvider,
DWORD dwProviderId, WCHAR* szProvider, LPDWORD pcchProvider)
LPDWORD pcchProvider)
{ {
LONG status; LONG status;
@ -276,8 +272,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetCardTypeProviderNameW(SCARDCONTEXT hCont
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName)
LPCSTR szGroupName)
{ {
LONG status; LONG status;
@ -291,8 +286,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName)
LPCWSTR szGroupName)
{ {
LONG status; LONG status;
@ -306,7 +300,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName) static LONG WINAPI Inspect_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName)
{ {
LONG status; LONG status;
@ -320,7 +314,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderGroupA(SCARDCONTEXT hContext, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName) static LONG WINAPI Inspect_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName)
{ {
LONG status; LONG status;
@ -334,8 +328,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderGroupW(SCARDCONTEXT hContext, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI Inspect_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szDeviceName) LPCSTR szDeviceName)
{ {
LONG status; LONG status;
@ -349,8 +343,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPC
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI Inspect_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szDeviceName) LPCWSTR szDeviceName)
{ {
LONG status; LONG status;
@ -364,7 +358,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPC
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName) static LONG WINAPI Inspect_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName)
{ {
LONG status; LONG status;
@ -378,7 +372,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName) static LONG WINAPI Inspect_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName)
{ {
LONG status; LONG status;
@ -392,8 +386,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWST
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI Inspect_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szGroupName) LPCSTR szGroupName)
{ {
LONG status; LONG status;
@ -407,8 +401,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LP
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI Inspect_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szGroupName) LPCWSTR szGroupName)
{ {
LONG status; LONG status;
@ -422,8 +416,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LP
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szReaderName, LPCSTR szGroupName) LPCSTR szGroupName)
{ {
LONG status; LONG status;
@ -437,9 +431,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContex
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szReaderName, LPCWSTR szGroupName)
LPCWSTR szGroupName)
{ {
LONG status; LONG status;
@ -453,11 +446,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContex
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName, static LONG WINAPI Inspect_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName,
LPCGUID pguidPrimaryProvider, LPCGUID pguidPrimaryProvider,
LPCGUID rgguidInterfaces, LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
DWORD dwInterfaceCount, LPCBYTE pbAtr, LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen)
LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
LONG status; LONG status;
@ -473,11 +465,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName, static LONG WINAPI Inspect_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCGUID pguidPrimaryProvider, LPCGUID pguidPrimaryProvider,
LPCGUID rgguidInterfaces, LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
DWORD dwInterfaceCount, LPCBYTE pbAtr, LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen)
LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
LONG status; LONG status;
@ -493,9 +484,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName,
LPCSTR szCardName, DWORD dwProviderId, DWORD dwProviderId, LPCSTR szProvider)
LPCSTR szProvider)
{ {
LONG status; LONG status;
@ -510,10 +500,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardSetCardTypeProviderNameA(SCARDCONTEXT hCont
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCWSTR szCardName, DWORD dwProviderId, LPCWSTR szProvider)
DWORD dwProviderId,
LPCWSTR szProvider)
{ {
LONG status; LONG status;
@ -528,7 +516,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardSetCardTypeProviderNameW(SCARDCONTEXT hCont
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName) static LONG WINAPI Inspect_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName)
{ {
LONG status; LONG status;
@ -542,7 +530,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCS
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName) static LONG WINAPI Inspect_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName)
{ {
LONG status; LONG status;
@ -556,7 +544,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCW
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem) static LONG WINAPI Inspect_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem)
{ {
LONG status; LONG status;
@ -570,7 +558,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID p
return status; return status;
} }
WINSCARDAPI HANDLE WINAPI Inspect_SCardAccessStartedEvent(void) static HANDLE WINAPI Inspect_SCardAccessStartedEvent(void)
{ {
HANDLE hEvent; HANDLE hEvent;
@ -583,7 +571,7 @@ WINSCARDAPI HANDLE WINAPI Inspect_SCardAccessStartedEvent(void)
return hEvent; return hEvent;
} }
WINSCARDAPI void WINAPI Inspect_SCardReleaseStartedEvent(void) static void WINAPI Inspect_SCardReleaseStartedEvent(void)
{ {
WLog_Print(g_Log, WLOG_DEBUG, "SCardReleaseStartedEvent {"); WLog_Print(g_Log, WLOG_DEBUG, "SCardReleaseStartedEvent {");
@ -592,9 +580,8 @@ WINSCARDAPI void WINAPI Inspect_SCardReleaseStartedEvent(void)
WLog_Print(g_Log, WLOG_DEBUG, "SCardReleaseStartedEvent }"); WLog_Print(g_Log, WLOG_DEBUG, "SCardReleaseStartedEvent }");
} }
WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards, static LONG WINAPI Inspect_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards,
LPSCARD_READERSTATEA rgReaderStates, LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
LONG status; LONG status;
@ -608,9 +595,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards, static LONG WINAPI Inspect_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards,
LPSCARD_READERSTATEW rgReaderStates, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
LONG status; LONG status;
@ -624,10 +610,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsByATRA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardLocateCardsByATRA(SCARDCONTEXT hContext, LPSCARD_ATRMASK rgAtrMasks,
LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, DWORD cAtrs, LPSCARD_READERSTATEA rgReaderStates,
LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
LONG status; LONG status;
@ -642,10 +627,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsByATRA(SCARDCONTEXT hContext,
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsByATRW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardLocateCardsByATRW(SCARDCONTEXT hContext, LPSCARD_ATRMASK rgAtrMasks,
LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, DWORD cAtrs, LPSCARD_READERSTATEW rgReaderStates,
LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
LONG status; LONG status;
@ -660,9 +644,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardLocateCardsByATRW(SCARDCONTEXT hContext,
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dwTimeout, static LONG WINAPI Inspect_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATEA rgReaderStates, LPSCARD_READERSTATEA rgReaderStates,
DWORD cReaders) DWORD cReaders)
{ {
LONG status; LONG status;
@ -676,9 +660,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWO
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout, static LONG WINAPI Inspect_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATEW rgReaderStates, LPSCARD_READERSTATEW rgReaderStates,
DWORD cReaders) DWORD cReaders)
{ {
LONG status; LONG status;
@ -692,7 +676,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWO
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardCancel(SCARDCONTEXT hContext) static LONG WINAPI Inspect_SCardCancel(SCARDCONTEXT hContext)
{ {
LONG status; LONG status;
@ -706,9 +690,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardCancel(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, static LONG WINAPI Inspect_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode,
DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
LONG status; LONG status;
@ -723,9 +707,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szRe
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader, static LONG WINAPI Inspect_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader, DWORD dwShareMode,
DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
LONG status; LONG status;
@ -740,9 +724,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szR
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, static LONG WINAPI Inspect_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode,
DWORD dwPreferredProtocols, DWORD dwInitialization, DWORD dwPreferredProtocols, DWORD dwInitialization,
LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
LONG status; LONG status;
@ -757,7 +741,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareM
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) static LONG WINAPI Inspect_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
{ {
LONG status; LONG status;
@ -771,7 +755,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDispo
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardBeginTransaction(SCARDHANDLE hCard) static LONG WINAPI Inspect_SCardBeginTransaction(SCARDHANDLE hCard)
{ {
LONG status; LONG status;
@ -785,7 +769,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardBeginTransaction(SCARDHANDLE hCard)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) static LONG WINAPI Inspect_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition)
{ {
LONG status; LONG status;
@ -799,7 +783,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwD
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardCancelTransaction(SCARDHANDLE hCard) static LONG WINAPI Inspect_SCardCancelTransaction(SCARDHANDLE hCard)
{ {
LONG status; LONG status;
@ -813,8 +797,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardCancelTransaction(SCARDHANDLE hCard)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol, static LONG WINAPI Inspect_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol,
LPBYTE pbAtr, LPDWORD pcbAtrLen) LPBYTE pbAtr, LPDWORD pcbAtrLen)
{ {
LONG status; LONG status;
@ -828,9 +812,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardState(SCARDHANDLE hCard, LPDWORD pdwState,
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames, static LONG WINAPI Inspect_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{ {
LONG status; LONG status;
@ -845,9 +829,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderN
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames, static LONG WINAPI Inspect_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{ {
LONG status; LONG status;
@ -862,10 +846,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReader
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci, static LONG WINAPI Inspect_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci,
LPCBYTE pbSendBuffer, DWORD cbSendLength, LPCBYTE pbSendBuffer, DWORD cbSendLength,
LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer, LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer,
LPDWORD pcbRecvLength) LPDWORD pcbRecvLength)
{ {
LONG status; LONG status;
@ -880,7 +864,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQ
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pcTransmitCount) static LONG WINAPI Inspect_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pcTransmitCount)
{ {
LONG status; LONG status;
@ -894,10 +878,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, static LONG WINAPI Inspect_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID lpInBuffer,
LPCVOID lpInBuffer, DWORD cbInBufferSize, DWORD cbInBufferSize, LPVOID lpOutBuffer,
LPVOID lpOutBuffer, DWORD cbOutBufferSize, DWORD cbOutBufferSize, LPDWORD lpBytesReturned)
LPDWORD lpBytesReturned)
{ {
LONG status; LONG status;
@ -912,8 +895,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardControl(SCARDHANDLE hCard, DWORD dwControlC
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr, static LONG WINAPI Inspect_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr,
LPDWORD pcbAttrLen) LPDWORD pcbAttrLen)
{ {
LONG status; LONG status;
@ -927,8 +910,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr, static LONG WINAPI Inspect_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr,
DWORD cbAttrLen) DWORD cbAttrLen)
{ {
LONG status; LONG status;
@ -942,7 +925,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc) static LONG WINAPI Inspect_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc)
{ {
LONG status; LONG status;
@ -956,7 +939,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStr
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc) static LONG WINAPI Inspect_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc)
{ {
LONG status; LONG status;
@ -970,7 +953,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStr
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc) static LONG WINAPI Inspect_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc)
{ {
LONG status; LONG status;
@ -984,7 +967,7 @@ WINSCARDAPI LONG WINAPI Inspect_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc) static LONG WINAPI Inspect_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc)
{ {
LONG status; LONG status;
@ -998,7 +981,7 @@ WINSCARDAPI LONG WINAPI Inspect_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardDlgExtendedError(void) static LONG WINAPI Inspect_SCardDlgExtendedError(void)
{ {
LONG status; LONG status;
@ -1012,9 +995,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardDlgExtendedError(void)
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI Inspect_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPSTR LookupName, DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data,
PBYTE Data, DWORD* DataLen) DWORD* DataLen)
{ {
LONG status; LONG status;
@ -1029,9 +1012,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardReadCacheA(SCARDCONTEXT hContext, UUID* Car
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI Inspect_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPWSTR LookupName, DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data,
PBYTE Data, DWORD* DataLen) DWORD* DataLen)
{ {
LONG status; LONG status;
@ -1046,9 +1029,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardReadCacheW(SCARDCONTEXT hContext, UUID* Car
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI Inspect_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPSTR LookupName, DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data,
PBYTE Data, DWORD DataLen) DWORD DataLen)
{ {
LONG status; LONG status;
@ -1063,9 +1046,9 @@ WINSCARDAPI LONG WINAPI Inspect_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* Ca
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI Inspect_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPWSTR LookupName, DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data,
PBYTE Data, DWORD DataLen) DWORD DataLen)
{ {
LONG status; LONG status;
@ -1080,8 +1063,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* Ca
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI Inspect_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPBYTE pbIcon, LPDWORD pcbIcon) LPBYTE pbIcon, LPDWORD pcbIcon)
{ {
LONG status; LONG status;
@ -1095,8 +1078,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCST
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI Inspect_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPBYTE pbIcon, LPDWORD pcbIcon) LPBYTE pbIcon, LPDWORD pcbIcon)
{ {
LONG status; LONG status;
@ -1110,8 +1093,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWS
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI Inspect_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPDWORD pdwDeviceTypeId) LPDWORD pdwDeviceTypeId)
{ {
LONG status; LONG status;
@ -1125,8 +1108,8 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPC
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI Inspect_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPDWORD pdwDeviceTypeId) LPDWORD pdwDeviceTypeId)
{ {
LONG status; LONG status;
@ -1140,10 +1123,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPC
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hContext,
LPCSTR szReaderName, LPCSTR szReaderName,
LPSTR szDeviceInstanceId, LPSTR szDeviceInstanceId,
LPDWORD pcchDeviceInstanceId) LPDWORD pcchDeviceInstanceId)
{ {
LONG status; LONG status;
@ -1159,10 +1142,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hCo
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hContext,
LPCWSTR szReaderName, LPCWSTR szReaderName,
LPWSTR szDeviceInstanceId, LPWSTR szDeviceInstanceId,
LPDWORD pcchDeviceInstanceId) LPDWORD pcchDeviceInstanceId)
{ {
LONG status; LONG status;
@ -1178,10 +1161,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hCo
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdA(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdA(SCARDCONTEXT hContext,
LPCSTR szDeviceInstanceId, LPCSTR szDeviceInstanceId,
LPSTR mszReaders, LPSTR mszReaders,
LPDWORD pcchReaders) LPDWORD pcchReaders)
{ {
LONG status; LONG status;
@ -1198,10 +1181,10 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdA(SCARDCONTE
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hContext, static LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hContext,
LPCWSTR szDeviceInstanceId, LPCWSTR szDeviceInstanceId,
LPWSTR mszReaders, LPWSTR mszReaders,
LPDWORD pcchReaders) LPDWORD pcchReaders)
{ {
LONG status; LONG status;
@ -1218,7 +1201,7 @@ WINSCARDAPI LONG WINAPI Inspect_SCardListReadersWithDeviceInstanceIdW(SCARDCONTE
return status; return status;
} }
WINSCARDAPI LONG WINAPI Inspect_SCardAudit(SCARDCONTEXT hContext, DWORD dwEvent) static LONG WINAPI Inspect_SCardAudit(SCARDCONTEXT hContext, DWORD dwEvent)
{ {
LONG status; LONG status;

View File

@ -155,11 +155,11 @@ const PCSC_SCARD_IO_REQUEST g_PCSC_rgSCardT1Pci = { SCARD_PROTOCOL_T1,
const PCSC_SCARD_IO_REQUEST g_PCSC_rgSCardRawPci = { PCSC_SCARD_PROTOCOL_RAW, const PCSC_SCARD_IO_REQUEST g_PCSC_rgSCardRawPci = { PCSC_SCARD_PROTOCOL_RAW,
sizeof(PCSC_SCARD_IO_REQUEST) }; sizeof(PCSC_SCARD_IO_REQUEST) };
WINSCARDAPI LONG WINAPI PCSC_SCardFreeMemory_Internal(SCARDCONTEXT hContext, LPCVOID pvMem); static LONG WINAPI PCSC_SCardFreeMemory_Internal(SCARDCONTEXT hContext, LPCVOID pvMem);
WINSCARDAPI LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVOID pvReserved1, static LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPCVOID pvReserved2,
LPSCARDCONTEXT phContext); LPSCARDCONTEXT phContext);
WINSCARDAPI LONG WINAPI PCSC_SCardReleaseContext_Internal(SCARDCONTEXT hContext); static LONG WINAPI PCSC_SCardReleaseContext_Internal(SCARDCONTEXT hContext);
static LONG PCSC_MapErrorCodeToWinSCard(LONG errorCode) static LONG PCSC_MapErrorCodeToWinSCard(LONG errorCode)
{ {
@ -585,9 +585,9 @@ static void* PCSC_RemoveMemoryBlock(SCARDCONTEXT hContext, void* pvMem)
* Standard Windows Smart Card API (PCSC) * Standard Windows Smart Card API (PCSC)
*/ */
WINSCARDAPI LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVOID pvReserved1, static LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPCVOID pvReserved2,
LPSCARDCONTEXT phContext) LPSCARDCONTEXT phContext)
{ {
WINPR_UNUSED(dwScope); /* SCARD_SCOPE_SYSTEM is the only scope supported by pcsc-lite */ WINPR_UNUSED(dwScope); /* SCARD_SCOPE_SYSTEM is the only scope supported by pcsc-lite */
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -601,8 +601,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardEstablishContext_Internal(DWORD dwScope, LPCVO
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, static LONG WINAPI PCSC_SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPSCARDCONTEXT phContext) LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
{ {
LONG status; LONG status;
status = PCSC_SCardEstablishContext_Internal(dwScope, pvReserved1, pvReserved2, phContext); status = PCSC_SCardEstablishContext_Internal(dwScope, pvReserved1, pvReserved2, phContext);
@ -613,7 +613,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardEstablishContext(DWORD dwScope, LPCVOID pvRese
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardReleaseContext_Internal(SCARDCONTEXT hContext) static LONG WINAPI PCSC_SCardReleaseContext_Internal(SCARDCONTEXT hContext)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -631,7 +631,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardReleaseContext_Internal(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardReleaseContext(SCARDCONTEXT hContext) static LONG WINAPI PCSC_SCardReleaseContext(SCARDCONTEXT hContext)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
status = PCSC_SCardReleaseContext_Internal(hContext); status = PCSC_SCardReleaseContext_Internal(hContext);
@ -642,7 +642,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardReleaseContext(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIsValidContext(SCARDCONTEXT hContext) static LONG WINAPI PCSC_SCardIsValidContext(SCARDCONTEXT hContext)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -654,8 +654,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardIsValidContext(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroups_Internal(SCARDCONTEXT hContext, LPSTR mszGroups, static LONG WINAPI PCSC_SCardListReaderGroups_Internal(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups) LPDWORD pcchGroups)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
BOOL pcchGroupsAlloc = FALSE; BOOL pcchGroupsAlloc = FALSE;
@ -703,8 +703,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroups_Internal(SCARDCONTEXT hContex
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups, static LONG WINAPI PCSC_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups) LPDWORD pcchGroups)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -722,8 +722,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR mszGroups, static LONG WINAPI PCSC_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWSTR mszGroups,
LPDWORD pcchGroups) LPDWORD pcchGroups)
{ {
LPSTR mszGroupsA = NULL; LPSTR mszGroupsA = NULL;
LPSTR* pMszGroupsA = &mszGroupsA; LPSTR* pMszGroupsA = &mszGroupsA;
@ -751,8 +751,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReaderGroupsW(SCARDCONTEXT hContext, LPWST
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReaders_Internal(SCARDCONTEXT hContext, LPCSTR mszGroups, static LONG WINAPI PCSC_SCardListReaders_Internal(SCARDCONTEXT hContext, LPCSTR mszGroups,
LPSTR mszReaders, LPDWORD pcchReaders) LPSTR mszReaders, LPDWORD pcchReaders)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
BOOL pcchReadersAlloc = FALSE; BOOL pcchReadersAlloc = FALSE;
@ -804,8 +804,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReaders_Internal(SCARDCONTEXT hContext, LP
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups, static LONG WINAPI PCSC_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups, LPSTR mszReaders,
LPSTR mszReaders, LPDWORD pcchReaders) LPDWORD pcchReaders)
{ {
BOOL nullCardContext = FALSE; BOOL nullCardContext = FALSE;
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -839,8 +839,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReadersA(SCARDCONTEXT hContext, LPCSTR msz
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups, static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups,
LPWSTR mszReaders, LPDWORD pcchReaders) LPWSTR mszReaders, LPDWORD pcchReaders)
{ {
LPSTR mszGroupsA = NULL; LPSTR mszGroupsA = NULL;
LPSTR mszReadersA = NULL; LPSTR mszReadersA = NULL;
@ -892,166 +892,163 @@ WINSCARDAPI LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR ms
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, static LONG WINAPI PCSC_SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr,
LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
CHAR* mszCards, LPDWORD pcchCards) CHAR* mszCards, LPDWORD pcchCards)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, static LONG WINAPI PCSC_SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr,
LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount, LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
WCHAR* mszCards, LPDWORD pcchCards) WCHAR* mszCards, LPDWORD pcchCards)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard, static LONG WINAPI PCSC_SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard,
LPGUID pguidInterfaces, LPDWORD pcguidInterfaces) LPGUID pguidInterfaces, LPDWORD pcguidInterfaces)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard, static LONG WINAPI PCSC_SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard,
LPGUID pguidInterfaces, LPDWORD pcguidInterfaces) LPGUID pguidInterfaces, LPDWORD pcguidInterfaces)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard, static LONG WINAPI PCSC_SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard,
LPGUID pguidProviderId) LPGUID pguidProviderId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard, static LONG WINAPI PCSC_SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard,
LPGUID pguidProviderId) LPGUID pguidProviderId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName, static LONG WINAPI PCSC_SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName,
DWORD dwProviderId, CHAR* szProvider, DWORD dwProviderId, CHAR* szProvider,
LPDWORD pcchProvider) LPDWORD pcchProvider)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCWSTR szCardName, DWORD dwProviderId, DWORD dwProviderId, WCHAR* szProvider,
WCHAR* szProvider, LPDWORD pcchProvider) LPDWORD pcchProvider)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName) static LONG WINAPI PCSC_SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName) static LONG WINAPI PCSC_SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName) static LONG WINAPI PCSC_SCardForgetReaderGroupA(SCARDCONTEXT hContext, LPCSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName) static LONG WINAPI PCSC_SCardForgetReaderGroupW(SCARDCONTEXT hContext, LPCWSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI PCSC_SCardIntroduceReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szDeviceName) LPCSTR szDeviceName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI PCSC_SCardIntroduceReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szDeviceName) LPCWSTR szDeviceName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName) static LONG WINAPI PCSC_SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName) static LONG WINAPI PCSC_SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI PCSC_SCardAddReaderToGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szGroupName)
{
return 0;
}
static LONG WINAPI PCSC_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szGroupName)
{
return 0;
}
static LONG WINAPI PCSC_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szGroupName) LPCSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardAddReaderToGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI PCSC_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szGroupName) LPCWSTR szGroupName)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI PCSC_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName,
LPCSTR szGroupName) LPCGUID pguidPrimaryProvider,
LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCWSTR szReaderName, LPCWSTR szGroupName) LPCGUID pguidPrimaryProvider,
LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName, static LONG WINAPI PCSC_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName,
LPCGUID pguidPrimaryProvider, DWORD dwProviderId, LPCSTR szProvider)
LPCGUID rgguidInterfaces,
DWORD dwInterfaceCount, LPCBYTE pbAtr,
LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardIntroduceCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName, static LONG WINAPI PCSC_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, LPCWSTR szCardName,
LPCGUID pguidPrimaryProvider, DWORD dwProviderId, LPCWSTR szProvider)
LPCGUID rgguidInterfaces,
DWORD dwInterfaceCount, LPCBYTE pbAtr,
LPCBYTE pbAtrMask, DWORD cbAtrLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, LPCSTR szCardName, static LONG WINAPI PCSC_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName)
DWORD dwProviderId, LPCSTR szProvider)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName)
LPCWSTR szCardName, DWORD dwProviderId,
LPCWSTR szProvider)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName) static LONG WINAPI PCSC_SCardFreeMemory_Internal(SCARDCONTEXT hContext, LPCVOID pvMem)
{
return 0;
}
WINSCARDAPI LONG WINAPI PCSC_SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName)
{
return 0;
}
WINSCARDAPI LONG WINAPI PCSC_SCardFreeMemory_Internal(SCARDCONTEXT hContext, LPCVOID pvMem)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1072,7 +1069,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardFreeMemory_Internal(SCARDCONTEXT hContext, LPC
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem) static LONG WINAPI PCSC_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1093,7 +1090,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMe
return status; return status;
} }
WINSCARDAPI HANDLE WINAPI PCSC_SCardAccessStartedEvent(void) static HANDLE WINAPI PCSC_SCardAccessStartedEvent(void)
{ {
LONG status = 0; LONG status = 0;
SCARDCONTEXT hContext = 0; SCARDCONTEXT hContext = 0;
@ -1123,7 +1120,7 @@ WINSCARDAPI HANDLE WINAPI PCSC_SCardAccessStartedEvent(void)
return g_StartedEvent; return g_StartedEvent;
} }
WINSCARDAPI void WINAPI PCSC_SCardReleaseStartedEvent(void) static void WINAPI PCSC_SCardReleaseStartedEvent(void)
{ {
g_StartedEventRefCount--; g_StartedEventRefCount--;
@ -1137,37 +1134,35 @@ WINSCARDAPI void WINAPI PCSC_SCardReleaseStartedEvent(void)
} }
} }
WINSCARDAPI LONG WINAPI PCSC_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards, static LONG WINAPI PCSC_SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards,
LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders) LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards, static LONG WINAPI PCSC_SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards,
LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders) LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardLocateCardsByATRA(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardLocateCardsByATRA(SCARDCONTEXT hContext, LPSCARD_ATRMASK rgAtrMasks,
LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, DWORD cAtrs, LPSCARD_READERSTATEA rgReaderStates,
LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardLocateCardsByATRW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardLocateCardsByATRW(SCARDCONTEXT hContext, LPSCARD_ATRMASK rgAtrMasks,
LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, DWORD cAtrs, LPSCARD_READERSTATEW rgReaderStates,
LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext, DWORD dwTimeout, static LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATEA rgReaderStates, LPSCARD_READERSTATEA rgReaderStates,
DWORD cReaders) DWORD cReaders)
{ {
PCSC_DWORD i, j; PCSC_DWORD i, j;
int* map; int* map;
@ -1262,9 +1257,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dwTimeout, static LONG WINAPI PCSC_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATEA rgReaderStates, LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1279,9 +1273,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChangeA(SCARDCONTEXT hContext, DWORD
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout, static LONG WINAPI PCSC_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATEW rgReaderStates, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders)
DWORD cReaders)
{ {
DWORD index; DWORD index;
LPSCARD_READERSTATEA states; LPSCARD_READERSTATEA states;
@ -1333,7 +1326,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardCancel(SCARDCONTEXT hContext) static LONG WINAPI PCSC_SCardCancel(SCARDCONTEXT hContext)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1345,9 +1338,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardCancel(SCARDCONTEXT hContext)
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardConnect_Internal(SCARDCONTEXT hContext, LPCSTR szReader, static LONG WINAPI PCSC_SCardConnect_Internal(SCARDCONTEXT hContext, LPCSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwShareMode, DWORD dwPreferredProtocols,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol)
{ {
BOOL shared; BOOL shared;
char* szReaderPCSC; char* szReaderPCSC;
@ -1393,9 +1386,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardConnect_Internal(SCARDCONTEXT hContext, LPCSTR
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, static LONG WINAPI PCSC_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode,
DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1411,9 +1404,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReade
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader, static LONG WINAPI PCSC_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader, DWORD dwShareMode,
DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
LPSTR szReaderA = NULL; LPSTR szReaderA = NULL;
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1434,9 +1427,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szRead
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, static LONG WINAPI PCSC_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode,
DWORD dwPreferredProtocols, DWORD dwInitialization, DWORD dwPreferredProtocols, DWORD dwInitialization,
LPDWORD pdwActiveProtocol) LPDWORD pdwActiveProtocol)
{ {
BOOL shared; BOOL shared;
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
@ -1458,7 +1451,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) static LONG WINAPI PCSC_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
PCSC_DWORD pcsc_dwDisposition = (PCSC_DWORD)dwDisposition; PCSC_DWORD pcsc_dwDisposition = (PCSC_DWORD)dwDisposition;
@ -1478,7 +1471,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposit
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardBeginTransaction(SCARDHANDLE hCard) static LONG WINAPI PCSC_SCardBeginTransaction(SCARDHANDLE hCard)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
@ -1506,7 +1499,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardBeginTransaction(SCARDHANDLE hCard)
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) static LONG WINAPI PCSC_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
@ -1537,13 +1530,13 @@ WINSCARDAPI LONG WINAPI PCSC_SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisp
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardCancelTransaction(SCARDHANDLE hCard) static LONG WINAPI PCSC_SCardCancelTransaction(SCARDHANDLE hCard)
{ {
return SCARD_S_SUCCESS; return SCARD_S_SUCCESS;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol, static LONG WINAPI PCSC_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD pdwProtocol,
LPBYTE pbAtr, LPDWORD pcbAtrLen) LPBYTE pbAtr, LPDWORD pcbAtrLen)
{ {
PCSC_DWORD cchReaderLen; PCSC_DWORD cchReaderLen;
SCARDCONTEXT hContext = 0; SCARDCONTEXT hContext = 0;
@ -1586,10 +1579,10 @@ WINSCARDAPI LONG WINAPI PCSC_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPD
* PCSC returns a string but Windows SCardStatus requires the return to be a multi string. * PCSC returns a string but Windows SCardStatus requires the return to be a multi string.
* Therefore extra length checks and additional buffer allocation is required * Therefore extra length checks and additional buffer allocation is required
*/ */
WINSCARDAPI LONG WINAPI PCSC_SCardStatus_Internal(SCARDHANDLE hCard, LPSTR mszReaderNames, static LONG WINAPI PCSC_SCardStatus_Internal(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen,
LPDWORD pcbAtrLen, BOOL unicode) BOOL unicode)
{ {
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
@ -1762,26 +1755,26 @@ out_fail:
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames, static LONG WINAPI PCSC_SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) LPDWORD pcbAtrLen)
{ {
return PCSC_SCardStatus_Internal(hCard, mszReaderNames, pcchReaderLen, pdwState, pdwProtocol, return PCSC_SCardStatus_Internal(hCard, mszReaderNames, pcchReaderLen, pdwState, pdwProtocol,
pbAtr, pcbAtrLen, FALSE); pbAtr, pcbAtrLen, FALSE);
} }
WINSCARDAPI LONG WINAPI PCSC_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames, static LONG WINAPI PCSC_SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) LPBYTE pbAtr, LPDWORD pcbAtrLen)
{ {
return PCSC_SCardStatus_Internal(hCard, (LPSTR)mszReaderNames, pcchReaderLen, pdwState, return PCSC_SCardStatus_Internal(hCard, (LPSTR)mszReaderNames, pcchReaderLen, pdwState,
pdwProtocol, pbAtr, pcbAtrLen, TRUE); pdwProtocol, pbAtr, pcbAtrLen, TRUE);
} }
WINSCARDAPI LONG WINAPI PCSC_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci, static LONG WINAPI PCSC_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci,
LPCBYTE pbSendBuffer, DWORD cbSendLength, LPCBYTE pbSendBuffer, DWORD cbSendLength,
LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer, LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer,
LPDWORD pcbRecvLength) LPDWORD pcbRecvLength)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
@ -1893,7 +1886,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUES
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pcTransmitCount) static LONG WINAPI PCSC_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pcTransmitCount)
{ {
WINPR_UNUSED(pcTransmitCount); WINPR_UNUSED(pcTransmitCount);
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
@ -1906,10 +1899,9 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetTransmitCount(SCARDHANDLE hCard, LPDWORD pc
return SCARD_S_SUCCESS; return SCARD_S_SUCCESS;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, static LONG WINAPI PCSC_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID lpInBuffer,
LPCVOID lpInBuffer, DWORD cbInBufferSize, DWORD cbInBufferSize, LPVOID lpOutBuffer,
LPVOID lpOutBuffer, DWORD cbOutBufferSize, DWORD cbOutBufferSize, LPDWORD lpBytesReturned)
LPDWORD lpBytesReturned)
{ {
DWORD IoCtlMethod = 0; DWORD IoCtlMethod = 0;
DWORD IoCtlFunction = 0; DWORD IoCtlFunction = 0;
@ -1981,8 +1973,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardControl(SCARDHANDLE hCard, DWORD dwControlCode
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_Internal(SCARDHANDLE hCard, DWORD dwAttrId, static LONG WINAPI PCSC_SCardGetAttrib_Internal(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr,
LPBYTE pbAttr, LPDWORD pcbAttrLen) LPDWORD pcbAttrLen)
{ {
SCARDCONTEXT hContext = 0; SCARDCONTEXT hContext = 0;
BOOL pcbAttrLenAlloc = FALSE; BOOL pcbAttrLenAlloc = FALSE;
@ -2048,8 +2040,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_Internal(SCARDHANDLE hCard, DWORD dw
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWORD dwAttrId, static LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWORD dwAttrId,
LPBYTE pbAttr, LPDWORD pcbAttrLen) LPBYTE pbAttr, LPDWORD pcbAttrLen)
{ {
size_t length = 0; size_t length = 0;
char* namePCSC = NULL; char* namePCSC = NULL;
@ -2163,8 +2155,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr, static LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr,
LPDWORD pcbAttrLen) LPDWORD pcbAttrLen)
{ {
DWORD cbAttrLen; DWORD cbAttrLen;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
@ -2329,8 +2321,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr, static LONG WINAPI PCSC_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr,
DWORD cbAttrLen) DWORD cbAttrLen)
{ {
LONG status = SCARD_S_SUCCESS; LONG status = SCARD_S_SUCCESS;
PCSC_SCARDHANDLE* pCard = NULL; PCSC_SCARDHANDLE* pCard = NULL;
@ -2351,116 +2343,113 @@ WINSCARDAPI LONG WINAPI PCSC_SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, L
return status; return status;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc) static LONG WINAPI PCSC_SCardUIDlgSelectCardA(LPOPENCARDNAMEA_EX pDlgStruc)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc) static LONG WINAPI PCSC_SCardUIDlgSelectCardW(LPOPENCARDNAMEW_EX pDlgStruc)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc) static LONG WINAPI PCSC_GetOpenCardNameA(LPOPENCARDNAMEA pDlgStruc)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc) static LONG WINAPI PCSC_GetOpenCardNameW(LPOPENCARDNAMEW pDlgStruc)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardDlgExtendedError(void) static LONG WINAPI PCSC_SCardDlgExtendedError(void)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI PCSC_SCardReadCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data,
DWORD* DataLen) DWORD* DataLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI PCSC_SCardReadCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data,
DWORD* DataLen) DWORD* DataLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI PCSC_SCardWriteCacheA(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data, DWORD FreshnessCounter, LPSTR LookupName, PBYTE Data,
DWORD DataLen) DWORD DataLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier, static LONG WINAPI PCSC_SCardWriteCacheW(SCARDCONTEXT hContext, UUID* CardIdentifier,
DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data, DWORD FreshnessCounter, LPWSTR LookupName, PBYTE Data,
DWORD DataLen) DWORD DataLen)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI PCSC_SCardGetReaderIconA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPBYTE pbIcon, LPDWORD pcbIcon) LPBYTE pbIcon, LPDWORD pcbIcon)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI PCSC_SCardGetReaderIconW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPBYTE pbIcon, LPDWORD pcbIcon) LPBYTE pbIcon, LPDWORD pcbIcon)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR szReaderName, static LONG WINAPI PCSC_SCardGetDeviceTypeIdA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPDWORD pdwDeviceTypeId) LPDWORD pdwDeviceTypeId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName, static LONG WINAPI PCSC_SCardGetDeviceTypeIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPDWORD pdwDeviceTypeId) LPDWORD pdwDeviceTypeId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardGetReaderDeviceInstanceIdA(SCARDCONTEXT hContext, LPCSTR szReaderName,
LPCSTR szReaderName, LPSTR szDeviceInstanceId,
LPSTR szDeviceInstanceId, LPDWORD pcchDeviceInstanceId)
LPDWORD pcchDeviceInstanceId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardGetReaderDeviceInstanceIdW(SCARDCONTEXT hContext, LPCWSTR szReaderName,
LPCWSTR szReaderName, LPWSTR szDeviceInstanceId,
LPWSTR szDeviceInstanceId, LPDWORD pcchDeviceInstanceId)
LPDWORD pcchDeviceInstanceId)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReadersWithDeviceInstanceIdA(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardListReadersWithDeviceInstanceIdA(SCARDCONTEXT hContext,
LPCSTR szDeviceInstanceId, LPCSTR szDeviceInstanceId,
LPSTR mszReaders, LPSTR mszReaders, LPDWORD pcchReaders)
LPDWORD pcchReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hContext, static LONG WINAPI PCSC_SCardListReadersWithDeviceInstanceIdW(SCARDCONTEXT hContext,
LPCWSTR szDeviceInstanceId, LPCWSTR szDeviceInstanceId,
LPWSTR mszReaders, LPWSTR mszReaders,
LPDWORD pcchReaders) LPDWORD pcchReaders)
{ {
return 0; return 0;
} }
WINSCARDAPI LONG WINAPI PCSC_SCardAudit(SCARDCONTEXT hContext, DWORD dwEvent) static LONG WINAPI PCSC_SCardAudit(SCARDCONTEXT hContext, DWORD dwEvent)
{ {
return 0; return 0;
} }