reader last result

src/DataAccess/ScReader.cpp

@@ -8,6 +8,7 @@
 #include "ScReader.h"
 
 thread_local LPSCARDCONTEXT ScReader::_context = nullptr;
+thread_local LONG ScReader::_lastResult = SCARD_S_SUCCESS;
 
 ScReader::~ScReader()
 {
@@ -19,18 +20,18 @@ bool ScReader::establishContext()
     if (!freeContext())
         return false;
     _context = new SCARDCONTEXT[1];
-    auto res = SCardEstablishContext(SCARD_SCOPE_SYSTEM, nullptr, nullptr, _context);
-    return res == SCARD_S_SUCCESS;
+    _lastResult = SCardEstablishContext(SCARD_SCOPE_SYSTEM, nullptr, nullptr, _context);
+    return _lastResult == SCARD_S_SUCCESS;
 }
 
 bool ScReader::freeContext()
 {
     if (!_context)
         return true;
-    auto res = SCardReleaseContext(*_context);
+    _lastResult = SCardReleaseContext(*_context);
     delete[] _context;
     _context = nullptr;
-    return res == SCARD_S_SUCCESS;
+    return _lastResult == SCARD_S_SUCCESS;
 }
 
 bool ScReader::connect(DWORD shareMode, DWORD protocols, DWORD disposition)
@@ -39,32 +40,32 @@ bool ScReader::connect(DWORD shareMode, DWORD protocols, DWORD disposition)
         return false;
     _card = new SCARDCONTEXT[1];
     _proto = new DWORD[1];
-    auto res = SCardConnect(*_context, _name.c_str(), shareMode, protocols, _card, _proto);
+    _lastResult = SCardConnect(*_context, _name.c_str(), shareMode, protocols, _card, _proto);
     if (*_proto == SCARD_PROTOCOL_T0)
         _sendPci = *SCARD_PCI_T0;
     if (*_proto == SCARD_PROTOCOL_T1)
         _sendPci = *SCARD_PCI_T1;
-    return res == SCARD_S_SUCCESS;
+    return _lastResult == SCARD_S_SUCCESS;
 }
 
 bool ScReader::disconnect(DWORD disposition)
 {
     if (!_card)
         return true;
-    auto res = SCardDisconnect(*_card, disposition);
+    _lastResult = SCardDisconnect(*_card, disposition);
     delete[] _proto;
     _proto = nullptr;
     delete[] _card;
     _card = nullptr;
-    return res == SCARD_S_SUCCESS;
+    return _lastResult == SCARD_S_SUCCESS;
 }
 
 std::shared_ptr<ScResult> ScReader::transmit(const ScCommand& command, DWORD size)
 {
     auto data = command.getData();
     auto resBuffer = new BYTE[size];
-    auto res = SCardTransmit(*_card, &_sendPci, (BYTE*)data.data(), data.size(), nullptr, resBuffer, &size);
-    if (res == SCARD_S_SUCCESS)
+    _lastResult = SCardTransmit(*_card, &_sendPci, (BYTE*)data.data(), data.size(), nullptr, resBuffer, &size);
+    if (_lastResult == SCARD_S_SUCCESS)
         return std::make_shared<ScResult>(std::string((char*)resBuffer, size));
     return std::make_shared<ScResult>("");
 }
@@ -74,8 +75,8 @@ std::vector<std::shared_ptr<ScReader>> ScReader::getReaders()
     std::vector<std::shared_ptr<ScReader>> readers;
     DWORD readerCount = SCARD_AUTOALLOCATE;
     LPTSTR readersNames = nullptr;
-    auto res = SCardListReaders(*_context, nullptr, (LPTSTR)&readersNames, &readerCount);
-    if (res == SCARD_S_SUCCESS)
+    _lastResult = SCardListReaders(*_context, nullptr, (LPTSTR)&readersNames, &readerCount);
+    if (_lastResult == SCARD_S_SUCCESS)
     {
         LPTSTR reader = readersNames;
         while (*reader)
@@ -87,3 +88,8 @@ std::vector<std::shared_ptr<ScReader>> ScReader::getReaders()
     SCardFreeMemory(*_context, readersNames);
     return readers;
 }
+
+LONG ScReader::getLastResult()
+{
+    return _lastResult;
+}

src/include/ScReader.h

@@ -21,6 +21,8 @@ public:
 
     static std::vector<std::shared_ptr<ScReader>> getReaders();
 
+    static LONG getLastResult();
+
     static bool establishContext();
 
     static bool freeContext();
@@ -45,7 +47,7 @@ private:
 
     SCARD_IO_REQUEST _sendPci;
 
-    LONG _lastResult;
+    static thread_local LONG _lastResult;
 };
 
 # include "ScReader.hxx"

src/include/ScReader.hxx

@@ -6,7 +6,6 @@ ScReader::ScReader(std::string name)
     : _name(name)
     , _card(nullptr)
     , _proto(nullptr)
-    , _lastResult(SCARD_S_SUCCESS)
 {
 }