winscard.cpp

diff  softcas/winscard/winscard.cpp arib25/src/winscard.cpp
6,8c6,11
< #include <Windows.h>
< #define htons htons_
< #define ntohs ntohs_
---
> #include <winscard.h>
> #define WINAPI
> typedef char CHAR;
> // #include <Windows.h>
> // #define htons htons_
> // #define ntohs ntohs_
13,27c16,30
< #pragma comment(linker,"/EXPORT:SCardEstablishContext=_SCardEstablishContext_@16")
< #pragma comment(linker,"/EXPORT:SCardListReadersA=_SCardListReadersA_@16")
< #pragma comment(linker,"/EXPORT:SCardListReadersW=_SCardListReadersW_@16")
< #pragma comment(linker,"/EXPORT:SCardConnectA=_SCardConnectA_@24")
< #pragma comment(linker,"/EXPORT:SCardConnectW=_SCardConnectW_@24")
< #pragma comment(linker,"/EXPORT:SCardTransmit=_SCardTransmit_@28")
< #pragma comment(linker,"/EXPORT:SCardDisconnect=_SCardDisconnect_@8")
< #pragma comment(linker,"/EXPORT:SCardFreeMemory=_SCardFreeMemory_@8")
< #pragma comment(linker,"/EXPORT:SCardReleaseContext=_SCardReleaseContext_@4")
< #pragma comment(linker,"/EXPORT:g_rgSCardT1Pci=_g_rgSCardT1Pci_")
< BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
< {
<     if(fdwReason==DLL_PROCESS_ATTACH)BCAS::Keys::RegisterAll();
<     return TRUE;
< }
---
> // #pragma comment(linker,"/EXPORT:SCardEstablishContext=_SCardEstablishContext_@16")
> // #pragma comment(linker,"/EXPORT:SCardListReadersA=_SCardListReadersA_@16")
> // #pragma comment(linker,"/EXPORT:SCardListReadersW=_SCardListReadersW_@16")
> // #pragma comment(linker,"/EXPORT:SCardConnectA=_SCardConnectA_@24")
> // #pragma comment(linker,"/EXPORT:SCardConnectW=_SCardConnectW_@24")
> // #pragma comment(linker,"/EXPORT:SCardTransmit=_SCardTransmit_@28")
> // #pragma comment(linker,"/EXPORT:SCardDisconnect=_SCardDisconnect_@8")
> // #pragma comment(linker,"/EXPORT:SCardFreeMemory=_SCardFreeMemory_@8")
> // #pragma comment(linker,"/EXPORT:SCardReleaseContext=_SCardReleaseContext_@4")
> // #pragma comment(linker,"/EXPORT:g_rgSCardT1Pci=_g_rgSCardT1Pci_")
> // BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
> // {
> //     if(fdwReason==DLL_PROCESS_ATTACH)BCAS::Keys::RegisterAll();
> //     return TRUE;
> // }
29c32
< LONG WINAPI SCardEstablishContext_(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT phContext)
---
> LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT phContext)
34c37
< LONG WINAPI SCardListReadersA_(SCARDCONTEXT,LPCTSTR,LPSTR mszReaders,LPDWORD pcchReaders)
---
> LONG WINAPI SCardListReaders(SCARDCONTEXT,LPCTSTR,LPSTR mszReaders,LPDWORD pcchReaders)
41,48c44,51
< LONG WINAPI SCardListReadersW_(SCARDCONTEXT,LPCTSTR,LPWSTR mszReaders,LPDWORD pcchReaders)
< {
<     WCHAR r[]=L"@OishiiSlurper\0";
<     if(mszReaders)memcpy(mszReaders,r,sizeof r);
<     *pcchReaders=sizeof r/sizeof r[0];
<     return SCARD_S_SUCCESS;
< }
< LONG WINAPI SCardConnectA_(SCARDCONTEXT,LPCTSTR,DWORD,DWORD,LPSCARDHANDLE phCard,LPDWORD pdwActiveProtocol)
---
> // LONG WINAPI SCardListReadersW_(SCARDCONTEXT,LPCTSTR,LPWSTR mszReaders,LPDWORD pcchReaders)
> // {
> //     WCHAR r[]=L"@OishiiSlurper\0";
> //     if(mszReaders)memcpy(mszReaders,r,sizeof r);
> //     *pcchReaders=sizeof r/sizeof r[0];
> //     return SCARD_S_SUCCESS;
> // }
> LONG WINAPI SCardConnect(SCARDCONTEXT,LPCTSTR,DWORD,DWORD,LPSCARDHANDLE phCard,LPDWORD pdwActiveProtocol)
49a53
>     BCAS::Keys::RegisterAll();
54,60c58,64
< LONG WINAPI SCardConnectW_(SCARDCONTEXT,LPCTSTR,DWORD,DWORD,LPSCARDHANDLE phCard,LPDWORD pdwActiveProtocol)
< {
<     *phCard=(SCARDHANDLE)0x35313239;
<     *pdwActiveProtocol=SCARD_PROTOCOL_T1;
<     return SCARD_S_SUCCESS;
< }
< LONG WINAPI SCardTransmit_(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE pbSendBuffer,DWORD cbSendLength,LPSCARD_IO_REQUEST,LPBYTE pbRecvBuffer,LPDWORD pcbRecvLength)
---
> // LONG WINAPI SCardConnectW_(SCARDCONTEXT,LPCTSTR,DWORD,DWORD,LPSCARDHANDLE phCard,LPDWORD pdwActiveProtocol)
> // {
> //     *phCard=(SCARDHANDLE)0x35313239;
> //     *pdwActiveProtocol=SCARD_PROTOCOL_T1;
> //     return SCARD_S_SUCCESS;
> // }
> LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE pbSendBuffer,DWORD cbSendLength,LPSCARD_IO_REQUEST,LPBYTE pbRecvBuffer,LPDWORD pcbRecvLength)
65c69
<         BYTE r[]={
---
>         static BYTE r[]={
74c78
<         BYTE r[]={
---
>         static BYTE r[]={
81c85
<         BYTE r[]={
---
>         static BYTE r[]={
89c93
<         BYTE r[]={
---
>         static BYTE r[]={
97,101c101,105
< LONG WINAPI SCardDisconnect_(SCARDHANDLE,DWORD){return SCARD_S_SUCCESS;}
< LONG WINAPI SCardFreeMemory_(SCARDCONTEXT,LPCVOID){return SCARD_S_SUCCESS;}
< LONG WINAPI SCardReleaseContext_(SCARDCONTEXT){return SCARD_S_SUCCESS;}
< SCARD_IO_REQUEST g_rgSCardT1Pci_;
< }
\ ファイル末尾に改行がありません
---
> LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD){return SCARD_S_SUCCESS;}
> LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID){return SCARD_S_SUCCESS;}
> LONG WINAPI SCardReleaseContext(SCARDCONTEXT){return SCARD_S_SUCCESS;}
> SCARD_IO_REQUEST g_rgSCardT1Pci;
> }