[logging] remove __FUNCTION__ from actual message

prefer the log formatter to provide that information.
This commit is contained in:
Armin Novak 2023-01-23 12:03:18 +01:00 committed by akallabeth
parent f4ee5226b0
commit 641022b795
107 changed files with 736 additions and 820 deletions
channels
ainput
audin/client/opensles
cliprdr
disp/client
drdynvc/client
rail/client
rdpdr
rdpgfx
rdpsnd/client
urbdrc/client
client
include/freerdp/server/proxy
libfreerdp
server
tools
winpr/libwinpr

View File

@ -110,8 +110,8 @@ static UINT ainput_send_input_event(AInputClientContext* context, UINT64 flags,
{
char ebuffer[128] = { 0 };
WLog_VRB(TAG, "[%s] sending timestamp=0x%08" PRIx64 ", flags=%s, %" PRId32 "x%" PRId32,
__FUNCTION__, time, ainput_flags_to_string(flags, ebuffer, sizeof(ebuffer)), x, y);
WLog_VRB(TAG, "sending timestamp=0x%08" PRIx64 ", flags=%s, %" PRId32 "x%" PRId32, time,
ainput_flags_to_string(flags, ebuffer, sizeof(ebuffer)), x, y);
}
/* Message type */

View File

@ -205,8 +205,8 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s)
Stream_Read_INT32(s, x);
Stream_Read_INT32(s, y);
WLog_VRB(TAG, "[%s] received: time=0x%08" PRIx64 ", flags=%s, %" PRId32 "x%" PRId32,
__FUNCTION__, time, ainput_flags_to_string(flags, buffer, sizeof(buffer)), x, y);
WLog_VRB(TAG, "received: time=0x%08" PRIx64 ", flags=%s, %" PRId32 "x%" PRId32, time,
ainput_flags_to_string(flags, buffer, sizeof(buffer)), x, y);
IFCALLRET(ainput->context.MouseEvent, error, &ainput->context, time, flags, x, y);
return error;

View File

@ -67,7 +67,7 @@ static void audin_receive(void* context, const void* data, size_t size)
if (!opensles || !data)
{
WLog_ERR(TAG, "[%s] Invalid arguments context=%p, data=%p", __FUNCTION__, opensles, data);
WLog_ERR(TAG, "Invalid arguments context=%p, data=%p", opensles, data);
return;
}

View File

@ -176,7 +176,7 @@ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream*
Stream_Read_UINT32(s, version); /* version (4 bytes) */
Stream_Read_UINT32(s, generalFlags); /* generalFlags (4 bytes) */
WLog_DBG(TAG, "[%s] Version: %" PRIu32 "", __FUNCTION__, version);
WLog_DBG(TAG, "Version: %" PRIu32 "", version);
cliprdr_print_general_capability_flags(generalFlags);

View File

