diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index 637632c51..33f76b84e 100755 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -181,7 +181,7 @@ UINT disp_recv_display_control_caps_pdu(DISP_CHANNEL_CALLBACK* callback, wStream if (Stream_GetRemainingLength(s) < 12) { - WLog_ERR(TAG, "not enought remaining data"); + WLog_ERR(TAG, "not enough remaining data"); return ERROR_INVALID_DATA; } @@ -206,7 +206,7 @@ UINT disp_recv_pdu(DISP_CHANNEL_CALLBACK* callback, wStream* s) if (Stream_GetRemainingLength(s) < 8) { - WLog_ERR(TAG, "not enought remaining data"); + WLog_ERR(TAG, "not enough remaining data"); return ERROR_INVALID_DATA; } diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 46fc212fd..3f806fe80 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -509,7 +509,7 @@ static UINT dvcman_open_channel(IWTSVirtualChannelManager* pChannelMgr, if ((pCallback->OnOpen) && (error = pCallback->OnOpen(pCallback))) { - WLog_ERR(TAG, "OnOpen failed with eror %u!", error); + WLog_ERR(TAG, "OnOpen failed with error %u!", error); return error; } @@ -561,7 +561,7 @@ static UINT dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, if ((ichannel->Close) && (error = ichannel->Close(ichannel))) { - WLog_ERR(TAG, "Close failed with eror %u!", error); + WLog_ERR(TAG, "Close failed with error %u!", error); return error; } } diff --git a/channels/encomsp/client/encomsp_main.c b/channels/encomsp/client/encomsp_main.c index 578085dd2..f2c1afee9 100644 --- a/channels/encomsp/client/encomsp_main.c +++ b/channels/encomsp/client/encomsp_main.c @@ -40,7 +40,7 @@ static UINT encomsp_read_header(wStream* s, ENCOMSP_ORDER_HEADER* header) { if (Stream_GetRemainingLength(s) < ENCOMSP_ORDER_HEADER_SIZE) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -72,7 +72,7 @@ static UINT encomsp_read_unicode_string(wStream* s, ENCOMSP_UNICODE_STRING* str) if (Stream_GetRemainingLength(s) < 2) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -86,7 +86,7 @@ static UINT encomsp_read_unicode_string(wStream* s, ENCOMSP_UNICODE_STRING* str) if (Stream_GetRemainingLength(s) < (size_t)(str->cchString * 2)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -151,7 +151,7 @@ static UINT encomsp_recv_filter_updated_pdu(encomspPlugin* encomsp, wStream* s, if (Stream_GetRemainingLength(s) < 1) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -160,7 +160,7 @@ static UINT encomsp_recv_filter_updated_pdu(encomspPlugin* encomsp, wStream* s, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -168,7 +168,7 @@ static UINT encomsp_recv_filter_updated_pdu(encomspPlugin* encomsp, wStream* s, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -205,7 +205,7 @@ static UINT encomsp_recv_application_created_pdu(encomspPlugin* encomsp, if (Stream_GetRemainingLength(s) < 6) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -222,7 +222,7 @@ static UINT encomsp_recv_application_created_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -230,7 +230,7 @@ static UINT encomsp_recv_application_created_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -267,7 +267,7 @@ static UINT encomsp_recv_application_removed_pdu(encomspPlugin* encomsp, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -276,7 +276,7 @@ static UINT encomsp_recv_application_removed_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -284,7 +284,7 @@ static UINT encomsp_recv_application_removed_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -321,7 +321,7 @@ static UINT encomsp_recv_window_created_pdu(encomspPlugin* encomsp, wStream* s, if (Stream_GetRemainingLength(s) < 10) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -339,7 +339,7 @@ static UINT encomsp_recv_window_created_pdu(encomspPlugin* encomsp, wStream* s, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -347,7 +347,7 @@ static UINT encomsp_recv_window_created_pdu(encomspPlugin* encomsp, wStream* s, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -384,7 +384,7 @@ static UINT encomsp_recv_window_removed_pdu(encomspPlugin* encomsp, wStream* s, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -393,7 +393,7 @@ static UINT encomsp_recv_window_removed_pdu(encomspPlugin* encomsp, wStream* s, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -401,7 +401,7 @@ static UINT encomsp_recv_window_removed_pdu(encomspPlugin* encomsp, wStream* s, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -438,7 +438,7 @@ static UINT encomsp_recv_show_window_pdu(encomspPlugin* encomsp, wStream* s, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -447,7 +447,7 @@ static UINT encomsp_recv_show_window_pdu(encomspPlugin* encomsp, wStream* s, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -455,7 +455,7 @@ static UINT encomsp_recv_show_window_pdu(encomspPlugin* encomsp, wStream* s, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -492,7 +492,7 @@ static UINT encomsp_recv_participant_created_pdu(encomspPlugin* encomsp, if (Stream_GetRemainingLength(s) < 10) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -510,7 +510,7 @@ static UINT encomsp_recv_participant_created_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -518,7 +518,7 @@ static UINT encomsp_recv_participant_created_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -555,7 +555,7 @@ static UINT encomsp_recv_participant_removed_pdu(encomspPlugin* encomsp, if (Stream_GetRemainingLength(s) < 12) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -566,7 +566,7 @@ static UINT encomsp_recv_participant_removed_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -574,7 +574,7 @@ static UINT encomsp_recv_participant_removed_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -611,7 +611,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( if (Stream_GetRemainingLength(s) < 6) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -621,7 +621,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -629,7 +629,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -703,7 +703,7 @@ static UINT encomsp_recv_graphics_stream_paused_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -711,7 +711,7 @@ static UINT encomsp_recv_graphics_stream_paused_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -749,7 +749,7 @@ static UINT encomsp_recv_graphics_stream_resumed_pdu(encomspPlugin* encomsp, if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -757,7 +757,7 @@ static UINT encomsp_recv_graphics_stream_resumed_pdu(encomspPlugin* encomsp, { if (Stream_GetRemainingLength(s) < (size_t)((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } diff --git a/channels/encomsp/server/encomsp_main.c b/channels/encomsp/server/encomsp_main.c index b9948b83c..cae52d9ca 100644 --- a/channels/encomsp/server/encomsp_main.c +++ b/channels/encomsp/server/encomsp_main.c @@ -94,7 +94,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( if (Stream_GetRemainingLength(s) < 6) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -104,7 +104,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( if ((beg + header->Length) < end) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -112,7 +112,7 @@ static UINT encomsp_recv_change_participant_control_level_pdu( { if (Stream_GetRemainingLength(s) < ((beg + header->Length) - end)) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } diff --git a/channels/rdpei/server/rdpei_main.c b/channels/rdpei/server/rdpei_main.c index e015796f8..7e774d35a 100644 --- a/channels/rdpei/server/rdpei_main.c +++ b/channels/rdpei/server/rdpei_main.c @@ -165,7 +165,7 @@ static UINT read_cs_ready_message(RdpeiServerContext *context, wStream *s) UINT error = CHANNEL_RC_OK; if (Stream_GetRemainingLength(s) < 10) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -199,7 +199,7 @@ static UINT read_touch_contact_data(RdpeiServerContext *context, wStream *s, RDP { if (Stream_GetRemainingLength(s) < 1) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -339,7 +339,7 @@ static UINT read_dismiss_hovering_contact(RdpeiServerContext *context, wStream * if (Stream_GetRemainingLength(s) < 1) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } diff --git a/channels/rdpsnd/server/rdpsnd_main.c b/channels/rdpsnd/server/rdpsnd_main.c index 83f6118df..4a8d682ca 100644 --- a/channels/rdpsnd/server/rdpsnd_main.c +++ b/channels/rdpsnd/server/rdpsnd_main.c @@ -105,7 +105,7 @@ static UINT rdpsnd_server_recv_waveconfirm(RdpsndServerContext* context, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "not enought data in stream!"); + WLog_ERR(TAG, "not enough data in stream!"); return ERROR_INVALID_DATA; } @@ -132,7 +132,7 @@ static UINT rdpsnd_server_recv_quality_mode(RdpsndServerContext* context, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "not enought data in stream!"); + WLog_ERR(TAG, "not enough data in stream!"); return ERROR_INVALID_DATA; } @@ -157,7 +157,7 @@ static UINT rdpsnd_server_recv_formats(RdpsndServerContext* context, wStream* s) if (Stream_GetRemainingLength(s) < 20) { - WLog_ERR(TAG, "not enought data in stream!"); + WLog_ERR(TAG, "not enough data in stream!"); return ERROR_INVALID_DATA; } @@ -173,7 +173,7 @@ static UINT rdpsnd_server_recv_formats(RdpsndServerContext* context, wStream* s) /* this check is only a guess as cbSize can influence the size of a format record */ if (Stream_GetRemainingLength(s) < context->num_client_formats * 18) { - WLog_ERR(TAG, "not enought data in stream!"); + WLog_ERR(TAG, "not enough data in stream!"); return ERROR_INVALID_DATA; } @@ -196,7 +196,7 @@ static UINT rdpsnd_server_recv_formats(RdpsndServerContext* context, wStream* s) { if (Stream_GetRemainingLength(s) < 18) { - WLog_ERR(TAG, "not enought data in stream!"); + WLog_ERR(TAG, "not enough data in stream!"); error = ERROR_INVALID_DATA; goto out_free; } @@ -942,7 +942,7 @@ UINT rdpsnd_server_handle_messages(RdpsndServerContext* context) break; default: - WLog_ERR(TAG, "UNKOWN MESSAGE TYPE!! (%#0X)", priv->msgType); + WLog_ERR(TAG, "UNKNOWN MESSAGE TYPE!! (%#0X)", priv->msgType); ret = ERROR_INVALID_DATA; break; } diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 715f5a9be..c19ccb649 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -141,7 +141,7 @@ static UINT remdesk_read_channel_header(wStream* s, if (Stream_GetRemainingLength(s) < 8) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -162,7 +162,7 @@ static UINT remdesk_read_channel_header(wStream* s, if (Stream_GetRemainingLength(s) < ChannelNameLen) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -256,7 +256,7 @@ static UINT remdesk_recv_ctl_version_info_pdu(remdeskPlugin* remdesk, if (Stream_GetRemainingLength(s) < 8) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -313,7 +313,7 @@ static UINT remdesk_recv_ctl_result_pdu(remdeskPlugin* remdesk, wStream* s, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } @@ -553,7 +553,7 @@ static UINT remdesk_recv_ctl_pdu(remdeskPlugin* remdesk, wStream* s, if (Stream_GetRemainingLength(s) < 4) { - WLog_ERR(TAG, "Not enought data!"); + WLog_ERR(TAG, "Not enough data!"); return ERROR_INVALID_DATA; } diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index 561bef3d5..d15059421 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -269,7 +269,7 @@ BOOL freerdp_image_copy_from_pointer_data( if (xorBpp == 8 && !palette) { - WLog_ERR(TAG, "null palette in convertion from %d bpp to %d bpp", + WLog_ERR(TAG, "null palette in conversion from %d bpp to %d bpp", xorBpp, dstBitsPerPixel); return -1; } diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c index 6cb76525f..da9269f6c 100644 --- a/libfreerdp/core/certificate.c +++ b/libfreerdp/core/certificate.c @@ -516,7 +516,7 @@ BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate if (Stream_GetRemainingLength(s) < wSignatureBlobLen) { - WLog_ERR(TAG, "not enought bytes for signature(len=%d)", wSignatureBlobLen); + WLog_ERR(TAG, "not enough bytes for signature(len=%d)", wSignatureBlobLen); return FALSE; } diff --git a/libfreerdp/core/errconnect.c b/libfreerdp/core/errconnect.c index cd983b464..ecbc68040 100644 --- a/libfreerdp/core/errconnect.c +++ b/libfreerdp/core/errconnect.c @@ -68,7 +68,7 @@ "The connection was cancelled." #define ERRCONNECT_SECURITY_NEGO_CONNECT_FAILED_STRING \ - "The connection failed at negociating security settings." + "The connection failed at negotiating security settings." #define ERRCONNECT_CONNECT_TRANSPORT_FAILED_STRING \ "The connection transport layer failed." diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index 64d554e79..01c9370dc 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -791,7 +791,7 @@ int rdp_recv_data_pdu(rdpRdp* rdp, wStream* s) { if (!(cs = StreamPool_Take(rdp->transport->ReceivePool, DstSize))) { - WLog_ERR(TAG, "Coudn't take stream from pool"); + WLog_ERR(TAG, "Couldn't take stream from pool"); return -1; }