system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: Use proper dllimports for winscard functions.

Browse source
This commit is contained in:
Alexandre Julliard 2023-11-03 17:29:45 +01:00
parent 9a7e038256
commit e7f44130eb
2 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/winscard/winscard.c
View file

@ -18,6 +18,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#define WINSCARDAPI
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winscard.h" #include "winscard.h"

156
include/winscard.h
View file

@ -24,6 +24,10 @@
#include <winsmcrd.h> #include <winsmcrd.h>
#include <scarderr.h> #include <scarderr.h>
#ifndef WINSCARDAPI
#define WINSCARDAPI DECLSPEC_IMPORT
#endif
/* Valid scopes for contexts */ /* Valid scopes for contexts */
#define SCARD_SCOPE_USER 0 #define SCARD_SCOPE_USER 0
#define SCARD_SCOPE_TERMINAL 1 #define SCARD_SCOPE_TERMINAL 1
@ -98,82 +102,82 @@ DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE)
extern "C" { extern "C" {
#endif #endif
HANDLE WINAPI SCardAccessStartedEvent(void); WINSCARDAPI HANDLE WINAPI SCardAccessStartedEvent(void);
LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); WINSCARDAPI LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR);
LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); WINSCARDAPI LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR);
#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) #define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup)
LONG WINAPI SCardBeginTransaction(SCARDHANDLE); WINSCARDAPI LONG WINAPI SCardBeginTransaction(SCARDHANDLE);
LONG WINAPI SCardCancel(SCARDCONTEXT); WINSCARDAPI LONG WINAPI SCardCancel(SCARDCONTEXT);
LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); WINSCARDAPI LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD);
LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); WINSCARDAPI LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD);
#define SCardConnect WINELIB_NAME_AW(SCardConnect) #define SCardConnect WINELIB_NAME_AW(SCardConnect)
LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); WINSCARDAPI LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD);
LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); WINSCARDAPI LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD);
LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); WINSCARDAPI LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD);
LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); WINSCARDAPI LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT);
LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); WINSCARDAPI LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR);
LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); WINSCARDAPI LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR);
#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) #define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType)
LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); WINSCARDAPI LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR);
LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); WINSCARDAPI LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR);
#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) #define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader)
LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); WINSCARDAPI LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR);
LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); WINSCARDAPI LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR);
#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) #define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup)
LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); WINSCARDAPI LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID);
LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); WINSCARDAPI LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD);
LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD);
LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD);
#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) #define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName)
LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); WINSCARDAPI LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID);
LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); WINSCARDAPI LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID);
#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) #define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId)
LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); WINSCARDAPI LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD);
LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); WINSCARDAPI LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD);
#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) #define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange)
LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); WINSCARDAPI LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD);
LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); WINSCARDAPI LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD);
#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) #define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType)
LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); WINSCARDAPI LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR);
LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); WINSCARDAPI LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR);
#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) #define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader)
LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); WINSCARDAPI LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR);
LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); WINSCARDAPI LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR);
#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) #define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup)
LONG WINAPI SCardIsValidContext(SCARDCONTEXT); WINSCARDAPI LONG WINAPI SCardIsValidContext(SCARDCONTEXT);
LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD);
LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD);
#define SCardListCards WINELIB_NAME_AW(SCardListCards) #define SCardListCards WINELIB_NAME_AW(SCardListCards)
LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); WINSCARDAPI LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD);
LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); WINSCARDAPI LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD);
#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) #define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces)
LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); WINSCARDAPI LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *);
LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); WINSCARDAPI LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *);
#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) #define SCardListReaders WINELIB_NAME_AW(SCardListReaders)
LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD);
LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); WINSCARDAPI LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD);
#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) #define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups)
LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); WINSCARDAPI LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD);
LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); WINSCARDAPI LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD);
#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) #define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards)
LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); WINSCARDAPI LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD);
LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); WINSCARDAPI LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD);
#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) #define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR)
LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); WINSCARDAPI LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD);
LONG WINAPI SCardReleaseContext(SCARDCONTEXT); WINSCARDAPI LONG WINAPI SCardReleaseContext(SCARDCONTEXT);
void WINAPI SCardReleaseStartedEvent(void); WINSCARDAPI void WINAPI SCardReleaseStartedEvent(void);
LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); WINSCARDAPI LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR);
LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); WINSCARDAPI LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR);
#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) #define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup)
LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); WINSCARDAPI LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD);
LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); WINSCARDAPI LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR);
LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); WINSCARDAPI LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR);
#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) #define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName)
LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); WINSCARDAPI LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); WINSCARDAPI LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); WINSCARDAPI LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
#define SCardStatus WINELIB_NAME_AW(SCardStatus) #define SCardStatus WINELIB_NAME_AW(SCardStatus)
LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); WINSCARDAPI LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD);
#ifdef __cplusplus #ifdef __cplusplus
} }