@ -43,14 +43,14 @@ static BOOL cliprdr_validate_file_contents_request(const CLIPRDR_FILE_CONTENTS_R
{
if (request->cbRequested != sizeof(UINT64))
{
WLog_ERR(TAG, "[%s]: cbRequested must be %" PRIu32 ", got %" PRIu32 "", __FUNCTION__,
sizeof(UINT64), request->cbRequested);
WLog_ERR(TAG, "cbRequested must be %" PRIu32 ", got %" PRIu32 "", sizeof(UINT64),
request->cbRequested);
return FALSE;
}
if (request->nPositionHigh != 0 || request->nPositionLow != 0)
{
WLog_ERR(TAG, "[%s]: nPositionHigh and nPositionLow must be set to 0", __FUNCTION__);
WLog_ERR(TAG, "nPositionHigh and nPositionLow must be set to 0");
return FALSE;
}
}
@ -193,8 +193,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
UINT32 length;
if (formatList->common.msgType != CB_FORMAT_LIST)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
formatList->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, formatList->common.msgType);
if (!useLongFormatNames)
{

View File

@ -128,8 +128,7 @@ static UINT cliprdr_server_capabilities(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (capabilities->common.msgType != CB_CLIP_CAPS)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
capabilities->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, capabilities->common.msgType);
if (capabilities->cCapabilitiesSets > UINT16_MAX)
{
@ -174,7 +173,7 @@ static UINT cliprdr_server_capabilities(CliprdrServerContext* context,
WLog_WARN(TAG, "Unknown capability set type %08" PRIx16, cap->capabilitySetType);
if (!Stream_SafeSeek(s, cap->capabilitySetLength))
{
WLog_ERR(TAG, "%s: short stream", __FUNCTION__);
WLog_ERR(TAG, "short stream");
return ERROR_NO_DATA;
}
break;
@ -201,8 +200,7 @@ static UINT cliprdr_server_monitor_ready(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (monitorReady->common.msgType != CB_MONITOR_READY)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
monitorReady->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, monitorReady->common.msgType);
s = cliprdr_packet_new(CB_MONITOR_READY, monitorReady->common.msgFlags,
monitorReady->common.dataLen);
@ -261,8 +259,7 @@ cliprdr_server_format_list_response(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (formatListResponse->common.msgType != CB_FORMAT_LIST_RESPONSE)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
formatListResponse->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, formatListResponse->common.msgType);
s = cliprdr_packet_new(CB_FORMAT_LIST_RESPONSE, formatListResponse->common.msgFlags,
formatListResponse->common.dataLen);
@ -293,8 +290,7 @@ static UINT cliprdr_server_lock_clipboard_data(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (lockClipboardData->common.msgType != CB_LOCK_CLIPDATA)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
lockClipboardData->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, lockClipboardData->common.msgType);
s = cliprdr_packet_lock_clipdata_new(lockClipboardData);
if (!s)
@ -325,8 +321,7 @@ cliprdr_server_unlock_clipboard_data(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (unlockClipboardData->common.msgType != CB_UNLOCK_CLIPDATA)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
unlockClipboardData->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, unlockClipboardData->common.msgType);
s = cliprdr_packet_unlock_clipdata_new(unlockClipboardData);
@ -357,8 +352,7 @@ static UINT cliprdr_server_format_data_request(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (formatDataRequest->common.msgType != CB_FORMAT_DATA_REQUEST)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
formatDataRequest->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, formatDataRequest->common.msgType);
s = cliprdr_packet_new(CB_FORMAT_DATA_REQUEST, formatDataRequest->common.msgFlags,
formatDataRequest->common.dataLen);
@ -392,8 +386,7 @@ cliprdr_server_format_data_response(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (formatDataResponse->common.msgType != CB_FORMAT_DATA_RESPONSE)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
formatDataResponse->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, formatDataResponse->common.msgType);
s = cliprdr_packet_new(CB_FORMAT_DATA_RESPONSE, formatDataResponse->common.msgFlags,
formatDataResponse->common.dataLen);
@ -427,8 +420,7 @@ cliprdr_server_file_contents_request(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (fileContentsRequest->common.msgType != CB_FILECONTENTS_REQUEST)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
fileContentsRequest->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, fileContentsRequest->common.msgType);
s = cliprdr_packet_file_contents_request_new(fileContentsRequest);
if (!s)
@ -460,8 +452,7 @@ cliprdr_server_file_contents_response(CliprdrServerContext* context,
cliprdr = (CliprdrServerPrivate*)context->handle;
if (fileContentsResponse->common.msgType != CB_FILECONTENTS_RESPONSE)
WLog_WARN(TAG, "[%s] called with invalid type %08" PRIx32, __FUNCTION__,
fileContentsResponse->common.msgType);
WLog_WARN(TAG, "called with invalid type %08" PRIx32, fileContentsResponse->common.msgType);
s = cliprdr_packet_file_contents_response_new(fileContentsResponse);
if (!s)

View File

@ -97,7 +97,7 @@ disp_send_display_control_monitor_layout_pdu(GENERIC_CHANNEL_CALLBACK* callback,
Stream_Write_UINT32(s, MonitorLayoutSize); /* MonitorLayoutSize (4 bytes) */
Stream_Write_UINT32(s, NumMonitors); /* NumMonitors (4 bytes) */
WLog_DBG(TAG, "%s: NumMonitors=%" PRIu32 "", __FUNCTION__, NumMonitors);
WLog_DBG(TAG, "NumMonitors=%" PRIu32 "", NumMonitors);
for (index = 0; index < NumMonitors; index++)
{

View File

@ -428,8 +428,8 @@ static void check_open_close_receive(DVCMAN_CHANNEL* channel)
if (cb->OnOpen || cb->OnClose)
{
if (!cb->OnOpen || !cb->OnClose)
WLog_WARN(TAG, "[%s] {%s:%" PRIu32 "} OnOpen=%p, OnClose=%p", __FUNCTION__, name, id,
cb->OnOpen, cb->OnClose);
WLog_WARN(TAG, "{%s:%" PRIu32 "} OnOpen=%p, OnClose=%p", name, id, cb->OnOpen,
cb->OnClose);
}
}

View File

@ -429,7 +429,7 @@ BOOL rail_is_feature_supported(const rdpContext* context, UINT32 featureMask)
char mask[256] = { 0 };
char actual[256] = { 0 };
WLog_WARN(TAG, "[%s] have %s, require %s", __func__,
WLog_WARN(TAG, "have %s, require %s",
freerdp_rail_support_flags_to_string(supported, actual, sizeof(actual)),
freerdp_rail_support_flags_to_string(featureMask, mask, sizeof(mask)));
return FALSE;

View File

@ -131,13 +131,13 @@ DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id)
if (!devman)
{
WLog_ERR(TAG, "[%s] device manager=%p", __FUNCTION__, devman);
WLog_ERR(TAG, "device manager=%p", devman);
return NULL;
}
device = (DEVICE*)ListDictionary_GetItemValue(devman->devices, key);
if (!device)
WLog_WARN(TAG, "[%s] could not find device ID 0x%08" PRIx32, __FUNCTION__, id);
WLog_WARN(TAG, "could not find device ID 0x%08" PRIx32, id);
return device;
}

View File

@ -988,7 +988,7 @@ static DWORD WINAPI drive_hotplug_thread_func(LPVOID arg)
out:
error = GetLastError();
if (error && rdpdr->rdpcontext)
setChannelError(rdpdr->rdpcontext, error, "%s reported an error", __FUNCTION__);
setChannelError(rdpdr->rdpcontext, error, "reported an error");
if (rdpdr->stopEvent)
{

View File

@ -818,8 +818,7 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if ((status = rdpdr_read_capset_header(context->priv->log, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!", status);
return status;
}
@ -835,8 +834,8 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if ((status =
rdpdr_server_read_general_capability_set(context, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!",
status);
return status;
}
@ -846,8 +845,8 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if ((status =
rdpdr_server_read_printer_capability_set(context, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!",
status);
return status;
}
@ -856,8 +855,8 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
case CAP_PORT_TYPE:
if ((status = rdpdr_server_read_port_capability_set(context, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!",
status);
return status;
}
@ -867,8 +866,8 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if ((status =
rdpdr_server_read_drive_capability_set(context, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!",
status);
return status;
}
@ -878,8 +877,8 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if ((status =
rdpdr_server_read_smartcard_capability_set(context, s, &capabilityHeader)))
{
WLog_Print(context->priv->log, WLOG_ERROR, "%s failed with error %" PRIu32 "!",
__FUNCTION__, status);
WLog_Print(context->priv->log, WLOG_ERROR, "failed with error %" PRIu32 "!",
status);
return status;
}
@ -898,7 +897,7 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co
if (((caps & mask) != 0) && ((context->supported & mask) == 0))
{
WLog_Print(context->priv->log, WLOG_WARN,
"[%s] client sent capability %s we did not announce!", __FUNCTION__,
"client sent capability %s we did not announce!",
freerdp_rdpdr_dtyp_string(mask));
}

View File

@ -2291,8 +2291,8 @@ static UINT rdpgfx_set_cache_slot_data(RdpgfxClientContext* context, UINT16 cach
/* Microsoft uses 1-based indexing for the egfx bitmap cache ! */
if (cacheSlot == 0 || cacheSlot > gfx->MaxCacheSlots)
{
WLog_ERR(TAG, "%s: invalid cache slot %" PRIu16 ", must be between 1 and %" PRIu16 "",
__FUNCTION__, cacheSlot, gfx->MaxCacheSlots);
WLog_ERR(TAG, "invalid cache slot %" PRIu16 ", must be between 1 and %" PRIu16 "",
cacheSlot, gfx->MaxCacheSlots);
return ERROR_INVALID_INDEX;
}
@ -2309,8 +2309,8 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac
/* Microsoft uses 1-based indexing for the egfx bitmap cache ! */
if (cacheSlot == 0 || cacheSlot > gfx->MaxCacheSlots)
{
WLog_ERR(TAG, "%s: invalid cache slot %" PRIu16 ", must be between 1 and %" PRIu16 "",
__FUNCTION__, cacheSlot, gfx->MaxCacheSlots);
WLog_ERR(TAG, "invalid cache slot %" PRIu16 ", must be between 1 and %" PRIu16 "",
cacheSlot, gfx->MaxCacheSlots);
return NULL;
}

View File

@ -216,8 +216,8 @@ static UINT rdpgfx_send_caps_confirm_pdu(RdpgfxServerContext* context,
return CHANNEL_RC_NO_MEMORY;
}
WLog_DBG(TAG, "[%s] CAPS version=0x%04" PRIx32 ", flags=0x%04" PRIx32 ", length=%" PRIu32,
__FUNCTION__, capsSet->version, capsSet->flags, capsSet->length);
WLog_DBG(TAG, "CAPS version=0x%04" PRIx32 ", flags=0x%04" PRIx32 ", length=%" PRIu32,
capsSet->version, capsSet->flags, capsSet->length);
Stream_Write_UINT32(s, capsSet->version); /* version (4 bytes) */
Stream_Write_UINT32(s, capsSet->length); /* capsDataLength (4 bytes) */

View File

@ -514,7 +514,7 @@ static void rdpsnd_set_volume_success_cb(pa_context* c, int success, void* userd
return;
WINPR_ASSERT(c);
WLog_INFO(TAG, "%s: %d", __FUNCTION__, success);
WLog_INFO(TAG, "%d", success);
}
static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value)

View File

@ -1514,8 +1514,8 @@ static VOID VCAPITYPE rdpsnd_virtual_channel_init_event_ex(LPVOID lpUserParam, L
if (error && plugin && plugin->rdpcontext)
{
char buffer[8192];
_snprintf(buffer, sizeof(buffer), "%s %s reported an error",
rdpsnd_is_dyn_str(plugin->dynamic), __FUNCTION__);
_snprintf(buffer, sizeof(buffer), "%s reported an error",
rdpsnd_is_dyn_str(plugin->dynamic));
setChannelError(plugin->rdpcontext, error, buffer);
}
}

View File

@ -542,8 +542,7 @@ static UINT urbdrc_process_channel_notification(GENERIC_CHANNEL_CALLBACK* callba
break;
default:
WLog_Print(urbdrc->log, WLOG_TRACE, "%s: unknown FunctionId 0x%" PRIX32 "",
__FUNCTION__, FunctionId);
WLog_Print(urbdrc->log, WLOG_TRACE, "unknown FunctionId 0x%" PRIX32 "", FunctionId);
error = 1;
break;
}

View File

@ -66,7 +66,7 @@ static void android_OnChannelConnectedEventHandler(void* context,
if (!context || !e)
{
WLog_FATAL(TAG, "%s(context=%p, EventArgs=%p", __FUNCTION__, context, (void*)e);
WLog_FATAL(TAG, "(context=%p, EventArgs=%p", context, (void*)e);
return;
}
@ -89,7 +89,7 @@ static void android_OnChannelDisconnectedEventHandler(void* context,
if (!context || !e)
{
WLog_FATAL(TAG, "%s(context=%p, EventArgs=%p", __FUNCTION__, context, (void*)e);
WLog_FATAL(TAG, "(context=%p, EventArgs=%p", context, (void*)e);
return;
}
@ -734,8 +734,7 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_free
if (!inst || !inst->context)
{
WLog_FATAL(TAG, "%s(env=%p, cls=%p, instance=%d", __FUNCTION__, (void*)env, (void*)cls,
instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}
@ -758,8 +757,7 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_free
if (!inst || !inst->context || !cls || !env)
{
WLog_FATAL(TAG, "%s(env=%p, cls=%p, instance=%d", __FUNCTION__, (void*)env, (void*)cls,
instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}
@ -798,8 +796,7 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(JNIEn
if (!env || !cls || !inst)
{
WLog_FATAL(TAG, "%s(env=%p, cls=%p, instance=%d", __FUNCTION__, (void*)env, (void*)cls,
instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}

View File

@ -896,7 +896,7 @@ static int WINAPI sdl_client_thread_proc(LPVOID arg)
if (nCount == 0)
{
WLog_Print(sdl->log, WLOG_ERROR, "%s: freerdp_get_event_handles failed", __FUNCTION__);
WLog_Print(sdl->log, WLOG_ERROR, "freerdp_get_event_handles failed");
break;
}
@ -917,8 +917,7 @@ static int WINAPI sdl_client_thread_proc(LPVOID arg)
}
if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_SUCCESS)
WLog_Print(sdl->log, WLOG_ERROR,
"%s: WaitForMultipleObjects failed with %" PRIu32 "", __FUNCTION__,
WLog_Print(sdl->log, WLOG_ERROR, "WaitForMultipleObjects failed with %" PRIu32 "",
status);
break;
}

View File

@ -255,7 +255,7 @@ static DWORD WINAPI tf_client_thread_proc(LPVOID arg)
if (nCount == 0)
{
WLog_ERR(TAG, "%s: freerdp_get_event_handles failed", __FUNCTION__);
WLog_ERR(TAG, "freerdp_get_event_handles failed");
break;
}
@ -263,8 +263,7 @@ static DWORD WINAPI tf_client_thread_proc(LPVOID arg)
if (status == WAIT_FAILED)
{
WLog_ERR(TAG, "%s: WaitForMultipleObjects failed with %" PRIu32 "", __FUNCTION__,
status);
WLog_ERR(TAG, "WaitForMultipleObjects failed with %" PRIu32 "", status);
break;
}

View File

@ -143,7 +143,7 @@ static BOOL wlf_Pointer_SetDefault(rdpContext* context)
static BOOL wlf_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
{
// TODO
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return TRUE;
}

View File

@ -504,7 +504,7 @@ static int wlfreerdp_run(freerdp* instance)
if (WAIT_FAILED == status)
{
WLog_Print(context->log, WLOG_ERROR, "%s: WaitForMultipleObjects failed", __FUNCTION__);
WLog_Print(context->log, WLOG_ERROR, "WaitForMultipleObjects failed");
break;
}

View File

@ -289,19 +289,19 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt
{
if (!xfc)
{
WLog_DBG(TAG, "[%s] called from [%s] xfc=%p", __FUNCTION__, fkt, xfc);
WLog_DBG(TAG, "called from [%s] xfc=%p", fkt, xfc);
return;
}
if (w == 0 || h == 0)
{
WLog_WARN(TAG, "[%s] invalid width and/or height specified: w=%d h=%d", __FUNCTION__, w, h);
WLog_WARN(TAG, "invalid width and/or height specified: w=%d h=%d", w, h);
return;
}
if (!xfc->window)
{
WLog_WARN(TAG, "[%s] invalid xfc->window=%p", __FUNCTION__, xfc->window);
WLog_WARN(TAG, "invalid xfc->window=%p", xfc->window);
return;
}
@ -601,12 +601,8 @@ BOOL xf_create_window(xfContext* xfc)
{
if (xfc->remote_app)
{
WLog_WARN(TAG,
"[%s] running in remote app mode, but XServer does not support transparency",
__FUNCTION__);
WLog_WARN(TAG,
"[%s] display of remote applications might be distorted (black frames, ...)",
__FUNCTION__);
WLog_WARN(TAG, "running in remote app mode, but XServer does not support transparency");
WLog_WARN(TAG, "display of remote applications might be distorted (black frames, ...)");
}
xfc->depth = DefaultDepthOfScreen(xfc->screen);
xfc->visual = DefaultVisual(xfc->display, xfc->screen_number);
@ -818,7 +814,7 @@ void xf_lock_x11_(xfContext* xfc, const char* fkt)
XLockDisplay(xfc->display);
xfc->locked++;
WLog_VRB(TAG, "%s:\t[%" PRIu32 "] from %s", __FUNCTION__, xfc->locked, fkt);
WLog_VRB(TAG, "[%" PRIu32 "] from %s", xfc->locked, fkt);
}
void xf_unlock_x11_(xfContext* xfc, const char* fkt)
@ -826,7 +822,7 @@ void xf_unlock_x11_(xfContext* xfc, const char* fkt)
if (xfc->locked == 0)
WLog_WARN(TAG, "X11: trying to unlock although not locked!");
WLog_VRB(TAG, "%s:\t[%" PRIu32 "] from %s", __FUNCTION__, xfc->locked - 1, fkt);
WLog_VRB(TAG, "[%" PRIu32 "] from %s", xfc->locked - 1, fkt);
if (!xfc->UseXThreads)
ReleaseMutex(xfc->mutex);
else

View File

@ -764,8 +764,8 @@ static BOOL xf_event_ConfigureNotify(xfContext* xfc, const XConfigureEvent* even
settings = xfc->common.context.settings;
WINPR_ASSERT(settings);
WLog_DBG(TAG, "%s: x=%" PRId32 ", y=%" PRId32 ", w=%" PRId32 ", h=%" PRId32, __func__, event->x,
event->y, event->width, event->height);
WLog_DBG(TAG, "x=%" PRId32 ", y=%" PRId32 ", w=%" PRId32 ", h=%" PRId32, event->x, event->y,
event->width, event->height);
if (!app)
{

View File

@ -280,7 +280,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (!surface->gdi.codecs)
{
WLog_ERR(TAG, "%s: global GDI codecs aren't set", __FUNCTION__);
WLog_ERR(TAG, "global GDI codecs aren't set");
goto out_free;
}
@ -303,8 +303,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
break;
default:
WLog_ERR(TAG, "%s: unknown pixelFormat 0x%" PRIx32 "", __FUNCTION__,
createSurface->pixelFormat);
WLog_ERR(TAG, "unknown pixelFormat 0x%" PRIx32 "", createSurface->pixelFormat);
ret = ERROR_INTERNAL_ERROR;
goto out_free;
}
@ -316,7 +315,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (!surface->gdi.data)
{
WLog_ERR(TAG, "%s: unable to allocate GDI data", __FUNCTION__);
WLog_ERR(TAG, "unable to allocate GDI data");
goto out_free;
}
@ -341,7 +340,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (!surface->stage)
{
WLog_ERR(TAG, "%s: unable to allocate stage buffer", __FUNCTION__);
WLog_ERR(TAG, "unable to allocate stage buffer");
goto out_free_gdidata;
}
@ -355,7 +354,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (!surface->image)
{
WLog_ERR(TAG, "%s: an error occurred when creating the XImage", __FUNCTION__);
WLog_ERR(TAG, "an error occurred when creating the XImage");
goto error_surface_image;
}
@ -366,7 +365,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (context->SetSurfaceData(context, surface->gdi.surfaceId, (void*)surface) != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "%s: an error occurred during SetSurfaceData", __FUNCTION__);
WLog_ERR(TAG, "an error occurred during SetSurfaceData");
goto error_set_surface_data;
}
@ -437,7 +436,7 @@ static UINT xf_UpdateWindowFromSurface(RdpgfxClientContext* context, gdiGfxSurfa
if (freerdp_settings_get_bool(gdi->context->settings, FreeRDP_RemoteApplicationMode))
return xf_AppUpdateWindowFromSurface(xfc, surface);
WLog_WARN(TAG, "[%s] function not implemented", __func__);
WLog_WARN(TAG, "function not implemented");
return CHANNEL_RC_OK;
}

View File

@ -265,7 +265,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer*
xTargetSize = MAX(1, pointer->width * xscale);
yTargetSize = MAX(1, pointer->height * yscale);
WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__,
WLog_DBG(TAG, "scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32,
xfc->scaledWidth, xfc->scaledHeight, settings->DesktopWidth, settings->DesktopHeight);
for (i = 0; i < xpointer->nCursors; i++)
{
@ -335,10 +335,9 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer*
const double ys = fabs(fabs(yscale) - 1.0);
WLog_DBG(TAG,
"%s: cursorIndex %" PRId32 " scaling pointer %" PRIu32 "x%" PRIu32 " --> %" PRIu32
"cursorIndex %" PRId32 " scaling pointer %" PRIu32 "x%" PRIu32 " --> %" PRIu32
"x%" PRIu32 " [%lfx%lf]",
__func__, cursorIndex, pointer->width, pointer->height, ci.width, ci.height,
xscale, yscale);
cursorIndex, pointer->width, pointer->height, ci.width, ci.height, xscale, yscale);
if ((xs > DBL_EPSILON) || (ys > DBL_EPSILON))
{
if (!freerdp_image_scale((BYTE*)ci.pixels, CursorFormat, 0, 0, 0, ci.width, ci.height,
@ -367,7 +366,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer*
}
else
{
WLog_DBG(TAG, "%s: using cached cursor %" PRId32, __func__, cursorIndex);
WLog_DBG(TAG, "using cached cursor %" PRId32, cursorIndex);
}
cursor[0] = xpointer->cursors[cursorIndex];
@ -455,13 +454,13 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
rc = TRUE;
fail:
WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL);
WLog_DBG(TAG, "%p", rc ? pointer : NULL);
return rc;
}
static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
{
WLog_DBG(TAG, "%s: %p", __func__, pointer);
WLog_DBG(TAG, "%p", pointer);
#ifdef WITH_XCURSOR
UINT32 i;
@ -489,7 +488,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
{
WLog_DBG(TAG, "%s: %p", __func__, pointer);
WLog_DBG(TAG, "%p", pointer);
#ifdef WITH_XCURSOR
xfContext* xfc = (xfContext*)context;
Window handle = xf_Pointer_get_window(xfc);
@ -511,7 +510,7 @@ static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
}
else
{
WLog_WARN(TAG, "%s: handle=%ld", __func__, handle);
WLog_WARN(TAG, "handle=%ld", handle);
}
#endif
return TRUE;
@ -519,7 +518,7 @@ static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
static BOOL xf_Pointer_SetNull(rdpContext* context)
{
WLog_DBG(TAG, "%s", __func__);
WLog_DBG(TAG, "called");
#ifdef WITH_XCURSOR
xfContext* xfc = (xfContext*)context;
static Cursor nullcursor = None;
@ -551,7 +550,7 @@ static BOOL xf_Pointer_SetNull(rdpContext* context)
static BOOL xf_Pointer_SetDefault(rdpContext* context)
{
WLog_DBG(TAG, "%s", __func__);
WLog_DBG(TAG, "called");
#ifdef WITH_XCURSOR
xfContext* xfc = (xfContext*)context;
Window handle = xf_Pointer_get_window(xfc);
@ -577,11 +576,11 @@ static BOOL xf_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
if (!handle)
{
WLog_WARN(TAG, "%s: focus %d, handle%lu", __func__, xfc->focused, handle);
WLog_WARN(TAG, "focus %d, handle%lu", xfc->focused, handle);
return TRUE;
}
WLog_DBG(TAG, "%s: %" PRIu32 "x%" PRIu32, __func__, x, y);
WLog_DBG(TAG, "%" PRIu32 "x%" PRIu32, x, y);
if (xfc->remote_app && !xfc->focused)
return TRUE;
@ -592,7 +591,7 @@ static BOOL xf_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
rc = XGetWindowAttributes(xfc->display, handle, &current);
if (rc == 0)
{
WLog_WARN(TAG, "%s: XGetWindowAttributes==%d", __func__, rc);
WLog_WARN(TAG, "XGetWindowAttributes==%d", rc);
goto out;
}
@ -601,17 +600,17 @@ static BOOL xf_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
rc = XChangeWindowAttributes(xfc->display, handle, CWEventMask, &tmp);
if (rc == 0)
{
WLog_WARN(TAG, "%s: XChangeWindowAttributes==%d", __func__, rc);
WLog_WARN(TAG, "XChangeWindowAttributes==%d", rc);
goto out;
}
rc = XWarpPointer(xfc->display, None, handle, 0, 0, 0, 0, x, y);
if (rc == 0)
WLog_WARN(TAG, "%s: XWarpPointer==%d", __func__, rc);
WLog_WARN(TAG, "XWarpPointer==%d", rc);
tmp.event_mask = current.your_event_mask;
rc = XChangeWindowAttributes(xfc->display, handle, CWEventMask, &tmp);
if (rc == 0)
WLog_WARN(TAG, "%s: 2.try XChangeWindowAttributes==%d", __func__, rc);
WLog_WARN(TAG, "2.try XChangeWindowAttributes==%d", rc);
ret = TRUE;
out:
xf_unlock_x11(xfc);

View File

@ -693,8 +693,7 @@ int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, i
}
break;
default:
WLog_WARN(TAG, "[%s] Unhandled event %d: Event was registered but is not handled!",
__FUNCTION__, evtype);
WLog_WARN(TAG, "Unhandled event %d: Event was registered but is not handled!", evtype);
break;
}

View File

@ -515,7 +515,7 @@ xfWindow* xf_CreateDesktopWindow(xfContext* xfc, char* name, int width, int heig
int rc = ftruncate(window->shmid, sizeof(window->handle));
if (rc != 0)
{
DEBUG_X11("%s: ftruncate failed with %s [%d]", __FUNCTION__, strerror(rc), rc);
DEBUG_X11("ftruncate failed with %s [%d]", strerror(rc), rc);
}
else
{
@ -1223,8 +1223,7 @@ UINT xf_AppUpdateWindowFromSurface(xfContext* xfc, gdiGfxSurface* surface)
xfAppWindow* appWindow = xf_rail_get_window(xfc, surface->windowId);
if (!appWindow)
{
WLog_VRB(TAG, "[%s] Failed to find a window for id=0x%08" PRIx64, __func__,
surface->windowId);
WLog_VRB(TAG, "Failed to find a window for id=0x%08" PRIx64, surface->windowId);
return CHANNEL_RC_OK;
}
@ -1254,9 +1253,9 @@ UINT xf_AppUpdateWindowFromSurface(xfContext* xfc, gdiGfxSurface* surface)
if (!appWindow->image)
{
WLog_WARN(TAG,
"[%s] Failed create a XImage[%" PRIu32 "x%" PRIu32 ", scanline=%" PRIu32
"Failed create a XImage[%" PRIu32 "x%" PRIu32 ", scanline=%" PRIu32
", bpp=%" PRIu32 "] for window id=0x%08" PRIx64,
__func__, surface->width, surface->height, surface->scanline, xfc->depth,
surface->width, surface->height, surface->scanline, xfc->depth,
surface->windowId);
goto fail;
}

View File

@ -37,7 +37,7 @@ static void ios_OnChannelConnectedEventHandler(void *context, const ChannelConne
if (!context || !e)
{
WLog_FATAL(TAG, "%s(context=%p, EventArgs=%p", __FUNCTION__, context, (void *)e);
WLog_FATAL(TAG, "(context=%p, EventArgs=%p", context, (void *)e);
return;
}
@ -66,7 +66,7 @@ static void ios_OnChannelDisconnectedEventHandler(void *context,
if (!context || !e)
{
WLog_FATAL(TAG, "%s(context=%p, EventArgs=%p", __FUNCTION__, context, (void *)e);
WLog_FATAL(TAG, "(context=%p, EventArgs=%p", context, (void *)e);
return;
}

View File

@ -31,27 +31,23 @@
/*
* log format in proxy is:
* "[SessionID=%s] - [__FUNCTION__]: Log message"
* both SessionID and __FUNCTION__ are optional, but if they should be written to the log,
* "[SessionID=%s]: Log message"
* SessionID is optional, but if they should be written to the log,
* that's the format.
*/
/* log macros that prepends session id and function name tp the log message */
#define PROXY_LOG_INFO(_tag, _context, _format, ...) \
WLog_INFO(TAG, "[SessionID=%s][%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", __FUNCTION__, \
##__VA_ARGS__)
#define PROXY_LOG_ERR(_tag, _context, _format, ...) \
WLog_ERR(TAG, "[SessionID=%s][%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", __FUNCTION__, \
##__VA_ARGS__)
#define PROXY_LOG_DBG(_tag, _context, _format, ...) \
WLog_DBG(TAG, "[SessionID=%s][%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", __FUNCTION__, \
##__VA_ARGS__)
#define PROXY_LOG_WARN(_tag, _context, _format, ...) \
WLog_WARN(TAG, "[SessionID=%s][%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", __FUNCTION__, \
##__VA_ARGS__)
#define PROXY_LOG_INFO(_tag, _context, _format, ...) \
WLog_INFO(TAG, "[SessionID=%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", ##__VA_ARGS__)
#define PROXY_LOG_ERR(_tag, _context, _format, ...) \
WLog_ERR(TAG, "[SessionID=%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", ##__VA_ARGS__)
#define PROXY_LOG_DBG(_tag, _context, _format, ...) \
WLog_DBG(TAG, "[SessionID=%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", ##__VA_ARGS__)
#define PROXY_LOG_WARN(_tag, _context, _format, ...) \
WLog_WARN(TAG, "[SessionID=%s]: " _format, \
(_context && _context->pdata) ? _context->pdata->session_id : "null", ##__VA_ARGS__)
#endif /* FREERDP_SERVER_PROXY_LOG_H */

View File

@ -1116,7 +1116,7 @@ fail:
int clear_compress(CLEAR_CONTEXT* clear, const BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData,
UINT32* pDstSize)
{
WLog_ERR(TAG, "TODO: %s not implemented!", __FUNCTION__);
WLog_ERR(TAG, "TODO: not implemented!");
return 1;
}

View File

@ -220,7 +220,7 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context, const BYTE* src,
if (srcFormat->wFormatTag != WAVE_FORMAT_PCM)
{
WLog_ERR(TAG, "%s requires %s for sample input, got %s", __FUNCTION__,
WLog_ERR(TAG, "requires %s for sample input, got %s",
audio_format_get_tag_string(WAVE_FORMAT_PCM),
audio_format_get_tag_string(srcFormat->wFormatTag));
return FALSE;

View File

@ -664,8 +664,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr
case 2: /* We only support stereo, so we can not handle this case. */
default: /* Unsupported number of channels */
WLog_WARN(TAG, "[%s] unsuported source channel count %" PRIu16, __FUNCTION__,
srcFormat->nChannels);
WLog_WARN(TAG, "unsuported source channel count %" PRIu16, srcFormat->nChannels);
return FALSE;
}
}
@ -693,8 +692,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr
case 1: /* Invalid, do we want to use a 0 channel sound? */
default: /* Unsupported number of channels */
WLog_WARN(TAG, "[%s] unsuported channel count %" PRIu16, __FUNCTION__,
srcFormat->nChannels);
WLog_WARN(TAG, "unsuported channel count %" PRIu16, srcFormat->nChannels);
return FALSE;
}

View File

@ -32,7 +32,7 @@ static INLINE BYTE* WRITEFGBGIMAGE(BYTE* pbDest, const BYTE* pbDestEnd, UINT32 r
if (cBits > 8)
{
WLog_ERR(TAG, "[%s] cBits %d > 8", __FUNCTION__, cBits);
WLog_ERR(TAG, "cBits %d > 8", cBits);
return NULL;
}
@ -66,7 +66,7 @@ static INLINE BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* pbDest, const BYTE* pbDestEnd,
if (cBits > 8)
{
WLog_ERR(TAG, "[%s] cBits %d > 8", __FUNCTION__, cBits);
WLog_ERR(TAG, "cBits %d > 8", cBits);
return NULL;
}
@ -112,15 +112,15 @@ static INLINE BOOL RLEDECOMPRESS(const BYTE* pbSrcBuffer, UINT32 cbSrcBuffer, BY
if ((rowDelta == 0) || (rowDelta < width))
{
WLog_ERR(TAG, "[%s] Invalid arguments: rowDelta=%" PRIu32 " == 0 || < width=%" PRIu32,
__FUNCTION__, rowDelta, width);
WLog_ERR(TAG, "Invalid arguments: rowDelta=%" PRIu32 " == 0 || < width=%" PRIu32, rowDelta,
width);
return FALSE;
}
if (!pbSrcBuffer || !pbDestBuffer)
{
WLog_ERR(TAG, "[%s] Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p", __FUNCTION__,
pbSrcBuffer, pbDestBuffer);
WLog_ERR(TAG, "Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p", pbSrcBuffer,
pbDestBuffer);
return FALSE;
}
@ -146,7 +146,7 @@ static INLINE BOOL RLEDECOMPRESS(const BYTE* pbSrcBuffer, UINT32 cbSrcBuffer, BY
code = ExtractCodeId(*pbSrc);
#if defined(WITH_DEBUG_CODECS)
WLog_VRB(TAG, "[%s] pbSrc=%p code=%s, rem=%" PRIuz, __FUNCTION__, pbSrc,
WLog_VRB(TAG, "pbSrc=%p code=%s, rem=%" PRIuz, pbSrc,
rle_code_str_buffer(code, sbuffer, sizeof(sbuffer)), pbEnd - pbSrc);
#endif
@ -440,9 +440,8 @@ static INLINE BOOL RLEDECOMPRESS(const BYTE* pbSrcBuffer, UINT32 cbSrcBuffer, BY
break;
default:
WLog_ERR(TAG,
"[%s] invalid code 0x%08" PRIx32 ", pbSrcBuffer=%p, pbSrc=%p, pbEnd=%p",
__FUNCTION__, code, pbSrcBuffer, pbSrc, pbEnd);
WLog_ERR(TAG, "invalid code 0x%08" PRIx32 ", pbSrcBuffer=%p, pbSrc=%p, pbEnd=%p",
code, pbSrcBuffer, pbSrc, pbEnd);
return FALSE;
}
}

View File

@ -484,8 +484,8 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
if (!interleaved || !pSrcData || !pDstData)
{
WLog_ERR(TAG, "[%s] invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p",
__FUNCTION__, interleaved, pSrcData, pDstData);
WLog_ERR(TAG, "invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p", interleaved,
pSrcData, pDstData);
return FALSE;
}
@ -512,7 +512,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
break;
default:
WLog_ERR(TAG, "[%s] Invalid color depth %" PRIu32 "", __FUNCTION__, bpp);
WLog_ERR(TAG, "Invalid color depth %" PRIu32 "", bpp);
return FALSE;
}
@ -526,7 +526,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
if (!interleaved->TempBuffer)
{
WLog_ERR(TAG, "[%s] interleaved->TempBuffer=%p", __FUNCTION__, interleaved->TempBuffer);
WLog_ERR(TAG, "interleaved->TempBuffer=%p", interleaved->TempBuffer);
return FALSE;
}
@ -536,7 +536,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
if (!RleDecompress24to24(pSrcData, SrcSize, interleaved->TempBuffer, scanline,
nSrcWidth, nSrcHeight))
{
WLog_ERR(TAG, "[%s] RleDecompress24to24 failed", __FUNCTION__);
WLog_ERR(TAG, "RleDecompress24to24 failed");
return FALSE;
}
@ -547,7 +547,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
if (!RleDecompress16to16(pSrcData, SrcSize, interleaved->TempBuffer, scanline,
nSrcWidth, nSrcHeight))
{
WLog_ERR(TAG, "[%s] RleDecompress16to16 failed", __FUNCTION__);
WLog_ERR(TAG, "RleDecompress16to16 failed");
return FALSE;
}
@ -557,14 +557,14 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
if (!RleDecompress8to8(pSrcData, SrcSize, interleaved->TempBuffer, scanline, nSrcWidth,
nSrcHeight))
{
WLog_ERR(TAG, "[%s] RleDecompress8to8 failed", __FUNCTION__);
WLog_ERR(TAG, "RleDecompress8to8 failed");
return FALSE;
}
break;
default:
WLog_ERR(TAG, "[%s] Invalid color depth %" PRIu32 "", __FUNCTION__, bpp);
WLog_ERR(TAG, "Invalid color depth %" PRIu32 "", bpp);
return FALSE;
}
@ -572,7 +572,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE*
interleaved->TempBuffer, SrcFormat, scanline, 0, 0, palette,
FREERDP_FLIP_VERTICAL | FREERDP_KEEP_DST_ALPHA))
{
WLog_ERR(TAG, "[%s] freerdp_image_copy failed", __FUNCTION__);
WLog_ERR(TAG, "freerdp_image_copy failed");
return FALSE;
}
return TRUE;

View File

@ -2615,7 +2615,7 @@ static BOOL progressive_rfx_write_message_progressive_simple(PROGRESSIVE_CONTEXT
WINPR_ASSERT(context);
if (context->mode != RLGR1)
{
WLog_ERR(TAG, "%s: error, RLGR1 mode is required!", __FUNCTION__);
WLog_ERR(TAG, "error, RLGR1 mode is required!");
return FALSE;
}

View File

@ -473,20 +473,19 @@ static BOOL rfx_process_message_codec_versions(RFX_CONTEXT* context, wStream* s)
if (numCodecs != 1)
{
WLog_ERR(TAG, "%s: numCodes is 0x%02" PRIX8 " (must be 0x01)", __FUNCTION__, numCodecs);
WLog_ERR(TAG, "numCodes is 0x%02" PRIX8 " (must be 0x01)", numCodecs);
return FALSE;
}
if (context->codec_id != 0x01)
{
WLog_ERR(TAG, "%s: invalid codec id (0x%02" PRIX32 ")", __FUNCTION__, context->codec_id);
WLog_ERR(TAG, "invalid codec id (0x%02" PRIX32 ")", context->codec_id);
return FALSE;
}
if (context->codec_version != WF_VERSION_1_0)
{
WLog_ERR(TAG, "%s: invalid codec version (0x%08" PRIX32 ")", __FUNCTION__,
context->codec_version);
WLog_ERR(TAG, "invalid codec version (0x%08" PRIX32 ")", context->codec_version);
return FALSE;
}
@ -533,8 +532,8 @@ static BOOL rfx_process_message_channels(RFX_CONTEXT* context, wStream* s)
if (!context->width || !context->height)
{
WLog_ERR(TAG, "%s: invalid channel with/height: %" PRIu16 "x%" PRIu16 "", __FUNCTION__,
context->width, context->height);
WLog_ERR(TAG, "invalid channel with/height: %" PRIu16 "x%" PRIu16 "", context->width,
context->height);
return FALSE;
}
@ -604,7 +603,7 @@ static BOOL rfx_process_message_frame_begin(RFX_CONTEXT* context, RFX_MESSAGE* m
if (*pExpectedBlockType != WBT_FRAME_BEGIN)
{
WLog_ERR(TAG, "%s: message unexpected wants WBT_FRAME_BEGIN", __FUNCTION__);
WLog_ERR(TAG, "message unexpected wants WBT_FRAME_BEGIN");
return FALSE;
}
@ -627,7 +626,7 @@ static BOOL rfx_process_message_frame_end(RFX_CONTEXT* context, RFX_MESSAGE* mes
{
if (*pExpectedBlockType != WBT_FRAME_END)
{
WLog_ERR(TAG, "%s: message unexpected, wants WBT_FRAME_END", __FUNCTION__);
WLog_ERR(TAG, "message unexpected, wants WBT_FRAME_END");
return FALSE;
}
@ -646,7 +645,7 @@ static BOOL rfx_process_message_region(RFX_CONTEXT* context, RFX_MESSAGE* messag
if (*pExpectedBlockType != WBT_REGION)
{
WLog_ERR(TAG, "%s: message unexpected wants WBT_REGION", __FUNCTION__);
WLog_ERR(TAG, "message unexpected wants WBT_REGION");
return FALSE;
}
@ -709,13 +708,13 @@ static BOOL rfx_process_message_region(RFX_CONTEXT* context, RFX_MESSAGE* messag
if (regionType != CBT_REGION)
{
WLog_ERR(TAG, "%s: invalid region type 0x%04" PRIX16 "", __FUNCTION__, regionType);
WLog_ERR(TAG, "invalid region type 0x%04" PRIX16 "", regionType);
return TRUE;
}
if (numTileSets != 0x0001)
{
WLog_ERR(TAG, "%s: invalid number of tilesets (%" PRIu16 ")", __FUNCTION__, numTileSets);
WLog_ERR(TAG, "invalid number of tilesets (%" PRIu16 ")", numTileSets);
return FALSE;
}
@ -754,7 +753,7 @@ static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa
if (*pExpectedBlockType != WBT_EXTENSION)
{
WLog_ERR(TAG, "%s: message unexpected wants a tileset", __FUNCTION__);
WLog_ERR(TAG, "message unexpected wants a tileset");
return FALSE;
}
@ -1043,7 +1042,7 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
if (blockType > WBT_CONTEXT && context->decodedHeaderBlocks != RFX_DECODED_HEADERS)
{
WLog_ERR(TAG, "%s: incomplete header blocks processing", __FUNCTION__);
WLog_ERR(TAG, "incomplete header blocks processing");
return FALSE;
}
@ -1062,7 +1061,7 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
if (codecId != 0x01)
{
WLog_ERR(TAG, "%s: invalid codecId 0x%02" PRIX8 "", __FUNCTION__, codecId);
WLog_ERR(TAG, "invalid codecId 0x%02" PRIX8 "", codecId);
return FALSE;
}
@ -1071,9 +1070,8 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
/* If the blockType is set to WBT_CONTEXT, then channelId MUST be set to 0xFF.*/
if (channelId != 0xFF)
{
WLog_ERR(TAG,
"%s: invalid channelId 0x%02" PRIX8 " for blockType 0x%08" PRIX32 "",
__FUNCTION__, channelId, blockType);
WLog_ERR(TAG, "invalid channelId 0x%02" PRIX8 " for blockType 0x%08" PRIX32 "",
channelId, blockType);
return FALSE;
}
}
@ -1082,8 +1080,8 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
/* For all other values of blockType, channelId MUST be set to 0x00. */
if (channelId != 0x00)
{
WLog_ERR(TAG, "%s: invalid channelId 0x%02" PRIX8 " for blockType WBT_CONTEXT",
__FUNCTION__, channelId);
WLog_ERR(TAG, "invalid channelId 0x%02" PRIX8 " for blockType WBT_CONTEXT",
channelId);
return FALSE;
}
}
@ -1143,7 +1141,7 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
break;
default:
WLog_ERR(TAG, "%s: unknown blockType 0x%" PRIX32 "", __FUNCTION__, blockType);
WLog_ERR(TAG, "unknown blockType 0x%" PRIX32 "", blockType);
return FALSE;
}
}
@ -1213,7 +1211,7 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
return TRUE;
}
WLog_ERR(TAG, "%s failed", __FUNCTION__);
WLog_ERR(TAG, "failed");
return FALSE;
}
@ -1657,7 +1655,7 @@ skip_encoding_loop:
return message;
}
WLog_ERR(TAG, "%s: failed", __FUNCTION__);
WLog_ERR(TAG, "failed");
message->freeRects = TRUE;
rfx_message_free(context, message);
return NULL;

View File

@ -1450,7 +1450,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, const vo
freerdp_settings_set_pointer(settings, id, NULL);
}
else
WLog_WARN(TAG, "Invalid id %" PRIuz " for %s", id, __FUNCTION__);
WLog_WARN(TAG, "Invalid id %" PRIuz, id);
return FALSE;
}
}
@ -1587,8 +1587,7 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings, s
goto fail;
return settings->RdpServerRsaKey;
default:
WLog_WARN(TAG, "Invalid id %s [%" PRIuz "] for %s",
freerdp_settings_get_name_for_key(id), id, __FUNCTION__);
WLog_WARN(TAG, "Invalid id %s [%" PRIuz "]", freerdp_settings_get_name_for_key(id), id);
return NULL;
}
@ -1748,8 +1747,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, size_t id, size_t
return TRUE;
default:
WLog_WARN(TAG, "Invalid id %s [%" PRIuz "] for %s",
freerdp_settings_get_name_for_key(id), id, __FUNCTION__);
WLog_WARN(TAG, "Invalid id %s [%" PRIuz "]", freerdp_settings_get_name_for_key(id), id);
return FALSE;
}

View File

@ -572,7 +572,7 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id)
return settings->Workarea;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -1307,7 +1307,7 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val)
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -1358,7 +1358,7 @@ UINT16 freerdp_settings_get_uint16(const rdpSettings* settings, size_t id)
return settings->TextANSICodePage;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -1429,7 +1429,7 @@ BOOL freerdp_settings_set_uint16(rdpSettings* settings, size_t id, UINT16 val)
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -1444,7 +1444,7 @@ INT16 freerdp_settings_get_int16(const rdpSettings* settings, size_t id)
switch (id)
{
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -1467,7 +1467,7 @@ BOOL freerdp_settings_set_int16(rdpSettings* settings, size_t id, INT16 val)
switch (id)
{
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -1848,7 +1848,7 @@ UINT32 freerdp_settings_get_uint32(const rdpSettings* settings, size_t id)
return settings->VirtualChannelCompressionFlags;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -2359,7 +2359,7 @@ BOOL freerdp_settings_set_uint32(rdpSettings* settings, size_t id, UINT32 val)
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -2380,7 +2380,7 @@ INT32 freerdp_settings_get_int32(const rdpSettings* settings, size_t id)
return settings->YPan;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -2411,7 +2411,7 @@ BOOL freerdp_settings_set_int32(rdpSettings* settings, size_t id, INT32 val)
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -2429,7 +2429,7 @@ UINT64 freerdp_settings_get_uint64(const rdpSettings* settings, size_t id)
return settings->ParentWindowId;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -2456,7 +2456,7 @@ BOOL freerdp_settings_set_uint64(rdpSettings* settings, size_t id, UINT64 val)
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -2471,7 +2471,7 @@ INT64 freerdp_settings_get_int64(const rdpSettings* settings, size_t id)
switch (id)
{
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return 0;
@ -2494,7 +2494,7 @@ BOOL freerdp_settings_set_int64(rdpSettings* settings, size_t id, INT64 val)
switch (id)
{
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -2776,7 +2776,7 @@ const char* freerdp_settings_get_string(const rdpSettings* settings, size_t id)
return settings->WmClass;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return NULL;
@ -3057,7 +3057,7 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, size_t id)
return settings->WmClass;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return NULL;
@ -3351,7 +3351,7 @@ BOOL freerdp_settings_set_string_(rdpSettings* settings, size_t id, const char*
return update_string(&settings->WmClass, cnv.cc, len, copy, cleanup);
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;
@ -3472,7 +3472,7 @@ void* freerdp_settings_get_pointer_writable(rdpSettings* settings, size_t id)
return settings->instance;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return NULL;
@ -3617,7 +3617,7 @@ BOOL freerdp_settings_set_pointer(rdpSettings* settings, size_t id, const void*
break;
default:
WLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id,
WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id,
freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
return FALSE;

View File

@ -4365,7 +4365,7 @@ BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s)
char buffer1[256] = { 0 };
char buffer2[256] = { 0 };
WLog_ERR(TAG, "[%s] expected %s, got %s", __FUNCTION__,
WLog_ERR(TAG, "expected %s, got %s",
pdu_type_to_str(PDU_TYPE_DEMAND_ACTIVE, buffer1, sizeof(buffer1)),
pdu_type_to_str(pduType, buffer2, sizeof(buffer2)));
}

View File

@ -541,7 +541,7 @@ static BOOL certificate_write_server_public_signature(const rdpCertificate* cert
Stream_Write_UINT16(s, wSignatureBlobType);
Stream_Write_UINT16(s, wSignatureBlobLen);
WLog_WARN(TAG, "[%s] TODO: Calcualte proper signature", __FUNCTION__);
WLog_WARN(TAG, "TODO: Calcualte proper signature");
Stream_Write(s, signature, wSignatureBlobLen);
return TRUE;

View File

@ -311,6 +311,6 @@ BOOL freerdp_channel_send_packet(rdpRdp* rdp, UINT16 channelId, size_t totalSize
Stream_Write(s, data, chunkSize);
/* WLog_DBG(TAG, "%s: sending data (flags=0x%x size=%d)", __FUNCTION__, flags, size); */
/* WLog_DBG(TAG, "sending data (flags=0x%x size=%d)", flags, size); */
return rdp_send(rdp, s, channelId);
}

View File

@ -504,8 +504,8 @@ BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdat
data.pcb = cdata;
if (!instance || !data.pcb)
{
WLog_ERR(TAG, "%s(%p, %" PRIu16 ", %p, 0x%08x): Invalid arguments", __FUNCTION__, instance,
channelId, data.pcb, flags);
WLog_ERR(TAG, "(%p, %" PRIu16 ", %p, 0x%08x): Invalid arguments", instance, channelId,
data.pcb, flags);
return FALSE;
}

View File

@ -1158,7 +1158,7 @@ state_run_t rdp_client_connect_license(rdpRdp* rdp, wStream* s)
{
char buffer[512] = { 0 };
char lbuffer[32] = { 0 };
WLog_ERR(TAG, "[%s] securityFlags=%s, missing required flag %s", __FUNCTION__,
WLog_ERR(TAG, "securityFlags=%s, missing required flag %s",
rdp_security_flag_string(securityFlags, buffer, sizeof(buffer)),
rdp_security_flag_string(SEC_LICENSE_PKT, lbuffer, sizeof(lbuffer)));
return STATE_RUN_FAILED;
@ -1283,7 +1283,7 @@ BOOL rdp_client_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state)
{
const char* name = rdp_state_string(state);
WLog_DBG(TAG, "%s %s --> %s", __FUNCTION__, rdp_get_state_string(rdp), name);
WLog_DBG(TAG, "%s --> %s", rdp_get_state_string(rdp), name);
if (!rdp_set_state(rdp, state))
return FALSE;
@ -1703,7 +1703,7 @@ BOOL rdp_server_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state)
client->activated = FALSE;
}
WLog_DBG(TAG, "%s %s --> %s", __FUNCTION__, rdp_get_state_string(rdp), rdp_state_string(state));
WLog_DBG(TAG, "%s --> %s", rdp_get_state_string(rdp), rdp_state_string(state));
if (!rdp_set_state(rdp, state))
goto fail;

View File

@ -375,7 +375,7 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth)
break;
case AUTH_STATE_INITIAL:
case AUTH_STATE_FINAL:
WLog_ERR(TAG, "%s: context in invalid state!", __FUNCTION__);
WLog_ERR(TAG, "context in invalid state!");
return -1;
}
@ -465,7 +465,7 @@ BOOL credssp_auth_encrypt(rdpCredsspAuth* auth, const SecBuffer* plaintext, SecB
switch (auth->state)
{
case AUTH_STATE_INITIAL:
WLog_ERR(TAG, "[%s] Invalid state %s", __FUNCTION__, credssp_auth_state_string(auth));
WLog_ERR(TAG, "Invalid state %s", credssp_auth_state_string(auth));
return FALSE;
default:
break;
@ -529,7 +529,7 @@ BOOL credssp_auth_decrypt(rdpCredsspAuth* auth, const SecBuffer* ciphertext, Sec
switch (auth->state)
{
case AUTH_STATE_INITIAL:
WLog_ERR(TAG, "[%s] Invalid state %s", __FUNCTION__, credssp_auth_state_string(auth));
WLog_ERR(TAG, "Invalid state %s", credssp_auth_state_string(auth));
return FALSE;
default:
break;

View File

@ -936,7 +936,7 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t
state = rdp_get_state(rdp);
if (!rdp_is_active_state(rdp))
{
WLog_WARN(TAG, "[%s] called before activation [%s]", __FUNCTION__, rdp_state_string(state));
WLog_WARN(TAG, "called before activation [%s]", rdp_state_string(state));
goto fail;
}

View File

@ -974,12 +974,12 @@ void freerdp_set_last_error_ex(rdpContext* context, UINT32 lastError, const char
WINPR_ASSERT(context);
if (lastError)
WLog_ERR(TAG, "%s:%s %s [0x%08" PRIX32 "]", fkt, __FUNCTION__,
freerdp_get_last_error_name(lastError), lastError);
WLog_ERR(TAG, "%s %s [0x%08" PRIX32 "]", fkt, freerdp_get_last_error_name(lastError),
lastError);
if (lastError == FREERDP_ERROR_SUCCESS)
{
WLog_DBG(TAG, "%s:%s resetting error state", fkt, __FUNCTION__);
WLog_DBG(TAG, "%s resetting error state", fkt);
}
else if (context->LastError != FREERDP_ERROR_SUCCESS)
{

View File

@ -759,7 +759,7 @@ static BOOL http_response_parse_header(HttpResponse* response)
fail:
if (!rc)
WLog_ERR(TAG, "%s: parsing failed", __FUNCTION__);
WLog_ERR(TAG, "parsing failed");
return rc;
}
@ -844,7 +844,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength)
{
if (!BIO_should_retry(tls->bio))
{
WLog_ERR(TAG, "%s: Retries exceeded", __FUNCTION__);
WLog_ERR(TAG, "Retries exceeded");
ERR_print_errors_cb(print_bio_error, NULL);
goto out_error;
}
@ -962,7 +962,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength)
{
if (!BIO_should_retry(tls->bio))
{
WLog_ERR(TAG, "%s: Retries exceeded", __FUNCTION__);
WLog_ERR(TAG, "Retries exceeded");
ERR_print_errors_cb(print_bio_error, NULL);
goto out_error;
}
@ -987,8 +987,8 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength)
if (bodyLength != response->BodyLength)
{
WLog_WARN(TAG, "%s: %s unexpected body length: actual: %" PRIuz ", expected: %" PRIuz,
__FUNCTION__, response->ContentType, response->BodyLength, bodyLength);
WLog_WARN(TAG, "%s unexpected body length: actual: %" PRIuz ", expected: %" PRIuz,
response->ContentType, response->BodyLength, bodyLength);
if (bodyLength > 0)
response->BodyLength = MIN(bodyLength, response->BodyLength);

View File

@ -318,8 +318,7 @@ static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT1
/* Read length of the string */
if (!Stream_CheckAndLogRequiredLength(TAG, s, 4))
{
WLog_ERR(TAG, "[%s]: Could not read stream length, only have % " PRIuz " bytes",
__FUNCTION__, rem);
WLog_ERR(TAG, "Could not read stream length, only have % " PRIuz " bytes", rem);
return FALSE;
}
Stream_Read_UINT16(s, strLenBytes);
@ -330,9 +329,8 @@ static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT1
/* seek past the string - if this fails something is wrong */
if (!Stream_SafeSeek(s, strLenBytes))
{
WLog_ERR(TAG,
"[%s]: Could not read stream data, only have % " PRIuz " bytes, expected %" PRIu16,
__FUNCTION__, rem - 4, strLenBytes);
WLog_ERR(TAG, "Could not read stream data, only have % " PRIuz " bytes, expected %" PRIu16,
rem - 4, strLenBytes);
return FALSE;
}
@ -1361,7 +1359,7 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16
/* Seek over tunnelId (4 bytes) */
if (!Stream_SafeSeek(s, 4))
{
WLog_ERR(TAG, "[%s] Short tunnelId, got %" PRIuz ", expected 4", __FUNCTION__,
WLog_ERR(TAG, "Short tunnelId, got %" PRIuz ", expected 4",
Stream_GetRemainingLength(s));
return FALSE;
}
@ -1382,15 +1380,14 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16
/* Seek over nonce (20 bytes) */
if (!Stream_SafeSeek(s, 20))
{
WLog_ERR(TAG, "[%s] Short nonce, got %" PRIuz ", expected 20", __FUNCTION__,
Stream_GetRemainingLength(s));
WLog_ERR(TAG, "Short nonce, got %" PRIuz ", expected 20", Stream_GetRemainingLength(s));
return FALSE;
}
/* Read serverCert */
if (!rdg_read_http_unicode_string(s, NULL, NULL))
{
WLog_ERR(TAG, "[%s] Failed to read server certificate", __FUNCTION__);
WLog_ERR(TAG, "Failed to read server certificate");
return FALSE;
}
}
@ -1407,7 +1404,7 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16
/* Read message string and invoke callback */
if (!rdg_read_http_unicode_string(s, &msg, &msgLenBytes))
{
WLog_ERR(TAG, "[%s] Failed to read consent message", __FUNCTION__);
WLog_ERR(TAG, "Failed to read consent message");
return FALSE;
}
@ -1501,7 +1498,7 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s)
if (errorCode != ERROR_SUCCESS)
{
WLog_ERR(TAG, "[%s] EXTAUTH_SSPI_NTLM failed with error %s [0x%08X]", __FUNCTION__,
WLog_ERR(TAG, "EXTAUTH_SSPI_NTLM failed with error %s [0x%08X]",
GetSecurityStatusString(errorCode), errorCode);
return FALSE;
}
@ -1584,8 +1581,7 @@ static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s)
if (Stream_Length(s) < packetLength)
{
WLog_ERR(TAG, "[%s] Short packet %" PRIuz ", expected %" PRIuz, __FUNCTION__,
Stream_Length(s), packetLength);
WLog_ERR(TAG, "Short packet %" PRIuz ", expected %" PRIuz, Stream_Length(s), packetLength);
return FALSE;
}
@ -1608,7 +1604,7 @@ static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s)
break;
case PKT_TYPE_DATA:
WLog_ERR(TAG, "[%s] Unexpected packet type DATA", __FUNCTION__);
WLog_ERR(TAG, "Unexpected packet type DATA");
return FALSE;
case PKT_TYPE_EXTENDED_AUTH_MSG:
@ -1616,7 +1612,7 @@ static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s)
break;
default:
WLog_ERR(TAG, "[%s] PKG TYPE 0x%x not implemented", __FUNCTION__, type);
WLog_ERR(TAG, "PKG TYPE 0x%x not implemented", type);
return FALSE;
}
@ -2316,7 +2312,7 @@ static BOOL rdg_process_service_message(rdpRdg* rdg, wStream* s)
/* Read message string */
if (!rdg_read_http_unicode_string(s, &msg, &msgLenBytes))
{
WLog_ERR(TAG, "[%s] Failed to read string", __FUNCTION__);
WLog_ERR(TAG, "Failed to read string");
return FALSE;
}
@ -2397,8 +2393,7 @@ static BOOL rdg_process_control_packet(rdpRdg* rdg, int type, size_t packetLengt
case PKT_TYPE_SERVICE_MESSAGE:
if (!s)
{
WLog_ERR(TAG, "[%s] PKT_TYPE_SERVICE_MESSAGE requires payload but none was sent",
__FUNCTION__);
WLog_ERR(TAG, "PKT_TYPE_SERVICE_MESSAGE requires payload but none was sent");
return FALSE;
}
status = rdg_process_service_message(rdg, s);

View File

@ -896,7 +896,7 @@ static BOOL TsProxyCreateTunnelWriteRequest(rdpTsg* tsg, const PTSG_PACKET tsgPa
return FALSE;
rpc = tsg->rpc;
WLog_DBG(TAG, "%s: %s", __FUNCTION__, tsg_packet_to_string(tsgPacket));
WLog_DBG(TAG, "%s", tsg_packet_to_string(tsgPacket));
s = Stream_New(NULL, 108);
if (!s)
@ -1052,7 +1052,7 @@ static BOOL TsProxyCreateTunnelReadResponse(rdpTsg* tsg, RPC_PDU* pdu,
Stream_Read_UINT32(pdu->s, packet->packetId); /* PacketId (4 bytes) */
Stream_Read_UINT32(pdu->s, SwitchValue); /* SwitchValue (4 bytes) */
WLog_DBG(TAG, "%s: %s", __FUNCTION__, tsg_packet_id_to_string(packet->packetId));
WLog_DBG(TAG, "%s", tsg_packet_id_to_string(packet->packetId));
if ((packet->packetId == TSG_PACKET_TYPE_CAPS_RESPONSE) &&
(SwitchValue == TSG_PACKET_TYPE_CAPS_RESPONSE))
@ -1451,7 +1451,7 @@ static BOOL TsProxyAuthorizeTunnelReadResponse(RPC_PDU* pdu)
Stream_Read_UINT32(pdu->s, packet->packetId); /* PacketId (4 bytes) */
Stream_Read_UINT32(pdu->s, SwitchValue); /* SwitchValue (4 bytes) */
WLog_DBG(TAG, "%s: %s", __FUNCTION__, tsg_packet_id_to_string(packet->packetId));
WLog_DBG(TAG, "%s", tsg_packet_id_to_string(packet->packetId));
if (packet->packetId == E_PROXY_NAP_ACCESSDENIED)
{
@ -1629,7 +1629,7 @@ static BOOL TsProxyMakeTunnelCallReadResponse(rdpTsg* tsg, RPC_PDU* pdu)
Stream_Read_UINT32(pdu->s, packet.packetId); /* PacketId (4 bytes) */
Stream_Read_UINT32(pdu->s, SwitchValue); /* SwitchValue (4 bytes) */
WLog_DBG(TAG, "%s: %s", __FUNCTION__, tsg_packet_id_to_string(packet.packetId));
WLog_DBG(TAG, "%s", tsg_packet_id_to_string(packet.packetId));
if ((packet.packetId != TSG_PACKET_TYPE_MESSAGE_PACKET) ||
(SwitchValue != TSG_PACKET_TYPE_MESSAGE_PACKET))

View File

@ -2090,7 +2090,7 @@ BOOL gcc_read_client_cluster_data(wStream* s, rdpMcs* mcs, UINT16 blockLength)
Stream_Read_UINT32(s, settings->ClusterInfoFlags); /* flags */
Stream_Read_UINT32(s, redirectedSessionId); /* redirectedSessionId */
WLog_VRB(TAG, "[%s] read ClusterInfoFlags=%s, RedirectedSessionId=0x%08" PRIx32, __FUNCTION__,
WLog_VRB(TAG, "read ClusterInfoFlags=%s, RedirectedSessionId=0x%08" PRIx32,
rdp_cluster_info_flags_to_string(settings->ClusterInfoFlags, buffer, sizeof(buffer)),
redirectedSessionId);
if (settings->ClusterInfoFlags & REDIRECTED_SESSIONID_FIELD_VALID)
@ -2139,7 +2139,7 @@ BOOL gcc_write_client_cluster_data(wStream* s, const rdpMcs* mcs)
if (settings->RedirectSmartCards && settings->SmartcardLogon)
flags |= REDIRECTED_SMARTCARD;
WLog_VRB(TAG, "[%s] write ClusterInfoFlags=%s, RedirectedSessionId=0x%08" PRIx32, __FUNCTION__,
WLog_VRB(TAG, "write ClusterInfoFlags=%s, RedirectedSessionId=0x%08" PRIx32,
rdp_cluster_info_flags_to_string(flags, buffer, sizeof(buffer)),
settings->RedirectedSessionId);
Stream_Write_UINT32(s, flags); /* flags */
@ -2233,7 +2233,7 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
WINPR_ASSERT(s);
WINPR_ASSERT(settings);
WLog_DBG(TAG, "[%s] MonitorCount=%" PRIu32, __FUNCTION__, settings->MonitorCount);
WLog_DBG(TAG, "MonitorCount=%" PRIu32, settings->MonitorCount);
if (settings->MonitorCount > 1)
{
length = (20 * settings->MonitorCount) + 12;
@ -2264,9 +2264,9 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
const UINT32 bottom = top + current->height - 1;
const UINT32 flags = current->is_primary ? MONITOR_PRIMARY : 0;
WLog_DBG(TAG,
"[%s] Monitor[%" PRIu32 "]: top=%" PRIu32 ", left=%" PRIu32 ", bottom=%" PRIu32
"Monitor[%" PRIu32 "]: top=%" PRIu32 ", left=%" PRIu32 ", bottom=%" PRIu32
", right=%" PRIu32 ", flags" PRIu32,
__FUNCTION__, i, top, left, bottom, right, flags);
i, top, left, bottom, right, flags);
Stream_Write_UINT32(s, left); /* left */
Stream_Write_UINT32(s, top); /* top */
Stream_Write_UINT32(s, right); /* right */
@ -2274,7 +2274,7 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
Stream_Write_UINT32(s, flags); /* flags */
}
}
WLog_DBG(TAG, "[%s] FINISHED", __FUNCTION__);
WLog_DBG(TAG, "FINISHED");
return TRUE;
}

View File

@ -486,9 +486,9 @@ static BOOL rdp_write_extended_info_packet(rdpRdp* rdp, wStream* s)
if (cbClientAddress > cbClientAddressMax)
{
WLog_WARN(TAG,
"[%s] the client address %s [%" PRIuz "] exceeds the limit of %" PRIuz
"the client address %s [%" PRIuz "] exceeds the limit of %" PRIuz
", truncating.",
__FUNCTION__, settings->ClientAddress, cbClientAddress, cbClientAddressMax);
settings->ClientAddress, cbClientAddress, cbClientAddressMax);
clientAddress[(cbClientAddressMax / sizeof(WCHAR)) - 1] = '\0';
cbClientAddress = cbClientAddressMax;
@ -505,9 +505,8 @@ static BOOL rdp_write_extended_info_packet(rdpRdp* rdp, wStream* s)
if (cbClientDir > cbClientDirMax)
{
WLog_WARN(TAG,
"[%s] the client dir %s [%" PRIuz "] exceeds the limit of %" PRIuz
", truncating.",
__FUNCTION__, settings->ClientDir, cbClientDir, cbClientDirMax);
"the client dir %s [%" PRIuz "] exceeds the limit of %" PRIuz ", truncating.",
settings->ClientDir, cbClientDir, cbClientDirMax);
clientDir[(cbClientDirMax / sizeof(WCHAR)) - 1] = '\0';
cbClientDir = cbClientDirMax;

View File

@ -536,7 +536,7 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid maxChannelIds [%" PRIu32 ", %" PRIu32 "]", __FUNCTION__,
WLog_ERR(TAG, "invalid maxChannelIds [%" PRIu32 ", %" PRIu32 "]",
targetParameters->maxChannelIds, maximumParameters->maxChannelIds);
return FALSE;
}
@ -553,8 +553,8 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid maxUserIds [%" PRIu32 ", %" PRIu32 "]", __FUNCTION__,
targetParameters->maxUserIds, maximumParameters->maxUserIds);
WLog_ERR(TAG, "invalid maxUserIds [%" PRIu32 ", %" PRIu32 "]", targetParameters->maxUserIds,
maximumParameters->maxUserIds);
return FALSE;
}
@ -569,8 +569,7 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid numPriorities [%" PRIu32 "]", __FUNCTION__,
maximumParameters->numPriorities);
WLog_ERR(TAG, "invalid numPriorities [%" PRIu32 "]", maximumParameters->numPriorities);
return FALSE;
}
@ -585,8 +584,8 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid maxHeight [%" PRIu32 ", %" PRIu32 "]", __FUNCTION__,
targetParameters->maxHeight, minimumParameters->maxHeight);
WLog_ERR(TAG, "invalid maxHeight [%" PRIu32 ", %" PRIu32 "]", targetParameters->maxHeight,
minimumParameters->maxHeight);
return FALSE;
}
@ -605,7 +604,7 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid maxMCSPDUsize [%" PRIu32 ", %" PRIu32 "]", __FUNCTION__,
WLog_ERR(TAG, "invalid maxMCSPDUsize [%" PRIu32 ", %" PRIu32 "]",
targetParameters->maxMCSPDUsize, minimumParameters->maxMCSPDUsize);
return FALSE;
}
@ -618,8 +617,7 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid maxMCSPDUsize [%" PRIu32 "]", __FUNCTION__,
maximumParameters->maxMCSPDUsize);
WLog_ERR(TAG, "invalid maxMCSPDUsize [%" PRIu32 "]", maximumParameters->maxMCSPDUsize);
return FALSE;
}
}
@ -633,9 +631,9 @@ BOOL mcs_merge_domain_parameters(DomainParameters* targetParameters,
}
else
{
WLog_ERR(TAG, "[%s] invalid protocolVersion [%" PRIu32 ", %" PRIu32 ", %" PRIu32 "]",
__FUNCTION__, targetParameters->protocolVersion,
minimumParameters->protocolVersion, maximumParameters->protocolVersion);
WLog_ERR(TAG, "invalid protocolVersion [%" PRIu32 ", %" PRIu32 ", %" PRIu32 "]",
targetParameters->protocolVersion, minimumParameters->protocolVersion,
maximumParameters->protocolVersion);
return FALSE;
}
@ -1487,7 +1485,7 @@ BOOL mcs_server_apply_to_settings(const rdpMcs* mcs, rdpSettings* settings)
rc = TRUE;
fail:
if (!rc)
WLog_WARN(TAG, "[%s] failed to apply settings", __FUNCTION__);
WLog_WARN(TAG, "failed to apply settings");
return rc;
}

View File

@ -812,8 +812,7 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
case CONNECTION_STATE_NEGO:
if (!rdp_server_accept_nego(rdp, s))
{
WLog_ERR(TAG, "%s: %s - rdp_server_accept_nego() fail", __FUNCTION__,
rdp_get_state_string(rdp));
WLog_ERR(TAG, "%s - rdp_server_accept_nego() fail", rdp_get_state_string(rdp));
}
else
{
@ -849,9 +848,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_server_accept_mcs_connect_initial(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_server_accept_mcs_connect_initial() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
}
else
ret = STATE_RUN_SUCCESS;
@ -862,9 +861,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_server_accept_mcs_erect_domain_request(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_server_accept_mcs_erect_domain_request() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
}
else
ret = STATE_RUN_SUCCESS;
@ -875,9 +874,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_server_accept_mcs_attach_user_request(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_server_accept_mcs_attach_user_request() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
}
else
ret = STATE_RUN_SUCCESS;
@ -888,9 +887,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_server_accept_mcs_channel_join_request(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_server_accept_mcs_channel_join_request() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
}
else
ret = STATE_RUN_SUCCESS;
@ -903,9 +902,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_server_establish_keys(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_server_establish_keys() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
ret = STATE_RUN_FAILED;
}
}
@ -922,9 +921,9 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
if (!rdp_recv_client_info(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_recv_client_info() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
}
else
{

View File

@ -404,7 +404,7 @@ BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo)
}
}
else
WLog_ERR(TAG, "%s missing context=%p", __FUNCTION__, context);
WLog_ERR(TAG, "missing context=%p", context);
}
else
{
@ -810,8 +810,8 @@ BOOL rdp_send_data_pdu(rdpRdp* rdp, wStream* s, BYTE type, UINT16 channel_id)
length += pad;
Stream_SetPosition(s, length);
Stream_SealLength(s);
WLog_DBG(TAG, "%s: sending data (type=0x%x size=%" PRIuz " channelId=%" PRIu16 ")",
__FUNCTION__, type, Stream_Length(s), channel_id);
WLog_DBG(TAG, "sending data (type=0x%x size=%" PRIuz " channelId=%" PRIu16 ")", type,
Stream_Length(s), channel_id);
rdp->outPackets++;
if (transport_write(rdp->transport, s) < 0)
@ -1711,8 +1711,7 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
{
if (nla_recv_pdu(rdp->nla, s) < 1)
{
WLog_ERR(TAG, "%s: %s - nla_recv_pdu() fail", __FUNCTION__,
rdp_get_state_string(rdp));
WLog_ERR(TAG, "%s - nla_recv_pdu() fail", rdp_get_state_string(rdp));
status = STATE_RUN_FAILED;
}
}
@ -1722,8 +1721,7 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
if (nego_get_state(rdp->nego) != NEGO_STATE_FINAL)
{
WLog_ERR(TAG, "%s: %s - nego_recv() fail", __FUNCTION__,
rdp_get_state_string(rdp));
WLog_ERR(TAG, "%s - nego_recv() fail", rdp_get_state_string(rdp));
status = STATE_RUN_FAILED;
}
else if (!nla_set_state(rdp->nla, NLA_STATE_FINAL))
@ -1771,8 +1769,7 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
case CONNECTION_STATE_MCS_CREATE_REQUEST:
if (!mcs_client_begin(rdp->mcs))
{
WLog_ERR(TAG, "%s: %s - mcs_client_begin() fail", __FUNCTION__,
rdp_get_state_string(rdp));
WLog_ERR(TAG, "%s - mcs_client_begin() fail", rdp_get_state_string(rdp));
status = STATE_RUN_FAILED;
}
else if (!rdp_client_transition_to_state(rdp, CONNECTION_STATE_MCS_CREATE_RESPONSE))
@ -1840,9 +1837,9 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
if (!rdp_client_connect_mcs_channel_join_confirm(rdp, s))
{
WLog_ERR(TAG,
"%s: %s - "
"%s - "
"rdp_client_connect_mcs_channel_join_confirm() fail",
__FUNCTION__, rdp_get_state_string(rdp));
rdp_get_state_string(rdp));
status = STATE_RUN_FAILED;
}
@ -1864,8 +1861,7 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
if (state_run_failed(status))
{
char buffer[64] = { 0 };
WLog_DBG(TAG, "%s: %s - rdp_client_connect_license() - %s", __FUNCTION__,
rdp_get_state_string(rdp),
WLog_DBG(TAG, "%s - rdp_client_connect_license() - %s", rdp_get_state_string(rdp),
state_run_result_string(status, buffer, ARRAYSIZE(buffer)));
}
@ -1887,9 +1883,9 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
{
char buffer[64] = { 0 };
WLog_DBG(TAG,
"%s: %s - "
"%s - "
"rdp_client_connect_demand_active() - %s",
__FUNCTION__, rdp_get_state_string(rdp),
rdp_get_state_string(rdp),
state_run_result_string(status, buffer, ARRAYSIZE(buffer)));
}
else if (status != STATE_RUN_REDIRECT)
@ -1932,15 +1928,13 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
if (state_run_failed(status))
{
char buffer[64] = { 0 };
WLog_DBG(TAG, "%s: %s - rdp_recv_pdu() - %s", __FUNCTION__,
rdp_get_state_string(rdp),
WLog_DBG(TAG, "%s - rdp_recv_pdu() - %s", rdp_get_state_string(rdp),
state_run_result_string(status, buffer, ARRAYSIZE(buffer)));
}
break;
default:
WLog_ERR(TAG, "%s: %s state %d", __FUNCTION__, rdp_get_state_string(rdp),
rdp_get_state(rdp));
WLog_ERR(TAG, "%s state %d", rdp_get_state_string(rdp), rdp_get_state(rdp));
status = STATE_RUN_FAILED;
break;
}
@ -1948,7 +1942,7 @@ static state_run_t rdp_recv_callback_int(rdpTransport* transport, wStream* s, vo
if (state_run_failed(status))
{
char buffer[64] = { 0 };
WLog_ERR(TAG, "%s: %s status %s", __FUNCTION__, rdp_get_state_string(rdp),
WLog_ERR(TAG, "%s status %s", rdp_get_state_string(rdp),
state_run_result_string(status, buffer, ARRAYSIZE(buffer)));
}
return status;

View File

@ -151,15 +151,13 @@ static BOOL rdp_redirection_read_unicode_string(wStream* s, char** str, size_t m
if ((length % 2) || length < 2 || length > maxLength)
{
WLog_ERR(TAG, "[%s] failure: invalid unicode string length: %" PRIu32 "", __FUNCTION__,
length);
WLog_ERR(TAG, "failure: invalid unicode string length: %" PRIu32 "", length);
return FALSE;
}
if (!Stream_CheckAndLogRequiredLength(TAG, s, length))
{
WLog_ERR(TAG, "[%s] failure: insufficient stream length (%" PRIu32 " bytes required)",
__FUNCTION__, length);
WLog_ERR(TAG, "failure: insufficient stream length (%" PRIu32 " bytes required)", length);
return FALSE;
}
@ -167,7 +165,7 @@ static BOOL rdp_redirection_read_unicode_string(wStream* s, char** str, size_t m
if (wstr[length / 2 - 1])
{
WLog_ERR(TAG, "[%s] failure: unterminated unicode string", __FUNCTION__);
WLog_ERR(TAG, "failure: unterminated unicode string");
return FALSE;
}
@ -175,7 +173,7 @@ static BOOL rdp_redirection_read_unicode_string(wStream* s, char** str, size_t m
*str = ConvertWCharNToUtf8Alloc(wstr, length / sizeof(WCHAR), NULL);
if (!*str)
{
WLog_ERR(TAG, "[%s] failure: string conversion failed", __FUNCTION__);
WLog_ERR(TAG, "failure: string conversion failed");
return FALSE;
}
@ -361,7 +359,7 @@ static state_run_t rdp_recv_server_redirection_pdu(rdpRdp* rdp, wStream* s)
{
char buffer1[1024] = { 0 };
char buffer2[1024] = { 0 };
WLog_ERR(TAG, "[%s] received invalid flags=%s, expected %s", __FUNCTION__,
WLog_ERR(TAG, "received invalid flags=%s, expected %s",
rdp_security_flag_string(flags, buffer1, sizeof(buffer1)),
rdp_security_flag_string(SEC_REDIRECTION_PKT, buffer2, sizeof(buffer2)));
return STATE_RUN_FAILED;

View File

@ -732,7 +732,7 @@ BOOL security_encrypt(BYTE* data, size_t length, rdpRdp* rdp)
EnterCriticalSection(&rdp->critical);
if (!rdp->rc4_encrypt_key)
{
WLog_ERR(TAG, "[%s] rdp->rc4_encrypt_key=%p", __FUNCTION__, rdp->rc4_encrypt_key);
WLog_ERR(TAG, "rdp->rc4_encrypt_key=%p", rdp->rc4_encrypt_key);
goto fail;
}
@ -766,7 +766,7 @@ BOOL security_decrypt(BYTE* data, size_t length, rdpRdp* rdp)
EnterCriticalSection(&rdp->critical);
if (!rdp->rc4_decrypt_key)
{
WLog_ERR(TAG, "[%s] rdp->rc4_decrypt_key=%p", __FUNCTION__, rdp->rc4_decrypt_key);
WLog_ERR(TAG, "rdp->rc4_decrypt_key=%p", rdp->rc4_decrypt_key);
goto fail;
}

View File

@ -512,7 +512,7 @@ static BOOL WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const
}
}
WLog_WARN(TAG, "[%s] unknown channelId %" PRIu16 " ignored", __FUNCTION__, channelId);
WLog_WARN(TAG, "unknown channelId %" PRIu16 " ignored", channelId);
return TRUE;
}

View File

@ -99,7 +99,7 @@ static void transport_ssl_cb(SSL* ssl, int where, int ret)
{
if (!freerdp_get_last_error(transport_get_context(transport)))
{
WLog_Print(transport->log, WLOG_ERROR, "%s: ACCESS DENIED", __FUNCTION__);
WLog_Print(transport->log, WLOG_ERROR, "ACCESS DENIED");
freerdp_set_last_error_log(transport_get_context(transport),
FREERDP_ERROR_AUTHENTICATION_FAILED);
}
@ -1001,8 +1001,7 @@ DWORD transport_get_event_handles(rdpTransport* transport, HANDLE* events, DWORD
{
if (count < 1)
{
WLog_Print(transport->log, WLOG_ERROR, "%s: provided handles array is too small",
__FUNCTION__);
WLog_Print(transport->log, WLOG_ERROR, "provided handles array is too small");
return 0;
}
@ -1023,9 +1022,9 @@ DWORD transport_get_event_handles(rdpTransport* transport, HANDLE* events, DWORD
if (nCount >= count)
{
WLog_Print(transport->log, WLOG_ERROR,
"%s: provided handles array is too small (count=%" PRIu32
" nCount=%" PRIu32 ")",
__FUNCTION__, count, nCount);
"provided handles array is too small (count=%" PRIu32 " nCount=%" PRIu32
")",
count, nCount);
return 0;
}
@ -1033,8 +1032,7 @@ DWORD transport_get_event_handles(rdpTransport* transport, HANDLE* events, DWORD
{
if (BIO_get_event(transport->frontBio, &events[nCount]) != 1)
{
WLog_Print(transport->log, WLOG_ERROR, "%s: error getting the frontBio handle",
__FUNCTION__);
WLog_Print(transport->log, WLOG_ERROR, "error getting the frontBio handle");
return 0;
}
nCount++;

View File

@ -269,14 +269,14 @@ BYTE* crypto_cert_hash(X509* xcert, const char* hash, UINT32* length)
}
if (!xcert || !length)
{
WLog_ERR(TAG, "[%s] Invalid arugments: xcert=%p, length=%p", __FUNCTION__, xcert, length);
WLog_ERR(TAG, "Invalid arugments: xcert=%p, length=%p", xcert, length);
return NULL;
}
fp = calloc(fp_len, sizeof(BYTE));
if (!fp)
{
WLog_ERR(TAG, "[%s] could not allocate %" PRIuz " bytes", __FUNCTION__, fp_len);
WLog_ERR(TAG, "could not allocate %" PRIuz " bytes", fp_len);
return NULL;
}

View File

@ -502,8 +502,7 @@ BOOL per_read_octet_string(wStream* s, const BYTE* oct_str, UINT16 length, UINT1
if (mlength + min != length)
{
WLog_ERR(TAG, "[%s] length mismatch: %" PRIu16 "!= %" PRIu16, __FUNCTION__, mlength + min,
length);
WLog_ERR(TAG, "length mismatch: %" PRIu16 "!= %" PRIu16, mlength + min, length);
return FALSE;
}

View File

@ -473,9 +473,9 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate)
if (!context || !bitmapUpdate || !context->gdi || !context->codecs)
{
WLog_ERR(TAG,
"[%s] Invalid arguments: context=%p, bitmapUpdate=%p, context->gdi=%p, "
"Invalid arguments: context=%p, bitmapUpdate=%p, context->gdi=%p, "
"context->codecs=%p",
__FUNCTION__, context, bitmapUpdate, context->gdi, context->codecs);
context, bitmapUpdate, context->gdi, context->codecs);
return FALSE;
}
@ -486,7 +486,7 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate)
if (!bmp)
{
WLog_ERR(TAG, "[%s] Bitmap_Alloc failed", __FUNCTION__);
WLog_ERR(TAG, "Bitmap_Alloc failed");
return FALSE;
}
@ -498,21 +498,21 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate)
bitmap->bitsPerPixel, bitmap->bitmapLength, bitmap->compressed,
RDP_CODEC_ID_NONE))
{
WLog_ERR(TAG, "[%s] bmp->Decompress failed", __FUNCTION__);
WLog_ERR(TAG, "bmp->Decompress failed");
Bitmap_Free(context, bmp);
return FALSE;
}
if (!bmp->New(context, bmp))
{
WLog_ERR(TAG, "[%s] bmp->New failed", __FUNCTION__);
WLog_ERR(TAG, "bmp->New failed");
Bitmap_Free(context, bmp);
return FALSE;
}
if (!bmp->Paint(context, bmp))
{
WLog_ERR(TAG, "[%s] bmp->Paint failed", __FUNCTION__);
WLog_ERR(TAG, "bmp->Paint failed");
Bitmap_Free(context, bmp);
return FALSE;
}
@ -961,25 +961,25 @@ out_fail:
static BOOL gdi_polygon_sc(rdpContext* context, const POLYGON_SC_ORDER* polygon_sc)
{
WLog_WARN(TAG, "%s: not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return FALSE;
}
static BOOL gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
{
WLog_WARN(TAG, "%s: not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return FALSE;
}
static BOOL gdi_ellipse_sc(rdpContext* context, const ELLIPSE_SC_ORDER* ellipse_sc)
{
WLog_WARN(TAG, "%s: not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return FALSE;
}
static BOOL gdi_ellipse_cb(rdpContext* context, const ELLIPSE_CB_ORDER* ellipse_cb)
{
WLog_WARN(TAG, "%s: not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return FALSE;
}

View File

@ -54,10 +54,9 @@ static BOOL is_within_surface(const gdiGfxSurface* surface, const RDPGFX_SURFACE
if (!is_rect_valid(&rect, surface->width, surface->height))
{
WLog_ERR(TAG,
"%s: Command rect %" PRIu32 "x" PRIu32 "-" PRIu32 "x" PRIu32
"Command rect %" PRIu32 "x" PRIu32 "-" PRIu32 "x" PRIu32
" not within bounds of " PRIu32 "x" PRIu32,
__FUNCTION__, rect.left, rect.top, cmd->width, cmd->height, surface->width,
surface->height);
rect.left, rect.top, cmd->width, cmd->height, surface->width, surface->height);
return FALSE;
}
@ -348,8 +347,7 @@ static UINT gdi_SurfaceCommand_Uncompressed(rdpGdi* gdi, RdpgfxClientContext* co
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -360,8 +358,7 @@ static UINT gdi_SurfaceCommand_Uncompressed(rdpGdi* gdi, RdpgfxClientContext* co
size = bpp * cmd->width * cmd->height * 1ULL;
if (cmd->length < size)
{
WLog_ERR(TAG, "%s: Not enough data, got %" PRIu32 ", expected %" PRIuz, __FUNCTION__,
cmd->length, size);
WLog_ERR(TAG, "Not enough data, got %" PRIu32 ", expected %" PRIuz, cmd->length, size);
return ERROR_INVALID_DATA;
}
@ -414,8 +411,7 @@ static UINT gdi_SurfaceCommand_RemoteFX(rdpGdi* gdi, RdpgfxClientContext* contex
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -474,8 +470,7 @@ static UINT gdi_SurfaceCommand_ClearCodec(rdpGdi* gdi, RdpgfxClientContext* cont
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -533,8 +528,7 @@ static UINT gdi_SurfaceCommand_Planar(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -594,8 +588,7 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -605,7 +598,7 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface->h264)
{
WLog_ERR(TAG, "%s: unable to create h264 context", __FUNCTION__);
WLog_ERR(TAG, "unable to create h264 context");
return ERROR_NOT_ENOUGH_MEMORY;
}
@ -685,8 +678,7 @@ static UINT gdi_SurfaceCommand_AVC444(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -696,7 +688,7 @@ static UINT gdi_SurfaceCommand_AVC444(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface->h264)
{
WLog_ERR(TAG, "%s: unable to create h264 context", __FUNCTION__);
WLog_ERR(TAG, "unable to create h264 context");
return ERROR_NOT_ENOUGH_MEMORY;
}
@ -825,8 +817,7 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context,
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -961,8 +952,7 @@ static UINT gdi_SurfaceCommand_Progressive(rdpGdi* gdi, RdpgfxClientContext* con
if (!surface)
{
WLog_ERR(TAG, "%s: unable to retrieve surfaceData for surfaceId=%" PRIu32 "", __FUNCTION__,
cmd->surfaceId);
WLog_ERR(TAG, "unable to retrieve surfaceData for surfaceId=%" PRIu32 "", cmd->surfaceId);
return ERROR_NOT_FOUND;
}
@ -1685,8 +1675,7 @@ static UINT gdi_MapSurfaceToOutput(RdpgfxClientContext* context,
if (surface->windowMapped)
{
WLog_WARN(TAG, "[%s] sufrace already windowMapped when trying to set outputMapped",
__func__);
WLog_WARN(TAG, "sufrace already windowMapped when trying to set outputMapped");
goto fail;
}
@ -1718,8 +1707,7 @@ gdi_MapSurfaceToScaledOutput(RdpgfxClientContext* context,
if (surface->windowMapped)
{
WLog_WARN(TAG, "[%s] sufrace already windowMapped when trying to set outputMapped",
__func__);
WLog_WARN(TAG, "sufrace already windowMapped when trying to set outputMapped");
goto fail;
}
@ -1755,8 +1743,7 @@ static UINT gdi_MapSurfaceToWindow(RdpgfxClientContext* context,
if (surface->outputMapped)
{
WLog_WARN(TAG, "[%s] sufrace already outputMapped when trying to set windowMapped",
__func__);
WLog_WARN(TAG, "sufrace already outputMapped when trying to set windowMapped");
goto fail;
}
@ -1764,8 +1751,8 @@ static UINT gdi_MapSurfaceToWindow(RdpgfxClientContext* context,
{
if (surface->windowId != surfaceToWindow->windowId)
{
WLog_WARN(TAG, "[%s] sufrace windowId mismatch, has %" PRIu64 ", expected %" PRIu64,
__func__, surface->windowId, surfaceToWindow->windowId);
WLog_WARN(TAG, "sufrace windowId mismatch, has %" PRIu64 ", expected %" PRIu64,
surface->windowId, surfaceToWindow->windowId);
goto fail;
}
}
@ -1799,8 +1786,7 @@ gdi_MapSurfaceToScaledWindow(RdpgfxClientContext* context,
if (surface->outputMapped)
{
WLog_WARN(TAG, "[%s] sufrace already outputMapped when trying to set windowMapped",
__func__);
WLog_WARN(TAG, "sufrace already outputMapped when trying to set windowMapped");
goto fail;
}
@ -1808,8 +1794,8 @@ gdi_MapSurfaceToScaledWindow(RdpgfxClientContext* context,
{
if (surface->windowId != surfaceToWindow->windowId)
{
WLog_WARN(TAG, "[%s] sufrace windowId mismatch, has %" PRIu64 ", expected %" PRIu64,
__func__, surface->windowId, surfaceToWindow->windowId);
WLog_WARN(TAG, "sufrace windowId mismatch, has %" PRIu64 ", expected %" PRIu64,
surface->windowId, surfaceToWindow->windowId);
goto fail;
}
}

View File

@ -142,7 +142,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
(DstWidth > UINT32_MAX / DstHeight) ||
(size > (UINT32_MAX / FreeRDPGetBytesPerPixel(bitmap->format))))
{
WLog_ERR(TAG, "[%s] invalid input data", __FUNCTION__);
WLog_ERR(TAG, "invalid input data");
return FALSE;
}
@ -164,7 +164,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
bitmap->top, bitmap->data, bitmap->format, gdi->stride,
gdi->height, &invalidRegion))
{
WLog_ERR(TAG, "[%s] rfx_process_message failed", __FUNCTION__);
WLog_ERR(TAG, "rfx_process_message failed");
return FALSE;
}
@ -178,7 +178,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
if (status < 1)
{
WLog_ERR(TAG, "[%s] nsc_process_message failed", __FUNCTION__);
WLog_ERR(TAG, "nsc_process_message failed");
return FALSE;
}
@ -192,7 +192,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
DstHeight, bpp, bitmap->data, bitmap->format, 0, 0, 0,
DstWidth, DstHeight, &gdi->palette))
{
WLog_ERR(TAG, "[%s] interleaved_decompress failed", __FUNCTION__);
WLog_ERR(TAG, "interleaved_decompress failed");
return FALSE;
}
}
@ -205,7 +205,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
bitmap->data, bitmap->format, 0, 0, 0, DstWidth, DstHeight,
TRUE))
{
WLog_ERR(TAG, "[%s] planar_decompress failed", __FUNCTION__);
WLog_ERR(TAG, "planar_decompress failed");
return FALSE;
}
}
@ -224,8 +224,8 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
if (dstSize < bitmap->length)
{
WLog_ERR(TAG, "[%s] dstSize %" PRIuz " < bitmap->length %" PRIu32, __FUNCTION__,
dstSize, bitmap->length);
WLog_ERR(TAG, "dstSize %" PRIuz " < bitmap->length %" PRIu32, dstSize,
bitmap->length);
return FALSE;
}
}
@ -233,7 +233,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const
if (!freerdp_image_copy(bitmap->data, bitmap->format, 0, 0, 0, DstWidth, DstHeight,
pSrcData, SrcFormat, 0, 0, 0, &gdi->palette, FREERDP_FLIP_VERTICAL))
{
WLog_ERR(TAG, "[%s] freerdp_image_copy failed", __FUNCTION__);
WLog_ERR(TAG, "freerdp_image_copy failed");
return FALSE;
}
}

View File

@ -220,8 +220,7 @@ BOOL gdi_RectToCRgn(const HGDI_RECT rect, INT32* x, INT32* y, INT32* w, INT32* h
if ((tmp < 0) || (tmp > INT32_MAX))
{
char buffer[256];
WLog_ERR(TAG, "[%s] rectangle invalid %s", __FUNCTION__,
gdi_rect_str(buffer, sizeof(buffer), rect));
WLog_ERR(TAG, "rectangle invalid %s", gdi_rect_str(buffer, sizeof(buffer), rect));
*w = 0;
rc = FALSE;
}
@ -231,8 +230,7 @@ BOOL gdi_RectToCRgn(const HGDI_RECT rect, INT32* x, INT32* y, INT32* w, INT32* h
if ((tmp < 0) || (tmp > INT32_MAX))
{
char buffer[256];
WLog_ERR(TAG, "[%s] rectangle invalid %s", __FUNCTION__,
gdi_rect_str(buffer, sizeof(buffer), rect));
WLog_ERR(TAG, "rectangle invalid %s", gdi_rect_str(buffer, sizeof(buffer), rect));
*h = 0;
rc = FALSE;
}

View File

@ -555,12 +555,12 @@ UINT rdpdr_read_capset_header(wLog* log, wStream* s, RDPDR_CAPABILITY_HEADER* he
Stream_Read_UINT32(s, header->Version); /* Version (4 bytes) */
WLog_Print(log, WLOG_TRACE,
"[%s] capability %s [0x%04" PRIx16 "] got version %" PRIu32 ", length %" PRIu16,
__FUNCTION__, rdpdr_cap_type_string(header->CapabilityType), header->CapabilityType,
"capability %s [0x%04" PRIx16 "] got version %" PRIu32 ", length %" PRIu16,
rdpdr_cap_type_string(header->CapabilityType), header->CapabilityType,
header->Version, header->CapabilityLength);
if (header->CapabilityLength < 8)
{
WLog_Print(log, WLOG_ERROR, "[%s] capability %s got short length %" PRIu32, __FUNCTION__,
WLog_Print(log, WLOG_ERROR, "capability %s got short length %" PRIu32,
rdpdr_cap_type_string(header->CapabilityType), header->CapabilityLength);
return ERROR_INVALID_DATA;
}
@ -581,8 +581,8 @@ UINT rdpdr_write_capset_header(wLog* log, wStream* s, const RDPDR_CAPABILITY_HEA
return ERROR_INVALID_DATA;
}
WLog_Print(log, WLOG_TRACE, "[%s] writing capability %s version %" PRIu32 ", length %" PRIu16,
__FUNCTION__, rdpdr_cap_type_string(header->CapabilityType), header->Version,
WLog_Print(log, WLOG_TRACE, "writing capability %s version %" PRIu32 ", length %" PRIu16,
rdpdr_cap_type_string(header->CapabilityType), header->Version,
header->CapabilityLength);
Stream_Write_UINT16(s, header->CapabilityType); /* CapabilityType (2 bytes) */
Stream_Write_UINT16(s, header->CapabilityLength); /* CapabilityLength (2 bytes) */

View File

@ -44,8 +44,8 @@ static UINT sf_peer_ainput_mouse_event(ainput_server_context* context, UINT64 ti
/* TODO: Implement */
WINPR_ASSERT(context);
WLog_WARN(TAG, "%s not implemented: 0x%08" PRIx64 ", 0x%08" PRIx64 ", %" PRId32 "x%" PRId32,
__FUNCTION__, timestamp, flags, x, y);
WLog_WARN(TAG, "not implemented: 0x%08" PRIx64 ", 0x%08" PRIx64 ", %" PRId32 "x%" PRId32,
timestamp, flags, x, y);
return CHANNEL_RC_OK;
}

View File

@ -56,7 +56,7 @@ static UINT sf_peer_audin_open_result(audin_server_context* context, UINT32 resu
/* TODO: Implement */
WINPR_ASSERT(context);
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
WLog_DBG(TAG, "AUDIN open result %" PRIu32 ".", result);
return CHANNEL_RC_OK;
}
@ -74,8 +74,8 @@ static UINT sf_peer_audin_receive_samples(audin_server_context* context, const A
WINPR_ASSERT(format);
WINPR_ASSERT(buf);
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_DBG(TAG, "%s receive %" PRIdz " frames.", __FUNCTION__, nframes);
WLog_WARN(TAG, "not implemented");
WLog_DBG(TAG, "receive %" PRIdz " frames.", nframes);
return CHANNEL_RC_OK;
}

View File

@ -593,8 +593,8 @@ static UINT rdpdr_process_server_core_capability_request(pf_channel_client_conte
rdpdr->common.capabilityVersions[header.CapabilityType] = header.Version;
WLog_Print(rdpdr->log, WLOG_TRACE,
"[%s] capability %s got version %" PRIu32 ", will use version %" PRIu32,
__FUNCTION__, rdpdr_cap_type_string(header.CapabilityType), header.Version,
"capability %s got version %" PRIu32 ", will use version %" PRIu32,
rdpdr_cap_type_string(header.CapabilityType), header.Version,
rdpdr->common.capabilityVersions[header.CapabilityType]);
}
@ -621,10 +621,10 @@ static UINT rdpdr_process_server_core_capability_request(pf_channel_client_conte
break;
default:
WLog_Print(
rdpdr->log, WLOG_WARN,
"[%s] unknown capability 0x%04" PRIx16 ", length %" PRIu16 ", version %" PRIu32,
__FUNCTION__, header.CapabilityType, header.CapabilityLength, header.Version);
WLog_Print(rdpdr->log, WLOG_WARN,
"unknown capability 0x%04" PRIx16 ", length %" PRIu16
", version %" PRIu32,
header.CapabilityType, header.CapabilityLength, header.Version);
Stream_Seek(s, header.CapabilityLength);
break;
}
@ -755,8 +755,8 @@ static UINT rdpdr_process_client_capability_response(pf_channel_server_context*
rdpdr->common.capabilityVersions[header.CapabilityType] = header.Version;
WLog_Print(rdpdr->log, WLOG_TRACE,
"[%s] capability %s got version %" PRIu32 ", will use version %" PRIu32,
__FUNCTION__, rdpdr_cap_type_string(header.CapabilityType), header.Version,
"capability %s got version %" PRIu32 ", will use version %" PRIu32,
rdpdr_cap_type_string(header.CapabilityType), header.Version,
rdpdr->common.capabilityVersions[header.CapabilityType]);
}
@ -898,7 +898,7 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co
if ((rdpdr->flags & mask) == mask)
{
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "[%s]: already past this state, abort!", __FUNCTION__);
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "already past this state, abort!");
return FALSE;
}
@ -908,7 +908,7 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co
Stream_Read_UINT16(s, component);
if (rcomponent != component)
{
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "[%s]: got component %s, expected %s", __FUNCTION__,
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "got component %s, expected %s",
rdpdr_component_string(component), rdpdr_component_string(rcomponent));
return FALSE;
}
@ -920,8 +920,8 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co
case PAKID_CORE_SERVER_CAPABILITY:
if (rdpdr->flags & STATE_CLIENT_EXPECT_SERVER_CORE_CAPABILITY_REQUEST)
{
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "[%s]: got duplicate packetid %s",
__FUNCTION__, rdpdr_packetid_string(packetid));
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "got duplicate packetid %s",
rdpdr_packetid_string(packetid));
return FALSE;
}
rdpdr->flags |= STATE_CLIENT_EXPECT_SERVER_CORE_CAPABILITY_REQUEST;
@ -930,8 +930,8 @@ rdpdr_process_server_capability_request_or_clientid_confirm(pf_channel_client_co
default:
if (rdpdr->flags & STATE_CLIENT_EXPECT_SERVER_CLIENT_ID_CONFIRM)
{
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "[%s]: got duplicate packetid %s",
__FUNCTION__, rdpdr_packetid_string(packetid));
CLIENT_RX_LOG(rdpdr->log, WLOG_WARN, "got duplicate packetid %s",
rdpdr_packetid_string(packetid));
return FALSE;
}
rdpdr->flags |= STATE_CLIENT_EXPECT_SERVER_CLIENT_ID_CONFIRM;
@ -1315,8 +1315,8 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
rdpdr = HashTable_GetItemValue(pc->interceptContextMap, channel_name);
if (!rdpdr)
{
WLog_ERR(TAG, "[%s]: Channel %s [0x%04" PRIx16 "] missing context in interceptContextMap",
__FUNCTION__, channel_name, channelId);
WLog_ERR(TAG, "Channel %s [0x%04" PRIx16 "] missing context in interceptContextMap",
channel_name, channelId);
return FALSE;
}
s = rdpdr->common.buffer;
@ -1325,8 +1325,8 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
if (!Stream_EnsureRemainingCapacity(s, xsize))
{
CLIENT_RX_LOG(rdpdr->log, WLOG_ERROR,
"[%s]: Channel %s [0x%04" PRIx16 "] not enough memory [need %" PRIuz "]",
__FUNCTION__, channel_name, channelId, xsize);
"Channel %s [0x%04" PRIx16 "] not enough memory [need %" PRIuz "]",
channel_name, channelId, xsize);
return FALSE;
}
Stream_Write(s, xdata, xsize);
@ -1419,10 +1419,9 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
default:
CLIENT_RX_LOG(
rdpdr->log, WLOG_ERROR,
"[%s]: Channel %s [0x%04" PRIx16
"Channel %s [0x%04" PRIx16
"] we´ve reached an impossible state %s! [%s] aliens invaded!",
__FUNCTION__, channel_name, channelId,
rdpdr_client_state_to_string(rdpdr->state),
channel_name, channelId, rdpdr_client_state_to_string(rdpdr->state),
rdpdr_packetid_string(packetid));
return FALSE;
}
@ -1433,10 +1432,9 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
#endif
default:
CLIENT_RX_LOG(rdpdr->log, WLOG_ERROR,
"[%s]: Channel %s [0x%04" PRIx16
"Channel %s [0x%04" PRIx16
"] we´ve reached an impossible state %s! aliens invaded!",
__FUNCTION__, channel_name, channelId,
rdpdr_client_state_to_string(rdpdr->state));
channel_name, channelId, rdpdr_client_state_to_string(rdpdr->state));
return FALSE;
}
@ -1790,7 +1788,7 @@ static pf_channel_server_context* get_channel(pServerContext* ps, BOOL send)
if (!rdpdr)
{
SERVER_RXTX_LOG(send, rdpdr->log, WLOG_ERROR,
"[%s]: Channel %s missing context in interceptContextMap", __FUNCTION__,
"Channel %s missing context in interceptContextMap",
RDPDR_SVC_CHANNEL_NAME);
return NULL;
}

View File

@ -259,7 +259,7 @@ fail:
BOOL pf_channel_smartcard_server_handle(pServerContext* ps, wStream* s)
{
WLog_ERR(TAG, "TODO: %s unimplemented", __FUNCTION__);
WLog_ERR(TAG, "TODO: unimplemented");
return TRUE;
}

View File

@ -52,8 +52,7 @@ static const char* strsignal(int signum)
static void cleanup_handler(int signum)
{
printf("\n");
WLog_INFO(TAG, "[%s]: caught signal %s [%d], starting cleanup...", __FUNCTION__,
strsignal(signum), signum);
WLog_INFO(TAG, "caught signal %s [%d], starting cleanup...", strsignal(signum), signum);
WLog_INFO(TAG, "stopping all connections.");
pf_server_stop(server);

View File

@ -53,7 +53,7 @@ static BOOL demo_client_init_connect(proxyPlugin* plugin, proxyData* pdata, void
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -63,7 +63,7 @@ static BOOL demo_client_uninit_connect(proxyPlugin* plugin, proxyData* pdata, vo
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -73,7 +73,7 @@ static BOOL demo_client_pre_connect(proxyPlugin* plugin, proxyData* pdata, void*
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -83,7 +83,7 @@ static BOOL demo_client_post_connect(proxyPlugin* plugin, proxyData* pdata, void
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -93,7 +93,7 @@ static BOOL demo_client_post_disconnect(proxyPlugin* plugin, proxyData* pdata, v
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -103,7 +103,7 @@ static BOOL demo_client_x509_certificate(proxyPlugin* plugin, proxyData* pdata,
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -113,7 +113,7 @@ static BOOL demo_client_login_failure(proxyPlugin* plugin, proxyData* pdata, voi
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -123,7 +123,7 @@ static BOOL demo_client_end_paint(proxyPlugin* plugin, proxyData* pdata, void* c
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -133,7 +133,7 @@ static BOOL demo_client_redirect(proxyPlugin* plugin, proxyData* pdata, void* cu
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -143,7 +143,7 @@ static BOOL demo_server_post_connect(proxyPlugin* plugin, proxyData* pdata, void
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -153,7 +153,7 @@ static BOOL demo_server_peer_activate(proxyPlugin* plugin, proxyData* pdata, voi
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -163,7 +163,7 @@ static BOOL demo_server_channels_init(proxyPlugin* plugin, proxyData* pdata, voi
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -173,7 +173,7 @@ static BOOL demo_server_channels_free(proxyPlugin* plugin, proxyData* pdata, voi
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -183,7 +183,7 @@ static BOOL demo_server_session_end(proxyPlugin* plugin, proxyData* pdata, void*
WINPR_ASSERT(pdata);
WINPR_ASSERT(custom);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -245,7 +245,7 @@ static BOOL demo_mouse_event(proxyPlugin* plugin, proxyData* pdata, void* param)
WINPR_ASSERT(pdata);
WINPR_ASSERT(event_data);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -257,7 +257,7 @@ static BOOL demo_mouse_ex_event(proxyPlugin* plugin, proxyData* pdata, void* par
WINPR_ASSERT(pdata);
WINPR_ASSERT(event_data);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -269,8 +269,8 @@ static BOOL demo_client_channel_data(proxyPlugin* plugin, proxyData* pdata, void
WINPR_ASSERT(pdata);
WINPR_ASSERT(channel);
WLog_INFO(TAG, "%s: %s [0x%04" PRIx16 "] got %" PRIuz, __FUNCTION__, channel->channel_name,
channel->channel_id, channel->data_len);
WLog_INFO(TAG, "%s [0x%04" PRIx16 "] got %" PRIuz, channel->channel_name, channel->channel_id,
channel->data_len);
return TRUE;
}
@ -282,8 +282,8 @@ static BOOL demo_server_channel_data(proxyPlugin* plugin, proxyData* pdata, void
WINPR_ASSERT(pdata);
WINPR_ASSERT(channel);
WLog_WARN(TAG, "%s: %s [0x%04" PRIx16 "] got %" PRIuz, __FUNCTION__, channel->channel_name,
channel->channel_id, channel->data_len);
WLog_WARN(TAG, "%s [0x%04" PRIx16 "] got %" PRIuz, channel->channel_name, channel->channel_id,
channel->data_len);
return TRUE;
}
@ -295,8 +295,7 @@ static BOOL demo_dynamic_channel_create(proxyPlugin* plugin, proxyData* pdata, v
WINPR_ASSERT(pdata);
WINPR_ASSERT(channel);
WLog_WARN(TAG, "%s: %s [0x%04" PRIx16 "]", __FUNCTION__, channel->channel_name,
channel->channel_id);
WLog_WARN(TAG, "%s [0x%04" PRIx16 "]", channel->channel_name, channel->channel_id);
return TRUE;
}
@ -308,7 +307,7 @@ static BOOL demo_server_fetch_target_addr(proxyPlugin* plugin, proxyData* pdata,
WINPR_ASSERT(pdata);
WINPR_ASSERT(event_data);
WLog_INFO(TAG, "%s", __FUNCTION__);
WLog_INFO(TAG, "called");
return TRUE;
}
@ -320,7 +319,7 @@ static BOOL demo_server_peer_logon(proxyPlugin* plugin, proxyData* pdata, void*
WINPR_ASSERT(info);
WINPR_ASSERT(info->identity);
WLog_INFO(TAG, "%s: %d", __FUNCTION__, info->automatic);
WLog_INFO(TAG, "%d", info->automatic);
return TRUE;
}

View File

@ -837,8 +837,7 @@ static DWORD WINAPI pf_client_thread_proc(pClientContext* pc)
if (status == WAIT_FAILED)
{
WLog_ERR(TAG, "%s: WaitForMultipleObjects failed with %" PRIu32 "", __FUNCTION__,
status);
WLog_ERR(TAG, "WaitForMultipleObjects failed with %" PRIu32 "", status);
break;
}

View File

@ -144,13 +144,13 @@ static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char*
strval = IniFile_GetKeyValueString(ini, section, key);
if (!strval && required)
{
WLog_ERR(TAG, "[%s]: key '%s.%s' does not exist.", __FUNCTION__, section, key);
WLog_ERR(TAG, "key '%s.%s' does not exist.", section, key);
return FALSE;
}
val = IniFile_GetKeyValueInt(ini, section, key);
if ((val <= 0) || (val > UINT16_MAX))
{
WLog_ERR(TAG, "[%s]: invalid value %d for key '%s.%s'.", __FUNCTION__, val, section, key);
WLog_ERR(TAG, "invalid value %d for key '%s.%s'.", val, section, key);
return FALSE;
}
@ -169,14 +169,14 @@ static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char*
strval = IniFile_GetKeyValueString(ini, section, key);
if (!strval && required)
{
WLog_ERR(TAG, "[%s]: key '%s.%s' does not exist.", __FUNCTION__, section, key);
WLog_ERR(TAG, "key '%s.%s' does not exist.", section, key);
return FALSE;
}
val = IniFile_GetKeyValueInt(ini, section, key);
if ((val < 0) || (val > INT32_MAX))
{
WLog_ERR(TAG, "[%s]: invalid value %d for key '%s.%s'.", __FUNCTION__, val, section, key);
WLog_ERR(TAG, "invalid value %d for key '%s.%s'.", val, section, key);
return FALSE;
}
@ -192,8 +192,8 @@ static BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* k
str_value = IniFile_GetKeyValueString(ini, section, key);
if (!str_value)
{
WLog_WARN(TAG, "[%s]: key '%s.%s' not found, value defaults to %s.", __FUNCTION__, section,
key, fallback ? bool_str_true : bool_str_false);
WLog_WARN(TAG, "key '%s.%s' not found, value defaults to %s.", section, key,
fallback ? bool_str_true : bool_str_false);
return fallback;
}
@ -220,7 +220,7 @@ static const char* pf_config_get_str(wIniFile* ini, const char* section, const c
if (!value)
{
if (required)
WLog_ERR(TAG, "[%s]: key '%s.%s' not found.", __FUNCTION__, section, key);
WLog_ERR(TAG, "key '%s.%s' not found.", section, key);
return NULL;
}
@ -653,13 +653,13 @@ proxyConfig* pf_server_config_load_buffer(const char* buffer)
if (!ini)
{
WLog_ERR(TAG, "[%s]: IniFile_New() failed!", __FUNCTION__);
WLog_ERR(TAG, "IniFile_New() failed!");
return NULL;
}
if (IniFile_ReadBuffer(ini, buffer) < 0)
{
WLog_ERR(TAG, "[%s] failed to parse ini: '%s'", __FUNCTION__, buffer);
WLog_ERR(TAG, "failed to parse ini: '%s'", buffer);
goto out;
}
@ -676,13 +676,13 @@ proxyConfig* pf_server_config_load_file(const char* path)
if (!ini)
{
WLog_ERR(TAG, "[%s]: IniFile_New() failed!", __FUNCTION__);
WLog_ERR(TAG, "IniFile_New() failed!");
return NULL;
}
if (IniFile_ReadFile(ini, path) < 0)
{
WLog_ERR(TAG, "[%s] failed to parse ini file: '%s'", __FUNCTION__, path);
WLog_ERR(TAG, "failed to parse ini file: '%s'", path);
goto out;
}
@ -957,7 +957,7 @@ static BOOL config_plugin_keyboard_event(proxyPlugin* plugin, proxyData* pdata,
WINPR_ASSERT(cfg);
rc = cfg->Keyboard;
WLog_DBG(TAG, "%s: %s", __FUNCTION__, boolstr(rc));
WLog_DBG(TAG, "%s", boolstr(rc));
return rc;
}
@ -981,7 +981,7 @@ static BOOL config_plugin_unicode_event(proxyPlugin* plugin, proxyData* pdata, v
WINPR_ASSERT(cfg);
rc = cfg->Keyboard;
WLog_DBG(TAG, "%s: %s", __FUNCTION__, boolstr(rc));
WLog_DBG(TAG, "%s", boolstr(rc));
return rc;
}
@ -1039,8 +1039,8 @@ static BOOL config_plugin_client_channel_data(proxyPlugin* plugin, proxyData* pd
WINPR_ASSERT(pdata);
WINPR_ASSERT(channel);
WLog_DBG(TAG, "%s: %s [0x%04" PRIx16 "] got %" PRIuz, __FUNCTION__, channel->channel_name,
channel->channel_id, channel->data_len);
WLog_DBG(TAG, "%s [0x%04" PRIx16 "] got %" PRIuz, channel->channel_name, channel->channel_id,
channel->data_len);
return TRUE;
}
@ -1052,8 +1052,8 @@ static BOOL config_plugin_server_channel_data(proxyPlugin* plugin, proxyData* pd
WINPR_ASSERT(pdata);
WINPR_ASSERT(channel);
WLog_DBG(TAG, "%s: %s [0x%04" PRIx16 "] got %" PRIuz, __FUNCTION__, channel->channel_name,
channel->channel_id, channel->data_len);
WLog_DBG(TAG, "%s [0x%04" PRIx16 "] got %" PRIuz, channel->channel_name, channel->channel_id,
channel->data_len);
return TRUE;
}
@ -1120,8 +1120,8 @@ static BOOL config_plugin_dynamic_channel_create(proxyPlugin* plugin, proxyData*
accept = cfg->CameraRedirection;
}
WLog_DBG(TAG, "%s: %s [0x%04" PRIx16 "]: %s", __FUNCTION__, channel->channel_name,
channel->channel_id, boolstr(accept));
WLog_DBG(TAG, "%s [0x%04" PRIx16 "]: %s", channel->channel_name, channel->channel_id,
boolstr(accept));
return accept;
}
@ -1174,7 +1174,7 @@ static BOOL config_plugin_channel_create(proxyPlugin* plugin, proxyData* pdata,
accept = cfg->RemoteApp;
}
WLog_DBG(TAG, "%s: %s [static]: %s", __FUNCTION__, channel->channel_name, boolstr(accept));
WLog_DBG(TAG, "%s [static]: %s", channel->channel_name, boolstr(accept));
return accept;
}

View File

@ -248,7 +248,7 @@ static BOOL pf_modules_ArrayList_ForEachFkt(void* data, size_t index, va_list ap
pdata = va_arg(ap, proxyData*);
param = va_arg(ap, void*);
WLog_VRB(TAG, "[%s]: running filter: %s", __FUNCTION__, plugin->name);
WLog_VRB(TAG, "running filter: %s", plugin->name);
switch (type)
{
@ -375,7 +375,7 @@ static void* pf_modules_get_plugin_data(proxyPluginsManager* mgr, const char* pl
static void pf_modules_abort_connect(proxyPluginsManager* mgr, proxyData* pdata)
{
WINPR_ASSERT(pdata);
WLog_DBG(TAG, "%s is called!", __FUNCTION__);
WLog_DBG(TAG, "is called!");
proxy_data_abort_connect(pdata);
}
@ -413,8 +413,7 @@ static BOOL pf_modules_register_plugin(proxyPluginsManager* mgr,
if (!ArrayList_Append(module->plugins, &internal))
{
WLog_ERR(TAG, "[%s]: failed adding plugin to list: %s", __FUNCTION__,
plugin_to_register->name);
WLog_ERR(TAG, "failed adding plugin to list: %s", plugin_to_register->name);
return FALSE;
}
@ -479,14 +478,14 @@ static BOOL pf_modules_load_module(const char* module_path, proxyModule* module,
if (handle == NULL)
{
WLog_ERR(TAG, "[%s]: failed loading external library: %s", __FUNCTION__, module_path);
WLog_ERR(TAG, "failed loading external library: %s", module_path);
return FALSE;
}
pEntryPoint = (proxyModuleEntryPoint)GetProcAddress(handle, MODULE_ENTRY_POINT);
if (!pEntryPoint)
{
WLog_ERR(TAG, "[%s]: GetProcAddress failed while loading %s", __FUNCTION__, module_path);
WLog_ERR(TAG, "GetProcAddress failed while loading %s", module_path);
goto error;
}
if (!ArrayList_Append(module->handles, handle))
@ -546,7 +545,7 @@ proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t c
if (module->plugins == NULL)
{
WLog_ERR(TAG, "[%s]: ArrayList_New failed!", __FUNCTION__);
WLog_ERR(TAG, "ArrayList_New failed!");
goto error;
}
obj = ArrayList_Object(module->plugins);
@ -559,7 +558,7 @@ proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t c
if (module->handles == NULL)
{
WLog_ERR(TAG, "[%s]: ArrayList_New failed!", __FUNCTION__);
WLog_ERR(TAG, "ArrayList_New failed!");
goto error;
}
ArrayList_Object(module->handles)->fnObjectFree = free_handle;

View File

@ -79,7 +79,7 @@ static BOOL pf_client_begin_paint(rdpContext* context)
WINPR_ASSERT(ps);
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->BeginPaint);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->BeginPaint(ps);
}
@ -101,7 +101,7 @@ static BOOL pf_client_end_paint(rdpContext* context)
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->EndPaint);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
/* proxy end paint */
if (!ps->update->EndPaint(ps))
@ -125,7 +125,7 @@ static BOOL pf_client_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bi
WINPR_ASSERT(ps);
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->BitmapUpdate);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->BitmapUpdate(ps, bitmap);
}
@ -143,7 +143,7 @@ static BOOL pf_client_desktop_resize(rdpContext* context)
WINPR_ASSERT(ps->update->DesktopResize);
WINPR_ASSERT(context->settings);
WINPR_ASSERT(ps->settings);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
ps->settings->DesktopWidth = context->settings->DesktopWidth;
ps->settings->DesktopHeight = context->settings->DesktopHeight;
return ps->update->DesktopResize(ps);
@ -160,7 +160,7 @@ static BOOL pf_client_remote_monitors(rdpContext* context, UINT32 count,
WINPR_ASSERT(pdata);
ps = (rdpContext*)pdata->ps;
WINPR_ASSERT(ps);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return freerdp_display_send_monitor_layout(ps, count, monitors);
}
@ -178,7 +178,7 @@ static BOOL pf_client_send_pointer_system(rdpContext* context,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerSystem);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerSystem(ps, pointer_system);
}
@ -196,7 +196,7 @@ static BOOL pf_client_send_pointer_position(rdpContext* context,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerPosition);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerPosition(ps, pointerPosition);
}
@ -214,7 +214,7 @@ static BOOL pf_client_send_pointer_color(rdpContext* context,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerColor);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerColor(ps, pointer_color);
}
@ -232,7 +232,7 @@ static BOOL pf_client_send_pointer_large(rdpContext* context,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerLarge);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerLarge(ps, pointer_large);
}
@ -249,7 +249,7 @@ static BOOL pf_client_send_pointer_new(rdpContext* context, const POINTER_NEW_UP
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerNew);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerNew(ps, pointer_new);
}
@ -267,7 +267,7 @@ static BOOL pf_client_send_pointer_cached(rdpContext* context,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->pointer);
WINPR_ASSERT(ps->update->pointer->PointerCached);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->pointer->PointerCached(ps, pointer_cached);
}
@ -285,7 +285,7 @@ static BOOL pf_client_save_session_info(rdpContext* context, UINT32 type, void*
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->SaveSessionInfo);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
switch (type)
{
@ -318,7 +318,7 @@ static BOOL pf_client_server_status_info(rdpContext* context, UINT32 status)
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->ServerStatusInfo);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->ServerStatusInfo(ps, status);
}
@ -335,7 +335,7 @@ static BOOL pf_client_set_keyboard_indicators(rdpContext* context, UINT16 led_fl
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->SetKeyboardIndicators);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->SetKeyboardIndicators(ps, led_flags);
}
@ -353,7 +353,7 @@ static BOOL pf_client_set_keyboard_ime_status(rdpContext* context, UINT16 imeId,
WINPR_ASSERT(ps->update);
WINPR_ASSERT(ps->update->SetKeyboardImeStatus);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
return ps->update->SetKeyboardImeStatus(ps, imeId, imeState, imeConvMode);
}
@ -373,7 +373,7 @@ static BOOL pf_client_window_create(rdpContext* context, const WINDOW_ORDER_INFO
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->WindowCreate);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->WindowCreate(ps, orderInfo, windowState);
rdp_update_unlock(ps->update);
@ -396,7 +396,7 @@ static BOOL pf_client_window_update(rdpContext* context, const WINDOW_ORDER_INFO
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->WindowUpdate);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->WindowUpdate(ps, orderInfo, windowState);
rdp_update_unlock(ps->update);
@ -419,7 +419,7 @@ static BOOL pf_client_window_icon(rdpContext* context, const WINDOW_ORDER_INFO*
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->WindowIcon);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->WindowIcon(ps, orderInfo, windowIcon);
rdp_update_unlock(ps->update);
@ -442,7 +442,7 @@ static BOOL pf_client_window_cached_icon(rdpContext* context, const WINDOW_ORDER
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->WindowCachedIcon);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->WindowCachedIcon(ps, orderInfo, windowCachedIcon);
rdp_update_unlock(ps->update);
@ -464,7 +464,7 @@ static BOOL pf_client_window_delete(rdpContext* context, const WINDOW_ORDER_INFO
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->WindowDelete);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->WindowDelete(ps, orderInfo);
rdp_update_unlock(ps->update);
@ -487,7 +487,7 @@ static BOOL pf_client_notify_icon_create(rdpContext* context, const WINDOW_ORDER
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->NotifyIconCreate);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->NotifyIconCreate(ps, orderInfo, notifyIconState);
rdp_update_unlock(ps->update);
@ -510,7 +510,7 @@ static BOOL pf_client_notify_icon_update(rdpContext* context, const WINDOW_ORDER
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->NotifyIconUpdate);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->NotifyIconUpdate(ps, orderInfo, notifyIconState);
rdp_update_unlock(ps->update);
@ -533,7 +533,7 @@ static BOOL pf_client_notify_icon_delete(rdpContext* context, const WINDOW_ORDER
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->NotifyIconDelete);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->NotifyIconDelete(ps, orderInfo);
rdp_update_unlock(ps->update);
@ -556,7 +556,7 @@ static BOOL pf_client_monitored_desktop(rdpContext* context, const WINDOW_ORDER_
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->MonitoredDesktop);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->MonitoredDesktop(ps, orderInfo, monitoredDesktop);
rdp_update_unlock(ps->update);
@ -578,7 +578,7 @@ static BOOL pf_client_non_monitored_desktop(rdpContext* context, const WINDOW_OR
WINPR_ASSERT(ps->update->window);
WINPR_ASSERT(ps->update->window->NonMonitoredDesktop);
WLog_DBG(TAG, __FUNCTION__);
WLog_DBG(TAG, "called");
rdp_update_lock(ps->update);
rc = ps->update->window->NonMonitoredDesktop(ps, orderInfo);
rdp_update_unlock(ps->update);

View File

@ -40,7 +40,7 @@
static BOOL win_shadow_input_synchronize_event(rdpShadowSubsystem* subsystem,
rdpShadowClient* client, UINT32 flags)
{
WLog_WARN(TAG, "%s: TODO: Implement!", __FUNCTION__);
WLog_WARN(TAG, "TODO: Implement!");
return TRUE;
}

View File

@ -201,7 +201,7 @@ static BOOL x11_shadow_input_synchronize_event(rdpShadowSubsystem* subsystem,
rdpShadowClient* client, UINT32 flags)
{
/* TODO: Implement */
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return TRUE;
}
@ -256,7 +256,7 @@ static BOOL x11_shadow_input_unicode_keyboard_event(rdpShadowSubsystem* subsyste
UINT16 code)
{
/* TODO: Implement */
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
return TRUE;
}

View File

@ -68,7 +68,7 @@ static UINT AudinServerOpening(audin_server_context* context)
static UINT AudinServerOpenResult(audin_server_context* context, UINT32 result)
{
/* TODO: Implement */
WLog_WARN(TAG, "%s not implemented", __FUNCTION__);
WLog_WARN(TAG, "not implemented");
WLog_INFO(TAG, "AUDIN open result %" PRIu32 ".\n", result);
return CHANNEL_RC_OK;
}

View File

@ -469,7 +469,7 @@ def write_getter_body(f, values, ret):
for val in values:
write_getter_case(f, val)
f.write('\t\tdefault:\n')
f.write('\t\t\tWLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n')
f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n')
f.write('\t\t\treturn ' + ret + ';\n')
f.write('\t}\n')
f.write('}\n\n')
@ -556,7 +556,7 @@ def write_setter(f, entry_dict, entry_type, entry_name):
for val in values:
write_setter_case(f, val, isString, isPointer)
f.write('\t\tdefault:\n')
f.write('\t\t\tWLog_ERR(TAG, "[%s] Invalid key index %" PRIuz " [%s|%s]", __FUNCTION__, id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n')
f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n')
f.write('\t\t\treturn FALSE;\n')
f.write('\t}\n')
f.write('\treturn TRUE;\n')

View File

@ -140,7 +140,7 @@ BOOL BuildCommDCBA(LPCSTR lpDef, LPDCB lpDCB)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -151,7 +151,7 @@ BOOL BuildCommDCBW(LPCWSTR lpDef, LPDCB lpDCB)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -162,7 +162,7 @@ BOOL BuildCommDCBAndTimeoutsA(LPCSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTi
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -173,7 +173,7 @@ BOOL BuildCommDCBAndTimeoutsW(LPCWSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommT
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -184,7 +184,7 @@ BOOL CommConfigDialogA(LPCSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -195,7 +195,7 @@ BOOL CommConfigDialogW(LPCWSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -212,7 +212,7 @@ BOOL GetCommConfig(HANDLE hCommDev, LPCOMMCONFIG lpCC, LPDWORD lpdwSize)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -229,7 +229,7 @@ BOOL SetCommConfig(HANDLE hCommDev, LPCOMMCONFIG lpCC, DWORD dwSize)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -246,7 +246,7 @@ BOOL GetCommMask(HANDLE hFile, PDWORD lpEvtMask)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -263,7 +263,7 @@ BOOL SetCommMask(HANDLE hFile, DWORD dwEvtMask)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -280,7 +280,7 @@ BOOL GetCommModemStatus(HANDLE hFile, PDWORD lpModemStat)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -741,7 +741,7 @@ BOOL GetDefaultCommConfigA(LPCSTR lpszName, LPCOMMCONFIG lpCC, LPDWORD lpdwSize)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -752,7 +752,7 @@ BOOL GetDefaultCommConfigW(LPCWSTR lpszName, LPCOMMCONFIG lpCC, LPDWORD lpdwSize
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -763,7 +763,7 @@ BOOL SetDefaultCommConfigA(LPCSTR lpszName, LPCOMMCONFIG lpCC, DWORD dwSize)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -774,7 +774,7 @@ BOOL SetDefaultCommConfigW(LPCWSTR lpszName, LPCOMMCONFIG lpCC, DWORD dwSize)
return FALSE;
/* TODO: not implemented */
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -791,7 +791,7 @@ BOOL SetCommBreak(HANDLE hFile)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -808,7 +808,7 @@ BOOL ClearCommBreak(HANDLE hFile)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -825,7 +825,7 @@ BOOL ClearCommError(HANDLE hFile, PDWORD lpErrors, LPCOMSTAT lpStat)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -882,7 +882,7 @@ BOOL EscapeCommFunction(HANDLE hFile, DWORD dwFunc)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -899,7 +899,7 @@ BOOL TransmitCommChar(HANDLE hFile, char cChar)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -916,7 +916,7 @@ BOOL WaitCommEvent(HANDLE hFile, PDWORD lpEvtMask, LPOVERLAPPED lpOverlapped)
if (!pComm)
return FALSE;
CommLog_Print(WLOG_ERROR, "%s: Not implemented", __FUNCTION__);
CommLog_Print(WLOG_ERROR, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}

View File

@ -44,7 +44,7 @@ static int convert_int(JNIEnv* env, const void* data, size_t size, void* buffer,
if (!utf8 || !utf16 || !stringClass)
{
WLog_ERR(TAG, "[%s] utf8-%p, utf16=%p, stringClass=%p", __func__, utf8, utf16, stringClass);
WLog_ERR(TAG, "utf8-%p, utf16=%p, stringClass=%p", utf8, utf16, stringClass);
return -1;
}
@ -54,14 +54,14 @@ static int convert_int(JNIEnv* env, const void* data, size_t size, void* buffer,
(*env)->GetMethodID(env, stringClass, "getBytes", "(Ljava/lang/String;)[B");
if (!constructorID || !getBytesID)
{
WLog_ERR(TAG, "[%s] constructorID=%p, getBytesID=%p", __func__, constructorID, getBytesID);
WLog_ERR(TAG, "constructorID=%p, getBytesID=%p", constructorID, getBytesID);
return -2;
}
jbyteArray ret = (*env)->NewByteArray(env, size);
if (!ret)
{
WLog_ERR(TAG, "[%s] NewByteArray(%" PRIuz ") failed", __func__, size);
WLog_ERR(TAG, "NewByteArray(%" PRIuz ") failed", size);
return -3;
}
@ -70,16 +70,14 @@ static int convert_int(JNIEnv* env, const void* data, size_t size, void* buffer,
jobject obj = (*env)->NewObject(env, stringClass, constructorID, ret, toUTF16 ? utf8 : utf16);
if (!obj)
{
WLog_ERR(TAG, "[%s] NewObject(String, byteArray, UTF-%d) failed", __func__,
toUTF16 ? 16 : 8);
WLog_ERR(TAG, "NewObject(String, byteArray, UTF-%d) failed", toUTF16 ? 16 : 8);
return -4;
}
jbyteArray res = (*env)->CallObjectMethod(env, obj, getBytesID, toUTF16 ? utf16 : utf8);
if (!res)
{
WLog_ERR(TAG, "[%s] CallObjectMethod(String, getBytes, UTF-%d) failed", __func__,
toUTF16 ? 16 : 8);
WLog_ERR(TAG, "CallObjectMethod(String, getBytes, UTF-%d) failed", toUTF16 ? 16 : 8);
return -4;
}

View File

@ -97,8 +97,8 @@ int int_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
if (targetCapacity > 0)
{
cchWideChar = 0;
WLog_ERR(TAG, "[%s] insufficient buffer supplied, got %d, required %d",
__FUNCTION__, targetCapacity, targetLength);
WLog_ERR(TAG, "insufficient buffer supplied, got %d, required %d",
targetCapacity, targetLength);
SetLastError(ERROR_INSUFFICIENT_BUFFER);
}
else
@ -111,12 +111,12 @@ int int_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
cchWideChar = targetLength;
break;
default:
WLog_WARN(TAG, "[%s] unexpected ICU error code %s [0x%08" PRIx32 "]", __func__,
u_errorName(error), error);
WLog_WARN(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "]", u_errorName(error),
error);
if (U_FAILURE(error))
{
WLog_ERR(TAG, "[%s] unexpected ICU error code %s [0x%08" PRIx32 "] is fatal",
__func__, u_errorName(error), error);
WLog_ERR(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "] is fatal",
u_errorName(error), error);
cchWideChar = 0;
SetLastError(ERROR_NO_UNICODE_TRANSLATION);
}
@ -182,8 +182,8 @@ int int_WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr,
case U_BUFFER_OVERFLOW_ERROR:
if (targetCapacity > 0)
{
WLog_ERR(TAG, "[%s] insufficient buffer supplied, got %d, required %d",
__FUNCTION__, targetCapacity, targetLength);
WLog_ERR(TAG, "insufficient buffer supplied, got %d, required %d",
targetCapacity, targetLength);
cbMultiByte = 0;
SetLastError(ERROR_INSUFFICIENT_BUFFER);
}
@ -197,12 +197,12 @@ int int_WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr,
cbMultiByte = targetLength;
break;
default:
WLog_WARN(TAG, "[%s] unexpected ICU error code %s [0x%08" PRIx32 "]", __func__,
u_errorName(error), error);
WLog_WARN(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "]", u_errorName(error),
error);
if (U_FAILURE(error))
{
WLog_ERR(TAG, "[%s] unexpected ICU error code %s [0x%08" PRIx32 "] is fatal",
__func__, u_errorName(error), error);
WLog_ERR(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "] is fatal",
u_errorName(error), error);
cbMultiByte = 0;
SetLastError(ERROR_NO_UNICODE_TRANSLATION);
}

View File

@ -207,7 +207,7 @@ static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -247,7 +247,7 @@ static BOOL FileWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrit
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -394,7 +394,7 @@ static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved,
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -500,7 +500,7 @@ static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfByte
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -788,7 +788,7 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
if (dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED)
{
WLog_ERR(TAG, "WinPR %s does not support the FILE_FLAG_OVERLAPPED flag", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the FILE_FLAG_OVERLAPPED flag");
SetLastError(ERROR_NOT_SUPPORTED);
return INVALID_HANDLE_VALUE;
}

View File

@ -622,7 +622,7 @@ BOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes)
char buffer[8192] = { 0 };
const char* flags =
flagsToStr(buffer, sizeof(buffer), dwFileAttributes & ~FILE_ATTRIBUTE_READONLY);
WLog_WARN(TAG, "[%s] Unsupported flags %s, ignoring!", __FUNCTION__, flags);
WLog_WARN(TAG, "Unsupported flags %s, ignoring!", flags);
}
fd = open(lpFileName, O_RDONLY);
@ -663,7 +663,7 @@ BOOL SetFileAttributesW(LPCWSTR lpFileName, DWORD dwFileAttributes)
char buffer[8192] = { 0 };
const char* flags =
flagsToStr(buffer, sizeof(buffer), dwFileAttributes & ~FILE_ATTRIBUTE_READONLY);
WLog_WARN(TAG, "[%s] Unsupported flags %s, ignoring!", __FUNCTION__, flags);
WLog_WARN(TAG, "Unsupported flags %s, ignoring!", flags);
}
lpCFileName = ConvertWCharToUtf8Alloc(lpFileName, NULL);
@ -867,7 +867,7 @@ BOOL WINAPI SetFileTime(HANDLE hFile, const FILETIME* lpCreationTime,
if (handle->ops->SetFileTime)
return handle->ops->SetFileTime(handle, lpCreationTime, lpLastAccessTime, lpLastWriteTime);
WLog_ERR(TAG, "%s operation not implemented", __FUNCTION__);
WLog_ERR(TAG, "operation not implemented");
return FALSE;
}

View File

@ -131,7 +131,7 @@ static HANDLE NamedPipeClientCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAcces
if (dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED)
{
WLog_ERR(TAG, "WinPR %s does not support the FILE_FLAG_OVERLAPPED flag", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the FILE_FLAG_OVERLAPPED flag");
SetLastError(ERROR_NOT_SUPPORTED);
return INVALID_HANDLE_VALUE;
}

View File

@ -52,7 +52,7 @@ BOOL GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped,
LPDWORD lpNumberOfBytesTransferred, BOOL bWait)
{
#if 1
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
#else
@ -131,7 +131,7 @@ BOOL GetOverlappedResultEx(HANDLE hFile, LPOVERLAPPED lpOverlapped,
LPDWORD lpNumberOfBytesTransferred, DWORD dwMilliseconds,
BOOL bAlertable)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -140,7 +140,7 @@ BOOL DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, D
LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned,
LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -148,7 +148,7 @@ BOOL DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, D
HANDLE CreateIoCompletionPort(HANDLE FileHandle, HANDLE ExistingCompletionPort,
ULONG_PTR CompletionKey, DWORD NumberOfConcurrentThreads)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -157,7 +157,7 @@ BOOL GetQueuedCompletionStatus(HANDLE CompletionPort, LPDWORD lpNumberOfBytesTra
PULONG_PTR lpCompletionKey, LPOVERLAPPED* lpOverlapped,
DWORD dwMilliseconds)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -166,7 +166,7 @@ BOOL GetQueuedCompletionStatusEx(HANDLE CompletionPort, LPOVERLAPPED_ENTRY lpCom
ULONG ulCount, PULONG ulNumEntriesRemoved, DWORD dwMilliseconds,
BOOL fAlertable)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -174,28 +174,28 @@ BOOL GetQueuedCompletionStatusEx(HANDLE CompletionPort, LPOVERLAPPED_ENTRY lpCom
BOOL PostQueuedCompletionStatus(HANDLE CompletionPort, DWORD dwNumberOfBytesTransferred,
ULONG_PTR dwCompletionKey, LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL CancelIo(HANDLE hFile)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL CancelIoEx(HANDLE hFile, LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL CancelSynchronousIo(HANDLE hThread)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -222,7 +222,7 @@ BOOL DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, D
LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned,
LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -230,7 +230,7 @@ BOOL DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, D
HANDLE CreateIoCompletionPort(HANDLE FileHandle, HANDLE ExistingCompletionPort,
ULONG_PTR CompletionKey, DWORD NumberOfConcurrentThreads)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -239,7 +239,7 @@ BOOL GetQueuedCompletionStatus(HANDLE CompletionPort, LPDWORD lpNumberOfBytesTra
PULONG_PTR lpCompletionKey, LPOVERLAPPED* lpOverlapped,
DWORD dwMilliseconds)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -248,7 +248,7 @@ BOOL GetQueuedCompletionStatusEx(HANDLE CompletionPort, LPOVERLAPPED_ENTRY lpCom
ULONG ulCount, PULONG ulNumEntriesRemoved, DWORD dwMilliseconds,
BOOL fAlertable)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -256,7 +256,7 @@ BOOL GetQueuedCompletionStatusEx(HANDLE CompletionPort, LPOVERLAPPED_ENTRY lpCom
BOOL PostQueuedCompletionStatus(HANDLE CompletionPort, DWORD dwNumberOfBytesTransferred,
ULONG_PTR dwCompletionKey, LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -268,7 +268,7 @@ BOOL CancelIo(HANDLE hFile)
BOOL CancelSynchronousIo(HANDLE hThread)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}

View File

@ -82,7 +82,7 @@
DLL_DIRECTORY_COOKIE AddDllDirectory(PCWSTR NewDirectory)
{
/* TODO: Implement */
WLog_ERR(TAG, "%s not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -90,7 +90,7 @@ DLL_DIRECTORY_COOKIE AddDllDirectory(PCWSTR NewDirectory)
BOOL RemoveDllDirectory(DLL_DIRECTORY_COOKIE Cookie)
{
/* TODO: Implement */
WLog_ERR(TAG, "%s not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -98,7 +98,7 @@ BOOL RemoveDllDirectory(DLL_DIRECTORY_COOKIE Cookie)
BOOL SetDefaultDllDirectories(DWORD DirectoryFlags)
{
/* TODO: Implement */
WLog_ERR(TAG, "%s not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -127,7 +127,7 @@ HMODULE LoadLibraryA(LPCSTR lpLibFileName)
if (!library)
{
const char* err = dlerror();
WLog_ERR(TAG, "%s failed with %s", __FUNCTION__, err);
WLog_ERR(TAG, "failed with %s", err);
return NULL;
}
@ -156,10 +156,10 @@ HMODULE LoadLibraryW(LPCWSTR lpLibFileName)
HMODULE LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
{
if (dwFlags != 0)
WLog_WARN(TAG, "%s does not support dwFlags 0x%08" PRIx32, __FUNCTION__, dwFlags);
WLog_WARN(TAG, "does not support dwFlags 0x%08" PRIx32, dwFlags);
if (hFile)
WLog_WARN(TAG, "%s does not support hFile != NULL", __FUNCTION__);
WLog_WARN(TAG, "does not support hFile != NULL");
return LoadLibraryA(lpLibFileName);
}
@ -167,10 +167,10 @@ HMODULE LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
HMODULE LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
{
if (dwFlags != 0)
WLog_WARN(TAG, "%s does not support dwFlags 0x%08" PRIx32, __FUNCTION__, dwFlags);
WLog_WARN(TAG, "does not support dwFlags 0x%08" PRIx32, dwFlags);
if (hFile)
WLog_WARN(TAG, "%s does not support hFile != NULL", __FUNCTION__);
WLog_WARN(TAG, "does not support hFile != NULL");
return LoadLibraryW(lpLibFileName);
}
@ -207,7 +207,7 @@ BOOL FreeLibrary(HMODULE hLibModule)
HMODULE GetModuleHandleA(LPCSTR lpModuleName)
{
/* TODO: Implement */
WLog_ERR(TAG, "%s not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -215,7 +215,7 @@ HMODULE GetModuleHandleA(LPCSTR lpModuleName)
HMODULE GetModuleHandleW(LPCWSTR lpModuleName)
{
/* TODO: Implement */
WLog_ERR(TAG, "%s not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -339,7 +339,7 @@ DWORD GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize)
}
#endif
WLog_ERR(TAG, "%s is not implemented", __FUNCTION__);
WLog_ERR(TAG, "is not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}

View File

@ -361,8 +361,8 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
}
fix_padded_string((char*)slotInfo.slotDescription, sizeof(slotInfo.slotDescription));
WLog_DBG(TAG, "%s: collecting keys for slot #%d(%lu) descr='%s' flags=0x%x", __FUNCTION__,
i, state->slots[i], slotInfo.slotDescription, slotInfo.flags);
WLog_DBG(TAG, "collecting keys for slot #%d(%lu) descr='%s' flags=0x%x", i, state->slots[i],
slotInfo.slotDescription, slotInfo.flags);
/* this is a safety guard as we're supposed to have listed only readers with tokens in them
*/
@ -381,8 +381,7 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
else
{
fix_padded_string((char*)tokenInfo.label, sizeof(tokenInfo.label));
WLog_DBG(TAG, "%s: token, label='%s' flags=0x%x", __FUNCTION__, tokenInfo.label,
tokenInfo.flags);
WLog_DBG(TAG, "token, label='%s' flags=0x%x", tokenInfo.label, tokenInfo.flags);
}
WINPR_ASSERT(p11->C_OpenSession);
@ -415,7 +414,7 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
goto cleanup_FindObjects;
}
WLog_DBG(TAG, "%s: slot has %d objects", __FUNCTION__, nslotObjects);
WLog_DBG(TAG, "slot has %d objects", nslotObjects);
for (j = 0; j < nslotObjects; j++)
{
NCryptKeyEnum* key = &state->keys[state->nKeys];

View File

@ -30,7 +30,7 @@ HRESULT PATH_ALLOC_COMBINE(PCWSTR pszPathIn, PCWSTR pszMore, unsigned long dwFla
size_t pszMoreLength;
size_t pszPathInLength;
size_t pszPathOutLength;
WLog_WARN(TAG, "%s: has known bugs and needs fixing.", __FUNCTION__);
WLog_WARN(TAG, "has known bugs and needs fixing.");
if (!ppszPathOut)
return E_INVALIDARG;
@ -105,7 +105,7 @@ HRESULT PATH_ALLOC_COMBINE(PCSTR pszPathIn, PCSTR pszMore, unsigned long dwFlags
int pszMoreLength;
int pszPathInLength;
int pszPathOutLength;
WLog_WARN(TAG, "%s: has known bugs and needs fixing.", __FUNCTION__);
WLog_WARN(TAG, "has known bugs and needs fixing.");
if (!ppszPathOut)
return E_INVALIDARG;

View File

@ -127,13 +127,13 @@
HRESULT PathCchRemoveBackslashA(PSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchRemoveBackslashW(PWSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -198,14 +198,14 @@ HRESULT PathCchRemoveBackslashW(PWSTR pszPath, size_t cchPath)
HRESULT PathCchRemoveBackslashExA(PSTR pszPath, size_t cchPath, PSTR* ppszEnd,
size_t* pcchRemaining)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchRemoveBackslashExW(PWSTR pszPath, size_t cchPath, PWSTR* ppszEnd,
size_t* pcchRemaining)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -343,13 +343,13 @@ HRESULT PathCchRemoveBackslashExW(PWSTR pszPath, size_t cchPath, PWSTR* ppszEnd,
HRESULT PathCchAppendExA(PSTR pszPath, size_t cchPath, PCSTR pszMore, unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchAppendExW(PWSTR pszPath, size_t cchPath, PCWSTR pszMore, unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -359,13 +359,13 @@ HRESULT PathCchAppendExW(PWSTR pszPath, size_t cchPath, PCWSTR pszMore, unsigned
HRESULT PathCchCanonicalizeA(PSTR pszPathOut, size_t cchPathOut, PCSTR pszPathIn)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchCanonicalizeW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -376,14 +376,14 @@ HRESULT PathCchCanonicalizeW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPath
HRESULT PathCchCanonicalizeExA(PSTR pszPathOut, size_t cchPathOut, PCSTR pszPathIn,
unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchCanonicalizeExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn,
unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -393,13 +393,13 @@ HRESULT PathCchCanonicalizeExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPa
HRESULT PathAllocCanonicalizeA(PCSTR pszPathIn, unsigned long dwFlags, PSTR* ppszPathOut)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathAllocCanonicalizeW(PCWSTR pszPathIn, unsigned long dwFlags, PWSTR* ppszPathOut)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -409,13 +409,13 @@ HRESULT PathAllocCanonicalizeW(PCWSTR pszPathIn, unsigned long dwFlags, PWSTR* p
HRESULT PathCchCombineA(PSTR pszPathOut, size_t cchPathOut, PCSTR pszPathIn, PCSTR pszMore)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchCombineW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, PCWSTR pszMore)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -426,14 +426,14 @@ HRESULT PathCchCombineW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, P
HRESULT PathCchCombineExA(PSTR pszPathOut, size_t cchPathOut, PCSTR pszPathIn, PCSTR pszMore,
unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchCombineExW(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, PCWSTR pszMore,
unsigned long dwFlags)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -555,7 +555,7 @@ HRESULT PathCchFindExtensionA(PCSTR pszPath, size_t cchPath, PCSTR* ppszExt)
HRESULT PathCchFindExtensionW(PCWSTR pszPath, size_t cchPath, PCWSTR* ppszExt)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -565,13 +565,13 @@ HRESULT PathCchFindExtensionW(PCWSTR pszPath, size_t cchPath, PCWSTR* ppszExt)
HRESULT PathCchRenameExtensionA(PSTR pszPath, size_t cchPath, PCSTR pszExt)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchRenameExtensionW(PWSTR pszPath, size_t cchPath, PCWSTR pszExt)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -581,13 +581,13 @@ HRESULT PathCchRenameExtensionW(PWSTR pszPath, size_t cchPath, PCWSTR pszExt)
HRESULT PathCchRemoveExtensionA(PSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchRemoveExtensionW(PWSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -597,13 +597,13 @@ HRESULT PathCchRemoveExtensionW(PWSTR pszPath, size_t cchPath)
BOOL PathCchIsRootA(PCSTR pszPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return FALSE;
}
BOOL PathCchIsRootW(PCWSTR pszPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return FALSE;
}
@ -645,13 +645,13 @@ BOOL PathIsUNCExW(PCWSTR pszPath, PCWSTR* ppszServer)
HRESULT PathCchSkipRootA(PCSTR pszPath, PCSTR* ppszRootEnd)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchSkipRootW(PCWSTR pszPath, PCWSTR* ppszRootEnd)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -661,13 +661,13 @@ HRESULT PathCchSkipRootW(PCWSTR pszPath, PCWSTR* ppszRootEnd)
HRESULT PathCchStripToRootA(PSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchStripToRootW(PWSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
@ -756,13 +756,13 @@ HRESULT PathCchStripPrefixW(PWSTR pszPath, size_t cchPath)
HRESULT PathCchRemoveFileSpecA(PSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}
HRESULT PathCchRemoveFileSpecW(PWSTR pszPath, size_t cchPath)
{
WLog_ERR(TAG, "%s: not implemented", __FUNCTION__);
WLog_ERR(TAG, "not implemented");
return E_NOTIMPL;
}

View File

@ -119,7 +119,7 @@ static BOOL PipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -157,7 +157,7 @@ static BOOL PipeWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrit
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -255,7 +255,7 @@ BOOL NamedPipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -348,7 +348,7 @@ BOOL NamedPipeWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite,
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -568,7 +568,7 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD
if (dwOpenMode & FILE_FLAG_OVERLAPPED)
{
WLog_ERR(TAG, "WinPR %s does not support the FILE_FLAG_OVERLAPPED flag", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the FILE_FLAG_OVERLAPPED flag");
SetLastError(ERROR_NOT_SUPPORTED);
return INVALID_HANDLE_VALUE;
}
@ -725,7 +725,7 @@ HANDLE CreateNamedPipeW(LPCWSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWOR
DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut,
LPSECURITY_ATTRIBUTES lpSecurityAttributes)
{
WLog_ERR(TAG, "%s is not implemented", __FUNCTION__);
WLog_ERR(TAG, "is not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@ -738,7 +738,7 @@ BOOL ConnectNamedPipe(HANDLE hNamedPipe, LPOVERLAPPED lpOverlapped)
if (lpOverlapped)
{
WLog_ERR(TAG, "WinPR %s does not support the lpOverlapped parameter", __FUNCTION__);
WLog_ERR(TAG, "WinPR does not support the lpOverlapped parameter");
SetLastError(ERROR_NOT_SUPPORTED);
return FALSE;
}
@ -799,7 +799,7 @@ BOOL DisconnectNamedPipe(HANDLE hNamedPipe)
BOOL PeekNamedPipe(HANDLE hNamedPipe, LPVOID lpBuffer, DWORD nBufferSize, LPDWORD lpBytesRead,
LPDWORD lpTotalBytesAvail, LPDWORD lpBytesLeftThisMessage)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -808,7 +808,7 @@ BOOL TransactNamedPipe(HANDLE hNamedPipe, LPVOID lpInBuffer, DWORD nInBufferSize
LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead,
LPOVERLAPPED lpOverlapped)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -853,7 +853,7 @@ BOOL WaitNamedPipeA(LPCSTR lpNamedPipeName, DWORD nTimeOut)
BOOL WaitNamedPipeW(LPCWSTR lpNamedPipeName, DWORD nTimeOut)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -901,7 +901,7 @@ BOOL SetNamedPipeHandleState(HANDLE hNamedPipe, LPDWORD lpMode, LPDWORD lpMaxCol
BOOL ImpersonateNamedPipeClient(HANDLE hNamedPipe)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -909,7 +909,7 @@ BOOL ImpersonateNamedPipeClient(HANDLE hNamedPipe)
BOOL GetNamedPipeClientComputerNameA(HANDLE Pipe, LPCSTR ClientComputerName,
ULONG ClientComputerNameLength)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -917,7 +917,7 @@ BOOL GetNamedPipeClientComputerNameA(HANDLE Pipe, LPCSTR ClientComputerName,
BOOL GetNamedPipeClientComputerNameW(HANDLE Pipe, LPCWSTR ClientComputerName,
ULONG ClientComputerNameLength)
{
WLog_ERR(TAG, "%s: Not implemented", __FUNCTION__);
WLog_ERR(TAG, "Not implemented");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}

View File

@ -59,13 +59,13 @@ LONG RegCloseKey(HKEY hKey)
LONG RegCopyTreeW(HKEY hKeySrc, LPCWSTR lpSubKey, HKEY hKeyDest)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegCopyTreeA(HKEY hKeySrc, LPCSTR lpSubKey, HKEY hKeyDest)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -73,7 +73,7 @@ LONG RegCreateKeyExW(HKEY hKey, LPCWSTR lpSubKey, DWORD Reserved, LPWSTR lpClass
REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult,
LPDWORD lpdwDisposition)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -81,157 +81,157 @@ LONG RegCreateKeyExA(HKEY hKey, LPCSTR lpSubKey, DWORD Reserved, LPSTR lpClass,
REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult,
LPDWORD lpdwDisposition)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteKeyExW(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired, DWORD Reserved)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteKeyExA(HKEY hKey, LPCSTR lpSubKey, REGSAM samDesired, DWORD Reserved)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteTreeW(HKEY hKey, LPCWSTR lpSubKey)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteTreeA(HKEY hKey, LPCSTR lpSubKey)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteValueW(HKEY hKey, LPCWSTR lpValueName)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDeleteValueA(HKEY hKey, LPCSTR lpValueName)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegDisablePredefinedCacheEx(void)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpName, LPDWORD lpcName, LPDWORD lpReserved,
LPWSTR lpClass, LPDWORD lpcClass, PFILETIME lpftLastWriteTime)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpName, LPDWORD lpcName, LPDWORD lpReserved,
LPSTR lpClass, LPDWORD lpcClass, PFILETIME lpftLastWriteTime)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegEnumValueW(HKEY hKey, DWORD dwIndex, LPWSTR lpValueName, LPDWORD lpcchValueName,
LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpValueName, LPDWORD lpcchValueName,
LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegFlushKey(HKEY hKey)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegGetKeySecurity(HKEY hKey, SECURITY_INFORMATION SecurityInformation,
PSECURITY_DESCRIPTOR pSecurityDescriptor, LPDWORD lpcbSecurityDescriptor)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegGetValueW(HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpValue, DWORD dwFlags, LPDWORD pdwType,
PVOID pvData, LPDWORD pcbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegGetValueA(HKEY hkey, LPCSTR lpSubKey, LPCSTR lpValue, DWORD dwFlags, LPDWORD pdwType,
PVOID pvData, LPDWORD pcbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadAppKeyW(LPCWSTR lpFile, PHKEY phkResult, REGSAM samDesired, DWORD dwOptions,
DWORD Reserved)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadAppKeyA(LPCSTR lpFile, PHKEY phkResult, REGSAM samDesired, DWORD dwOptions,
DWORD Reserved)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadKeyW(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpFile)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadKeyA(HKEY hKey, LPCSTR lpSubKey, LPCSTR lpFile)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadMUIStringW(HKEY hKey, LPCWSTR pszValue, LPWSTR pszOutBuf, DWORD cbOutBuf,
LPDWORD pcbData, DWORD Flags, LPCWSTR pszDirectory)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegLoadMUIStringA(HKEY hKey, LPCSTR pszValue, LPSTR pszOutBuf, DWORD cbOutBuf, LPDWORD pcbData,
DWORD Flags, LPCSTR pszDirectory)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegNotifyChangeKeyValue(HKEY hKey, BOOL bWatchSubtree, DWORD dwNotifyFilter, HANDLE hEvent,
BOOL fAsynchronous)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegOpenCurrentUser(REGSAM samDesired, PHKEY phkResult)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -284,7 +284,7 @@ LONG RegOpenKeyExA(HKEY hKey, LPCSTR lpSubKey, DWORD ulOptions, REGSAM samDesire
LONG RegOpenUserClassesRoot(HANDLE hToken, DWORD dwOptions, REGSAM samDesired, PHKEY phkResult)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -293,7 +293,7 @@ LONG RegQueryInfoKeyW(HKEY hKey, LPWSTR lpClass, LPDWORD lpcClass, LPDWORD lpRes
LPDWORD lpcValues, LPDWORD lpcMaxValueNameLen, LPDWORD lpcMaxValueLen,
LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -302,7 +302,7 @@ LONG RegQueryInfoKeyA(HKEY hKey, LPSTR lpClass, LPDWORD lpcClass, LPDWORD lpRese
LPDWORD lpcValues, LPDWORD lpcMaxValueNameLen, LPDWORD lpcMaxValueLen,
LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
@ -495,60 +495,60 @@ LONG RegQueryValueExA(HKEY hKey, LPCSTR lpValueName, LPDWORD lpReserved, LPDWORD
LONG RegRestoreKeyW(HKEY hKey, LPCWSTR lpFile, DWORD dwFlags)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegRestoreKeyA(HKEY hKey, LPCSTR lpFile, DWORD dwFlags)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegSaveKeyExW(HKEY hKey, LPCWSTR lpFile, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
DWORD Flags)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegSaveKeyExA(HKEY hKey, LPCSTR lpFile, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
DWORD Flags)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegSetKeySecurity(HKEY hKey, SECURITY_INFORMATION SecurityInformation,
PSECURITY_DESCRIPTOR pSecurityDescriptor)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegSetValueExW(HKEY hKey, LPCWSTR lpValueName, DWORD Reserved, DWORD dwType,
const BYTE* lpData, DWORD cbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegSetValueExA(HKEY hKey, LPCSTR lpValueName, DWORD Reserved, DWORD dwType, const BYTE* lpData,
DWORD cbData)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegUnLoadKeyW(HKEY hKey, LPCWSTR lpSubKey)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}
LONG RegUnLoadKeyA(HKEY hKey, LPCSTR lpSubKey)
{
WLog_ERR(TAG, "TODO: Implement %s", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return -1;
}

View File

@ -36,7 +36,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_InitializeSecurityContextW(
ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2,
PCtxtHandle phNewContext, PSecBufferDesc pOutput, PULONG pfContextAttr, PTimeStamp ptsExpiry)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -108,7 +108,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_QueryContextAttributes(PCtxtHandle phCo
if (!pBuffer)
return SEC_E_INSUFFICIENT_MEMORY;
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -117,7 +117,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_AcquireCredentialsHandleW(
void* pAuthData, SEC_GET_KEY_FN pGetKeyFn, void* pvGetKeyArgument, PCredHandle phCredential,
PTimeStamp ptsExpiry)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -150,7 +150,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_AcquireCredentialsHandleA(
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -158,7 +158,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_QueryCredentialsAttributesW(PCredHandle
ULONG ulAttribute,
void* pBuffer)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -177,7 +177,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_QueryCredentialsAttributesA(PCredHandle
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -200,7 +200,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_FreeCredentialsHandle(PCredHandle phCre
static SECURITY_STATUS SEC_ENTRY credssp_EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
PSecBufferDesc pMessage, ULONG MessageSeqNo)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -208,14 +208,14 @@ static SECURITY_STATUS SEC_ENTRY credssp_DecryptMessage(PCtxtHandle phContext,
PSecBufferDesc pMessage, ULONG MessageSeqNo,
ULONG* pfQOP)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
static SECURITY_STATUS SEC_ENTRY credssp_MakeSignature(PCtxtHandle phContext, ULONG fQOP,
PSecBufferDesc pMessage, ULONG MessageSeqNo)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -223,7 +223,7 @@ static SECURITY_STATUS SEC_ENTRY credssp_VerifySignature(PCtxtHandle phContext,
PSecBufferDesc pMessage,
ULONG MessageSeqNo, ULONG* pfQOP)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}

View File

@ -403,7 +403,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(PCredHandl
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute=%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
#else
return SEC_E_UNSUPPORTED_FUNCTION;
@ -1278,7 +1278,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(PCtxtHandle ph
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute=%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
#else
return SEC_E_UNSUPPORTED_FUNCTION;

View File

@ -228,7 +228,7 @@ static NTLM_CONTEXT* ntlm_ContextNew(void)
status = RegQueryValueExA(hKey, "WorkstationName", NULL, &dwType, (BYTE*)workstation,
&dwSize);
if (status != ERROR_SUCCESS)
WLog_WARN(TAG, "[%s]: Key ''WorkstationName' not found", __FUNCTION__);
WLog_WARN(TAG, "Key ''WorkstationName' not found");
workstation[dwSize] = '\0';
if (ntlm_SetContextWorkstation(context, workstation) < 0)
@ -402,7 +402,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryCredentialsAttributesW(PCredHandle ph
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -847,7 +847,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phCont
return ntlm_computeMicValue(context, (SecBuffer*)pBuffer);
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=0x%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -963,7 +963,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_SetContextAttributesW(PCtxtHandle phContex
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute=%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
}

View File

@ -1437,7 +1437,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_QueryCredentialsAttributesW(PCredHand
ULONG ulAttribute,
void* pBuffer)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1445,7 +1445,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_QueryCredentialsAttributesA(PCredHand
ULONG ulAttribute,
void* pBuffer)
{
WLog_ERR(TAG, "[%s]: TODO: Implement", __FUNCTION__);
WLog_ERR(TAG, "TODO: Implement");
return SEC_E_UNSUPPORTED_FUNCTION;
}

View File

@ -114,7 +114,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_QueryCredentialsAttributesW(PCredHandl
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute=%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -325,7 +325,7 @@ static SECURITY_STATUS SEC_ENTRY schannel_QueryContextAttributes(PCtxtHandle phC
return SEC_E_OK;
}
WLog_ERR(TAG, "[%s]: TODO: Implement ulAttribute=%08" PRIx32, __FUNCTION__, ulAttribute);
WLog_ERR(TAG, "TODO: Implement ulAttribute=%08" PRIx32, ulAttribute);
return SEC_E_UNSUPPORTED_FUNCTION;
}

View File

@ -514,8 +514,8 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesW(ULONG* pcPackages,
if (!(g_SspiW && g_SspiW->EnumerateSecurityPackagesW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -533,8 +533,8 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesA(ULONG* pcPackages,
if (!(g_SspiA && g_SspiA->EnumerateSecurityPackagesA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -566,8 +566,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageNa
if (!(g_SspiW && g_SspiW->QuerySecurityPackageInfoW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -585,8 +585,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoA(SEC_CHAR* pszPackageNam
if (!(g_SspiA && g_SspiA->QuerySecurityPackageInfoA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -608,8 +608,8 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleW(
if (!(g_SspiW && g_SspiW->AcquireCredentialsHandleW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -631,8 +631,8 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleA(
if (!(g_SspiA && g_SspiA->AcquireCredentialsHandleA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -652,8 +652,8 @@ SECURITY_STATUS SEC_ENTRY sspi_ExportSecurityContext(PCtxtHandle phContext, ULON
if (!(g_SspiW && g_SspiW->ExportSecurityContext))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -670,8 +670,8 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeCredentialsHandle(PCredHandle phCredential)
if (!(g_SspiW && g_SspiW->FreeCredentialsHandle))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -690,8 +690,8 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextW(SEC_WCHAR* pszPackage,
if (!(g_SspiW && g_SspiW->ImportSecurityContextW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -710,8 +710,8 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextA(SEC_CHAR* pszPackage,
if (!(g_SspiA && g_SspiA->ImportSecurityContextA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -729,8 +729,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesW(PCredHandle phCredent
if (!(g_SspiW && g_SspiW->QueryCredentialsAttributesW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -748,8 +748,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesA(PCredHandle phCredent
if (!(g_SspiA && g_SspiA->QueryCredentialsAttributesA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -773,8 +773,8 @@ SECURITY_STATUS SEC_ENTRY sspi_AcceptSecurityContext(PCredHandle phCredential,
if (!(g_SspiW && g_SspiW->AcceptSecurityContext))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -793,8 +793,8 @@ SECURITY_STATUS SEC_ENTRY sspi_ApplyControlToken(PCtxtHandle phContext, PSecBuff
if (!(g_SspiW && g_SspiW->ApplyControlToken))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -811,8 +811,8 @@ SECURITY_STATUS SEC_ENTRY sspi_CompleteAuthToken(PCtxtHandle phContext, PSecBuff
if (!(g_SspiW && g_SspiW->CompleteAuthToken))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -829,8 +829,8 @@ SECURITY_STATUS SEC_ENTRY sspi_DeleteSecurityContext(PCtxtHandle phContext)
if (!(g_SspiW && g_SspiW->DeleteSecurityContext))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -847,8 +847,8 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeContextBuffer(void* pvContextBuffer)
if (!(g_SspiW && g_SspiW->FreeContextBuffer))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -865,8 +865,8 @@ SECURITY_STATUS SEC_ENTRY sspi_ImpersonateSecurityContext(PCtxtHandle phContext)
if (!(g_SspiW && g_SspiW->ImpersonateSecurityContext))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -886,8 +886,8 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextW(
if (!(g_SspiW && g_SspiW->InitializeSecurityContextW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -909,8 +909,8 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextA(
if (!(g_SspiA && g_SspiA->InitializeSecurityContextA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -930,8 +930,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesW(PCtxtHandle phContext, UL
if (!(g_SspiW && g_SspiW->QueryContextAttributesW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -949,8 +949,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesA(PCtxtHandle phContext, UL
if (!(g_SspiA && g_SspiA->QueryContextAttributesA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -967,8 +967,8 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityContextToken(PCtxtHandle phContext,
if (!(g_SspiW && g_SspiW->QuerySecurityContextToken))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -986,8 +986,8 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesW(PCtxtHandle phContext, ULON
if (!(g_SspiW && g_SspiW->SetContextAttributesW))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1005,8 +1005,8 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesA(PCtxtHandle phContext, ULON
if (!(g_SspiA && g_SspiA->SetContextAttributesA))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1023,8 +1023,8 @@ SECURITY_STATUS SEC_ENTRY sspi_RevertSecurityContext(PCtxtHandle phContext)
if (!(g_SspiW && g_SspiW->RevertSecurityContext))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1044,8 +1044,8 @@ SECURITY_STATUS SEC_ENTRY sspi_DecryptMessage(PCtxtHandle phContext, PSecBufferD
if (!(g_SspiW && g_SspiW->DecryptMessage))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1063,8 +1063,8 @@ SECURITY_STATUS SEC_ENTRY sspi_EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
if (!(g_SspiW && g_SspiW->EncryptMessage))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1082,8 +1082,8 @@ SECURITY_STATUS SEC_ENTRY sspi_MakeSignature(PCtxtHandle phContext, ULONG fQOP,
if (!(g_SspiW && g_SspiW->MakeSignature))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1101,8 +1101,8 @@ SECURITY_STATUS SEC_ENTRY sspi_VerifySignature(PCtxtHandle phContext, PSecBuffer
if (!(g_SspiW && g_SspiW->VerifySignature))
{
WLog_Print(g_Log, WLOG_WARN, "[%s]: Security module does not provide an implementation",
__FUNCTION__);
WLog_Print(g_Log, WLOG_WARN, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}

View File

@ -1290,7 +1290,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleW(
if (!table->AcquireCredentialsHandleW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1320,7 +1320,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleA(
if (!table->AcquireCredentialsHandleA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1356,7 +1356,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ExportSecurityContext(PCtxtHandle phConte
if (!table->ExportSecurityContext)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1388,7 +1388,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_FreeCredentialsHandle(PCredHandle phCrede
if (!table->FreeCredentialsHandle)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1422,7 +1422,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextW(SEC_WCHAR* pszPack
if (!table->ImportSecurityContextW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1456,7 +1456,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextA(SEC_CHAR* pszPacka
if (!table->ImportSecurityContextA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1489,7 +1489,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesW(PCredHandle p
if (!table->QueryCredentialsAttributesW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1522,7 +1522,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesA(PCredHandle p
if (!table->QueryCredentialsAttributesA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1556,7 +1556,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesW(PCredHandle phC
if (!table->SetCredentialsAttributesW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1590,7 +1590,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesA(PCredHandle phC
if (!table->SetCredentialsAttributesA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1627,7 +1627,7 @@ winpr_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSe
if (!table->AcceptSecurityContext)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1662,7 +1662,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ApplyControlToken(PCtxtHandle phContext,
if (!table->ApplyControlToken)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1695,7 +1695,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_CompleteAuthToken(PCtxtHandle phContext,
if (!table->CompleteAuthToken)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1727,7 +1727,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_DeleteSecurityContext(PCtxtHandle phConte
if (!table->DeleteSecurityContext)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1768,7 +1768,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImpersonateSecurityContext(PCtxtHandle ph
if (!table->ImpersonateSecurityContext)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1803,7 +1803,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextW(
if (!table->InitializeSecurityContextW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1840,7 +1840,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextA(
if (!table->InitializeSecurityContextA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1875,7 +1875,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesW(PCtxtHandle phCon
if (!table->QueryContextAttributesW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1908,7 +1908,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesA(PCtxtHandle phCon
if (!table->QueryContextAttributesA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1941,7 +1941,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityContextToken(PCtxtHandle phC
if (!table->QuerySecurityContextToken)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -1975,7 +1975,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesW(PCtxtHandle phConte
if (!table->SetContextAttributesW)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2009,7 +2009,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesA(PCtxtHandle phConte
if (!table->SetContextAttributesA)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2041,7 +2041,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_RevertSecurityContext(PCtxtHandle phConte
if (!table->RevertSecurityContext)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2077,7 +2077,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_DecryptMessage(PCtxtHandle phContext,
if (!table->DecryptMessage)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2110,7 +2110,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_EncryptMessage(PCtxtHandle phContext, ULO
if (!table->EncryptMessage)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2143,7 +2143,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_MakeSignature(PCtxtHandle phContext, ULON
if (!table->MakeSignature)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}
@ -2177,7 +2177,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_VerifySignature(PCtxtHandle phContext,
if (!table->VerifySignature)
{
WLog_WARN(TAG, "[%s]: Security module does not provide an implementation", __FUNCTION__);
WLog_WARN(TAG, "Security module does not provide an implementation");
return SEC_E_UNSUPPORTED_FUNCTION;
}

Some files were not shown because too many files have changed in this diff Show More