[Pcsclite-cvs-commit] r2072 - in trunk/PCSC: doc doc/example src
src/PCSC src/utils
Ludovic Rousseau
rousseau at costa.debian.org
Tue Jun 6 09:31:08 UTC 2006
Author: rousseau
Date: 2006-06-06 09:31:07 +0000 (Tue, 06 Jun 2006)
New Revision: 2072
Modified:
trunk/PCSC/doc/example/pcsc_demo.c
trunk/PCSC/doc/pcsc-lite.tex
trunk/PCSC/src/PCSC/ifdhandler.h
trunk/PCSC/src/PCSC/winscard.h
trunk/PCSC/src/eventhandler.c
trunk/PCSC/src/ifdwrapper.c
trunk/PCSC/src/readerfactory.c
trunk/PCSC/src/readerfactory.h
trunk/PCSC/src/utils/formaticc.c
trunk/PCSC/src/winscard.c
trunk/PCSC/src/winscard_clnt.c
trunk/PCSC/src/winscard_scf.c
Log:
replace LPTSTR and LPCTSTR by LPSTR and LPCSTR
Modified: trunk/PCSC/doc/example/pcsc_demo.c
===================================================================
--- trunk/PCSC/doc/example/pcsc_demo.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/doc/example/pcsc_demo.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -54,7 +54,7 @@
LONG rv;
SCARDCONTEXT hContext;
DWORD dwReaders;
- LPTSTR mszReaders;
+ LPSTR mszReaders;
char *ptr, **readers = NULL;
int nbReaders;
SCARDHANDLE hCard;
Modified: trunk/PCSC/doc/pcsc-lite.tex
===================================================================
--- trunk/PCSC/doc/pcsc-lite.tex 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/doc/pcsc-lite.tex 2006-06-06 09:31:07 UTC (rev 2072)
@@ -127,13 +127,13 @@
LONG & long \\
LPBYTE & unsigned char * \\
LPCBYTE & const unsigned char * \\
-LPCTSTR & const char * \\
+LPCSTR & const char * \\
LPCVOID & const void * \\
LPCWSTR & char * \\
LPDWORD & unsigned long * \\
LPSCARDCONTEXT & unsigned long * \\
LPSCARDHANDLE & unsigned long * \\
-LPTSTR & char * \\
+LPSTR & char * \\
LPVOID & void * \\
PSCARDCONTEXT & unsigned long * \\
PSCARDHANDLE & unsigned long * \\
@@ -331,8 +331,8 @@
#include <winscard.h>
LONG SCardListReaders(SCARDCONTEXT hContext,
- LPCTSTR mszGroups,
- LPTSTR mszReaders,
+ LPCSTR mszGroups,
+ LPSTR mszReaders,
LPDWORD pcchReaders);
\end{verbatim}
@@ -361,13 +361,13 @@
\example
\begin{verbatim}
SCARDCONTEXT hContext;
-LPTSTR mszReaders;
+LPSTR mszReaders;
DWORD dwReaders;
LONG rv;
rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
rv = SCardListReaders(hContext, NULL, NULL, &dwReaders);
-mszReaders = (LPTSTR)malloc(sizeof(char)*dwReaders);
+mszReaders = (LPSTR)malloc(sizeof(char)*dwReaders);
rv = SCardListReaders(hContext, NULL, mszReaders, &dwReaders);
\end{verbatim}
@@ -388,7 +388,7 @@
#include <winscard.h>
LONG SCardListReaderGroups(SCARDCONTEXT hContext,
- LPTSTR mszGroups,
+ LPSTR mszGroups,
LPDWORD pcchGroups);
\end{verbatim}
@@ -415,13 +415,13 @@
\example
\begin{verbatim}
SCARDCONTEXT hContext;
-LPTSTR mszGroups;
+LPSTR mszGroups;
DWORD dwGroups;
LONG rv;
rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
rv = SCardListReaderGroups(hContext, NULL, &dwGroups);
-mszGroups = (LPTSTR)malloc(sizeof(char)*dwGroups);
+mszGroups = (LPSTR)malloc(sizeof(char)*dwGroups);
rv = SCardListReaderGroups(hContext, mszGroups, &dwGroups);
\end{verbatim}
@@ -442,7 +442,7 @@
#include <winscard.h>
LONG SCardConnect(SCARDCONTEXT hContext,
- LPCTSTR szReader,
+ LPCSTR szReader,
DWORD dwShareMode,
DWORD dwPreferredProtocols,
LPSCARDHANDLE phCard,
@@ -998,7 +998,7 @@
#include <winscard.h>
LONG SCardStatus(SCARDHANDLE hCard,
- LPTSTR szReaderName,
+ LPSTR szReaderName,
LPDWORD pcchReaderLen,
LPDWORD pdwState,
LPDWORD pdwProtocol,
@@ -1125,7 +1125,7 @@
\begin{verbatim}
typedef struct {
- LPCTSTR szReader; /* Reader name */
+ LPCSTR szReader; /* Reader name */
LPVOID pvUserData; /* User defined data */
DWORD dwCurrentState; /* Current state of reader */
DWORD dwEventState; /* Reader state after a state change */
Modified: trunk/PCSC/src/PCSC/ifdhandler.h
===================================================================
--- trunk/PCSC/src/PCSC/ifdhandler.h 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/PCSC/ifdhandler.h 2006-06-06 09:31:07 UTC (rev 2072)
@@ -29,10 +29,10 @@
typedef struct _DEVICE_CAPABILITIES
{
- LPTSTR Vendor_Name; /* Tag 0x0100 */
- LPTSTR IFD_Type; /* Tag 0x0101 */
+ LPSTR Vendor_Name; /* Tag 0x0100 */
+ LPSTR IFD_Type; /* Tag 0x0101 */
DWORD IFD_Version; /* Tag 0x0102 */
- LPTSTR IFD_Serial; /* Tag 0x0103 */
+ LPSTR IFD_Serial; /* Tag 0x0103 */
DWORD IFD_Channel_ID; /* Tag 0x0110 */
DWORD Asynch_Supported; /* Tag 0x0120 */
@@ -158,7 +158,7 @@
* IFDHControl() API changed
*/
- RESPONSECODE IFDHCreateChannelByName(DWORD, LPTSTR);
+ RESPONSECODE IFDHCreateChannelByName(DWORD, LPSTR);
RESPONSECODE IFDHControl(DWORD, DWORD, PUCHAR, DWORD, PUCHAR,
DWORD, LPDWORD);
#else
Modified: trunk/PCSC/src/PCSC/winscard.h
===================================================================
--- trunk/PCSC/src/PCSC/winscard.h 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/PCSC/winscard.h 2006-06-06 09:31:07 UTC (rev 2072)
@@ -35,7 +35,7 @@
PCSC_API LONG SCardSetTimeout(SCARDCONTEXT hContext, DWORD dwTimeout);
PCSC_API LONG SCardConnect(SCARDCONTEXT hContext,
- LPCTSTR szReader,
+ LPCSTR szReader,
DWORD dwShareMode,
DWORD dwPreferredProtocols,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol);
@@ -54,7 +54,7 @@
PCSC_API LONG SCardCancelTransaction(SCARDHANDLE hCard);
PCSC_API LONG SCardStatus(SCARDHANDLE hCard,
- LPTSTR mszReaderNames, LPDWORD pcchReaderLen,
+ LPSTR mszReaderNames, LPDWORD pcchReaderLen,
LPDWORD pdwState,
LPDWORD pdwProtocol,
LPBYTE pbAtr, LPDWORD pcbAtrLen);
@@ -74,11 +74,11 @@
LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
PCSC_API LONG SCardListReaderGroups(SCARDCONTEXT hContext,
- LPTSTR mszGroups, LPDWORD pcchGroups);
+ LPSTR mszGroups, LPDWORD pcchGroups);
PCSC_API LONG SCardListReaders(SCARDCONTEXT hContext,
- LPCTSTR mszGroups,
- LPTSTR mszReaders, LPDWORD pcchReaders);
+ LPCSTR mszGroups,
+ LPSTR mszReaders, LPDWORD pcchReaders);
PCSC_API LONG SCardCancel(SCARDCONTEXT hContext);
Modified: trunk/PCSC/src/eventhandler.c
===================================================================
--- trunk/PCSC/src/eventhandler.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/eventhandler.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -203,7 +203,7 @@
void EHStatusHandlerThread(PREADER_CONTEXT rContext)
{
LONG rv;
- LPCTSTR lpcReader;
+ LPCSTR lpcReader;
DWORD dwStatus, dwReaderSharing;
DWORD dwCurrentState;
int pageSize;
Modified: trunk/PCSC/src/ifdwrapper.c
===================================================================
--- trunk/PCSC/src/ifdwrapper.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/ifdwrapper.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -120,7 +120,7 @@
#ifndef PCSCLITE_STATIC_DRIVER
RESPONSECODE(*IO_create_channel) (DWORD) = NULL;
RESPONSECODE(*IFDH_create_channel) (DWORD, DWORD) = NULL;
- RESPONSECODE(*IFDH_create_channel_by_name) (DWORD, LPTSTR) = NULL;
+ RESPONSECODE(*IFDH_create_channel_by_name) (DWORD, LPSTR) = NULL;
if (rContext->dwVersion == IFD_HVERSION_1_0)
IO_create_channel =
Modified: trunk/PCSC/src/readerfactory.c
===================================================================
--- trunk/PCSC/src/readerfactory.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/readerfactory.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -68,7 +68,7 @@
return EHInitializeEventStructures();
}
-LONG RFAddReader(LPTSTR lpcReader, DWORD dwPort, LPTSTR lpcLibrary, LPTSTR lpcDevice)
+LONG RFAddReader(LPSTR lpcReader, DWORD dwPort, LPSTR lpcLibrary, LPSTR lpcDevice)
{
DWORD dwContext = 0, dwGetSize;
UCHAR ucGetData[1], ucThread[1];
@@ -469,7 +469,7 @@
return SCARD_S_SUCCESS;
}
-LONG RFRemoveReader(LPTSTR lpcReader, DWORD dwPort)
+LONG RFRemoveReader(LPSTR lpcReader, DWORD dwPort)
{
LONG rv;
PREADER_CONTEXT sContext;
@@ -546,8 +546,8 @@
return SCARD_S_SUCCESS;
}
-LONG RFSetReaderName(PREADER_CONTEXT rContext, LPTSTR readerName,
- LPTSTR libraryName, DWORD dwPort, DWORD dwSlot)
+LONG RFSetReaderName(PREADER_CONTEXT rContext, LPSTR readerName,
+ LPSTR libraryName, DWORD dwPort, DWORD dwSlot)
{
LONG parent = -1; /* reader number of the parent of the clone */
DWORD valueLength;
@@ -655,10 +655,10 @@
}
#if 0
-LONG RFListReaders(LPTSTR lpcReaders, LPDWORD pdwReaderNum)
+LONG RFListReaders(LPSTR lpcReaders, LPDWORD pdwReaderNum)
{
DWORD dwCSize;
- LPTSTR lpcTReaders;
+ LPSTR lpcTReaders;
int i, p;
if (dwNumReadersContexts == 0)
@@ -732,7 +732,7 @@
}
#endif
-LONG RFReaderInfo(LPTSTR lpcReader, PREADER_CONTEXT * sReader)
+LONG RFReaderInfo(LPSTR lpcReader, PREADER_CONTEXT * sReader)
{
int i;
@@ -754,7 +754,7 @@
return SCARD_E_UNKNOWN_READER;
}
-LONG RFReaderInfoNamePort(DWORD dwPort, LPTSTR lpcReader,
+LONG RFReaderInfoNamePort(DWORD dwPort, LPSTR lpcReader,
PREADER_CONTEXT * sReader)
{
char lpcStripReader[MAX_READERNAME];
Modified: trunk/PCSC/src/readerfactory.h
===================================================================
--- trunk/PCSC/src/readerfactory.h 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/readerfactory.h 2006-06-06 09:31:07 UTC (rev 2072)
@@ -86,7 +86,7 @@
/* API V3.0 only */
RESPONSECODE (*pvfControl)(DWORD, DWORD, LPCVOID, DWORD, LPVOID,
DWORD, LPDWORD);
- RESPONSECODE (*pvfCreateChannelByName)(DWORD, LPTSTR);
+ RESPONSECODE (*pvfCreateChannelByName)(DWORD, LPSTR);
};
typedef struct FctMap_V3 FCT_MAP_V3, *PFCT_MAP_V3;
@@ -180,12 +180,12 @@
typedef struct ReaderContext READER_CONTEXT, *PREADER_CONTEXT;
LONG RFAllocateReaderSpace(void);
- LONG RFAddReader(LPTSTR, DWORD, LPTSTR, LPTSTR);
- LONG RFRemoveReader(LPTSTR, DWORD);
- LONG RFSetReaderName(PREADER_CONTEXT, LPTSTR, LPTSTR, DWORD, DWORD);
- LONG RFListReaders(LPTSTR, LPDWORD);
- LONG RFReaderInfo(LPTSTR, struct ReaderContext **);
- LONG RFReaderInfoNamePort(DWORD, LPTSTR, struct ReaderContext **);
+ LONG RFAddReader(LPSTR, DWORD, LPSTR, LPSTR);
+ LONG RFRemoveReader(LPSTR, DWORD);
+ LONG RFSetReaderName(PREADER_CONTEXT, LPSTR, LPSTR, DWORD, DWORD);
+ LONG RFListReaders(LPSTR, LPDWORD);
+ LONG RFReaderInfo(LPSTR, struct ReaderContext **);
+ LONG RFReaderInfoNamePort(DWORD, LPSTR, struct ReaderContext **);
LONG RFReaderInfoById(DWORD, struct ReaderContext **);
LONG RFCheckSharing(DWORD);
LONG RFLockSharing(DWORD);
Modified: trunk/PCSC/src/utils/formaticc.c
===================================================================
--- trunk/PCSC/src/utils/formaticc.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/utils/formaticc.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -31,9 +31,9 @@
SCARD_IO_REQUEST sRecvPci;
SCARD_READERSTATE_A rgReaderStates[1];
DWORD dwSendLength, dwRecvLength, dwPref, dwReaders;
- LPTSTR mszReaders;
+ LPSTR mszReaders;
BYTE s[MAX_BUFFER_SIZE], r[MAX_BUFFER_SIZE];
- LPCTSTR mszGroups;
+ LPCSTR mszGroups;
LONG rv;
FILE *fp;
FILE *fo;
Modified: trunk/PCSC/src/winscard.c
===================================================================
--- trunk/PCSC/src/winscard.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/winscard.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -182,7 +182,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
-LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -212,7 +212,7 @@
Log3(PCSC_LOG_DEBUG, "Attempting Connect to %s using protocol: %d",
szReader, dwPreferredProtocols);
- rv = RFReaderInfo((LPTSTR) szReader, &rContext);
+ rv = RFReaderInfo((LPSTR) szReader, &rContext);
if (rv != SCARD_S_SUCCESS)
{
@@ -1067,7 +1067,7 @@
return rv;
}
-LONG SCardStatus(SCARDHANDLE hCard, LPTSTR mszReaderNames,
+LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -1498,8 +1498,8 @@
return SCARD_S_SUCCESS;
}
-LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
- LPTSTR mszReaders, LPDWORD pcchReaders)
+LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups,
+ LPSTR mszReaders, LPDWORD pcchReaders)
{
/*
* Client side function
Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/winscard_clnt.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -129,7 +129,7 @@
struct _psChannelMap
{
SCARDHANDLE hCard;
- LPTSTR readerName;
+ LPSTR readerName;
};
typedef struct _psChannelMap CHANNEL_MAP, *PCHANNEL_MAP;
@@ -184,7 +184,7 @@
static LONG SCardGetContextIndiceTH(SCARDCONTEXT);
static LONG SCardRemoveContext(SCARDCONTEXT);
-static LONG SCardAddHandle(SCARDHANDLE, DWORD, LPTSTR);
+static LONG SCardAddHandle(SCARDHANDLE, DWORD, LPSTR);
static LONG SCardGetIndicesFromHandle(SCARDHANDLE, PDWORD, PDWORD);
static LONG SCardGetIndicesFromHandleTH(SCARDHANDLE, PDWORD, PDWORD);
static LONG SCardRemoveHandle(SCARDHANDLE);
@@ -614,7 +614,7 @@
* rv = SCardConnect(hContext, "Reader X", SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, &hCard, &dwActiveProtocol);
* @endcode
*/
-LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -701,7 +701,7 @@
/*
* Keep track of the handle locally
*/
- rv = SCardAddHandle(*phCard, dwContextIndex, (LPTSTR) szReader);
+ rv = SCardAddHandle(*phCard, dwContextIndex, (LPSTR) szReader);
SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
PROFILE_END
@@ -1374,7 +1374,7 @@
* rv=SCardStatus(hCard, NULL, &dwReaderLen, &dwState, &dwProtocol, pbAtr, &dwAtrLen);
* @endcode
*/
-LONG SCardStatus(SCARDHANDLE hCard, LPTSTR mszReaderNames,
+LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -1531,7 +1531,7 @@
*
* @code
* typedef struct {
- * LPCTSTR szReader; // Reader name
+ * LPCSTR szReader; // Reader name
* LPVOID pvUserData; // User defined data
* DWORD dwCurrentState; // Current state of reader
* DWORD dwEventState; // Reader state after a state change
@@ -1781,7 +1781,7 @@
currReader->dwEventState = SCARD_STATE_IGNORE;
} else
{
- LPTSTR lpcReaderName;
+ LPSTR lpcReaderName;
int i;
/************ Looks for correct readernames *********************/
@@ -2779,18 +2779,18 @@
* @test
* @code
* SCARDCONTEXT hContext;
- * LPTSTR mszReaders;
+ * LPSTR mszReaders;
* DWORD dwReaders;
* LONG rv;
* ...
* rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
* rv = SCardListReaders(hContext, NULL, NULL, &dwReaders);
- * mszReaders = (LPTSTR)malloc(sizeof(char)*dwReaders);
+ * mszReaders = (LPSTR)malloc(sizeof(char)*dwReaders);
* rv = SCardListReaders(hContext, NULL, mszReaders, &dwReaders);
* @endcode
*/
-LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
- LPTSTR mszReaders, LPDWORD pcchReaders)
+LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups,
+ LPSTR mszReaders, LPDWORD pcchReaders)
{
DWORD dwReadersLen;
int i, lastChrPtr;
@@ -2883,17 +2883,17 @@
* @test
* @code
* SCARDCONTEXT hContext;
- * LPTSTR mszGroups;
+ * LPSTR mszGroups;
* DWORD dwGroups;
* LONG rv;
* ...
* rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
* rv = SCardListReaderGroups(hContext, NULL, &dwGroups);
- * mszGroups = (LPTSTR)malloc(sizeof(char)*dwGroups);
+ * mszGroups = (LPSTR)malloc(sizeof(char)*dwGroups);
* rv = SCardListReaderGroups(hContext, mszGroups, &dwGroups);
* @endcode
*/
-LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPTSTR mszGroups,
+LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups)
{
LONG rv = SCARD_S_SUCCESS;
@@ -3120,7 +3120,7 @@
*/
static LONG SCardAddHandle(SCARDHANDLE hCard, DWORD dwContextIndex,
- LPTSTR readerName)
+ LPSTR readerName)
{
int i;
Modified: trunk/PCSC/src/winscard_scf.c
===================================================================
--- trunk/PCSC/src/winscard_scf.c 2006-06-06 09:20:19 UTC (rev 2071)
+++ trunk/PCSC/src/winscard_scf.c 2006-06-06 09:31:07 UTC (rev 2072)
@@ -79,7 +79,7 @@
static struct _psReaderMap
{
SCF_Terminal_t hTerminal;
- LPTSTR ReaderName;
+ LPSTR ReaderName;
short SharedRefCount;
DWORD dwCurrentState;
BYTE bAtr[MAX_ATR_SIZE];
@@ -111,14 +111,14 @@
LPDWORD pcbAtrLen);
static LONG ConvertStatus(SCF_Status_t status);
-static LONG SCardGetReaderIndice(LPCTSTR ReaderName);
+static LONG SCardGetReaderIndice(LPCSTR ReaderName);
static LONG getNewContext(SCARDCONTEXT * phContext);
static LONG SCardAddContext(SCARDCONTEXT hContext, SCF_Session_t hSession);
static SCF_Session_t getSessionForContext(SCARDCONTEXT hContext);
static LONG SCardRemoveContext(SCARDCONTEXT hContext);
static LONG SCardGetContextIndice(SCARDCONTEXT hContext);
-static LONG getNewHandle(SCARDCONTEXT hContext, LPCTSTR szReader,
+static LONG getNewHandle(SCARDCONTEXT hContext, LPCSTR szReader,
SCARDHANDLE * phCard, DWORD);
static LONG getCardForHandle(SCARDHANDLE PSCS_hCard, SCF_Card_t * SCF_hCard);
static LONG SCardRemoveHandle(SCARDHANDLE hCard);
@@ -198,8 +198,8 @@
}
-static LONG SCardListReadersTH(SCARDCONTEXT hContext, LPCTSTR mszGroups,
- LPTSTR mszReaders, LPDWORD pcchReaders)
+static LONG SCardListReadersTH(SCARDCONTEXT hContext, LPCSTR mszGroups,
+ LPSTR mszReaders, LPDWORD pcchReaders)
{
static int first_time = 1;
int i = 0;
@@ -270,8 +270,8 @@
}
-LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
- LPTSTR mszReaders, LPDWORD pcchReaders)
+LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups,
+ LPSTR mszReaders, LPDWORD pcchReaders)
{
long rv;
@@ -285,7 +285,7 @@
/* by najam */
-static LONG SCardConnectTH(SCARDCONTEXT hContext, LPCTSTR szReader,
+static LONG SCardConnectTH(SCARDCONTEXT hContext, LPCSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -341,7 +341,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader, DWORD dwShareMode,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode,
DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -405,7 +405,7 @@
LPDWORD pdwActiveProtocol)
{
SCARDCONTEXT hContext;
- LPTSTR ReaderName;
+ LPSTR ReaderName;
SCARDHANDLE tempHandle;
LONG rv;
@@ -583,7 +583,7 @@
return rv;
}
-static LONG SCardStatusTH(SCARDHANDLE hCard, LPTSTR mszReaderNames,
+static LONG SCardStatusTH(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -672,7 +672,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardStatus(SCARDHANDLE hCard, LPTSTR mszReaderNames,
+LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -692,7 +692,7 @@
LONG rv, retIndice, readerIndice;
PSCARD_READERSTATE_A currReader;
PREADER_STATE rContext;
- LPTSTR lpcReaderName;
+ LPSTR lpcReaderName;
DWORD dwTime;
DWORD dwState;
DWORD dwBreakFlag;
@@ -1123,7 +1123,7 @@
}
-static LONG SCardListReaderGroupsTH(SCARDCONTEXT hContext, LPTSTR mszGroups,
+static LONG SCardListReaderGroupsTH(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups)
{
LONG rv = SCARD_S_SUCCESS;
@@ -1153,7 +1153,7 @@
return rv;
}
-LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPTSTR mszGroups,
+LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPSTR mszGroups,
LPDWORD pcchGroups)
{
long rv;
@@ -1223,7 +1223,7 @@
return -1;
}
-static LONG SCardGetReaderIndice(LPCTSTR ReaderName)
+static LONG SCardGetReaderIndice(LPCSTR ReaderName)
{
int i = 0;
@@ -1373,7 +1373,7 @@
}
-static LONG getNewHandle(SCARDCONTEXT hContext, LPCTSTR szReader,
+static LONG getNewHandle(SCARDCONTEXT hContext, LPCSTR szReader,
SCARDHANDLE * phCard, DWORD dwShareMode)
{
long rv = 0, ReaderIndice;
@@ -1859,7 +1859,7 @@
/*
* Note that this function is not used
*/
-LONG SCardCheckReaderAvailability(LPTSTR readerName, LONG errorCode)
+LONG SCardCheckReaderAvailability(LPSTR readerName, LONG errorCode)
{
#if 0
LONG retIndice;
More information about the Pcsclite-cvs-commit
mailing list