Merge pull request FreeRDP#11636 from akallabeth/scard

[utils,smartcard] better logging and error checks

Author: akallabeth

include/freerdp/utils/rdpdr_utils.h

@@ -51,6 +51,17 @@ extern "C"
 	FREERDP_API const char* rdpdr_cap_type_string(UINT16 capability);
 
 	FREERDP_API LONG scard_log_status_error(const char* tag, const char* what, LONG status);
+
+	/** @brief log a smartcard related issue with a wLog
+	 *
+	 *  @param log The logger to use
+	 *  @param what The module affected
+	 *  @param status The status to log
+	 *
+	 *  @return The \ref status logged
+	 *  @since version 3.16.0
+	 */
+	FREERDP_API LONG scard_log_status_error_wlog(wLog* log, const char* what, LONG status);
 	FREERDP_API const char* scard_get_ioctl_string(UINT32 ioControlCode, BOOL funcName);
 
 	FREERDP_API BOOL rdpdr_write_iocompletion_header(wStream* out, UINT32 DeviceId,

libfreerdp/utils/CMakeLists.txt

@@ -32,6 +32,7 @@ set(${MODULE_PREFIX}_SRCS
     gfx.c
     drdynvc.c
     smartcard_operations.c
+    smartcard_pack.h
     smartcard_pack.c
     smartcard_call.c
     stopwatch.c

libfreerdp/utils/rdpdr_utils.c

@@ -29,6 +29,12 @@
 #include <freerdp/log.h>
 
 LONG scard_log_status_error(const char* tag, const char* what, LONG status)
+{
+	wLog* log = WLog_Get(tag);
+	return scard_log_status_error_wlog(log, what, status);
+}
+
+LONG scard_log_status_error_wlog(wLog* log, const char* what, LONG status)
 {
 	if (status != SCARD_S_SUCCESS)
 	{
@@ -44,7 +50,7 @@ LONG scard_log_status_error(const char* tag, const char* what, LONG status)
 			default:
 				break;
 		}
-		WLog_Print(WLog_Get(tag), level, "%s failed with error %s [%" PRId32 "]", what,
+		WLog_Print(log, level, "%s failed with error %s [%" PRId32 "]", what,
 		           SCardGetErrorString(status), status);
 	}
 	return status;