From e7f44130ebdeaf9ec4cbbeb7d0ed9cc3854c0c94 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 3 Nov 2023 17:29:45 +0100 Subject: [PATCH] include: Use proper dllimports for winscard functions. --- dlls/winscard/winscard.c | 1 + include/winscard.h | 156 ++++++++++++++++++++------------------- 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 9555aa4ed80..d0c7f412a6c 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -18,6 +18,7 @@ */ #include +#define WINSCARDAPI #include "windef.h" #include "winbase.h" #include "winscard.h" diff --git a/include/winscard.h b/include/winscard.h index 0ce473b6bf1..132972a4a9b 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -24,6 +24,10 @@ #include #include +#ifndef WINSCARDAPI +#define WINSCARDAPI DECLSPEC_IMPORT +#endif + /* Valid scopes for contexts */ #define SCARD_SCOPE_USER 0 #define SCARD_SCOPE_TERMINAL 1 @@ -98,82 +102,82 @@ DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) extern "C" { #endif -HANDLE WINAPI SCardAccessStartedEvent(void); -LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); -LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); -#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) -LONG WINAPI SCardBeginTransaction(SCARDHANDLE); -LONG WINAPI SCardCancel(SCARDCONTEXT); -LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); -LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); -#define SCardConnect WINELIB_NAME_AW(SCardConnect) -LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); -LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); -LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); -LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); -LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); -LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); -#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) -LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); -LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); -#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) -LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); -LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); -#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) -LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); -LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); -#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) -LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); -LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); -#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) -LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); -LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); -#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) -LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); -LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); -#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) -LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); -LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); -#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) -LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); -LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); -#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) -LONG WINAPI SCardIsValidContext(SCARDCONTEXT); -LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); -LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); -#define SCardListCards WINELIB_NAME_AW(SCardListCards) -LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); -LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); -#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) -LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); -LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); -#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) -LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); -LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); -#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) -LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); -LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); -#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) -LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); -LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); -#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) -LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); -LONG WINAPI SCardReleaseContext(SCARDCONTEXT); -void WINAPI SCardReleaseStartedEvent(void); -LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); -LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); -#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) -LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); -LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); -LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); -#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) -LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -#define SCardStatus WINELIB_NAME_AW(SCardStatus) -LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); +WINSCARDAPI HANDLE WINAPI SCardAccessStartedEvent(void); +WINSCARDAPI LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +WINSCARDAPI LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) +WINSCARDAPI LONG WINAPI SCardBeginTransaction(SCARDHANDLE); +WINSCARDAPI LONG WINAPI SCardCancel(SCARDCONTEXT); +WINSCARDAPI LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +WINSCARDAPI LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +#define SCardConnect WINELIB_NAME_AW(SCardConnect) +WINSCARDAPI LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); +WINSCARDAPI LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); +WINSCARDAPI LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); +WINSCARDAPI LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); +WINSCARDAPI LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); +WINSCARDAPI LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) +WINSCARDAPI LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); +WINSCARDAPI LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) +WINSCARDAPI LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); +WINSCARDAPI LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) +WINSCARDAPI LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); +WINSCARDAPI LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); +WINSCARDAPI LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); +WINSCARDAPI LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); +#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) +WINSCARDAPI LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); +WINSCARDAPI LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); +#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) +WINSCARDAPI LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); +WINSCARDAPI LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) +WINSCARDAPI LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +WINSCARDAPI LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) +WINSCARDAPI LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); +WINSCARDAPI LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) +WINSCARDAPI LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); +WINSCARDAPI LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) +WINSCARDAPI LONG WINAPI SCardIsValidContext(SCARDCONTEXT); +WINSCARDAPI LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); +WINSCARDAPI LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); +#define SCardListCards WINELIB_NAME_AW(SCardListCards) +WINSCARDAPI LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); +WINSCARDAPI LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); +#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) +WINSCARDAPI LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); +WINSCARDAPI LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); +#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) +WINSCARDAPI LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); +WINSCARDAPI LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); +#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) +WINSCARDAPI LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); +WINSCARDAPI LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) +WINSCARDAPI LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); +WINSCARDAPI LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) +WINSCARDAPI LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); +WINSCARDAPI LONG WINAPI SCardReleaseContext(SCARDCONTEXT); +WINSCARDAPI void WINAPI SCardReleaseStartedEvent(void); +WINSCARDAPI LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +WINSCARDAPI LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) +WINSCARDAPI LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); +WINSCARDAPI LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); +WINSCARDAPI LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); +#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) +WINSCARDAPI LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +WINSCARDAPI LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +WINSCARDAPI LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +#define SCardStatus WINELIB_NAME_AW(SCardStatus) +WINSCARDAPI LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); #ifdef __cplusplus }