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

channels/smartcard: code style cleanup

Browse Source
This commit is contained in:
Marc-André Moreau 2013-10-24 15:34:14 -04:00
parent 1ffb3f40b0
commit f9ef874fec
2 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/smartcard/client/smartcard_main.h
View File

@ -112,8 +112,8 @@ struct _SMARTCARD_DEVICE
HANDLE irpEvent; HANDLE irpEvent;
HANDLE stopEvent; HANDLE stopEvent;
LIST* CompletionIds; LIST* CompletionIds;
HANDLE CompletionIdsMutex; HANDLE CompletionIdsMutex;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
SCARDHANDLE hCard; SCARDHANDLE hCard;

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

@ -166,7 +166,7 @@ static char *ioctl_to_string(DWORD code)
break; break;
} }
memset(res, 0, sizeof(res)); ZeroMemory(res, sizeof(res));
strncpy(res, rc, strlen(rc)); strncpy(res, rc, strlen(rc));
return res; return res;
} }
@ -295,6 +295,7 @@ static UINT32 handle_CardHandle(SMARTCARD_DEVICE* scard, IRP* irp, int *redirect
assert(redirect); assert(redirect);
status = handle_Context(scard, irp, redirect); status = handle_Context(scard, irp, redirect);
if (status) if (status)
return status; return status;
@ -357,7 +358,7 @@ static UINT32 handle_RedirContextRef(SMARTCARD_DEVICE* scard, IRP* irp,
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
memset(hContext, 0, sizeof(SCARDCONTEXT)); ZeroMemory(hContext, sizeof(SCARDCONTEXT));
Stream_Read(irp->input, hContext, len); Stream_Read(irp->input, hContext, len);
DEBUG_SCARD("hContext=%p", *hContext); DEBUG_SCARD("hContext=%p", *hContext);
@ -371,6 +372,7 @@ static UINT32 handle_RedirHandleRef(SMARTCARD_DEVICE* scard, IRP* irp,
UINT32 len, status; UINT32 len, status;
status = handle_RedirContextRef(scard, irp, redirect, hContext); status = handle_RedirContextRef(scard, irp, redirect, hContext);
if (status) if (status)
return status; return status;
@ -403,7 +405,7 @@ static UINT32 handle_RedirHandleRef(SMARTCARD_DEVICE* scard, IRP* irp,
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
memset(hHandle, 0, sizeof(SCARDHANDLE)); ZeroMemory(hHandle, sizeof(SCARDHANDLE));
Stream_Read_UINT32(irp->input, *hHandle); Stream_Read_UINT32(irp->input, *hHandle);
DEBUG_SCARD("hCard=%p", *hHandle); DEBUG_SCARD("hCard=%p", *hHandle);
@ -482,6 +484,7 @@ static BOOL check_handle_is_forwarded(SMARTCARD_DEVICE *scard,
#endif #endif
status = SCardStatus(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen); status = SCardStatus(hCard, (LPSTR) &readerName, &readerLen, &state, &protocol, pbAtr, &atrLen);
if (status == SCARD_S_SUCCESS) if (status == SCARD_S_SUCCESS)
{ {
rc = check_reader_is_forwarded(scard, readerName); rc = check_reader_is_forwarded(scard, readerName);
@ -689,10 +692,12 @@ static UINT32 handle_EstablishContext(SMARTCARD_DEVICE* scard, IRP* irp)
SCARDCONTEXT hContext = -1; SCARDCONTEXT hContext = -1;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
@ -729,23 +734,27 @@ static UINT32 handle_ReleaseContext(SMARTCARD_DEVICE* scard, IRP* irp)
SCARDCONTEXT hContext = -1; SCARDCONTEXT hContext = -1;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
return status; return status;
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
return status; return status;
status = SCardReleaseContext(hContext); status = SCardReleaseContext(hContext);
memset(&scard->hContext, 0, sizeof(scard->hContext)); ZeroMemory(&scard->hContext, sizeof(scard->hContext));
if (status) if (status)
DEBUG_SCARD("%s (0x%08x)", pcsc_stringify_error(status), (unsigned) status); DEBUG_SCARD("%s (0x%08x)", pcsc_stringify_error(status), (unsigned) status);
@ -764,18 +773,22 @@ static UINT32 handle_IsValidContext(SMARTCARD_DEVICE* scard, IRP* irp)
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
return status; return status;
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
return status; return status;
@ -806,14 +819,17 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wide)
int pos, poslen1, poslen2, allowed_pos; int pos, poslen1, poslen2, allowed_pos;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -959,14 +975,17 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wid
SCARD_READERSTATE *readerStates = NULL, *cur; SCARD_READERSTATE *readerStates = NULL, *cur;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -987,6 +1006,7 @@ static UINT32 handle_GetStatusChange(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wid
/* Get context */ /* Get context */
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
goto finish; goto finish;
@ -1139,18 +1159,22 @@ static UINT32 handle_Cancel(SMARTCARD_DEVICE *scard, IRP* irp)
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
return status; return status;
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
return status; return status;
@ -1178,10 +1202,12 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wide)
SCARDHANDLE hCard; SCARDHANDLE hCard;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
@ -1197,6 +1223,7 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wide)
/* Read common data */ /* Read common data */
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -1212,10 +1239,12 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wide)
Stream_Read_UINT32(irp->input, dwPreferredProtocol); Stream_Read_UINT32(irp->input, dwPreferredProtocol);
status = smartcard_input_reader_name(irp, &readerName, wide); status = smartcard_input_reader_name(irp, &readerName, wide);
if (status) if (status)
goto finish; goto finish;
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
goto finish; goto finish;
@ -1237,6 +1266,7 @@ static UINT32 handle_Connect(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wide)
DEBUG_WARN("Failure: %s 0x%08x", pcsc_stringify_error(status), (unsigned) status); DEBUG_WARN("Failure: %s 0x%08x", pcsc_stringify_error(status), (unsigned) status);
else else
DEBUG_SCARD("Success 0x%08x", (unsigned) hCard); DEBUG_SCARD("Success 0x%08x", (unsigned) hCard);
scard->hCard = hCard; scard->hCard = hCard;
Stream_Write_UINT32(irp->output, 0x00000000); Stream_Write_UINT32(irp->output, 0x00000000);
@ -1268,14 +1298,17 @@ static UINT32 handle_Reconnect(SMARTCARD_DEVICE* scard, IRP* irp)
DWORD dwActiveProtocol = 0; DWORD dwActiveProtocol = 0;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -1327,14 +1360,17 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* scard, IRP* irp)
DWORD dwDisposition = 0; DWORD dwDisposition = 0;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -1348,6 +1384,7 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Read_UINT32(irp->input, dwDisposition); Stream_Read_UINT32(irp->input, dwDisposition);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
return status; return status;
@ -1366,7 +1403,8 @@ static UINT32 handle_Disconnect(SMARTCARD_DEVICE* scard, IRP* irp)
DEBUG_SCARD("Failure: %s (0x%08x)", pcsc_stringify_error(status), (unsigned) status); DEBUG_SCARD("Failure: %s (0x%08x)", pcsc_stringify_error(status), (unsigned) status);
else else
DEBUG_SCARD("Success"); DEBUG_SCARD("Success");
memset(&scard->hCard, 0, sizeof(scard->hCard));
ZeroMemory(&scard->hCard, sizeof(scard->hCard));
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
@ -1381,14 +1419,17 @@ static UINT32 handle_BeginTransaction(SMARTCARD_DEVICE* scard, IRP* irp)
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -1401,6 +1442,7 @@ static UINT32 handle_BeginTransaction(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
return status; return status;
@ -1431,14 +1473,17 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* scard, IRP* irp)
DWORD dwDisposition = 0; DWORD dwDisposition = 0;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -1451,6 +1496,7 @@ static UINT32 handle_EndTransaction(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Read_UINT32(irp->input, dwDisposition); Stream_Read_UINT32(irp->input, dwDisposition);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
return status; return status;
@ -1489,14 +1535,17 @@ static UINT32 handle_State(SMARTCARD_DEVICE* scard, IRP* irp)
#endif #endif
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -1512,6 +1561,7 @@ static UINT32 handle_State(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Seek_UINT32(irp->input); /* atrLen */ Stream_Seek_UINT32(irp->input); /* atrLen */
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
goto finish; goto finish;
@ -1594,14 +1644,17 @@ static DWORD handle_Status(SMARTCARD_DEVICE *scard, IRP* irp, BOOL wide)
#endif #endif
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -1612,11 +1665,13 @@ static DWORD handle_Status(SMARTCARD_DEVICE *scard, 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(irp->input, 4);
Stream_Read_UINT32(irp->input, readerLen); Stream_Read_UINT32(irp->input, readerLen);
Stream_Read_UINT32(irp->input, atrLen); Stream_Read_UINT32(irp->input, atrLen);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
goto finish; goto finish;
@ -1729,14 +1784,17 @@ static UINT32 handle_Transmit(SMARTCARD_DEVICE* scard, IRP* irp)
ioRecvPci.v = NULL; ioRecvPci.v = NULL;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -1967,14 +2025,17 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* scard, IRP* irp)
DWORD outBufferSize; DWORD outBufferSize;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
goto finish; goto finish;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
goto finish; goto finish;
@ -1993,6 +2054,7 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Read_UINT32(irp->input, outBufferSize); Stream_Read_UINT32(irp->input, outBufferSize);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
goto finish; goto finish;
@ -2002,6 +2064,7 @@ static UINT32 handle_Control(SMARTCARD_DEVICE* scard, IRP* irp)
controlFunction = WIN_CTL_FUNCTION(controlCode); controlFunction = WIN_CTL_FUNCTION(controlCode);
controlCode = SCARD_CTL_CODE(controlFunction); controlCode = SCARD_CTL_CODE(controlFunction);
} }
DEBUG_SCARD("controlCode: 0x%08x", (unsigned) controlCode); DEBUG_SCARD("controlCode: 0x%08x", (unsigned) controlCode);
if (pvInBuffer) if (pvInBuffer)
@ -2080,14 +2143,17 @@ static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* scard, IRP* irp)
BYTE* pbAttr = NULL; BYTE* pbAttr = NULL;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_CardHandle(scard, irp, &redirect); status = handle_CardHandle(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -2103,6 +2169,7 @@ static UINT32 handle_GetAttrib(SMARTCARD_DEVICE* scard, IRP* irp)
Stream_Read_UINT32(irp->input, dwAttrLen); Stream_Read_UINT32(irp->input, dwAttrLen);
status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard); status = handle_RedirHandleRef(scard, irp, redirect, &hContext, &hCard);
if (status) if (status)
return status; return status;
@ -2213,14 +2280,13 @@ finish:
} }
static UINT32 handle_AccessStartedEvent(SMARTCARD_DEVICE* scard, IRP* irp) static UINT32 handle_AccessStartedEvent(SMARTCARD_DEVICE* scard, IRP* irp)
{ {
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));
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
@ -2262,14 +2328,17 @@ static UINT32 handle_LocateCardsByATR(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wi
SERVER_SCARD_ATRMASK* pAtrMasks = NULL; SERVER_SCARD_ATRMASK* pAtrMasks = NULL;
status = handle_CommonTypeHeader(scard, irp); status = handle_CommonTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_PrivateTypeHeader(scard, irp); status = handle_PrivateTypeHeader(scard, irp);
if (status) if (status)
return status; return status;
status = handle_Context(scard, irp, &redirect); status = handle_Context(scard, irp, &redirect);
if (status) if (status)
return status; return status;
@ -2282,6 +2351,7 @@ static UINT32 handle_LocateCardsByATR(SMARTCARD_DEVICE* scard, IRP* irp, BOOL wi
Stream_Seek(irp->input, 4); Stream_Seek(irp->input, 4);
status = handle_RedirContextRef(scard, irp, redirect, &hContext); status = handle_RedirContextRef(scard, irp, redirect, &hContext);
if (status) if (status)
return status; return status;