Headers diff for winscard.dll between 5.2.3790.3959-Windows 5.0 and 6.0.6002.18005-Windows 6.0 versions

winscard.h (5.2.3790.3959-Windows 5.0)		winscard.h (6.0.6002.18005-Windows 6.0)

skipping to change at line 132		skipping to change at line 132
// The following services provide for managing the Smart Card Database.		// The following services provide for managing the Smart Card Database.
//		//

#define SCARD_ALL_READERS TEXT("SCard$AllReaders\000")		#define SCARD_ALL_READERS TEXT("SCard$AllReaders\000")
#define SCARD_DEFAULT_READERS TEXT("SCard$DefaultReaders\000")		#define SCARD_DEFAULT_READERS TEXT("SCard$DefaultReaders\000")
#define SCARD_LOCAL_READERS TEXT("SCard$LocalReaders\000")		#define SCARD_LOCAL_READERS TEXT("SCard$LocalReaders\000")
#define SCARD_SYSTEM_READERS TEXT("SCard$SystemReaders\000")		#define SCARD_SYSTEM_READERS TEXT("SCard$SystemReaders\000")

#define SCARD_PROVIDER_PRIMARY 1 // Primary Provider Id		#define SCARD_PROVIDER_PRIMARY 1 // Primary Provider Id
#define SCARD_PROVIDER_CSP 2 // Crypto Service Provider Id		#define SCARD_PROVIDER_CSP 2 // Crypto Service Provider Id

		#define SCARD_PROVIDER_KSP 3 // Key Storage Provider Id

//		//
// Database Reader routines		// Database Reader routines
//		//

extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardListReaderGroupsA(		SCardListReaderGroupsA(
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
OUT LPSTR mszGroups,		OUT LPSTR mszGroups,
IN OUT LPDWORD pcchGroups);		IN OUT LPDWORD pcchGroups);

skipping to change at line 456		skipping to change at line 457
//		//
// The following services are supplied to simplify the use of the Service		// The following services are supplied to simplify the use of the Service
// Manager API.		// Manager API.
//		//

extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardFreeMemory(		SCardFreeMemory(
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
IN LPCVOID pvMem);		IN LPCVOID pvMem);


		#if (NTDDI_VERSION >= NTDDI_WINXP)
extern WINSCARDAPI HANDLE WINAPI		extern WINSCARDAPI HANDLE WINAPI
SCardAccessStartedEvent(void);		SCardAccessStartedEvent(void);

extern WINSCARDAPI void WINAPI		extern WINSCARDAPI void WINAPI
SCardReleaseStartedEvent(void);		SCardReleaseStartedEvent(void);

		#endif // (NTDDI_VERSION >= NTDDI_WINXP)

//		//
////////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////////
//		//
// Reader Services		// Reader Services
//		//
// The following services supply means for tracking cards within readers.		// The following services supply means for tracking cards within readers.
//		//

typedef struct {		typedef struct {

skipping to change at line 584		skipping to change at line 587
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
IN LPCWSTR mszCards,		IN LPCWSTR mszCards,
IN OUT LPSCARD_READERSTATEW rgReaderStates,		IN OUT LPSCARD_READERSTATEW rgReaderStates,
IN DWORD cReaders);		IN DWORD cReaders);
#ifdef UNICODE		#ifdef UNICODE
#define SCardLocateCards SCardLocateCardsW		#define SCardLocateCards SCardLocateCardsW
#else		#else
#define SCardLocateCards SCardLocateCardsA		#define SCardLocateCards SCardLocateCardsA
#endif // !UNICODE		#endif // !UNICODE


		#if (NTDDI_VERSION >= NTDDI_WINXP)
typedef struct _SCARD_ATRMASK {		typedef struct _SCARD_ATRMASK {
DWORD cbAtr; // Number of bytes in the ATR and the mask.		DWORD cbAtr; // Number of bytes in the ATR and the mask.
BYTE rgbAtr[36]; // Atr of card (extra alignment bytes)		BYTE rgbAtr[36]; // Atr of card (extra alignment bytes)
BYTE rgbMask[36]; // Mask for the Atr (extra alignment bytes)		BYTE rgbMask[36]; // Mask for the Atr (extra alignment bytes)
} SCARD_ATRMASK, PSCARD_ATRMASK, LPSCARD_ATRMASK;		} SCARD_ATRMASK, PSCARD_ATRMASK, LPSCARD_ATRMASK;

extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardLocateCardsByATRA(		SCardLocateCardsByATRA(
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
IN LPSCARD_ATRMASK rgAtrMasks,		IN LPSCARD_ATRMASK rgAtrMasks,

skipping to change at line 609		skipping to change at line 613
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
IN LPSCARD_ATRMASK rgAtrMasks,		IN LPSCARD_ATRMASK rgAtrMasks,
IN DWORD cAtrs,		IN DWORD cAtrs,
IN OUT LPSCARD_READERSTATEW rgReaderStates,		IN OUT LPSCARD_READERSTATEW rgReaderStates,
IN DWORD cReaders);		IN DWORD cReaders);
#ifdef UNICODE		#ifdef UNICODE
#define SCardLocateCardsByATR SCardLocateCardsByATRW		#define SCardLocateCardsByATR SCardLocateCardsByATRW
#else		#else
#define SCardLocateCardsByATR SCardLocateCardsByATRA		#define SCardLocateCardsByATR SCardLocateCardsByATRA
#endif // !UNICODE		#endif // !UNICODE

		#endif // (NTDDI_VERSION >= NTDDI_WINXP)

extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardGetStatusChangeA(		SCardGetStatusChangeA(
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,
IN DWORD dwTimeout,		IN DWORD dwTimeout,
IN OUT LPSCARD_READERSTATEA rgReaderStates,		IN OUT LPSCARD_READERSTATEA rgReaderStates,
IN DWORD cReaders);		IN DWORD cReaders);
extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardGetStatusChangeW(		SCardGetStatusChangeW(
IN SCARDCONTEXT hContext,		IN SCARDCONTEXT hContext,

skipping to change at line 751		skipping to change at line 756
extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardTransmit(		SCardTransmit(
IN SCARDHANDLE hCard,		IN SCARDHANDLE hCard,
IN LPCSCARD_IO_REQUEST pioSendPci,		IN LPCSCARD_IO_REQUEST pioSendPci,
IN LPCBYTE pbSendBuffer,		IN LPCBYTE pbSendBuffer,
IN DWORD cbSendLength,		IN DWORD cbSendLength,
IN OUT LPSCARD_IO_REQUEST pioRecvPci,		IN OUT LPSCARD_IO_REQUEST pioRecvPci,
OUT LPBYTE pbRecvBuffer,		OUT LPBYTE pbRecvBuffer,
IN OUT LPDWORD pcbRecvLength);		IN OUT LPDWORD pcbRecvLength);


		#if (NTDDI_VERSION >= NTDDI_LONGHORN)
		extern WINSCARDAPI LONG WINAPI
		SCardGetTransmitCount(
		IN SCARDHANDLE hCard,
		OUT LPDWORD pcTransmitCount);
		#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)

//		//
////////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////////
//		//
// Reader Control Routines		// Reader Control Routines
//		//
// The following services provide for direct, low-level manipulation of the		// The following services provide for direct, low-level manipulation of the
// reader by the calling application allowing it control over the		// reader by the calling application allowing it control over the
// attributes of the communications with the card.		// attributes of the communications with the card.
//		//


skipping to change at line 1057		skipping to change at line 1069
LPOPENCARDNAMEW);		LPOPENCARDNAMEW);
#ifdef UNICODE		#ifdef UNICODE
#define GetOpenCardName GetOpenCardNameW		#define GetOpenCardName GetOpenCardNameW
#else		#else
#define GetOpenCardName GetOpenCardNameA		#define GetOpenCardName GetOpenCardNameA
#endif // !UNICODE		#endif // !UNICODE

extern WINSCARDAPI LONG WINAPI		extern WINSCARDAPI LONG WINAPI
SCardDlgExtendedError (void);		SCardDlgExtendedError (void);


		#if (NTDDI_VERSION >= NTDDI_LONGHORN)

		//
		// Smartcard Caching API
		//

		extern WINSCARDAPI LONG WINAPI
		SCardReadCacheA(
		IN SCARDCONTEXT hContext,
		IN UUID *CardIdentifier,
		IN DWORD FreshnessCounter,
		IN LPSTR LookupName,
		OUT PBYTE Data,
		OUT DWORD *DataLen);
		extern WINSCARDAPI LONG WINAPI
		SCardReadCacheW(
		IN SCARDCONTEXT hContext,
		IN UUID *CardIdentifier,
		IN DWORD FreshnessCounter,
		IN LPWSTR LookupName,
		OUT PBYTE Data,
		OUT DWORD *DataLen);
		#ifdef UNICODE
		#define SCardReadCache SCardReadCacheW
		#else
		#define SCardReadCache SCardReadCacheA
		#endif // !UNICODE

		extern WINSCARDAPI LONG WINAPI
		SCardWriteCacheA(
		IN SCARDCONTEXT hContext,
		IN UUID *CardIdentifier,
		IN DWORD FreshnessCounter,
		IN LPSTR LookupName,
		IN PBYTE Data,
		IN DWORD DataLen);
		extern WINSCARDAPI LONG WINAPI
		SCardWriteCacheW(
		IN SCARDCONTEXT hContext,
		IN UUID *CardIdentifier,
		IN DWORD FreshnessCounter,
		IN LPWSTR LookupName,
		IN PBYTE Data,
		IN DWORD DataLen);
		#ifdef UNICODE
		#define SCardWriteCache SCardWriteCacheW
		#else
		#define SCardWriteCache SCardWriteCacheA
		#endif // !UNICODE

		#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif
#endif // _WINSCARD_H_		#endif // _WINSCARD_H_

End of changes. 7 change blocks.
0 lines changed or deleted		64 lines changed or added

This html diff was produced by rfcdiff 1.41.