Merge pull request #22 from crocs-muni/devel

Devel

Winscard/Winscard.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include <chrono>
 #include <thread>
 #include <fstream>
@@ -3084,7 +3084,7 @@ void GetDesktopPath(char_type* path)
 	string_type stringPath = "/home/";
     stringPath += login;
     stringPath += "/Desktop/APDUPlay/";
-    type_copy(rulesFilePath, stringPath.c_str());
+    type_copy(path, stringPath.c_str());
 #else
 	char_type appData[MAX_PATH];
 	SHGetFolderPath(NULL, CSIDL_DESKTOPDIRECTORY | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, appData);

WinscardTests/main.cpp

@@ -125,7 +125,7 @@ std::string BytesToHex(BYTE* data, size_t dataLen) {
 	std::stringstream ss;
 	char oneByte[3];
 	for (size_t i = 0; i < dataLen; ++i) {
-		snprintf(oneByte, sizeof(oneByte), "%.2x", data[i]);
+		sprintf_s(oneByte, sizeof(oneByte), "%.2x", data[i]);
 		ss << oneByte;
 	}
 	return ss.str();
@@ -155,13 +155,21 @@ static SCard LONG(STDCALL *Original_SCardListReaders)(
 	OUT     LPSTR mszReaders,
 	IN OUT  LPDWORD pcchReaders
 	);
-
+static SCard LONG(STDCALL *Original_SCardListReadersW)(
+	IN      SCARDCONTEXT hContext,
+	IN      LPCWSTR mszGroups,
+	OUT     LPWSTR mszReaders,
+	IN OUT  LPDWORD pcchReaders
+	);
 static SCard LONG(STDCALL *Original_SCardEstablishContext)(
 	IN  DWORD dwScope,
 	IN  LPCVOID pvReserved1,
 	IN  LPCVOID pvReserved2,
 	OUT LPSCARDCONTEXT phContext
 	);
+static SCard LONG(STDCALL *Original_SCardReleaseContext)(
+	IN  SCARDCONTEXT hContext
+	);
 
 int SendAPDU(string_type apdu, SCARDHANDLE  hCard, DWORD scProtocol) {
 	int status = 0;