FakeWinScard対応.diff.txt

diff -uNr オリジナル/CardReader.cpp 修正後/CardReader.cpp
--- オリジナル/CardReader.cpp  Sat Sep 15 19:00:00 2012
+++ 修正後/CardReader.cpp    Mon Sep 30 03:20:26 2013
@@ -366,6 +366,8 @@
        ::ZeroMemory(&ReaderState, sizeof(ReaderState));
        ReaderState.szReader = pszReader;

+#ifdef XXXXX
+
        TRACE(TEXT("SCardGetStatusChange\n"));
        Result = ::SCardGetStatusChange(m_SCardContext, 0, &ReaderState, 1);
        if (Result != SCARD_S_SUCCESS) {
@@ -384,6 +386,8 @@
            return false;
        }

+#endif
+
        DWORD dwActiveProtocol = SCARD_PROTOCOL_UNDEFINED;

        TRACE(TEXT("SCardConnect\n"));
@@ -401,6 +405,8 @@
            return false;
        }

+#ifdef XXXX
+
        LPTSTR pszReaderName;
        BYTE Atr[32];
        DWORD dwReaderLen = SCARD_AUTOALLOCATE, dwState, dwProtocol, dwAtrLen = sizeof(Atr);
@@ -420,6 +426,8 @@
              pszReaderName, dwState, dwProtocol, dwAtrLen, dwAtrLen ? szAtr : TEXT("n/a"));
        ::SCardFreeMemory(m_SCardContext, pszReaderName);

+#endif
+
        m_pszReaderName = StdUtil::strdup(pszReader);
    } else {
        // 全てのカードリーダに対してオープンを試みる
@@ -484,7 +492,9 @@
 bool CSCardReader::IsAvailable()
 {
    return m_bIsEstablish
+#ifdef XXXXX
        && ::SCardIsValidContext(m_SCardContext) == SCARD_S_SUCCESS
+#endif
        && m_NumReaders > 0;
 }

@@ -494,6 +504,8 @@
    if (!m_bIsEstablish || pszReader == NULL)
        return false;

+#ifdef XXXX
+
    LONG Result;

    SCARD_READERSTATE ReaderState;
@@ -507,6 +519,8 @@
    if (!(ReaderState.dwEventState & SCARD_STATE_PRESENT))
        return false;

+#endif
+
    return true;
 }

@@ -907,7 +921,7 @@
    if (!GetLibraryFunc(m_hLib, pEstablishContext, "CasLinkEstablishContext")
     || !GetLibraryFunc(m_hLib, pListReaders, FUNC_NAME("CasLinkListReaders"))
     || !GetLibraryFunc(m_hLib, m_pCasLinkReleaseContext, "CasLinkReleaseContext")
-    || !GetLibraryFunc(m_hLib, m_pCasLinkConnect, "CasLinkConnect")
+    || !GetLibraryFunc(m_hLib, m_pCasLinkConnect, FUNC_NAME("CasLinkConnect"))
     || !GetLibraryFunc(m_hLib, m_pCasLinkDisconnect, "CasLinkDisconnect")
     || !GetLibraryFunc(m_hLib, m_pCasLinkTransmit, "CasLinkTransmit")) {
        ::FreeLibrary(m_hLib);
diff -uNr オリジナル/CardReader.h 修正後/CardReader.h
--- オリジナル/CardReader.h    Sat Sep 15 19:00:00 2012
+++ 修正後/CardReader.h  Mon Sep 30 03:08:56 2013
@@ -1,6 +1,8 @@
 #ifndef CARD_READER_H
 #define CARD_READER_H

+#define CARDREADER_SCARD_DYNAMIC_SUPPORT
+#define CARDREADER_BONCASCLIENT_SUPPORT

 #include <winscard.h>
 #include "BonBaseClass.h"