[Pcsclite-cvs-commit] PCSC/src wintypes.h,1.7,1.8 winscard_clnt.c,1.35,1.36 winscard_scf.c,1.9,1.10 winscard.h,1.10,1.11 winscard.c,1.25,1.26 readerfactory.h,1.13,1.14 readerfactory.c,1.45,1.46 ifdwrapper.c,1.16,1.17 ifdhandler.h,1.9,1.10 eventhandler.c,1.17,1.18
sauveron-guest@haydn.debian.org
sauveron-guest@haydn.debian.org
Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv8648/src
Modified Files:
wintypes.h winscard_clnt.c winscard_scf.c winscard.h
winscard.c readerfactory.h readerfactory.c ifdwrapper.c
ifdhandler.h eventhandler.c
Log Message:
Change the names of the types LPCSTR to LPCTSTR and LPSTR to LPTSTR to be compliant with the Microsoft SCard API
Index: wintypes.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/wintypes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wintypes.h 18 Oct 2003 17:19:36 -0000 1.7
+++ wintypes.h 5 Jun 2004 15:43:11 -0000 1.8
@@ -39,11 +39,11 @@
typedef unsigned short WORD;
typedef long LONG;
typedef long RESPONSECODE;
- typedef const char *LPCSTR;
+ typedef const char *LPCTSTR;
typedef const BYTE *LPCBYTE;
typedef BYTE *LPBYTE;
typedef DWORD *LPDWORD;
- typedef char *LPSTR;
+ typedef char *LPTSTR;
#else
#include <windows.h>
Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- winscard_clnt.c 5 Jun 2004 15:33:53 -0000 1.35
+++ winscard_clnt.c 5 Jun 2004 15:43:11 -0000 1.36
@@ -47,7 +47,7 @@
struct _psChannelMap
{
SCARDHANDLE hCard;
- LPSTR readerName;
+ LPTSTR readerName;
};
typedef struct _psChannelMap CHANNEL_MAP, *PCHANNEL_MAP;
@@ -79,7 +79,7 @@
static LONG SCardGetContextIndiceTH(SCARDCONTEXT);
static LONG SCardRemoveContext(SCARDCONTEXT);
-static LONG SCardAddHandle(SCARDHANDLE, DWORD, LPSTR);
+static LONG SCardAddHandle(SCARDHANDLE, DWORD, LPTSTR);
static LONG SCardGetIndicesFromHandle(SCARDHANDLE, PDWORD, PDWORD);
static LONG SCardGetIndicesFromHandleTH(SCARDHANDLE, PDWORD, PDWORD);
static LONG SCardRemoveHandle(SCARDHANDLE);
@@ -381,7 +381,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -471,7 +471,7 @@
/*
* Keep track of the handle locally
*/
- rv = SCardAddHandle(*phCard, dwContextIndex, (LPSTR) szReader);
+ rv = SCardAddHandle(*phCard, dwContextIndex, (LPTSTR) szReader);
SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
return rv;
}
@@ -915,7 +915,7 @@
return scCancelStruct.rv;
}
-LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderNames,
+LONG SCardStatus(SCARDHANDLE hCard, LPTSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -1069,7 +1069,7 @@
LONG rv;
PSCARD_READERSTATE_A currReader;
PREADER_STATES rContext;
- LPSTR lpcReaderName;
+ LPTSTR lpcReaderName;
DWORD dwTime;
DWORD dwState;
DWORD dwBreakFlag;
@@ -1879,8 +1879,8 @@
}
}
-LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups,
- LPSTR mszReaders, LPDWORD pcchReaders)
+LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
+ LPTSTR mszReaders, LPDWORD pcchReaders)
{
DWORD dwGroupsLen, dwReadersLen;
int i, lastChrPtr;
@@ -1962,7 +1962,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPSTR mszGroups,
+LONG SCardListReaderGroups(SCARDCONTEXT hContext, LPTSTR mszGroups,
LPDWORD pcchGroups)
{
LONG rv = SCARD_S_SUCCESS;
@@ -2116,7 +2116,7 @@
*/
static LONG SCardAddHandle(SCARDHANDLE hCard, DWORD dwContextIndex,
- LPSTR readerName)
+ LPTSTR readerName)
{
int i;
Index: winscard_scf.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_scf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- winscard_scf.c 11 Dec 2003 19:56:50 -0000 1.9
+++ winscard_scf.c 5 Jun 2004 15:43:11 -0000 1.10
@@ -74,7 +74,7 @@
/* Reader Map to handle Status and GetStatusChange. */
static struct _psReaderMap {
SCF_Terminal_t hTerminal;
- LPSTR ReaderName;
+ LPTSTR ReaderName;
short SharedRefCount;
DWORD dwCurrentState;
BYTE bAtr[MAX_ATR_SIZE];
@@ -105,14 +105,14 @@
LPDWORD pcbAtrLen);
static LONG ConvertStatus(SCF_Status_t status);
-static LONG SCardGetReaderIndice(LPCSTR ReaderName);
+static LONG SCardGetReaderIndice(LPCTSTR 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,LPCSTR szReader,
+static LONG getNewHandle(SCARDCONTEXT hContext,LPCTSTR szReader,
SCARDHANDLE *phCard, DWORD);
static LONG getCardForHandle(SCARDHANDLE PSCS_hCard, SCF_Card_t *SCF_hCard);
static LONG SCardRemoveHandle(SCARDHANDLE hCard);
@@ -194,8 +194,8 @@
}
-static LONG SCardListReadersTH( SCARDCONTEXT hContext, LPCSTR mszGroups,
- LPSTR mszReaders, LPDWORD pcchReaders ) {
+static LONG SCardListReadersTH( SCARDCONTEXT hContext, LPCTSTR mszGroups,
+ LPTSTR mszReaders, LPDWORD pcchReaders ) {
static int first_time = 1;
int i=0;
static DWORD dwReadersLen=0;
@@ -256,8 +256,8 @@
}
-LONG SCardListReaders( SCARDCONTEXT hContext, LPCSTR mszGroups,
- LPSTR mszReaders, LPDWORD pcchReaders ) {
+LONG SCardListReaders( SCARDCONTEXT hContext, LPCTSTR mszGroups,
+ LPTSTR mszReaders, LPDWORD pcchReaders ) {
long rv;
@@ -270,7 +270,7 @@
/* by najam */
-static LONG SCardConnectTH( SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode,
+static LONG SCardConnectTH( SCARDCONTEXT hContext, LPCTSTR szReader, DWORD dwShareMode,
DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol ) {
LONG rv;
@@ -329,7 +329,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader, DWORD dwShareMode,
DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -392,7 +392,7 @@
LPDWORD pdwActiveProtocol ) {
SCARDCONTEXT hContext;
- LPSTR ReaderName;
+ LPTSTR ReaderName;
SCARDHANDLE tempHandle;
LONG rv;
@@ -569,7 +569,7 @@
SCardUnlockThread();
return rv;
}
-static LONG SCardStatusTH( SCARDHANDLE hCard, LPSTR mszReaderNames,
+static LONG SCardStatusTH( SCARDHANDLE hCard, LPTSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr,
LPDWORD pcbAtrLen ) {
@@ -647,7 +647,7 @@
return SCARD_S_SUCCESS;
}
-LONG SCardStatus( SCARDHANDLE hCard, LPSTR mszReaderNames,
+LONG SCardStatus( SCARDHANDLE hCard, LPTSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr,
LPDWORD pcbAtrLen ) {
@@ -667,7 +667,7 @@
LONG rv, retIndice;
PSCARD_READERSTATE_A currReader;
PREADER_STATES rContext;
- LPSTR lpcReaderName;
+ LPTSTR lpcReaderName;
DWORD dwTime;
DWORD dwState;
DWORD dwBreakFlag;
@@ -1041,7 +1041,7 @@
}
-static LONG SCardListReaderGroupsTH( SCARDCONTEXT hContext, LPSTR mszGroups,
+static LONG SCardListReaderGroupsTH( SCARDCONTEXT hContext, LPTSTR mszGroups,
LPDWORD pcchGroups)
{
LONG rv = SCARD_S_SUCCESS;
@@ -1068,7 +1068,7 @@
return rv;
}
-LONG SCardListReaderGroups( SCARDCONTEXT hContext, LPSTR mszGroups,
+LONG SCardListReaderGroups( SCARDCONTEXT hContext, LPTSTR mszGroups,
LPDWORD pcchGroups) {
long rv;
@@ -1130,7 +1130,7 @@
return -1;
}
-static LONG SCardGetReaderIndice(LPCSTR ReaderName)
+static LONG SCardGetReaderIndice(LPCTSTR ReaderName)
{
int i=0;
@@ -1269,7 +1269,7 @@
}
-static LONG getNewHandle(SCARDCONTEXT hContext,LPCSTR szReader,
+static LONG getNewHandle(SCARDCONTEXT hContext,LPCTSTR szReader,
SCARDHANDLE *phCard, DWORD dwShareMode)
{
long rv=0, ReaderIndice;
@@ -1694,7 +1694,7 @@
}
-LONG SCardCheckReaderAvailability( LPSTR readerName, LONG errorCode ) {
+LONG SCardCheckReaderAvailability( LPTSTR readerName, LONG errorCode ) {
LONG retIndice;
int i;
Index: winscard.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- winscard.h 19 Apr 2004 16:25:23 -0000 1.10
+++ winscard.h 5 Jun 2004 15:43:11 -0000 1.11
@@ -32,7 +32,7 @@
LONG SCardSetTimeout(SCARDCONTEXT hContext, DWORD dwTimeout);
LONG SCardConnect(SCARDCONTEXT hContext,
- LPCSTR szReader,
+ LPCTSTR szReader,
DWORD dwShareMode,
DWORD dwPreferredProtocols,
LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol);
@@ -51,7 +51,7 @@
LONG SCardCancelTransaction(SCARDHANDLE hCard);
LONG SCardStatus(SCARDHANDLE hCard,
- LPSTR mszReaderNames, LPDWORD pcchReaderLen,
+ LPTSTR mszReaderNames, LPDWORD pcchReaderLen,
LPDWORD pdwState,
LPDWORD pdwProtocol,
LPBYTE pbAtr, LPDWORD pcbAtrLen);
@@ -71,11 +71,11 @@
LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
LONG SCardListReaderGroups(SCARDCONTEXT hContext,
- LPSTR mszGroups, LPDWORD pcchGroups);
+ LPTSTR mszGroups, LPDWORD pcchGroups);
LONG SCardListReaders(SCARDCONTEXT hContext,
- LPCSTR mszGroups,
- LPSTR mszReaders, LPDWORD pcchReaders);
+ LPCTSTR mszGroups,
+ LPTSTR mszReaders, LPDWORD pcchReaders);
LONG SCardCancel(SCARDCONTEXT hContext);
Index: winscard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- winscard.c 10 May 2004 07:47:49 -0000 1.25
+++ winscard.c 5 Jun 2004 15:43:11 -0000 1.26
@@ -98,7 +98,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
-LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader,
+LONG SCardConnect(SCARDCONTEXT hContext, LPCTSTR szReader,
DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard,
LPDWORD pdwActiveProtocol)
{
@@ -142,7 +142,7 @@
DebugLogB("Attempting Connect to %s", szReader);
- rv = RFReaderInfo((LPSTR) szReader, &rContext);
+ rv = RFReaderInfo((LPTSTR) szReader, &rContext);
if (rv != SCARD_S_SUCCESS)
{
@@ -990,7 +990,7 @@
return rv;
}
-LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderNames,
+LONG SCardStatus(SCARDHANDLE hCard, LPTSTR mszReaderNames,
LPDWORD pcchReaderLen, LPDWORD pdwState,
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
@@ -1454,8 +1454,8 @@
return SCARD_S_SUCCESS;
}
-LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups,
- LPSTR mszReaders, LPDWORD pcchReaders)
+LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
+ LPTSTR mszReaders, LPDWORD pcchReaders)
{
/*
* Client side function
Index: readerfactory.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- readerfactory.h 3 May 2004 13:51:38 -0000 1.13
+++ readerfactory.h 5 Jun 2004 15:43:11 -0000 1.14
@@ -119,12 +119,12 @@
typedef struct ReaderContext READER_CONTEXT, *PREADER_CONTEXT;
LONG RFAllocateReaderSpace(DWORD);
- 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 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 RFReaderInfoById(DWORD, struct ReaderContext **);
LONG RFCheckSharing(DWORD);
LONG RFLockSharing(DWORD);
Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- readerfactory.c 3 May 2004 13:54:23 -0000 1.45
+++ readerfactory.c 5 Jun 2004 15:43:11 -0000 1.46
@@ -57,7 +57,7 @@
return rv;
}
-LONG RFAddReader(LPSTR lpcReader, DWORD dwPort, LPSTR lpcLibrary, LPSTR lpcDevice)
+LONG RFAddReader(LPTSTR lpcReader, DWORD dwPort, LPTSTR lpcLibrary, LPTSTR lpcDevice)
{
DWORD dwContext, dwContextB, dwGetSize;
UCHAR ucGetData[1], ucThread[1];
@@ -435,7 +435,7 @@
return SCARD_S_SUCCESS;
}
-LONG RFRemoveReader(LPSTR lpcReader, DWORD dwPort)
+LONG RFRemoveReader(LPTSTR lpcReader, DWORD dwPort)
{
LONG rv;
PREADER_CONTEXT sContext;
@@ -518,8 +518,8 @@
return SCARD_S_SUCCESS;
}
-LONG RFSetReaderName(PREADER_CONTEXT rContext, LPSTR readerName,
- LPSTR libraryName, DWORD dwPort, DWORD dwSlot)
+LONG RFSetReaderName(PREADER_CONTEXT rContext, LPTSTR readerName,
+ LPTSTR libraryName, DWORD dwPort, DWORD dwSlot)
{
LONG rv; /* rv is the reader number of the parent of the clone */
LONG ret;
@@ -691,10 +691,10 @@
return rv;
}
-LONG RFListReaders(LPSTR lpcReaders, LPDWORD pdwReaderNum)
+LONG RFListReaders(LPTSTR lpcReaders, LPDWORD pdwReaderNum)
{
DWORD dwCSize;
- LPSTR lpcTReaders;
+ LPTSTR lpcTReaders;
int i, p;
/*
@@ -772,7 +772,7 @@
return SCARD_S_SUCCESS;
}
-LONG RFReaderInfo(LPSTR lpcReader, PREADER_CONTEXT * sReader)
+LONG RFReaderInfo(LPTSTR lpcReader, PREADER_CONTEXT * sReader)
{
int i;
@@ -799,7 +799,7 @@
return SCARD_E_UNKNOWN_READER;
}
-LONG RFReaderInfoNamePort(DWORD dwPort, LPSTR lpcReader,
+LONG RFReaderInfoNamePort(DWORD dwPort, LPTSTR lpcReader,
PREADER_CONTEXT * sReader)
{
char lpcStripReader[MAX_READERNAME];
Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ifdwrapper.c 6 May 2004 09:03:31 -0000 1.16
+++ ifdwrapper.c 5 Jun 2004 15:43:11 -0000 1.17
@@ -132,7 +132,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, LPSTR) = NULL;
+ RESPONSECODE(*IFDH_create_channel_by_name) (DWORD, LPTSTR) = NULL;
#endif
/*
@@ -162,7 +162,7 @@
else
{
IFDH_create_channel = (RESPONSECODE(*)(DWORD, DWORD)) vFunction;
- IFDH_create_channel_by_name = (RESPONSECODE(*)(DWORD, LPSTR)) vFunction1;
+ IFDH_create_channel_by_name = (RESPONSECODE(*)(DWORD, LPTSTR)) vFunction1;
}
#endif
Index: ifdhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdhandler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ifdhandler.h 19 Apr 2004 16:27:51 -0000 1.9
+++ ifdhandler.h 5 Jun 2004 15:43:11 -0000 1.10
@@ -24,10 +24,10 @@
typedef struct _DEVICE_CAPABILITIES
{
- LPSTR Vendor_Name; /* Tag 0x0100 */
- LPSTR IFD_Type; /* Tag 0x0101 */
+ LPTSTR Vendor_Name; /* Tag 0x0100 */
+ LPTSTR IFD_Type; /* Tag 0x0101 */
DWORD IFD_Version; /* Tag 0x0102 */
- LPSTR IFD_Serial; /* Tag 0x0103 */
+ LPTSTR IFD_Serial; /* Tag 0x0103 */
DWORD IFD_Channel_ID; /* Tag 0x0110 */
DWORD Asynch_Supported; /* Tag 0x0120 */
@@ -144,7 +144,7 @@
* IFDHControl() API changed
*/
- RESPONSECODE IFDHCreateChannelByName(DWORD, LPSTR);
+ RESPONSECODE IFDHCreateChannelByName(DWORD, LPTSTR);
RESPONSECODE IFDHControl(DWORD, DWORD, LPCVOID, DWORD, LPVOID, DWORD,
LPDWORD);
Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- eventhandler.c 26 May 2004 20:53:38 -0000 1.17
+++ eventhandler.c 5 Jun 2004 15:43:11 -0000 1.18
@@ -151,7 +151,7 @@
LONG EHSpawnEventHandler(PREADER_CONTEXT rContext)
{
LONG rv;
- LPCSTR lpcReader;
+ LPCTSTR lpcReader;
DWORD dwStatus, dwProtocol;
int i;
@@ -214,7 +214,7 @@
void EHStatusHandlerThread(PREADER_CONTEXT rContext)
{
LONG rv;
- LPCSTR lpcReader;
+ LPCTSTR lpcReader;
DWORD dwStatus, dwProtocol, dwReaderSharing;
DWORD dwErrorCount, dwCurrentState;
int i, pageSize;