morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[channel,smartcard] fix logging issues

Browse Source
This commit is contained in:
Armin Novak
2026-02-20 12:04:45 +01:00
parent 43f30eb03c
commit 042d0dfd77
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/smartcard/client/smartcard_main.c
View File

@@ -74,7 +74,6 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg)
{
SMARTCARD_CONTEXT* pContext = (SMARTCARD_CONTEXT*)arg;
DWORD nCount = 0;
LONG status = 0;
DWORD waitStatus = 0;
HANDLE hEvents[2] = { 0 };
wMessage message = { 0 };
@@ -111,7 +110,7 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg)
if (!MessageQueue_Peek(pContext->IrpQueue, &message, TRUE))
{
WLog_ERR(TAG, "MessageQueue_Peek failed!");
status = ERROR_INTERNAL_ERROR;
error = ERROR_INTERNAL_ERROR;
break;
}
@@ -125,14 +124,17 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg)
BOOL handled = FALSE;
WINPR_ASSERT(smartcard);
if ((status = smartcard_irp_device_control_call(
smartcard->callctx, element->irp->output, &element->irp->IoStatus,
&element->operation)))
const LONG status =
smartcard_irp_device_control_call(smartcard->callctx, element->irp->output,
&element->irp->IoStatus, &element->operation);
if (status)
{
element->irp->Discard(element->irp);
smartcard_operation_free(&element->operation, TRUE);
WLog_ERR(TAG, "smartcard_irp_device_control_call failed with error %" PRId32 "",
status);
WLog_ERR(TAG,
"smartcard_irp_device_control_call failed with error %s [%" PRId32 "]",
NtStatus2Tag(status), status);
error = (UINT)status;
break;
}
@@ -143,17 +145,18 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg)
if (error)
{
WLog_ERR(TAG, "Queue_Enqueue failed!");
WLog_ERR(TAG, "smartcard_complete_irp failed with %s [%" PRIu32 "]",
WTSErrorToString(error), error);
break;
}
}
}
}
if (status && smartcard->rdpcontext)
if (error && smartcard->rdpcontext)
setChannelError(smartcard->rdpcontext, error, "smartcard_context_thread reported an error");
ExitThread((uint32_t)status);
ExitThread(error);
return error;
}

2
libfreerdp/utils/smartcard_call.c
View File

@@ -120,7 +120,7 @@ static LONG smartcard_EstablishContext_Call(scard_call_context* smartcard, wStre
if (!HashTable_Insert(smartcard->rgSCardContextList, key, (void*)pContext))
{
WLog_Print(smartcard->log, WLOG_ERROR, "ListDictionary_Add failed!");
WLog_Print(smartcard->log, WLOG_ERROR, "HashTable_Insert failed!");
context_free(pContext);
return STATUS_INTERNAL_ERROR;
}