| winscard.h (6.3.9600.17415-Windows 8.1) | | winscard.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 42 | | skipping to change at line 42 |
|---|
| #include "winsmcrd.h" | | #include "winsmcrd.h" |
| #ifndef SCARD_S_SUCCESS | | #ifndef SCARD_S_SUCCESS |
| #include "SCardErr.h" | | #include "SCardErr.h" |
| #endif | | #endif |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #pragma warning(disable:4820) // padding added after data member |
| | #endif |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #ifndef _LPCBYTE_DEFINED | | #ifndef _LPCBYTE_DEFINED |
| #define _LPCBYTE_DEFINED | | #define _LPCBYTE_DEFINED |
| typedef const BYTE *LPCBYTE; | | typedef const BYTE *LPCBYTE; |
| #endif | | #endif |
| #ifndef _LPCVOID_DEFINED | | #ifndef _LPCVOID_DEFINED |
| #define _LPCVOID_DEFINED | | #define _LPCVOID_DEFINED |
| typedef const VOID *LPCVOID; | | typedef const VOID *LPCVOID; |
| | |
| skipping to change at line 1078 | | skipping to change at line 1083 |
|---|
| typedef enum { | | typedef enum { |
| RSR_MATCH_TYPE_READER_AND_CONTAINER = 1, | | RSR_MATCH_TYPE_READER_AND_CONTAINER = 1, |
| RSR_MATCH_TYPE_SERIAL_NUMBER, | | RSR_MATCH_TYPE_SERIAL_NUMBER, |
| RSR_MATCH_TYPE_ALL_CARDS | | RSR_MATCH_TYPE_ALL_CARDS |
| } READER_SEL_REQUEST_MATCH_TYPE; | | } READER_SEL_REQUEST_MATCH_TYPE; |
| | |
| typedef struct { | | typedef struct { |
| DWORD dwShareMode; | | DWORD dwShareMode; |
| DWORD dwPreferredProtocols; | | DWORD dwPreferredProtocols; |
| READER_SEL_REQUEST_MATCH_TYPE MatchType; | | READER_SEL_REQUEST_MATCH_TYPE MatchType; |
|
| | #pragma warning(push) |
| | #pragma warning(disable:4201) |
| union { | | union { |
| struct { | | struct { |
| DWORD cbReaderNameOffset; | | DWORD cbReaderNameOffset; |
| DWORD cchReaderNameLength; | | DWORD cchReaderNameLength; |
| DWORD cbContainerNameOffset; | | DWORD cbContainerNameOffset; |
| DWORD cchContainerNameLength; | | DWORD cchContainerNameLength; |
| DWORD dwDesiredCardModuleVersion; | | DWORD dwDesiredCardModuleVersion; |
| DWORD dwCspFlags; | | DWORD dwCspFlags; |
| } ReaderAndContainerParameter; | | } ReaderAndContainerParameter; |
| struct { | | struct { |
| DWORD cbSerialNumberOffset; | | DWORD cbSerialNumberOffset; |
| DWORD cbSerialNumberLength; | | DWORD cbSerialNumberLength; |
| DWORD dwDesiredCardModuleVersion; | | DWORD dwDesiredCardModuleVersion; |
| } SerialNumberParameter; | | } SerialNumberParameter; |
|
| }; | | } DUMMYUNIONNAME; |
| | #pragma warning(pop) |
| } READER_SEL_REQUEST, *PREADER_SEL_REQUEST; | | } READER_SEL_REQUEST, *PREADER_SEL_REQUEST; |
| | |
| // | | // |
| // READER_SEL_RESPONSE | | // READER_SEL_RESPONSE |
| // Reader selection response from reader selection provider | | // Reader selection response from reader selection provider |
| // | | // |
| // Members: | | // Members: |
| // cbReaderNameOffset: | | // cbReaderNameOffset: |
| // Byte offset of matched reader name UNICODE string from the beginning of | | // Byte offset of matched reader name UNICODE string from the beginning of |
| // READER_SEL_RESPONSE structure | | // READER_SEL_RESPONSE structure |
| | |
| skipping to change at line 1392 | | skipping to change at line 1400 |
|---|
| extern WINSCARDAPI LONG WINAPI | | extern WINSCARDAPI LONG WINAPI |
| SCardAudit( | | SCardAudit( |
| _In_ SCARDCONTEXT hContext, | | _In_ SCARDCONTEXT hContext, |
| _In_ DWORD dwEvent); | | _In_ DWORD dwEvent); |
| | |
| #endif // (NTDDI_VERSION >= NTDDI_WIN8) | | #endif // (NTDDI_VERSION >= NTDDI_WIN8) |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| #endif // _WINSCARD_H_ | | #endif // _WINSCARD_H_ |
| | |
| End of changes. 4 change blocks. |
|---|
| 1 lines changed or deleted | | 13 lines changed or added |
|---|
|