mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels/smartcard: improve packing of data structures

Browse Source
This commit is contained in:
Marc-André Moreau 2014-04-05 11:22:48 -04:00
parent f9ada64587
commit 23745fd58a
2 changed files with 250 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

364
channels/smartcard/client/smartcard_operations.c
View File

@ -845,9 +845,10 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
LONG status; LONG status;
int redirect = 0; int redirect = 0;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
DWORD dwTimeout = 0; GetStatusChangeA_Call call;
DWORD readerCount = 0; ReaderStateA* readerState = NULL;
SCARD_READERSTATEA *readerStates = NULL, *cur; LPSCARD_READERSTATEA rgReaderState = NULL;
LPSCARD_READERSTATEA rgReaderStates = NULL;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -873,11 +874,9 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
goto finish; goto finish;
} }
Stream_Read_UINT32(irp->input, dwTimeout); Stream_Read_UINT32(irp->input, call.dwTimeOut); /* dwTimeOut (4 bytes) */
Stream_Read_UINT32(irp->input, readerCount); Stream_Read_UINT32(irp->input, call.cReaders); /* cReaders (4 bytes) */
Stream_Seek_UINT32(irp->input); /* rgReaderStatesPointer (4 bytes) */
/* Skip reader state */
Stream_Seek(irp->input, 4);
/* Get context */ /* Get context */
status = handle_RedirContextRef(smartcard, irp, redirect, &hContext); status = handle_RedirContextRef(smartcard, irp, redirect, &hContext);
@ -886,7 +885,7 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
goto finish; goto finish;
/* Skip ReaderStateConformant */ /* Skip ReaderStateConformant */
if (Stream_GetRemainingLength(irp->input) < 4 ) if (Stream_GetRemainingLength(irp->input) < 4)
{ {
DEBUG_WARN("length violation %d [%d]", 4, DEBUG_WARN("length violation %d [%d]", 4,
Stream_GetRemainingLength(irp->input)); Stream_GetRemainingLength(irp->input));
@ -895,14 +894,13 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
} }
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
if (readerCount > 0) if (call.cReaders > 0)
{ {
readerStates = malloc(readerCount * sizeof(SCARD_READERSTATE)); call.rgReaderStates = (ReaderStateA*) calloc(1, call.cReaders * sizeof(ReaderStateA));
ZeroMemory(readerStates, readerCount * sizeof(SCARD_READERSTATE));
for (i = 0; i < readerCount; i++) for (i = 0; i < call.cReaders; i++)
{ {
cur = &readerStates[i]; readerState = &call.rgReaderStates[i];
if (Stream_GetRemainingLength(irp->input) < 52 ) if (Stream_GetRemainingLength(irp->input) < 52 )
{ {
@ -914,28 +912,22 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
/* Stream_Read_UINT32(irp->input, readerState->Common.dwCurrentState); /* dwCurrentState (4 bytes) */
* TODO: on-wire is little endian; need to either Stream_Read_UINT32(irp->input, readerState->Common.dwEventState); /* dwEventState (4 bytes) */
* convert to host endian or fix the headers to Stream_Read_UINT32(irp->input, readerState->Common.cbAtr); /* cbAtr (4 bytes) */
* request the order we want Stream_Read(irp->input, readerState->Common.rgbAtr, 32);
*/
Stream_Read_UINT32(irp->input, cur->dwCurrentState);
Stream_Read_UINT32(irp->input, cur->dwEventState);
Stream_Read_UINT32(irp->input, cur->cbAtr);
Stream_Read(irp->input, cur->rgbAtr, 32);
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
/* reset high bytes? */ /* reset high bytes? */
cur->dwCurrentState &= 0x0000FFFF; readerState->Common.dwCurrentState &= 0x0000FFFF;
cur->dwEventState = 0; readerState->Common.dwEventState = 0;
} }
for (i = 0; i < readerCount; i++) for (i = 0; i < call.cReaders; i++)
{ {
UINT32 dataLength; UINT32 dataLength;
cur = &readerStates[i]; readerState = &call.rgReaderStates[i];
if (Stream_GetRemainingLength(irp->input) < 12 ) if (Stream_GetRemainingLength(irp->input) < 12 )
{ {
@ -955,56 +947,68 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
smartcard_input_repos(irp, smartcard_input_string(irp,
(char **) &cur->szReader, dataLength, wide));
if (!cur->szReader) smartcard_input_repos(irp, smartcard_input_string(irp,
(char**) &readerState->szReader, dataLength, wide));
if (!readerState->szReader)
{ {
DEBUG_WARN("cur->szReader=%p", cur->szReader); DEBUG_WARN("cur->szReader=%p", readerState->szReader);
continue; continue;
} }
if (strcmp(cur->szReader, "\\\\?PnP?\\Notification") == 0)
cur->dwCurrentState |= SCARD_STATE_IGNORE; if (strcmp((char*) readerState->szReader, "\\\\?PnP?\\Notification") == 0)
readerState->Common.dwCurrentState |= SCARD_STATE_IGNORE;
} }
} }
else else
{ {
readerStates = NULL; call.rgReaderStates = NULL;
} }
status = SCardGetStatusChangeA(hContext, (DWORD) dwTimeout, readerStates, (DWORD) readerCount); rgReaderStates = (SCARD_READERSTATEA*) calloc(1, call.cReaders * sizeof(SCARD_READERSTATEA));
Stream_Write_UINT32(irp->output, readerCount); for (i = 0; i < call.cReaders; i++)
Stream_Write_UINT32(irp->output, 0x00084dd8);
Stream_Write_UINT32(irp->output, readerCount);
for (i = 0; i < readerCount; i++)
{ {
cur = &readerStates[i]; rgReaderStates[i].szReader = (LPCSTR) call.rgReaderStates[i].szReader;
rgReaderStates[i].dwCurrentState = call.rgReaderStates[i].Common.dwCurrentState;
rgReaderStates[i].dwEventState = call.rgReaderStates[i].Common.dwEventState;
rgReaderStates[i].cbAtr = call.rgReaderStates[i].Common.cbAtr;
CopyMemory(&(rgReaderStates[i].rgbAtr), &(call.rgReaderStates[i].Common.rgbAtr), 36);
}
/* TODO: do byte conversions if necessary */ status = SCardGetStatusChangeA(hContext, (DWORD) call.dwTimeOut, rgReaderStates, (DWORD) call.cReaders);
Stream_Write_UINT32(irp->output, cur->dwCurrentState);
Stream_Write_UINT32(irp->output, cur->dwEventState);
Stream_Write_UINT32(irp->output, cur->cbAtr);
Stream_Write(irp->output, cur->rgbAtr, 32);
Stream_Write_UINT32(irp->output, call.cReaders);
Stream_Write_UINT32(irp->output, 0x00084dd8);
Stream_Write_UINT32(irp->output, call.cReaders);
for (i = 0; i < call.cReaders; i++)
{
rgReaderState = &rgReaderStates[i];
Stream_Write_UINT32(irp->output, rgReaderState->dwCurrentState);
Stream_Write_UINT32(irp->output, rgReaderState->dwEventState);
Stream_Write_UINT32(irp->output, rgReaderState->cbAtr);
Stream_Write(irp->output, rgReaderState->rgbAtr, 32);
Stream_Zero(irp->output, 4); Stream_Zero(irp->output, 4);
} }
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
finish: finish:
if (readerStates) if (call.rgReaderStates)
{ {
for (i = 0; i < readerCount; i++) for (i = 0; i < call.cReaders; i++)
{ {
cur = &readerStates[i]; readerState = &call.rgReaderStates[i];
if (cur->szReader) if (readerState->szReader)
free((void*) cur->szReader); free((void*) readerState->szReader);
cur->szReader = NULL; readerState->szReader = NULL;
} }
free(readerStates); free(call.rgReaderStates);
free(rgReaderStates);
} }
return status; return status;
@ -1045,14 +1049,12 @@ static UINT32 handle_Cancel(SMARTCARD_DEVICE* smartcard, IRP* irp)
static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide) static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
{ {
int redirect = 0;
LONG status; LONG status;
int redirect = 0;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
char* readerName = NULL;
DWORD dwShareMode = 0;
DWORD dwPreferredProtocol = 0;
DWORD dwActiveProtocol = 0;
SCARDHANDLE hCard; SCARDHANDLE hCard;
ConnectA_Call call;
Connect_Return ret;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1064,7 +1066,6 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
if (status) if (status)
goto finish; goto finish;
/* Skip ptrReader */
if (Stream_GetRemainingLength(irp->input) < 4) if (Stream_GetRemainingLength(irp->input) < 4)
{ {
DEBUG_WARN("Length violation %d [%d]", 4, DEBUG_WARN("Length violation %d [%d]", 4,
@ -1072,9 +1073,8 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
Stream_Seek(irp->input, 4); Stream_Seek_UINT32(irp->input); /* szReaderPointer (4 bytes) */
/* Read common data */
status = handle_Context(smartcard, irp, &redirect); status = handle_Context(smartcard, irp, &redirect);
if (status) if (status)
@ -1082,16 +1082,17 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
if (Stream_GetRemainingLength(irp->input) < 8) if (Stream_GetRemainingLength(irp->input) < 8)
{ {
DEBUG_WARN("Length violadion %d [%d]", 8, DEBUG_WARN("Length violation %d [%d]", 8,
Stream_GetRemainingLength(irp->input)); Stream_GetRemainingLength(irp->input));
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
Stream_Read_UINT32(irp->input, dwShareMode); Stream_Read_UINT32(irp->input, call.Common.dwShareMode); /* dwShareMode (4 bytes) */
Stream_Read_UINT32(irp->input, dwPreferredProtocol); Stream_Read_UINT32(irp->input, call.Common.dwPreferredProtocols); /* dwPreferredProtocols (4 bytes) */
status = smartcard_input_reader_name(irp, &readerName, wide); call.szReader = NULL;
status = smartcard_input_reader_name(irp, (char**) &call.szReader, wide);
if (status) if (status)
goto finish; goto finish;
@ -1101,15 +1102,15 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
if (status) if (status)
goto finish; goto finish;
if (!check_reader_is_forwarded(smartcard, readerName)) if (!check_reader_is_forwarded(smartcard, (char*) call.szReader))
{ {
DEBUG_WARN("Reader '%s' not forwarded!", readerName); DEBUG_WARN("Reader '%s' not forwarded!", call.szReader);
status = SCARD_E_INVALID_TARGET; status = SCARD_E_INVALID_TARGET;
goto finish; goto finish;
} }
status = SCardConnectA(hContext, readerName, (DWORD) dwShareMode, status = SCardConnectA(hContext, (char*) call.szReader, (DWORD) call.Common.dwShareMode,
(DWORD) dwPreferredProtocol, &hCard, (DWORD *) &dwActiveProtocol); (DWORD) call.Common.dwPreferredProtocols, &hCard, (DWORD*) &ret.dwActiveProtocol);
smartcard->hCard = hCard; smartcard->hCard = hCard;
@ -1117,15 +1118,15 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wide)
Stream_Write_UINT32(irp->output, 0x00000000); Stream_Write_UINT32(irp->output, 0x00000000);
Stream_Write_UINT32(irp->output, 0x00000004); Stream_Write_UINT32(irp->output, 0x00000004);
Stream_Write_UINT32(irp->output, 0x016Cff34); Stream_Write_UINT32(irp->output, 0x016Cff34);
Stream_Write_UINT32(irp->output, dwActiveProtocol); Stream_Write_UINT32(irp->output, ret.dwActiveProtocol); /* dwActiveProtocol (4 bytes) */
Stream_Write_UINT32(irp->output, 0x00000004); Stream_Write_UINT32(irp->output, 0x00000004);
Stream_Write_UINT32(irp->output, hCard); Stream_Write_UINT32(irp->output, hCard);
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
finish: finish:
if (readerName) if (call.szReader)
free(readerName); free(call.szReader);
return status; return status;
} }
@ -1136,10 +1137,8 @@ static UINT32 handle_Reconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
LONG status; LONG status;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
SCARDHANDLE hCard; SCARDHANDLE hCard;
DWORD dwShareMode = 0; Reconnect_Call call;
DWORD dwPreferredProtocol = 0; Reconnect_Return ret;
DWORD dwInitialization = 0;
DWORD dwActiveProtocol = 0;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1163,9 +1162,9 @@ static UINT32 handle_Reconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Read_UINT32(irp->input, dwShareMode); Stream_Read_UINT32(irp->input, call.dwShareMode); /* dwShareMode (4 bytes) */
Stream_Read_UINT32(irp->input, dwPreferredProtocol); Stream_Read_UINT32(irp->input, call.dwPreferredProtocols); /* dwPreferredProtocols (4 bytes) */
Stream_Read_UINT32(irp->input, dwInitialization); Stream_Read_UINT32(irp->input, call.dwInitialization); /* dwInitialization (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1178,10 +1177,10 @@ static UINT32 handle_Reconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_E_INVALID_TARGET; return SCARD_E_INVALID_TARGET;
} }
status = SCardReconnect(hCard, (DWORD) dwShareMode, (DWORD) dwPreferredProtocol, status = SCardReconnect(hCard, (DWORD) call.dwShareMode, (DWORD) call.dwPreferredProtocols,
(DWORD) dwInitialization, (LPDWORD) &dwActiveProtocol); (DWORD) call.dwInitialization, (LPDWORD) &ret.dwActiveProtocol);
Stream_Write_UINT32(irp->output, dwActiveProtocol); Stream_Write_UINT32(irp->output, ret.dwActiveProtocol); /* dwActiveProtocol (4 bytes) */
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
return status; return status;
@ -1189,11 +1188,11 @@ static UINT32 handle_Reconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
static UINT32 handle_Disconnect(SMARTCARD_DEVICE* smartcard, IRP* irp) static UINT32 handle_Disconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
{ {
int redirect = 0;
LONG status; LONG status;
int redirect = 0;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
SCARDHANDLE hCard; SCARDHANDLE hCard;
DWORD dwDisposition = 0; HCardAndDisposition_Call call;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1217,7 +1216,7 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Read_UINT32(irp->input, dwDisposition); Stream_Read_UINT32(irp->input, call.dwDisposition); /* dwDisposition (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1230,7 +1229,7 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_E_INVALID_TARGET; return SCARD_E_INVALID_TARGET;
} }
status = SCardDisconnect(hCard, (DWORD) dwDisposition); status = SCardDisconnect(hCard, (DWORD) call.dwDisposition);
ZeroMemory(&smartcard->hCard, sizeof(smartcard->hCard)); ZeroMemory(&smartcard->hCard, sizeof(smartcard->hCard));
@ -1241,10 +1240,11 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* smartcard, IRP* irp)
static UINT32 handle_BeginTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp) static UINT32 handle_BeginTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
{ {
int redirect = 0;
LONG status; LONG status;
int redirect = 0;
SCARDHANDLE hCard; SCARDHANDLE hCard;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
HCardAndDisposition_Call call;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1267,7 +1267,8 @@ static UINT32 handle_BeginTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
Stream_GetRemainingLength(irp->input)); Stream_GetRemainingLength(irp->input));
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Seek(irp->input, 4);
Stream_Read_UINT32(irp->input, call.dwDisposition); /* dwDisposition (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1293,7 +1294,7 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
LONG status; LONG status;
SCARDHANDLE hCard; SCARDHANDLE hCard;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
DWORD dwDisposition = 0; HCardAndDisposition_Call call;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1316,7 +1317,8 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
Stream_GetRemainingLength(irp->input)); Stream_GetRemainingLength(irp->input));
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Read_UINT32(irp->input, dwDisposition);
Stream_Read_UINT32(irp->input, call.dwDisposition); /* dwDisposition (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1329,7 +1331,7 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_E_INVALID_TARGET; return SCARD_E_INVALID_TARGET;
} }
status = SCardEndTransaction(hCard, dwDisposition); status = SCardEndTransaction(hCard, call.dwDisposition);
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
@ -1338,15 +1340,15 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* smartcard, IRP* irp)
static UINT32 handle_State(SMARTCARD_DEVICE* smartcard, IRP* irp) static UINT32 handle_State(SMARTCARD_DEVICE* smartcard, IRP* irp)
{ {
int redirect = 0;
LONG status; LONG status;
int redirect = 0;
SCARDHANDLE hCard; SCARDHANDLE hCard;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
DWORD state = 0, protocol = 0; State_Call call;
State_Return ret;
DWORD readerLen; DWORD readerLen;
DWORD atrLen = SCARD_ATR_LENGTH;
char* readerName = NULL; char* readerName = NULL;
BYTE pbAtr[SCARD_ATR_LENGTH]; BYTE atr[SCARD_ATR_LENGTH];
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1371,8 +1373,8 @@ static UINT32 handle_State(SMARTCARD_DEVICE* smartcard, IRP* irp)
goto finish; goto finish;
} }
Stream_Seek(irp->input, 4); Stream_Read_UINT32(irp->input, call.fpbAtrIsNULL); /* fpbAtrIsNULL (4 bytes) */
Stream_Seek_UINT32(irp->input); /* atrLen */ Stream_Read_UINT32(irp->input, call.cbAtrLen); /* cbAtrLen (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1387,7 +1389,12 @@ static UINT32 handle_State(SMARTCARD_DEVICE* smartcard, IRP* irp)
} }
readerLen = SCARD_AUTOALLOCATE; readerLen = SCARD_AUTOALLOCATE;
status = SCardStatusA(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
ret.rgAtr = atr;
ret.cbAtrLen = SCARD_ATR_LENGTH;
status = SCardStatusA(hCard, (LPSTR) &readerName, &readerLen,
&ret.dwState, &ret.dwProtocol, ret.rgAtr, &ret.cbAtrLen);
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
{ {
@ -1395,14 +1402,14 @@ static UINT32 handle_State(SMARTCARD_DEVICE* smartcard, IRP* irp)
goto finish; goto finish;
} }
Stream_Write_UINT32(irp->output, state); Stream_Write_UINT32(irp->output, ret.dwState); /* dwState (4 bytes) */
Stream_Write_UINT32(irp->output, protocol); Stream_Write_UINT32(irp->output, ret.dwProtocol); /* dwProtocol (4 bytes) */
Stream_Write_UINT32(irp->output, atrLen); Stream_Write_UINT32(irp->output, ret.cbAtrLen); /* cbAtrLen (4 bytes) */
Stream_Write_UINT32(irp->output, 0x00000001); Stream_Write_UINT32(irp->output, 0x00000001); /* rgAtrPointer (4 bytes) */
Stream_Write_UINT32(irp->output, atrLen); Stream_Write_UINT32(irp->output, ret.cbAtrLen); /* rgAtrLength (4 bytes) */
Stream_Write(irp->output, pbAtr, atrLen); Stream_Write(irp->output, ret.rgAtr, ret.cbAtrLen); /* rgAtr */
smartcard_output_repos(irp, atrLen); smartcard_output_repos(irp, ret.cbAtrLen);
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
finish: finish:
@ -1769,18 +1776,15 @@ finish:
static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp) static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp)
{ {
int redirect = 0;
LONG status; LONG status;
UINT32 length;
int redirect = 0;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
SCARDHANDLE hCard; SCARDHANDLE hCard;
UINT32 pvInBuffer, fpvOutBufferIsNULL;
UINT32 controlCode;
UINT32 controlFunction; UINT32 controlFunction;
BYTE* recvBuffer = NULL; Control_Call call;
BYTE* sendBuffer = NULL; Control_Return ret;
UINT32 recvLength; UINT32 pvInBufferPointer;
DWORD nBytesReturned;
DWORD outBufferSize;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1805,11 +1809,12 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp)
goto finish; goto finish;
} }
Stream_Read_UINT32(irp->input, controlCode); call.pvInBuffer = NULL;
Stream_Read_UINT32(irp->input, recvLength); Stream_Read_UINT32(irp->input, call.dwControlCode); /* dwControlCode (4 bytes) */
Stream_Read_UINT32(irp->input, pvInBuffer); Stream_Read_UINT32(irp->input, call.cbInBufferSize); /* cbInBufferSize (4 bytes) */
Stream_Read_UINT32(irp->input, fpvOutBufferIsNULL); Stream_Read_UINT32(irp->input, pvInBufferPointer); /* pvInBufferPointer (4 bytes) */
Stream_Read_UINT32(irp->input, outBufferSize); Stream_Read_UINT32(irp->input, call.fpvOutBufferIsNULL); /* fpvOutBufferIsNULL (4 bytes) */
Stream_Read_UINT32(irp->input, call.cbOutBufferSize); /* cbOutBufferSize (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1817,13 +1822,13 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp)
goto finish; goto finish;
/* Translate Windows SCARD_CTL_CODE's to corresponding local code */ /* Translate Windows SCARD_CTL_CODE's to corresponding local code */
if (DEVICE_TYPE_FROM_CTL_CODE(controlCode) == FILE_DEVICE_SMARTCARD) if (DEVICE_TYPE_FROM_CTL_CODE(call.dwControlCode) == FILE_DEVICE_SMARTCARD)
{ {
controlFunction = FUNCTION_FROM_CTL_CODE(controlCode); controlFunction = FUNCTION_FROM_CTL_CODE(call.dwControlCode);
controlCode = SCARD_CTL_CODE(controlFunction); call.dwControlCode = SCARD_CTL_CODE(controlFunction);
} }
if (pvInBuffer) if (pvInBufferPointer)
{ {
/* Get the size of the linked data. */ /* Get the size of the linked data. */
if (Stream_GetRemainingLength(irp->input) < 4) if (Stream_GetRemainingLength(irp->input) < 4)
@ -1833,23 +1838,26 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp)
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
Stream_Read_UINT32(irp->input, recvLength);
Stream_Read_UINT32(irp->input, length); /* Length (4 bytes) */
/* Check, if there is actually enough data... */ /* Check, if there is actually enough data... */
if (Stream_GetRemainingLength(irp->input) < recvLength) if (Stream_GetRemainingLength(irp->input) < length)
{ {
DEBUG_WARN("length violation %d [%d]", recvLength, DEBUG_WARN("length violation %d [%d]", length,
Stream_GetRemainingLength(irp->input)); Stream_GetRemainingLength(irp->input));
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
recvBuffer = malloc(recvLength);
Stream_Read(irp->input, recvBuffer, recvLength); call.pvInBuffer = malloc(length);
call.cbInBufferSize = length;
Stream_Read(irp->input, call.pvInBuffer, length);
} }
nBytesReturned = outBufferSize; ret.cbOutBufferSize = call.cbOutBufferSize;
sendBuffer = malloc(outBufferSize); ret.pvOutBuffer = malloc(call.cbOutBufferSize);
if (!check_handle_is_forwarded(smartcard, hCard, hContext)) if (!check_handle_is_forwarded(smartcard, hCard, hContext))
{ {
@ -1858,40 +1866,40 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* smartcard, IRP* irp)
goto finish; goto finish;
} }
status = SCardControl(hCard, (DWORD) controlCode, recvBuffer, (DWORD) recvLength, status = SCardControl(hCard, (DWORD) call.dwControlCode,
sendBuffer, (DWORD) outBufferSize, &nBytesReturned); call.pvInBuffer, (DWORD) call.cbInBufferSize,
ret.pvOutBuffer, (DWORD) call.cbOutBufferSize, &ret.cbOutBufferSize);
Stream_Write_UINT32(irp->output, (UINT32) nBytesReturned); Stream_Write_UINT32(irp->output, (UINT32) ret.cbOutBufferSize); /* cbOutBufferSize (4 bytes) */
Stream_Write_UINT32(irp->output, 0x00000004); Stream_Write_UINT32(irp->output, 0x00000004); /* pvOutBufferPointer (4 bytes) */
Stream_Write_UINT32(irp->output, nBytesReturned); Stream_Write_UINT32(irp->output, ret.cbOutBufferSize); /* pvOutBufferLength (4 bytes) */
if (nBytesReturned > 0) if (ret.cbOutBufferSize > 0)
{ {
Stream_Write(irp->output, sendBuffer, nBytesReturned); Stream_Write(irp->output, ret.pvOutBuffer, ret.cbOutBufferSize); /* pvOutBuffer */
smartcard_output_repos(irp, nBytesReturned); smartcard_output_repos(irp, ret.cbOutBufferSize);
} }
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
finish: finish:
if (recvBuffer) if (call.pvInBuffer)
free(recvBuffer); free(call.pvInBuffer);
if (sendBuffer) if (ret.pvOutBuffer)
free(sendBuffer); free(ret.pvOutBuffer);
return status; return status;
} }
static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* smartcard, IRP* irp) static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* smartcard, IRP* irp)
{ {
int redirect = 0;
LONG status; LONG status;
DWORD cbAttrLen;
int redirect = 0;
SCARDHANDLE hCard; SCARDHANDLE hCard;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
DWORD dwAttrId = 0; GetAttrib_Call call;
DWORD dwAttrLen = 0; GetAttrib_Return ret;
DWORD attrLen = 0;
BYTE* pbAttr = NULL;
status = handle_CommonTypeHeader(smartcard, irp); status = handle_CommonTypeHeader(smartcard, irp);
@ -1915,9 +1923,9 @@ static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Read_UINT32(irp->input, dwAttrId); Stream_Read_UINT32(irp->input, call.dwAttrId); /* dwAttrId (4 bytes) */
Stream_Seek(irp->input, 0x4); Stream_Read_UINT32(irp->input, call.fpbAttrIsNULL); /* fpbAttrIsNULL (4 bytes) */
Stream_Read_UINT32(irp->input, dwAttrLen); Stream_Read_UINT32(irp->input, call.cbAttrLen); /* cbAttrLen (4 bytes) */
status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(smartcard, irp, redirect, &hContext, &hCard);
@ -1930,40 +1938,44 @@ static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_E_INVALID_TARGET; return SCARD_E_INVALID_TARGET;
} }
attrLen = (dwAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE; ret.pbAttr = NULL;
status = SCardGetAttrib(hCard, dwAttrId, attrLen == 0 ? NULL : (BYTE*) &pbAttr, &attrLen);
cbAttrLen = (call.cbAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE;
status = SCardGetAttrib(hCard, call.dwAttrId, (cbAttrLen == 0) ? NULL : (BYTE*) &ret.pbAttr, &cbAttrLen);
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
{ {
attrLen = (dwAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE; cbAttrLen = (call.cbAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE;
} }
if (dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_A && status == SCARD_E_UNSUPPORTED_FEATURE) if (call.dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_A && status == SCARD_E_UNSUPPORTED_FEATURE)
{ {
status = SCardGetAttrib(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_W, status = SCardGetAttrib(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_W,
attrLen == 0 ? NULL : (BYTE*) &pbAttr, &attrLen); (cbAttrLen == 0) ? NULL : (BYTE*) &ret.pbAttr, &cbAttrLen);
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
{ {
attrLen = (dwAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE; cbAttrLen = (call.cbAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE;
} }
} }
if (dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_W && status == SCARD_E_UNSUPPORTED_FEATURE) if (call.dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_W && status == SCARD_E_UNSUPPORTED_FEATURE)
{ {
status = SCardGetAttrib(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_A, status = SCardGetAttrib(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_A,
attrLen == 0 ? NULL : (BYTE*) &pbAttr, &attrLen); (cbAttrLen == 0) ? NULL : (BYTE*) &ret.pbAttr, &cbAttrLen);
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
{ {
attrLen = (dwAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE; cbAttrLen = (call.cbAttrLen == 0) ? 0 : SCARD_AUTOALLOCATE;
} }
} }
if (attrLen > dwAttrLen && pbAttr != NULL)
if ((cbAttrLen > call.cbAttrLen) && (ret.pbAttr != NULL))
{ {
status = SCARD_E_INSUFFICIENT_BUFFER; status = SCARD_E_INSUFFICIENT_BUFFER;
} }
dwAttrLen = attrLen; call.cbAttrLen = cbAttrLen;
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
{ {
@ -1972,26 +1984,25 @@ static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* smartcard, IRP* irp)
} }
else else
{ {
Stream_Write_UINT32(irp->output, dwAttrLen); ret.cbAttrLen = call.cbAttrLen;
Stream_Write_UINT32(irp->output, 0x00000200);
Stream_Write_UINT32(irp->output, dwAttrLen);
if (!pbAttr) Stream_Write_UINT32(irp->output, ret.cbAttrLen); /* cbAttrLen (4 bytes) */
{ Stream_Write_UINT32(irp->output, 0x00000200); /* pbAttrPointer (4 bytes) */
Stream_Zero(irp->output, dwAttrLen); Stream_Write_UINT32(irp->output, ret.cbAttrLen); /* pbAttrLength (4 bytes) */
}
if (!ret.pbAttr)
Stream_Zero(irp->output, ret.cbAttrLen); /* pbAttr */
else else
{ Stream_Write(irp->output, ret.pbAttr, ret.cbAttrLen); /* pbAttr */
Stream_Write(irp->output, pbAttr, dwAttrLen);
} smartcard_output_repos(irp, ret.cbAttrLen);
smartcard_output_repos(irp, dwAttrLen);
/* align to multiple of 4 */ /* align to multiple of 4 */
Stream_Write_UINT32(irp->output, 0); Stream_Write_UINT32(irp->output, 0);
} }
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
finish: finish:
SCardFreeMemory(hContext, pbAttr); SCardFreeMemory(hContext, ret.pbAttr);
return status; return status;
} }
@ -2004,7 +2015,7 @@ static UINT32 handle_AccessStartedEvent(SMARTCARD_DEVICE* smartcard, IRP* irp)
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4); /* Unused (4 bytes) */
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
@ -2090,11 +2101,6 @@ static UINT32 handle_LocateCardsByATR(SMARTCARD_DEVICE* smartcard, IRP* irp, BOO
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
/*
* TODO: on-wire is little endian; need to either
* convert to host endian or fix the headers to
* request the order we want
*/
Stream_Read_UINT32(irp->input, cur->dwCurrentState); Stream_Read_UINT32(irp->input, cur->dwCurrentState);
Stream_Read_UINT32(irp->input, cur->dwEventState); Stream_Read_UINT32(irp->input, cur->dwEventState);
Stream_Read_UINT32(irp->input, cur->cbAtr); Stream_Read_UINT32(irp->input, cur->cbAtr);

131
channels/smartcard/client/smartcard_pack.h
View File

@ -31,14 +31,14 @@
typedef struct _REDIR_SCARDCONTEXT typedef struct _REDIR_SCARDCONTEXT
{ {
/* [range] */ unsigned long cbContext; /* [range] */ DWORD cbContext;
/* [size_is][unique] */ BYTE *pbContext; /* [size_is][unique] */ BYTE *pbContext;
} REDIR_SCARDCONTEXT; } REDIR_SCARDCONTEXT;
typedef struct _REDIR_SCARDHANDLE typedef struct _REDIR_SCARDHANDLE
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cbHandle; /* [range] */ DWORD cbHandle;
/* [size_is] */ BYTE *pbHandle; /* [size_is] */ BYTE *pbHandle;
} REDIR_SCARDHANDLE; } REDIR_SCARDHANDLE;
@ -50,7 +50,7 @@ typedef struct _long_Return
typedef struct _longAndMultiString_Return typedef struct _longAndMultiString_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cBytes; /* [range] */ DWORD cBytes;
/* [size_is][unique] */ BYTE *msz; /* [size_is][unique] */ BYTE *msz;
} ListReaderGroups_Return; } ListReaderGroups_Return;
@ -89,7 +89,7 @@ typedef struct _ContextAndTwoStringW_Call
typedef struct _EstablishContext_Call typedef struct _EstablishContext_Call
{ {
unsigned long dwScope; DWORD dwScope;
} EstablishContext_Call; } EstablishContext_Call;
typedef struct _EstablishContext_Return typedef struct _EstablishContext_Return
@ -102,23 +102,23 @@ typedef struct _ListReaderGroups_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
long fmszGroupsIsNULL; long fmszGroupsIsNULL;
unsigned long cchGroups; DWORD cchGroups;
} ListReaderGroups_Call; } ListReaderGroups_Call;
typedef struct _ListReaders_Call typedef struct _ListReaders_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes; /* [range] */ DWORD cBytes;
/* [size_is][unique] */ BYTE *mszGroups; /* [size_is][unique] */ BYTE *mszGroups;
long fmszReadersIsNULL; long fmszReadersIsNULL;
unsigned long cchReaders; DWORD cchReaders;
} ListReaders_Call; } ListReaders_Call;
typedef struct _ReaderState_Common_Call typedef struct _ReaderState_Common_Call
{ {
unsigned long dwCurrentState; DWORD dwCurrentState;
unsigned long dwEventState; DWORD dwEventState;
/* [range] */ unsigned long cbAtr; /* [range] */ DWORD cbAtr;
BYTE rgbAtr[ 36 ]; BYTE rgbAtr[ 36 ];
} ReaderState_Common_Call; } ReaderState_Common_Call;
@ -136,42 +136,41 @@ typedef struct _ReaderStateW
typedef struct _ReaderState_Return typedef struct _ReaderState_Return
{ {
unsigned long dwCurrentState; DWORD dwCurrentState;
unsigned long dwEventState; DWORD dwEventState;
/* [range] */ unsigned long cbAtr; /* [range] */ DWORD cbAtr;
BYTE rgbAtr[ 36 ]; BYTE rgbAtr[ 36 ];
} ReaderState_Return; } ReaderState_Return;
typedef struct _GetStatusChangeA_Call typedef struct _GetStatusChangeA_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes; DWORD dwTimeOut;
/* [size_is] */ BYTE *mszCards; /* [range] */ DWORD cReaders;
/* [range] */ unsigned long cReaders;
/* [size_is] */ ReaderStateA *rgReaderStates; /* [size_is] */ ReaderStateA *rgReaderStates;
} GetStatusChangeA_Call; } GetStatusChangeA_Call;
typedef struct _LocateCardsA_Call typedef struct _LocateCardsA_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes; /* [range] */ DWORD cBytes;
/* [size_is] */ BYTE *mszCards; /* [size_is] */ BYTE *mszCards;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderStateA *rgReaderStates; /* [size_is] */ ReaderStateA *rgReaderStates;
} LocateCardsA_Call; } LocateCardsA_Call;
typedef struct _LocateCardsW_Call typedef struct _LocateCardsW_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cBytes; /* [range] */ DWORD cBytes;
/* [size_is] */ BYTE *mszCards; /* [size_is] */ BYTE *mszCards;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderStateW *rgReaderStates; /* [size_is] */ ReaderStateW *rgReaderStates;
} LocateCardsW_Call; } LocateCardsW_Call;
typedef struct _LocateCards_ATRMask typedef struct _LocateCards_ATRMask
{ {
/* [range] */ unsigned long cbAtr; /* [range] */ DWORD cbAtr;
BYTE rgbAtr[ 36 ]; BYTE rgbAtr[ 36 ];
BYTE rgbMask[ 36 ]; BYTE rgbMask[ 36 ];
} LocateCards_ATRMask; } LocateCards_ATRMask;
@ -179,25 +178,25 @@ typedef struct _LocateCards_ATRMask
typedef struct _LocateCardsByATRA_Call typedef struct _LocateCardsByATRA_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cAtrs; /* [range] */ DWORD cAtrs;
/* [size_is] */ LocateCards_ATRMask *rgAtrMasks; /* [size_is] */ LocateCards_ATRMask *rgAtrMasks;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderStateA *rgReaderStates; /* [size_is] */ ReaderStateA *rgReaderStates;
} LocateCardsByATRA_Call; } LocateCardsByATRA_Call;
typedef struct _LocateCardsByATRW_Call typedef struct _LocateCardsByATRW_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
/* [range] */ unsigned long cAtrs; /* [range] */ DWORD cAtrs;
/* [size_is] */ LocateCards_ATRMask *rgAtrMasks; /* [size_is] */ LocateCards_ATRMask *rgAtrMasks;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderStateW *rgReaderStates; /* [size_is] */ ReaderStateW *rgReaderStates;
} LocateCardsByATRW_Call; } LocateCardsByATRW_Call;
typedef struct _GetStatusChange_Return typedef struct _GetStatusChange_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderState_Return *rgReaderStates; /* [size_is] */ ReaderState_Return *rgReaderStates;
} LocateCards_Return; } LocateCards_Return;
@ -206,16 +205,16 @@ typedef struct _GetStatusChange_Return GetStatusChange_Return;
typedef struct _GetStatusChangeW_Call typedef struct _GetStatusChangeW_Call
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
unsigned long dwTimeOut; DWORD dwTimeOut;
/* [range] */ unsigned long cReaders; /* [range] */ DWORD cReaders;
/* [size_is] */ ReaderStateW *rgReaderStates; /* [size_is] */ ReaderStateW *rgReaderStates;
} GetStatusChangeW_Call; } GetStatusChangeW_Call;
typedef struct _Connect_Common typedef struct _Connect_Common
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
unsigned long dwShareMode; DWORD dwShareMode;
unsigned long dwPreferredProtocols; DWORD dwPreferredProtocols;
} Connect_Common; } Connect_Common;
typedef struct _ConnectA_Call typedef struct _ConnectA_Call
@ -234,42 +233,42 @@ typedef struct _Connect_Return
{ {
long ReturnCode; long ReturnCode;
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwActiveProtocol; DWORD dwActiveProtocol;
} Connect_Return; } Connect_Return;
typedef struct _Reconnect_Call typedef struct _Reconnect_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwShareMode; DWORD dwShareMode;
unsigned long dwPreferredProtocols; DWORD dwPreferredProtocols;
unsigned long dwInitialization; DWORD dwInitialization;
} Reconnect_Call; } Reconnect_Call;
typedef struct Reconnect_Return typedef struct Reconnect_Return
{ {
long ReturnCode; long ReturnCode;
unsigned long dwActiveProtocol; DWORD dwActiveProtocol;
} Reconnect_Return; } Reconnect_Return;
typedef struct _HCardAndDisposition_Call typedef struct _HCardAndDisposition_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwDisposition; DWORD dwDisposition;
} HCardAndDisposition_Call; } HCardAndDisposition_Call;
typedef struct _State_Call typedef struct _State_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
long fpbAtrIsNULL; long fpbAtrIsNULL;
unsigned long cbAtrLen; DWORD cbAtrLen;
} State_Call; } State_Call;
typedef struct _State_Return typedef struct _State_Return
{ {
long ReturnCode; long ReturnCode;
unsigned long dwState; DWORD dwState;
unsigned long dwProtocol; DWORD dwProtocol;
/* [range] */ unsigned long cbAtrLen; /* [range] */ DWORD cbAtrLen;
/* [size_is][unique] */ BYTE *rgAtr; /* [size_is][unique] */ BYTE *rgAtr;
} State_Return; } State_Return;
@ -277,25 +276,25 @@ typedef struct _Status_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
long fmszReaderNamesIsNULL; long fmszReaderNamesIsNULL;
unsigned long cchReaderLen; DWORD cchReaderLen;
unsigned long cbAtrLen; DWORD cbAtrLen;
} Status_Call; } Status_Call;
typedef struct _Status_Return typedef struct _Status_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cBytes; /* [range] */ DWORD cBytes;
/* [size_is][unique] */ BYTE *mszReaderNames; /* [size_is][unique] */ BYTE *mszReaderNames;
unsigned long dwState; DWORD dwState;
unsigned long dwProtocol; DWORD dwProtocol;
BYTE pbAtr[ 32 ]; BYTE pbAtr[ 32 ];
/* [range] */ unsigned long cbAtrLen; /* [range] */ DWORD cbAtrLen;
} Status_Return; } Status_Return;
typedef struct _SCardIO_Request typedef struct _SCardIO_Request
{ {
unsigned long dwProtocol; DWORD dwProtocol;
/* [range] */ unsigned long cbExtraBytes; /* [range] */ DWORD cbExtraBytes;
/* [size_is][unique] */ BYTE *pbExtraBytes; /* [size_is][unique] */ BYTE *pbExtraBytes;
} SCardIO_Request; } SCardIO_Request;
@ -303,18 +302,18 @@ typedef struct _Transmit_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
SCardIO_Request ioSendPci; SCardIO_Request ioSendPci;
/* [range] */ unsigned long cbSendLength; /* [range] */ DWORD cbSendLength;
/* [size_is] */ BYTE *pbSendBuffer; /* [size_is] */ BYTE *pbSendBuffer;
/* [unique] */ SCardIO_Request *pioRecvPci; /* [unique] */ SCardIO_Request *pioRecvPci;
long fpbRecvBufferIsNULL; long fpbRecvBufferIsNULL;
unsigned long cbRecvLength; DWORD cbRecvLength;
} Transmit_Call; } Transmit_Call;
typedef struct _Transmit_Return typedef struct _Transmit_Return
{ {
long ReturnCode; long ReturnCode;
/* [unique] */ SCardIO_Request *pioRecvPci; /* [unique] */ SCardIO_Request *pioRecvPci;
/* [range] */ unsigned long cbRecvLength; /* [range] */ DWORD cbRecvLength;
/* [size_is][unique] */ BYTE *pbRecvBuffer; /* [size_is][unique] */ BYTE *pbRecvBuffer;
} Transmit_Return; } Transmit_Return;
@ -326,46 +325,46 @@ typedef struct _GetTransmitCount_Call
typedef struct _GetTransmitCount_Return typedef struct _GetTransmitCount_Return
{ {
long ReturnCode; long ReturnCode;
unsigned long cTransmitCount; DWORD cTransmitCount;
} GetTransmitCount_Return; } GetTransmitCount_Return;
typedef struct _Control_Call typedef struct _Control_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwControlCode; DWORD dwControlCode;
/* [range] */ unsigned long cbInBufferSize; /* [range] */ DWORD cbInBufferSize;
/* [size_is][unique] */ BYTE *pvInBuffer; /* [size_is][unique] */ BYTE *pvInBuffer;
long fpvOutBufferIsNULL; long fpvOutBufferIsNULL;
unsigned long cbOutBufferSize; DWORD cbOutBufferSize;
} Control_Call; } Control_Call;
typedef struct _Control_Return typedef struct _Control_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cbOutBufferSize; /* [range] */ DWORD cbOutBufferSize;
/* [size_is][unique] */ BYTE *pvOutBuffer; /* [size_is][unique] */ BYTE *pvOutBuffer;
} Control_Return; } Control_Return;
typedef struct _GetAttrib_Call typedef struct _GetAttrib_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwAttrId; DWORD dwAttrId;
long fpbAttrIsNULL; long fpbAttrIsNULL;
unsigned long cbAttrLen; DWORD cbAttrLen;
} GetAttrib_Call; } GetAttrib_Call;
typedef struct _GetAttrib_Return typedef struct _GetAttrib_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cbAttrLen; /* [range] */ DWORD cbAttrLen;
/* [size_is][unique] */ BYTE *pbAttr; /* [size_is][unique] */ BYTE *pbAttr;
} GetAttrib_Return; } GetAttrib_Return;
typedef struct _SetAttrib_Call typedef struct _SetAttrib_Call
{ {
REDIR_SCARDHANDLE hCard; REDIR_SCARDHANDLE hCard;
unsigned long dwAttrId; DWORD dwAttrId;
/* [range] */ unsigned long cbAttrLen; /* [range] */ DWORD cbAttrLen;
/* [size_is] */ BYTE *pbAttr; /* [size_is] */ BYTE *pbAttr;
} SetAttrib_Call; } SetAttrib_Call;
@ -373,9 +372,9 @@ typedef struct _ReadCache_Common
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
UUID *CardIdentifier; UUID *CardIdentifier;
unsigned long FreshnessCounter; DWORD FreshnessCounter;
long fPbDataIsNULL; long fPbDataIsNULL;
unsigned long cbDataLen; DWORD cbDataLen;
} ReadCache_Common; } ReadCache_Common;
typedef struct _ReadCacheA_Call typedef struct _ReadCacheA_Call
@ -393,7 +392,7 @@ typedef struct _ReadCacheW_Call
typedef struct _ReadCache_Return typedef struct _ReadCache_Return
{ {
long ReturnCode; long ReturnCode;
/* [range] */ unsigned long cbDataLen; /* [range] */ DWORD cbDataLen;
/* [size_is][unique] */ BYTE *pbData; /* [size_is][unique] */ BYTE *pbData;
} ReadCache_Return; } ReadCache_Return;
@ -401,8 +400,8 @@ typedef struct _WriteCache_Common
{ {
REDIR_SCARDCONTEXT Context; REDIR_SCARDCONTEXT Context;
UUID *CardIdentifier; UUID *CardIdentifier;
unsigned long FreshnessCounter; DWORD FreshnessCounter;
/* [range] */ unsigned long cbDataLen; /* [range] */ DWORD cbDataLen;
/* [size_is][unique] */ BYTE *pbData; /* [size_is][unique] */ BYTE *pbData;
} WriteCache_Common; } WriteCache_Common;