VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix build with visual studio

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@376 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-12-10 18:45:04 +00:00
parent d286f16ef7
commit d4be5cfad1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ccid/src/cats-test.c
View File

@@ -23,6 +23,9 @@
#include <winscard.h> #include <winscard.h>
#include <time.h> #include <time.h>
#pragma comment(lib, "ws2_32.lib")
#pragma comment(lib, "winscard.lib")
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@@ -205,7 +208,6 @@ main(int argc, char *argv[])
goto err; goto err;
#define SIMULATE_BUERGERCLIENT 1
#ifdef SIMULATE_BUERGERCLIENT #ifdef SIMULATE_BUERGERCLIENT
r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY, r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY,
SCARD_LEAVE_CARD, &protocol); SCARD_LEAVE_CARD, &protocol);
@@ -320,7 +322,6 @@ main(int argc, char *argv[])
difftime(t_end, t_start)); difftime(t_end, t_start));
#define SIMULATE_TA_CA 1
#ifdef SIMULATE_TA_CA #ifdef SIMULATE_TA_CA
r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY, r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY,
SCARD_LEAVE_CARD, &protocol); SCARD_LEAVE_CARD, &protocol);

6
ccid/src/pcscutil.c
View File

@@ -21,6 +21,8 @@
#include "pcscutil.h" #include "pcscutil.h"
#pragma comment(lib, "winscard.lib")
LONG LONG
pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtocols, pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtocols,
LPSCARDCONTEXT phContext, LPSTR *readers, LPSCARDHANDLE phCard, LPSCARDCONTEXT phContext, LPSTR *readers, LPSCARDHANDLE phCard,
@@ -39,7 +41,7 @@ pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtoco
readerslen = SCARD_AUTOALLOCATE; readerslen = SCARD_AUTOALLOCATE;
r = SCardListReaders(*phContext, NULL, (LPSTR) readers, &readerslen); r = SCardListReaders(*phContext, NULL, (LPCWSTR) readers, &readerslen);
if (r != SCARD_S_SUCCESS) { if (r != SCARD_S_SUCCESS) {
fprintf(stderr, "Could not get readers\n"); fprintf(stderr, "Could not get readers\n");
goto err; goto err;
@@ -58,7 +60,7 @@ pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtoco
} }
r = SCardConnect(*phContext, reader, dwShareMode, dwPreferredProtocols, r = SCardConnect(*phContext, (LPCWSTR) reader, dwShareMode, dwPreferredProtocols,
phCard, pdwActiveProtocol); phCard, pdwActiveProtocol);
if (r != SCARD_S_SUCCESS) { if (r != SCARD_S_SUCCESS) {
fprintf(stderr, "Could not connect to %s\n", reader); fprintf(stderr, "Could not connect to %s\n", reader);