diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index f7f2b0c2c..ca1bb6c2a 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -243,7 +243,7 @@ endmacro(add_channel_server_library) set(FILENAME "ChannelOptions.cmake") file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") -# We need special treatement for drdynvc: +# We need special treatment for drdynvc: # It needs to be the first entry so that every # dynamic channel has the dependent options available. set(DRDYNVC_MATCH "") diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c index e5895fe80..a6183e05f 100644 --- a/channels/ainput/server/ainput_main.c +++ b/channels/ainput/server/ainput_main.c @@ -576,7 +576,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) break; default: - WLog_ERR(TAG, "AINPUT chanel is in invalid state %d", ainput->state); + WLog_ERR(TAG, "AINPUT channel is in invalid state %d", ainput->state); break; } diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index be9ad9bba..8b6ad6cc5 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -197,7 +197,7 @@ static DWORD WINAPI audin_oss_thread_func(LPVOID arg) if (ioctl(pcm_handle, SNDCTL_DSP_GETCAPS, &tmp) == -1) { - OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignory", errno); + OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignored", errno); } else if ((tmp & PCM_CAP_INPUT) == 0) { @@ -262,7 +262,7 @@ static DWORD WINAPI audin_oss_thread_func(LPVOID arg) continue; } - if ((size_t)stmp < buffer_size) /* Not enouth data. */ + if ((size_t)stmp < buffer_size) /* Not enough data. */ continue; if ((error = oss->receive(&oss->format, buffer, buffer_size, oss->user_data))) diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c index 5da9f5b6d..6ac7dfddd 100644 --- a/channels/cliprdr/cliprdr_common.c +++ b/channels/cliprdr/cliprdr_common.c @@ -435,7 +435,7 @@ UINT cliprdr_read_format_list(wStream* s, CLIPRDR_FORMAT_LIST* formatList, BOOL * or 16 Unicode characters)" * However, both Windows RDSH and mstsc violate this specs as seen in the following * example of a transferred short format name string: [R.i.c.h. .T.e.x.t. .F.o.r.m.a.t.] - * These are 16 unicode charaters - *without* terminating null ! + * These are 16 unicode characters - *without* terminating null ! */ szFormatName = Stream_ConstPointer(sub1); diff --git a/channels/location/client/location_main.c b/channels/location/client/location_main.c index ec822c326..c650914e0 100644 --- a/channels/location/client/location_main.c +++ b/channels/location/client/location_main.c @@ -221,12 +221,12 @@ static UINT location_send_base_location3d(IWTSVirtualChannel* channel, if (pdu->source) WLog_DBG(TAG, - "latitude=%lf, logitude=%lf, altitude=%" PRId32 + "latitude=%lf, longitude=%lf, altitude=%" PRId32 ", speed=%lf, heading=%lf, haccuracy=%lf, source=%" PRIu8, pdu->latitude, pdu->longitude, pdu->altitude, pdu->speed, pdu->heading, pdu->horizontalAccuracy, *pdu->source); else - WLog_DBG(TAG, "latitude=%lf, logitude=%lf, altitude=%" PRId32, pdu->latitude, + WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32, pdu->latitude, pdu->longitude, pdu->altitude); if (!location_write_header(s, PDUTYPE_BASE_LOCATION3D, pdu->source ? 25 : 12)) @@ -264,10 +264,10 @@ static UINT location_send_location2d_delta(IWTSVirtualChannel* channel, const BOOL ext = pdu->speedDelta && pdu->headingDelta; if (ext) - WLog_DBG(TAG, "latitude=%lf, logitude=%lf, speed=%lf, heading=%lf", pdu->latitudeDelta, + WLog_DBG(TAG, "latitude=%lf, longitude=%lf, speed=%lf, heading=%lf", pdu->latitudeDelta, pdu->longitudeDelta, pdu->speedDelta, pdu->headingDelta); else - WLog_DBG(TAG, "latitude=%lf, logitude=%lf", pdu->latitudeDelta, pdu->longitudeDelta); + WLog_DBG(TAG, "latitude=%lf, longitude=%lf", pdu->latitudeDelta, pdu->longitudeDelta); if (!location_write_header(s, PDUTYPE_LOCATION2D_DELTA, ext ? 16 : 8)) return ERROR_OUTOFMEMORY; @@ -300,11 +300,11 @@ static UINT location_send_location3d_delta(IWTSVirtualChannel* channel, const BOOL ext = pdu->speedDelta && pdu->headingDelta; if (ext) - WLog_DBG(TAG, "latitude=%lf, logitude=%lf, altitude=%" PRId32 ", speed=%lf, heading=%lf", + WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32 ", speed=%lf, heading=%lf", pdu->latitudeDelta, pdu->longitudeDelta, pdu->altitudeDelta, pdu->speedDelta, pdu->headingDelta); else - WLog_DBG(TAG, "latitude=%lf, logitude=%lf, altitude=%" PRId32, pdu->latitudeDelta, + WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32, pdu->latitudeDelta, pdu->longitudeDelta, pdu->altitudeDelta); if (!location_write_header(s, PDUTYPE_LOCATION3D_DELTA, ext ? 20 : 12)) diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 78324f8dc..90a43bd6c 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -583,7 +583,7 @@ static UINT handle_hotplug(rdpdrPlugin* rdpdr) if (!path) continue; - /* not plugable device */ + /* not pluggable device */ if (strstr(path, "/Volumes/") == NULL) { free(path); @@ -950,7 +950,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) if (!path) return FALSE; - /* not plugable device */ + /* not pluggable device */ if (isAutomountLocation(path)) { for (size_t i = 0; i < arg->dev_array_size; i++) diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index 281696250..611d2da7d 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -232,7 +232,7 @@ static BOOL rdpsnd_oss_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form if (ioctl(oss->pcm_handle, SNDCTL_DSP_GETCAPS, &mask) == -1) { - OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignory", errno); + OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignored", errno); } else if ((mask & PCM_CAP_OUTPUT) == 0) { diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index d2cbbc5b4..61c30ba6c 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -555,7 +555,7 @@ static void close_terminated_irp_thread(wListDictionary* list, wLog* log, ULONG_ HANDLE cirpThread = ListDictionary_GetItemValue(list, (void*)id); /* FIXME: not quite sure a zero timeout is a good thing to check whether a thread is - * stil alived or not */ + * still alive or not */ const DWORD waitResult = WaitForSingleObject(cirpThread, 0); if (waitResult == WAIT_OBJECT_0) diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index c297a20cf..13847eef9 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -766,8 +766,8 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder* decoder, const BYTE* data, UIN mdecoder->seeking = TRUE; - /* since we cant make the gstreamer pipeline jump to the new start time after a seek - - * we just maintain a offset between realtime and gstreamer time + /* since we can't make the gstreamer pipeline jump to the new start time after a seek - + * we just maintain an offset between realtime and gstreamer time */ mdecoder->seek_offset = start_time; } diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index 95091028e..721620ebe 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -96,7 +96,7 @@ static BOOL tsmf_oss_open(ITSMFAudioDevice* audio, const char* device) #if 0 /* FreeBSD OSS implementation at this moment (2015.03) does not set PCM_CAP_OUTPUT flag. */ if (ioctl(oss->pcm_handle, SNDCTL_DSP_GETCAPS, &mask) == -1) { - OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignory", errno); + OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignored", errno); } else if ((mask & PCM_CAP_OUTPUT) == 0) { diff --git a/channels/tsmf/client/tsmf_constants.h b/channels/tsmf/client/tsmf_constants.h index 43d37f27d..abfa4e4fa 100644 --- a/channels/tsmf/client/tsmf_constants.h +++ b/channels/tsmf/client/tsmf_constants.h @@ -35,7 +35,7 @@ #define STREAM_ID_PROXY 0x40000000 #define STREAM_ID_NONE 0x00000000 -/* Functon ID */ +/* Function ID */ /* Common IDs for all interfaces are as follows. */ #define RIMCALL_RELEASE 0x00000001 #define RIMCALL_QUERYINTERFACE 0x00000002 diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index db7f3366d..457b745e1 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -47,7 +47,7 @@ struct s_ITSMFDecoder BOOL (*GetDecodedDimension)(ITSMFDecoder* decoder, UINT32* width, UINT32* height); /* Free the decoder */ void (*Free)(ITSMFDecoder* decoder); - /* Optional Contol function */ + /* Optional Control function */ BOOL (*Control)(ITSMFDecoder* decoder, ITSMFControlMsg control_msg, UINT32* arg); /* Decode a sample with extended interface. */ BOOL(*DecodeEx) diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index cbb5bdf12..f02aac2a7 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -1644,7 +1644,7 @@ static int udev_get_hub_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UDEVI LIBUSB_DEVICE* dev = libusb_list[i]; if ((bus_number != libusb_get_bus_number(dev)) || - (1 != libusb_get_device_address(dev))) /* Root hub allways first on bus. */ + (1 != libusb_get_device_address(dev))) /* Root hub always first on bus. */ libusb_unref_device(dev); else { diff --git a/channels/urbdrc/common/msusb.c b/channels/urbdrc/common/msusb.c index dd76b1dca..72619beef 100644 --- a/channels/urbdrc/common/msusb.c +++ b/channels/urbdrc/common/msusb.c @@ -49,7 +49,7 @@ BOOL msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, if (!MsInterface || !NewMsPipes) return FALSE; - /* free orignal MsPipes */ + /* free original MsPipes */ msusb_mspipes_free(MsInterface->MsPipes, MsInterface->NumberOfPipes); /* And replace it */ MsInterface->MsPipes = NewMsPipes; diff --git a/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about.html b/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about.html index fa73e4288..29cf3bcd1 100644 --- a/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about.html +++ b/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about.html @@ -293,7 +293,7 @@ Original SSLeay License * This library is free for commercial and non-commercial use as long as -* the following conditions are aheared to. The following conditions +* the following conditions are adhered to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, @@ -343,7 +343,7 @@ Original SSLeay License * Eric Young (eay@cryptsoft.com)" -* The word 'cryptographic' can be left out if the rouines from the library +* The word 'cryptographic' can be left out if the routines from the library * being used are not cryptographic related :-). @@ -379,7 +379,7 @@ Original SSLeay License * -* The licence and distribution terms for any publically available version or +* The licence and distribution terms for any publicly available version or * derivative of this code cannot be changed. i.e. this code cannot simply be diff --git a/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about_phone.html b/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about_phone.html index fa73e4288..29cf3bcd1 100644 --- a/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about_phone.html +++ b/client/Android/Studio/aFreeRDP/src/main/assets/about_page/about_phone.html @@ -293,7 +293,7 @@ Original SSLeay License * This library is free for commercial and non-commercial use as long as -* the following conditions are aheared to. The following conditions +* the following conditions are adhered to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, @@ -343,7 +343,7 @@ Original SSLeay License * Eric Young (eay@cryptsoft.com)" -* The word 'cryptographic' can be left out if the rouines from the library +* The word 'cryptographic' can be left out if the routines from the library * being used are not cryptographic related :-). @@ -379,7 +379,7 @@ Original SSLeay License * -* The licence and distribution terms for any publically available version or +* The licence and distribution terms for any publicly available version or * derivative of this code cannot be changed. i.e. this code cannot simply be diff --git a/client/Android/Studio/aFreeRDP/src/main/assets/de_about_page/about_phone.html b/client/Android/Studio/aFreeRDP/src/main/assets/de_about_page/about_phone.html index a5d966490..fb46dae43 100644 --- a/client/Android/Studio/aFreeRDP/src/main/assets/de_about_page/about_phone.html +++ b/client/Android/Studio/aFreeRDP/src/main/assets/de_about_page/about_phone.html @@ -394,7 +394,7 @@ Original SSLeay License * -* The licence and distribution terms for any publically available version or +* The licence and distribution terms for any publicly available version or * derivative of this code cannot be changed. i.e. this code cannot simply be diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c index b4847a2e8..4e914fee2 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c @@ -500,7 +500,7 @@ static DWORD WINAPI android_thread_func(LPVOID param) else { status = android_freerdp_run(instance); - WLog_DBG(TAG, "Disonnect..."); + WLog_DBG(TAG, "Disconnect..."); if (!freerdp_disconnect(instance)) status = GetLastError(); @@ -650,7 +650,7 @@ JNIEXPORT jlong JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp if (setenv("HOME", _strdup(envStr), 1) != 0) { char ebuffer[256] = { 0 }; - WLog_FATAL(TAG, "Failed to set environemnt HOME=%s %s [%d]", env, + WLog_FATAL(TAG, "Failed to set environment HOME=%s %s [%d]", env, winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); return (jlong)NULL; } @@ -996,7 +996,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { JNIEnv* env; setlocale(LC_ALL, ""); - WLog_DBG(TAG, "Setting up JNI environement..."); + WLog_DBG(TAG, "Setting up JNI environment..."); /* if (freerdp_handle_signals() != 0) @@ -1029,7 +1029,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { JNIEnv* env; - WLog_DBG(TAG, "Tearing down JNI environement..."); + WLog_DBG(TAG, "Tearing down JNI environment..."); if ((*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_6) != JNI_OK) { diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java index b482a0213..31fe01875 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java @@ -204,9 +204,9 @@ public class SessionView extends View return res; } - public void setTouchPointerPadding(int widht, int height) + public void setTouchPointerPadding(int width, int height) { - touchPointerPaddingWidth = widht; + touchPointerPaddingWidth = width; touchPointerPaddingHeight = height; requestLayout(); } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java index 2e8dfc881..25565dc46 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java @@ -145,7 +145,7 @@ public class DoubleGestureDetector mCurrentDoubleDownEvent.recycle(); mCurrentDoubleDownEvent = MotionEvent.obtain(ev); - // set detection mode to unkown and send a TOUCH timeout event to detect single taps + // set detection mode to unknown and send a TOUCH timeout event to detect single taps mCurrentMode = MODE_UNKNOWN; mHandler.sendEmptyMessageDelayed(TAP, SINGLE_DOUBLE_TOUCH_TIMEOUT); diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/GestureDetector.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/GestureDetector.java index 2e971b594..a1107642c 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/GestureDetector.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/GestureDetector.java @@ -474,7 +474,7 @@ public class GestureDetector /** * Notified when a long press occurs with the initial on down {@link MotionEvent} - * that trigged it. + * that triggered it. * * @param e The initial on down motion event that started the longpress. */ diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java index f1456b23d..654cd671c 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java @@ -433,7 +433,7 @@ public class KeyboardMapper boolean modifierActive = isModifierPressed(); // if a modifier is pressed we will send a VK event (if possible) so that key // combinations will be recognized correctly. Otherwise we will send the unicode - // key. At the end we will reset all modifiers and notifiy our listener. + // key. At the end we will reset all modifiers and notify our listener. int vkcode = getVirtualKeyCode(event.getKeyCode()); if ((vkcode & KEY_FLAG_UNICODE) != 0) listener.processUnicodeKey(vkcode & (~KEY_FLAG_UNICODE)); diff --git a/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml b/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml index 6df8edc78..f05612aa6 100644 --- a/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml +++ b/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + context->pubSub, sdl_OnChannelConnectedEventHandler); @@ -1080,7 +1080,7 @@ static int sdl_run(SdlContext* sdl) } /* Called after a RDP connection was successfully established. - * Settings might have changed during negociation of client / server feature + * Settings might have changed during negotiation of client / server feature * support. * * Set up local framebuffers and paing callbacks. diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp index 48786ec9a..de400882d 100644 --- a/client/SDL/SDL3/sdl_freerdp.cpp +++ b/client/SDL/SDL3/sdl_freerdp.cpp @@ -586,7 +586,7 @@ static BOOL sdl_pre_connect(freerdp* instance) return FALSE; /* OrderSupport is initialized at this point. * Only override it if you plan to implement custom order - * callbacks or deactiveate certain features. */ + * callbacks or deactivate certain features. */ /* Register the channel listeners. * They are required to set up / tear down channels if they are loaded. */ PubSub_SubscribeChannelConnected(instance->context->pubSub, sdl_OnChannelConnectedEventHandler); @@ -1066,7 +1066,7 @@ static int sdl_run(SdlContext* sdl) } /* Called after a RDP connection was successfully established. - * Settings might have changed during negociation of client / server feature + * Settings might have changed during negotiation of client / server feature * support. * * Set up local framebuffers and paing callbacks. diff --git a/client/Sample/tf_freerdp.c b/client/Sample/tf_freerdp.c index efffdc36d..7915635de 100644 --- a/client/Sample/tf_freerdp.c +++ b/client/Sample/tf_freerdp.c @@ -159,7 +159,7 @@ static BOOL tf_pre_connect(freerdp* instance) return FALSE; /* OrderSupport is initialized at this point. * Only override it if you plan to implement custom order - * callbacks or deactiveate certain features. */ + * callbacks or deactivate certain features. */ /* Register the channel listeners. * They are required to set up / tear down channels if they are loaded. */ PubSub_SubscribeChannelConnected(instance->context->pubSub, tf_OnChannelConnectedEventHandler); @@ -171,7 +171,7 @@ static BOOL tf_pre_connect(freerdp* instance) } /* Called after a RDP connection was successfully established. - * Settings might have changed during negociation of client / server feature + * Settings might have changed during negotiation of client / server feature * support. * * Set up local framebuffers and paing callbacks. diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c index 5ece73712..e16b9e6c4 100644 --- a/client/Windows/wf_event.c +++ b/client/Windows/wf_event.c @@ -795,7 +795,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam if (g_focus_hWnd == hWnd && wfc && !wfc->fullscreen) { - DEBUG_KBD("loosing focus %X", hWnd); + DEBUG_KBD("losing focus %X", hWnd); if (alt_ctrl_down()) g_flipping_out = TRUE; diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index 0723846ae..4dc964709 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -439,7 +439,7 @@ void wf_toggle_fullscreen(wfContext* wfc) if (!wfc->fullscreen) { - // Reenable window tracking AFTER resizing it back, otherwise it can lean to repositioning + // Re-enable window tracking AFTER resizing it back, otherwise it can lean to repositioning // errors. wfc->disablewindowtracking = FALSE; } diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index da29cc952..36d0b9910 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -130,7 +130,7 @@ if (WITH_XEXT) endif() endif() -option(WITH_XCURSOR "[X11] enalbe Xcursor" ON) +option(WITH_XCURSOR "[X11] enable Xcursor" ON) if (WITH_XCURSOR) find_package(X11 REQUIRED) if(X11_Xcursor_FOUND) @@ -154,7 +154,7 @@ if (WITH_XV) endif() endif() -option(WITH_XI "[X11] enalbe Xi" ON) +option(WITH_XI "[X11] enable Xi" ON) if (WITH_XI) find_package(X11 REQUIRED) if(X11_Xi_FOUND) diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index 85da7f30f..bc3687925 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -1116,7 +1116,7 @@ static void xf_button_map_init(xfContext* xfc) * connection. * * @param instance - pointer to the rdp_freerdp structure that contains the connection's parameters, - * and will be filled with the appropriate informations. + * and will be filled with the appropriate information. * * @return TRUE if successful. FALSE otherwise. * Can exit with error code XF_EXIT_PARSE_ARGUMENTS if there is an error in the parameters. diff --git a/client/X11/xf_gfx.c b/client/X11/xf_gfx.c index 90dea843e..48a275505 100644 --- a/client/X11/xf_gfx.c +++ b/client/X11/xf_gfx.c @@ -249,7 +249,7 @@ static UINT32 x11_pad_scanline(UINT32 scanline, UINT32 inPad) scanline += pad; } - /* 16 byte alingment is required for ASM optimized code */ + /* 16 byte alignment is required for ASM optimized code */ if (scanline % 16) scanline += 16 - scanline % 16; diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 88804bfa7..bcd337b55 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -337,7 +337,7 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) } /* - It is safe to proceed with simply toogling _NET_WM_STATE_FULLSCREEN window state on the + It is safe to proceed with simply toggling _NET_WM_STATE_FULLSCREEN window state on the following conditions: - The window manager supports multiple monitor full screen - The user requested to use a single monitor to render the remote desktop diff --git a/client/common/client.c b/client/common/client.c index fb65b087f..fabec8f68 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -1986,7 +1986,7 @@ static BOOL freerdp_client_register_pen(rdpClientContext* cctx, UINT32 flags, IN return TRUE; } - WLog_WARN(TAG, "No free slots for an additiona pen device, skipping"); + WLog_WARN(TAG, "No free slot for an additional pen device, skipping"); return TRUE; } diff --git a/client/common/cmdline.c b/client/common/cmdline.c index cf87850b3..56ba36ba4 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -2864,7 +2864,7 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_ if (option_starts_with("remap:", val)) { - /* Append this new occurance to the already existing list */ + /* Append this new occurence to the already existing list */ char* now = _strdup(&val[6]); const char* old = freerdp_settings_get_string(settings, FreeRDP_KeyboardRemappingList); @@ -5818,7 +5818,7 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings) } /** - * step 2: do various adjustements in the settings, to handle channels and settings dependencies + * step 2: do various adjustments in the settings to handle channels and settings dependencies */ if ((freerdp_static_channel_collection_find(settings, RDPSND_CHANNEL_NAME)) || (freerdp_dynamic_channel_collection_find(settings, RDPSND_CHANNEL_NAME)) @@ -5875,7 +5875,7 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings) while (tok) { - /* Syntax: Comma seperated list of the following entries: + /* Syntax: Comma separated list of the following entries: * '*' ... Redirect all drives, including hotplug * 'DynamicDrives' ... hotplug * '%' ... user home directory diff --git a/client/common/cmdline.h b/client/common/cmdline.h index 7cd325ed6..8f994db8b 100644 --- a/client/common/cmdline.h +++ b/client/common/cmdline.h @@ -316,7 +316,7 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = { "mic", "Audio input (microphone)" }, #if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE) { "smartcard-list", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_PRINT, NULL, NULL, NULL, -1, NULL, - "[DEPRECATED, use /list:smartcard] List smartcard informations" }, + "[DEPRECATED, use /list:smartcard] List smartcard information" }, { "monitor-list", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_PRINT, NULL, NULL, NULL, -1, NULL, "[DEPRECATED, use /list:monitor] List detected monitors" }, #endif diff --git a/client/common/man/freerdp-global-envvar.1.in b/client/common/man/freerdp-global-envvar.1.in index 5ddead9ed..9e8fa72ac 100644 --- a/client/common/man/freerdp-global-envvar.1.in +++ b/client/common/man/freerdp-global-envvar.1.in @@ -2,7 +2,7 @@ .PP wlog environment variable .RS 4 -@MANPAGE_NAME@ uses wLog as its log facility, you can refer to the corresponding man page (wlog(7)) for more informations\&. Arguments passed via the +@MANPAGE_NAME@ uses wLog as its log facility, you can refer to the corresponding man page (wlog(7)) for more information\&. Arguments passed via the \fI/log\-level\fR or \fI/log\-filters\fR diff --git a/client/iOS/Additions/TSXAdditions.m b/client/iOS/Additions/TSXAdditions.m index 3d5f40ada..39862967b 100644 --- a/client/iOS/Additions/TSXAdditions.m +++ b/client/iOS/Additions/TSXAdditions.m @@ -126,7 +126,7 @@ @end -#pragma mark Mutable deep copy for dicionary, array and set +#pragma mark Mutable deep copy for dictionary, array and set @implementation NSDictionary (TSXAdditions) diff --git a/client/iOS/Controllers/AdvancedBookmarkEditorController.m b/client/iOS/Controllers/AdvancedBookmarkEditorController.m index 30434cc74..2b02ce251 100644 --- a/client/iOS/Controllers/AdvancedBookmarkEditorController.m +++ b/client/iOS/Controllers/AdvancedBookmarkEditorController.m @@ -234,7 +234,7 @@ EditSelectionTableViewCell *selCell = (EditSelectionTableViewCell *)cell; [[selCell label] setText:NSLocalizedString(@"Security", - @"'Security': Bookmark protocl security settings")]; + @"'Security': Bookmark protocol security settings")]; [[selCell selection] setText:ProtocolSecurityDescription([_params intForKey:@"security"])]; break; diff --git a/client/iOS/Controllers/AppSettingsController.m b/client/iOS/Controllers/AppSettingsController.m index 5596e168d..2a18f2b87 100644 --- a/client/iOS/Controllers/AppSettingsController.m +++ b/client/iOS/Controllers/AppSettingsController.m @@ -14,7 +14,7 @@ @implementation AppSettingsController -// keep this up-to-date for correct section display/hidding +// keep this up-to-date for correct section display/hiding #define SECTION_UI_SETTINGS 0 #define SECTION_CERTIFICATE_HANDLING_SETTINGS 1 #define SECTION_NUM_SECTIONS 2 diff --git a/client/iOS/Controllers/BookmarkEditorController.h b/client/iOS/Controllers/BookmarkEditorController.h index 10dbf705c..c0c26f934 100644 --- a/client/iOS/Controllers/BookmarkEditorController.h +++ b/client/iOS/Controllers/BookmarkEditorController.h @@ -15,7 +15,7 @@ @class ConnectionParams; @protocol BookmarkEditorDelegate -// bookmark editing finsihed +// bookmark editing finished - (void)commitBookmark:(ComputerBookmark *)bookmark; @end diff --git a/client/iOS/Controllers/BookmarkListController.m b/client/iOS/Controllers/BookmarkListController.m index 1d37caf66..c286de8ff 100644 --- a/client/iOS/Controllers/BookmarkListController.m +++ b/client/iOS/Controllers/BookmarkListController.m @@ -419,7 +419,7 @@ } } -// prevent that an item is moved befoer the Add Bookmark item +// prevent that an item is moved before the Add Bookmark item - (NSIndexPath *)tableView:(UITableView *)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath *)sourceIndexPath toProposedIndexPath:(NSIndexPath *)proposedDestinationIndexPath @@ -796,7 +796,7 @@ - (UIButton *)disclosureButtonWithImage:(UIImage *)image { - // we make the button a little bit bigger (image widht * 2, height + 10) so that the user + // we make the button a little bit bigger (image width * 2, height + 10) so that the user // doesn't accidentally connect to the bookmark ... UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; [button setFrame:CGRectMake(0, 0, [image size].width * 2, [image size].height + 10)]; diff --git a/client/iOS/Controllers/EditorBaseController.h b/client/iOS/Controllers/EditorBaseController.h index 780bff9ce..37c95b342 100644 --- a/client/iOS/Controllers/EditorBaseController.h +++ b/client/iOS/Controllers/EditorBaseController.h @@ -38,7 +38,7 @@ extern NSString *TableCellIdentifierButton; // returns one of the requested table view cells - (UITableViewCell *)tableViewCellFromIdentifier:(NSString *)identifier; -// Adjust text input cells label/textfield widht according to the label's text size +// Adjust text input cells label/textfield width according to the label's text size - (void)adjustEditTextTableViewCell:(EditTextTableViewCell *)cell; @end diff --git a/client/iOS/Controllers/EncryptionController.m b/client/iOS/Controllers/EncryptionController.m index d7431bf55..2abb36f9d 100644 --- a/client/iOS/Controllers/EncryptionController.m +++ b/client/iOS/Controllers/EncryptionController.m @@ -68,7 +68,7 @@ static EncryptionController *_shared_encryption_controller = nil; return _shared_encryptor; } -// For the current implementation, decryptors and encryptors are equivilant. +// For the current implementation, decryptors and encryptors are equivalent. - (Encryptor *)decryptor { return [self encryptor]; diff --git a/client/iOS/Controllers/RDPSessionViewController.m b/client/iOS/Controllers/RDPSessionViewController.m index 257f70af8..161564ce1 100644 --- a/client/iOS/Controllers/RDPSessionViewController.m +++ b/client/iOS/Controllers/RDPSessionViewController.m @@ -139,7 +139,7 @@ } [[self navigationController] setNavigationBarHidden:YES animated:animated]; - // if sesssion is suspended - notify that we got a new bitmap context + // if session is suspended - notify that we got a new bitmap context if ([_session isSuspended]) [self sessionBitmapContextWillChange:_session]; diff --git a/client/iOS/Controllers/ScreenSelectionController.h b/client/iOS/Controllers/ScreenSelectionController.h index a4d8f9bab..4df34e1c3 100644 --- a/client/iOS/Controllers/ScreenSelectionController.h +++ b/client/iOS/Controllers/ScreenSelectionController.h @@ -19,7 +19,7 @@ NSString *_keyPath; ConnectionParams *_params; - // avaiable options + // available options OrderedDictionary *_color_options; NSArray *_resolution_modes; diff --git a/client/iOS/Controllers/ScreenSelectionController.m b/client/iOS/Controllers/ScreenSelectionController.m index cfe747dda..b1ca4c0d3 100644 --- a/client/iOS/Controllers/ScreenSelectionController.m +++ b/client/iOS/Controllers/ScreenSelectionController.m @@ -158,7 +158,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // custom widht/height cells are not selectable + // custom width/height cells are not selectable if ([indexPath section] == 1 && [indexPath row] >= [_resolution_modes count]) return; diff --git a/client/iOS/FreeRDP/ios_freerdp.m b/client/iOS/FreeRDP/ios_freerdp.m index 3721ea8e7..1db23e32a 100644 --- a/client/iOS/FreeRDP/ios_freerdp.m +++ b/client/iOS/FreeRDP/ios_freerdp.m @@ -423,7 +423,7 @@ void ios_uninit_freerdp() { } -/* compatibilty functions */ +/* compatibility functions */ size_t fwrite$UNIX2003(const void *ptr, size_t size, size_t nmemb, FILE *stream) { return fwrite(ptr, size, nmemb, stream); diff --git a/client/iOS/Misc/Reachability.m b/client/iOS/Misc/Reachability.m index 6a3eb2ecd..4d577f6ac 100644 --- a/client/iOS/Misc/Reachability.m +++ b/client/iOS/Misc/Reachability.m @@ -86,7 +86,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach @"info was wrong class in ReachabilityCallback"); // We're on the main RunLoop, so an NSAutoreleasePool is not necessary, but is added defensively - // in case someon uses the Reachablity object in a different thread. + // in case someone uses the Reachablity object in a different thread. NSAutoreleasePool *myPool = [[NSAutoreleasePool alloc] init]; Reachability *noteObject = (Reachability *)info; diff --git a/client/iOS/Misc/Utils.m b/client/iOS/Misc/Utils.m index 468f667b5..1344f64b4 100644 --- a/client/iOS/Misc/Utils.m +++ b/client/iOS/Misc/Utils.m @@ -130,7 +130,7 @@ NSArray *ResolutionModes() NSString *LocalizedAutomaticSecurity() { - return NSLocalizedString(@"Automatic", @"Automatic protocl security selection"); + return NSLocalizedString(@"Automatic", @"Automatic protocol security selection"); } NSString *ProtocolSecurityDescription(TSXProtocolSecurityOptions type) diff --git a/client/iOS/Models/RDPKeyboard.m b/client/iOS/Models/RDPKeyboard.m index 47ebdd90c..668228939 100644 --- a/client/iOS/Models/RDPKeyboard.m +++ b/client/iOS/Models/RDPKeyboard.m @@ -235,7 +235,7 @@ - (void)handleAlphaNumChar:(int)character { - // if we recive an uppercase letter - make it lower and send an shift down event to server + // if we receive an uppercase letter - make it lower and send an shift down event to server BOOL shift_was_sent = NO; if (isupper(character) && _shift_pressed == NO) { diff --git a/client/iOS/Models/RDPSession.h b/client/iOS/Models/RDPSession.h index f010b775e..221f7de10 100644 --- a/client/iOS/Models/RDPSession.h +++ b/client/iOS/Models/RDPSession.h @@ -100,7 +100,7 @@ extern NSString *TSXSessionDidFailToConnectNotification; // get a small session screenshot - (UIImage *)getScreenshotWithSize:(CGSize)size; -// returns the session's current paramters +// returns the session's current parameters - (rdpSettings *)getSessionParams; // returns the session's name (usually the label of the bookmark the session was created with) diff --git a/client/iOS/Models/RDPSession.m b/client/iOS/Models/RDPSession.m index 964582414..9a844cc23 100644 --- a/client/iOS/Models/RDPSession.m +++ b/client/iOS/Models/RDPSession.m @@ -294,7 +294,7 @@ out_free: - (void)connect { - // Set Screen Size to automatic if widht or height are still 0 + // Set Screen Size to automatic if width or height are still 0 rdpSettings *settings = _freerdp->context->settings; if (freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth) == 0 || diff --git a/client/iOS/Resources/en.lproj/Localizable.strings b/client/iOS/Resources/en.lproj/Localizable.strings index b4951facc..309c8d55f 100644 --- a/client/iOS/Resources/en.lproj/Localizable.strings +++ b/client/iOS/Resources/en.lproj/Localizable.strings @@ -28,7 +28,7 @@ /* Advanced Settings title */ "Advanced Settings" = "Advanced Settings"; -/* Automatic protocl security selection +/* Automatic protocol security selection Screen resolution selector: Automatic resolution (full screen on iPad, reasonable size on iPhone) */ "Automatic" = "Automatic"; @@ -205,7 +205,7 @@ /* 'Screen': Bookmark Screen settings */ "Screen" = "Screen"; -/* 'Security': Bookmark protocl security settings */ +/* 'Security': Bookmark protocol security settings */ "Security" = "Security"; /* Server Certificate Handling section title */ diff --git a/client/iOS/Views/BlockAlertView.m b/client/iOS/Views/BlockAlertView.m index 030f151ce..1ae94a5e3 100644 --- a/client/iOS/Views/BlockAlertView.m +++ b/client/iOS/Views/BlockAlertView.m @@ -279,7 +279,7 @@ static UIFont *buttonFont = nil; } else if (_blocks.count == 1) { - // In this case this is the ony button. We'll size according to the text + // In this case this is the only button. We'll size according to the text CGSize size = [title sizeWithFont:buttonFont minFontSize:10 actualFontSize:nil diff --git a/cmake/ClangDetectTool.cmake b/cmake/ClangDetectTool.cmake index a1ecd56d3..a7e0f5ff4 100644 --- a/cmake/ClangDetectTool.cmake +++ b/cmake/ClangDetectTool.cmake @@ -23,7 +23,7 @@ function (clang_detect_tool VAR NAME OPTS) ) if (_CLANG_TOOL_VERSION_FAILED) - message(WARNING "A problem was encounterd with ${${VAR}}") + message(WARNING "A problem was encountered with ${${VAR}}") message(WARNING "${_CLANG_TOOL_VERSION_FAILED}") unset(${VAR}) return() diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake index c5146f760..164b70629 100644 --- a/cmake/FindCairo.cmake +++ b/cmake/FindCairo.cmake @@ -57,7 +57,7 @@ IF(NOT PKGCONFIG_FOUND AND WIN32 AND NOT CYGWIN) # MINGW should go here too IF(MSVC) # Implementation details: - # We are using the libraries located in the VC subdir instead of the parent directory eventhough : + # We are using the libraries located in the VC subdir instead of the parent directory even though : FIND_LIBRARY(CAIRO_DEBUG NAMES cairod diff --git a/cmake/FindKRB5.cmake b/cmake/FindKRB5.cmake index a9365e672..7c96e85ba 100644 --- a/cmake/FindKRB5.cmake +++ b/cmake/FindKRB5.cmake @@ -13,7 +13,7 @@ # KRB5_LDFLAGS - Additional linker flags # KRB5_CFLAGS - Additional compiler flags # KRB5_VERSION - This is set to version advertised by pkg-config or read from manifest. -# In case the library is found but no version info availabe it'll be set to "unknown" +# In case the library is found but no version info available it'll be set to "unknown" include(CheckIncludeFile) include(CheckIncludeFiles) diff --git a/cmake/ListTargetProperties.cmake b/cmake/ListTargetProperties.cmake index 059f14624..8b1969e0d 100644 --- a/cmake/ListTargetProperties.cmake +++ b/cmake/ListTargetProperties.cmake @@ -1,4 +1,4 @@ -# Get all propreties that cmake supports +# Get all properties that cmake supports if(NOT CMAKE_PROPERTY_LIST) execute_process(COMMAND cmake --help-property-list OUTPUT_VARIABLE CMAKE_PROPERTY_LIST) diff --git a/cmake/MergeStaticLibs.cmake b/cmake/MergeStaticLibs.cmake index 4fa5dad9c..8f34e3021 100644 --- a/cmake/MergeStaticLibs.cmake +++ b/cmake/MergeStaticLibs.cmake @@ -60,7 +60,7 @@ function(merge_static_libs output_library) # Now the easy part for MSVC and for MAC if(MSVC) - # lib.exe does the merging of libraries just need to conver the list into string + # lib.exe does the merging of libraries just need to convert the list into string foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES}) set(flags "") foreach(lib ${libfiles_${CONFIG_TYPE}}) diff --git a/cmake/PlatformDefaults.cmake b/cmake/PlatformDefaults.cmake index e632510e9..f7742ef27 100644 --- a/cmake/PlatformDefaults.cmake +++ b/cmake/PlatformDefaults.cmake @@ -1,4 +1,4 @@ -# This option allows deactivating FreeRDP supplied platform defauts to replace these with +# This option allows deactivating FreeRDP supplied platform defaults to replace these with # user supplied values. # # Compilation will fail without a replacement defining the symbols, but that can be @@ -25,7 +25,7 @@ if (USE_PLATFORM_DEFAULT) # is implemented, so ignore _POSIX_VERSION from unistd.h add_definitions("-D_POSIX_C_SOURCE=200809L") # TODO: FreeBSD allows mixing POSIX and BSD API calls if we do not set - # _POSIX_C_SOURCE but lack a macro to reenable the BSD calls... + # _POSIX_C_SOURCE but lack a macro to re-enable the BSD calls... add_definitions("-D__BSD_VISIBLE") # There are some symbols only visible for XOpen standard @@ -48,7 +48,7 @@ if (USE_PLATFORM_DEFAULT) # is implemented, so ignore _POSIX_VERSION from unistd.h add_definitions("-D_POSIX_C_SOURCE=200809L") - # as _POSIX_C_SOURCE sets a fully POSIX confirmant environment reenable + # as _POSIX_C_SOURCE sets a fully POSIX confirmant environment re-enable # MacOS API visibility by defining the following feature test macro add_definitions("-D_DARWIN_C_SOURCE") endif() @@ -73,7 +73,7 @@ if (USE_PLATFORM_DEFAULT) # is implemented, so ignore _POSIX_VERSION from unistd.h add_definitions("-D_POSIX_C_SOURCE=200809L") # TODO: FreeBSD allows mixing POSIX and BSD API calls if we do not set - # _POSIX_C_SOURCE but lack a macro to reenable the BSD calls... + # _POSIX_C_SOURCE but lack a macro to re-enable the BSD calls... add_definitions("-D__BSD_VISIBLE") # There are some symbols only visible for XOpen standard diff --git a/docs/Doxyfile b/docs/Doxyfile index 324675be4..9ba204e11 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -85,7 +85,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. diff --git a/docs/README.building b/docs/README.building index affdb3f8b..4baa8f163 100644 --- a/docs/README.building +++ b/docs/README.building @@ -112,7 +112,7 @@ We support * FUSE for file clipboard support (linux/mac os, disable with -DWITH_FUSE=OFF) * Wayland for wlfreerdp (disable with -DWITH_WAYLAND=OFF) * X11 development headers for X11 client (disable with -DWITH_X11=OFF) -* ALSA development headers/libraris (disable with -DWITH_ALSA=OFF) +* ALSA development headers/libraries (disable with -DWITH_ALSA=OFF) * PULSE development headers/libraries (disable with -DWITH_PULSE=OFF) * OSS development headers/libraries (disable with -DWITH_OSS=OFF) @@ -137,7 +137,7 @@ disable with -DWITH_WINPR_TOOLS=OFF * Use Ninja to speed up your builds * For release builds add -DCMAKE_BUILD_TYPE=Release (or RelWithDebInfo for less optimized but with debug symbols) * -DWITH_VERBOSE_WINPR_ASSERT=OFF reduces the size of the build considerably but removes lots - of santity checks in code. Recommended for stable builds, for builds not from stable releases + of sanity checks in code. Recommended for stable builds, for builds not from stable releases it is recommended to keep -DWITH_VERBOSE_WINPR_ASSERT=ON to have useful information on crashes. 15. Example build instructions: diff --git a/docs/README.ios b/docs/README.ios index 72bbadce2..a4dabcecb 100644 --- a/docs/README.ios +++ b/docs/README.ios @@ -100,7 +100,7 @@ CMAKE_IOS_SDK_ROOT (used by toolchain file) * absolute path to the iOS SDK (i.e. /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk) the toolchain file will usually auto-detect the correct SDK, depending on IOS_PLATFORM FREERDP_IOS_EXTERNAL_SSL_PATH (used by FindOpenSSL) -* absolut root path to the pre-built static OpenSSL libraries +* absolute root path to the pre-built static OpenSSL libraries CODE_SIGN_IDENTITY * specify the identity to sign the code with diff --git a/docs/README.macOS b/docs/README.macOS index 47b5f84ee..f1b296a68 100644 --- a/docs/README.macOS +++ b/docs/README.macOS @@ -4,7 +4,7 @@ More documentation might be found at https://github.com/FreeRDP/FreeRDP/wiki/Com Starting with "El Capitan" Apple removed the openssl headers. Therefore it's required to build openssl manually upfront. For example by using MacPorts or Homebrew. To build FreeRDP against this library it's required to set the PKG_CONFIG_PATH -pointing to the openssl root directory befor building. +pointing to the openssl root directory before building. For example with brew it would look like this: export PKG_CONFIG_PATH=$(brew --prefix)/opt/openssl/lib/pkgconfig diff --git a/docs/version_detection.md b/docs/version_detection.md index 0cd3b8963..3a00c5d3c 100644 --- a/docs/version_detection.md +++ b/docs/version_detection.md @@ -6,7 +6,7 @@ When doing a `xfreerdp /version` for example the following is shown `This is FreeRDP version 3.0.0-dev (c99c4cecddee4e5b914b122bc1531d47a668bb8e)` -The first part ist the Version as defined in `RAW_VERSION_STRING` and the second part, in braces, +The first part is the Version as defined in `RAW_VERSION_STRING` and the second part, in braces, the `GIT_REVISON` of this version. `RAW_VERSION_STRING` is very vital as it determines the version used for libraries as well also for diff --git a/docs/wlog.md b/docs/wlog.md index e6d1286ae..3d166d840 100644 --- a/docs/wlog.md +++ b/docs/wlog.md @@ -38,7 +38,7 @@ The level list below is top down. Top the highest level. * WLOG_TRACE - print everything including package dumps * WLOG_DEBUG - debug messages -* WLOG_INFO - general informations +* WLOG_INFO - general information * WLOG_WARN - warnings * WLOG_ERROR - errors * WLOG_FATAL - fatal problems diff --git a/include/config/settings_keys.h.in b/include/config/settings_keys.h.in index 32fd2353b..9635f71ca 100644 --- a/include/config/settings_keys.h.in +++ b/include/config/settings_keys.h.in @@ -110,7 +110,7 @@ typedef enum } FreeRDP_Settings_Keys_Pointer; -/** Highest indes in the rdpSettings stable API +/** Highest index in the rdpSettings stable API * * \since version 3.0.0 */ diff --git a/include/freerdp/channels/gfxredir.h b/include/freerdp/channels/gfxredir.h index b21bcc8e3..ff0beacbe 100644 --- a/include/freerdp/channels/gfxredir.h +++ b/include/freerdp/channels/gfxredir.h @@ -113,7 +113,7 @@ typedef struct { UINT64 poolId; UINT64 poolSize; - UINT32 sectionNameLength; // number of charactor, must include null terminated char. + UINT32 sectionNameLength; // number of characters, must include null terminated char. const unsigned short* sectionName; // Windows-style 2 bytes wchar_t with null-terminated. } GFXREDIR_OPEN_POOL_PDU; diff --git a/include/freerdp/codec/color.h b/include/freerdp/codec/color.h index fbd9f8a87..78f2d43d0 100644 --- a/include/freerdp/codec/color.h +++ b/include/freerdp/codec/color.h @@ -56,7 +56,7 @@ extern "C" /*** Design considerations * * The format naming scheme is based on byte position in memory. - * RGBA for example names a byte array with red on positon 0, green on 1 etc. + * RGBA for example names a byte array with red on position 0, green on 1 etc. * * To read and write the appropriate format from / to memory use FreeRDPReadColor and * FreeRDPWriteColor. @@ -145,7 +145,7 @@ typedef struct gdi_palette gdiPalette; * @param _g green color value * @param _b blue color value * @param _a alpha color value - * @param palette pallete to use (only used for 8 bit color!) + * @param palette palette to use (only used for 8 bit color!) */ #if defined(WITH_FREERDP_DEPRECATED) #define SplitColor(...) FreeRDPSplitColor(__VA_ARGS__) @@ -245,7 +245,7 @@ typedef struct gdi_palette gdiPalette; * @param color The pixel color in srcFormat representation * @param srcFormat The PIXEL_FORMAT_* of color * @param dstFormat The PIXEL_FORMAT_* of the return. - * @param palette pallete to use (only used for 8 bit color!) + * @param palette palette to use (only used for 8 bit color!) * * @return The converted pixel color in dstFormat representation */ @@ -434,9 +434,9 @@ typedef struct gdi_palette gdiPalette; /*** * - * @param pDstData destionation buffer - * @param DstFormat destionation buffer format - * @param nDstStep destionation buffer stride (line in bytes) 0 for default + * @param pDstData destination buffer + * @param DstFormat destination buffer format + * @param nDstStep destination buffer stride (line in bytes) 0 for default * @param nXDst destination buffer offset x * @param nYDst destination buffer offset y * @param nWidth width to copy in pixels diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h index ef6020340..c052db82e 100644 --- a/include/freerdp/crypto/crypto.h +++ b/include/freerdp/crypto/crypto.h @@ -43,7 +43,7 @@ extern "C" /** BASE64 encode data * * @param data The data to encode - * @param length The lenght of the data in bytes + * @param length The length of the data in bytes * @param withCrLf Option to split the encoded data with CRLF linebreaks * * @since version 3.0.0 diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 5ec14a92f..e071ea6ed 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -417,7 +417,7 @@ owned by rdpRdp */ size to allocate the context buffer. freerdp_new() sets it to sizeof(rdpContext). If modifying it, there should always be a minimum of sizeof(rdpContext), as the freerdp library will assume it can use the 'context' - field to set the required informations in it. Clients will typically make it + field to set the required information in it. Clients will typically make it bigger, and use a context structure embedding the rdpContext, and adding additional information after that. */ diff --git a/include/freerdp/server/proxy/proxy_server.h b/include/freerdp/server/proxy/proxy_server.h index 39e738f3e..702b3268d 100644 --- a/include/freerdp/server/proxy/proxy_server.h +++ b/include/freerdp/server/proxy/proxy_server.h @@ -50,7 +50,7 @@ extern "C" /** * @brief pf_server_add_module Allows registering proxy modules that are - * build-in instead of shipped as separate + * built-in instead of shipped as separate * module loaded at runtime. * * @param server A proxy instance to add the module to. Must NOT be NULL diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index d808d5697..03935f430 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -661,7 +661,7 @@ extern "C" * the settings. * * \param settings A pointer to the settings to use - * \param capsFlags A pointer to the capablity flags, must have capsCount fields + * \param capsFlags A pointer to the capability flags, must have capsCount fields * \param capsData A pointer array to the RAW capability data, must have capsCount fields * \param capsSizes A pointer to an array of RAW capability sizes, must have capsCount fields * \param capsCount The number of capabilities contained in the RAW data diff --git a/include/freerdp/transport_io.h b/include/freerdp/transport_io.h index 1e9de38dc..fd13dc1b1 100644 --- a/include/freerdp/transport_io.h +++ b/include/freerdp/transport_io.h @@ -79,7 +79,7 @@ extern "C" typedef BOOL (*pTransportGetPublicKey)(rdpTransport* transport, const BYTE** data, DWORD* length); /** - * @brief Mofify transport behaviour between bocking and non blocking operation + * @brief Modify transport behaviour between blocking and non blocking operation * * @param transport The transport to manipulate * @param blocking Boolean to set the transport \b TRUE blocking and \b FALSE non-blocking @@ -133,7 +133,7 @@ extern "C" * incomplete: FALSE if the whole PDU is available, TRUE otherwise * Return: 0 -> PDU header incomplete * >0 -> PDU header complete, length of PDU. - * <0 -> Abort, an error occured + * <0 -> Abort, an error occurred */ FREERDP_API SSIZE_T transport_parse_pdu(rdpTransport* transport, wStream* s, BOOL* incomplete); FREERDP_API rdpContext* transport_get_context(rdpTransport* transport); diff --git a/include/freerdp/window.h b/include/freerdp/window.h index bc56e59d8..2b65a76ce 100644 --- a/include/freerdp/window.h +++ b/include/freerdp/window.h @@ -55,7 +55,7 @@ #define WINDOW_ORDER_FIELD_APPBAR_STATE 0x00000040 #define WINDOW_ORDER_FIELD_APPBAR_EDGE 0x00000001 -/* Window (chached) Icon */ +/* Window (cached) Icon */ #define WINDOW_ORDER_ICON 0x40000000 #define WINDOW_ORDER_CACHED_ICON 0x80000000 #define WINDOW_ORDER_FIELD_ICON_BIG 0x00002000 diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c index 0b3fa9467..c3c7cf39b 100644 --- a/libfreerdp/codec/dsp_ffmpeg.c +++ b/libfreerdp/codec/dsp_ffmpeg.c @@ -737,7 +737,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, 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, __func__, + WLog_WARN(TAG, "[%s] unsupported source channel count %" PRIu16, __func__, srcFormat->nChannels); return FALSE; } @@ -766,7 +766,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, 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, __func__, + WLog_WARN(TAG, "[%s] unsupported channel count %" PRIu16, __func__, srcFormat->nChannels); return FALSE; } diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c index 1272dd8af..35ad4551f 100644 --- a/libfreerdp/codec/region.c +++ b/libfreerdp/codec/region.c @@ -282,7 +282,7 @@ static void region16_copy_band_with_union(RECTANGLE_16* dst, const RECTANGLE_16* * * We first copy as-is items that are before Item2, the first overlapping * item. - * Then we find the last one that overlap unionRect to agregate Item2, Item3 + * Then we find the last one that overlap unionRect to aggregate Item2, Item3 * and Item4 to create Item2. * Finally Item5 is copied as Item3. * @@ -589,13 +589,13 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* | | | | possible cases: - 1) no top split, merge zone then a bottom split. The band will be splitted + 1) no top split, merge zone then a bottom split. The band will be split in two - 2) not band split, only the merge zone, band merged with rect but not splitted + 2) not band split, only the merge zone, band merged with rect but not split 3) a top split, the merge zone and no bottom split. The band will be split in two 4) a top split, the merge zone and also a bottom split. The band will be - splitted in 3, but the coalesce algorithm may merge the created bands + split in 3, but the coalesce algorithm may merge the created bands */ UINT16 mergeTop = currentBand->top; UINT16 mergeBottom = currentBand->bottom; diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 03e90c0c6..ee5ad6320 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -60,7 +60,7 @@ * and lower quality. * * This is the default values being use by the MS RDP server, and we will also - * use it as our default values for the encoder. It can be overrided by setting + * use it as our default values for the encoder. It can be overridden by setting * the context->num_quants and context->quants member. * * The order of the values are: @@ -257,7 +257,7 @@ RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) * that are actually in front/beyond the buffer. Offset calculations are * performed at the BufferPool_Take function calls in rfx_encode/decode.c. * - * We then multiply by 3 to use a single, partioned buffer for all 3 channels. + * We then multiply by 3 to use a single, partionned buffer for all 3 channels. */ priv->BufferPool = BufferPool_New(TRUE, (8192ULL + 32ULL) * 3ULL, 16); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c index 772665ec2..52f32a2bb 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c @@ -5432,7 +5432,7 @@ static BOOL CompareBitmap(const BYTE* srcA, UINT32 srcAFormat, const BYTE* srcB, if ((srcABits < 15) || (srcBBits < 15)) return FALSE; - /* Compare with folliwing granularity: + /* Compare with following granularity: * 32 --> 24 bpp: Each color channel has 8bpp, no difference expected * 24/32 --> 15/16 bpp: 8bit per channel against 5/6bit per channel, +/- 3bit * 16 --> 15bpp: 5/6bit per channel against 5 bit per channel, +/- 1bit diff --git a/libfreerdp/codec/xcrush.c b/libfreerdp/codec/xcrush.c index cbd5b2bca..4c50b852e 100644 --- a/libfreerdp/codec/xcrush.c +++ b/libfreerdp/codec/xcrush.c @@ -769,7 +769,7 @@ static INLINE size_t xcrush_copy_bytes_no_overlap(BYTE* WINPR_RESTRICT dst, const BYTE* WINPR_RESTRICT src, size_t num) { // src and dst overlaps - // we should copy the area that doesn't overlap repeatly + // we should copy the area that doesn't overlap repeatedly const size_t diff = (dst > src) ? dst - src : src - dst; const size_t rest = num % diff; const size_t end = num - rest; diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 9a3420771..6dc1603eb 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -1099,7 +1099,7 @@ static BOOL rdp_read_pointer_capability_set(wStream* s, rdpSettings* settings) { WLog_WARN(TAG, "[MS-RDPBCGR] 2.2.7.1.5 Pointer Capability Set " "(TS_POINTER_CAPABILITYSET)::colorPointerFlag received is %" PRIu16 - ". Vaue is ignored and always assumed to be TRUE"); + ". Value is ignored and always assumed to be TRUE"); } /* pointerCacheSize is optional */ @@ -2705,7 +2705,7 @@ static BOOL rdp_apply_multifragment_update_capability_set(rdpSettings* settings, else { /* - * In client mode we keep up with the server's capabilites. + * In client mode we keep up with the server's capabilities. * In RemoteFX mode we MUST do this but it might also be useful to * receive larger related bitmap updates. */ diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index a311d3b1a..5d57815f1 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -198,7 +198,7 @@ BOOL freerdp_connect(freerdp* instance) if (rc == 0) goto freerdp_connect_finally; - /* Pointers might have changed inbetween */ + /* Pointers might have changed in between */ { rdp_update_internal* up = update_cast(rdp->update); diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index dc60b0e6e..40337daf5 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -1307,7 +1307,7 @@ static SSIZE_T http_response_recv_line(rdpTls* tls, HttpResponse* response) goto out_error; } - /* Always check at most the lase 8 bytes for occurance of the desired + /* Always check at most the lase 8 bytes for occurrence of the desired * sequence of \r\n\r\n */ s = (position > 8) ? 8 : position; end = (char*)Stream_Pointer(response->data) - s; diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 98d921a4b..e7d6b9af6 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -728,7 +728,7 @@ wStream* license_send_stream_init(rdpLicense* license) * layer is used. If the peer has not indicated that it is capable of * processing encrypted licensing packets (rdp->do_crypt_license) we turn * off encryption (via rdp->do_crypt) before initializing the rdp stream - * and reenable it afterwards. + * and re-enable it afterwards. */ if (do_crypt) diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index 45625bd5a..8866caf6d 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -102,7 +102,7 @@ * subInterval INTEGER (0..MAX) * } * - * AttachUserRequest ::= [APPPLICATION 10] IMPLICIT SEQUENCE + * AttachUserRequest ::= [APPLICATION 10] IMPLICIT SEQUENCE * { * } * diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index fcf81050b..76886afd9 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -1509,7 +1509,7 @@ BOOL nego_send_negotiation_response(rdpNego* nego) ENCRYPTION_LEVEL_NONE) { /** - * If the server implementation did not explicitely set a + * If the server implementation did not explicitly set a * encryption level we default to client compatible */ if (!freerdp_settings_set_uint32(settings, FreeRDP_EncryptionLevel, @@ -1817,7 +1817,7 @@ void nego_enable_aad(rdpNego* nego, BOOL enable_aad) * Set routing token. * @param nego A pointer to the NEGO struct * @param RoutingToken A pointer to the routing token - * @param RoutingTokenLength The lenght of the routing token + * @param RoutingTokenLength The length of the routing token * * @return \b TRUE for success, \b FALSE otherwise */ diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index 4de49049a..e7e5bf22b 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -2968,7 +2968,7 @@ static void log_build_warn_cipher(rdpRdp* rdp, log_line_t* firstLine, WINPR_CIPH char key[WINPR_CIPHER_MAX_KEY_LENGTH] = { 0 }; char iv[WINPR_CIPHER_MAX_IV_LENGTH] = { 0 }; - /* RC4 only exists in the compatiblity functions winpr_RC4_* + /* RC4 only exists in the compatibility functions winpr_RC4_* * winpr_Cipher_* does not support that. */ if (md == WINPR_CIPHER_ARC4_128) { @@ -3079,7 +3079,7 @@ void rdp_log_build_warnings(rdpRdp* rdp) WINPR_ASSERT(rdp); /* Since this function is called in context creation routines stop logging - * this issue repetedly. This is required for proxy, which would otherwise + * this issue repeatedly. This is required for proxy, which would otherwise * spam the log with these. */ if (count > 0) return; diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index 46eeffa67..231c96443 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -1012,7 +1012,7 @@ BOOL rdp_write_enhanced_security_redirection_packet(wStream* s, const rdpRedirec if (redirection->flags & LB_PASSWORD) { - /* Password is eighter UNICODE or opaque data */ + /* Password is either UNICODE or opaque data */ if (!redir_write_data(LB_PASSWORD, s, redirection->PasswordLength, redirection->Password)) goto fail; } diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index 69abed206..b1145c2d7 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -354,7 +354,7 @@ static BOOL monitor_operlaps(const rdpSettings* settings, UINT32 start, UINT32 c WLog_ERR( TAG, "Mulitimonitor mode requested, but local layout has gaps or overlapping areas!"); - WLog_ERR(TAG, "Please reconfigure your local monitor setup so that thre are no gaps or " + WLog_ERR(TAG, "Please reconfigure your local monitor setup so that there are no gaps or " "overlapping areas!"); return TRUE; } diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index a2cea0986..144a6c55b 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -931,7 +931,7 @@ static SSIZE_T parse_nla_mode_pdu(rdpTransport* transport, wStream* stream) } else if ((lengthEncoding & ~(0x80)) == 2) { - /* check for header bytes already was readed in previous calls */ + /* check for header bytes already read in previous calls */ UINT16 length = 0; if (Stream_GetRemainingLength(s) < 2) return 0; diff --git a/libfreerdp/crypto/cert_common.h b/libfreerdp/crypto/cert_common.h index 7604fdfaa..dca753c02 100644 --- a/libfreerdp/crypto/cert_common.h +++ b/libfreerdp/crypto/cert_common.h @@ -1,6 +1,6 @@ /** * FreeRDP: A Remote Desktop Protocol Implementation - * Certificate and private key heplers + * Certificate and private key helpers * * Copyright 2023 Armin Novak * Copyright 2023 Thincast Technologies GmbH diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index f42cd7625..6fa85f880 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -746,7 +746,7 @@ static void tls_reset(rdpTls* tls) } /* tls->underlying is a stacked BIO under tls->bio. - * BIO_free_all will free recursivly. */ + * BIO_free_all will free recursively. */ if (tls->bio) BIO_free_all(tls->bio); else if (tls->underlying) diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index 3a5826640..05cdeb26c 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -48,7 +48,7 @@ BYTE* x509_utils_get_hash(const X509* xcert, const char* hash, size_t* length) } if (!xcert || !length) { - WLog_ERR(TAG, "Invalid arugments: xcert=%p, length=%p", xcert, length); + WLog_ERR(TAG, "Invalid arguments: xcert=%p, length=%p", xcert, length); return NULL; } diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index d9158a9ca..1cbfe2a49 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -425,7 +425,7 @@ static BOOL vgids_prepare_fstable(const vgidsFilesysTableEntry* fstable, DWORD n BYTE** outData, DWORD* outDataSize) { /* Filesystem table: - BYTE unkonwn: 0x01 + BYTE unknown: 0x01 Array of vgidsFilesysTableEntry */ BYTE* data = malloc(sizeof(vgidsFilesysTableEntry) * numEntries + 1); @@ -536,7 +536,7 @@ static BYTE vgids_get_algid(vgidsContext* p_Ctx) static BOOL vgids_prepare_keymap(vgidsContext* context, BYTE** outData, DWORD* outDataSize) { /* Key map record table: - BYTE unkonwn (count?): 0x01 + BYTE unknown (count?): 0x01 Array of vgidsKeymapRecord */ BYTE* data = NULL; @@ -1032,7 +1032,7 @@ static BOOL vgids_ins_manage_security_environment(vgidsContext* context, wStream Stream_Read_UINT8(s, context->currentSE.keyRef); create_response: - /* If an error occured reset SE */ + /* If an error occurred reset SE */ if (status != ISO_STATUS_SUCCESS) memset(&context->currentSE, 0, sizeof(context->currentSE)); return vgids_create_response(status, resultData, resultDataSize, response, responseSize); diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 7ddc90ac5..1d22c8163 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -93,7 +93,7 @@ static const SYSTEM_LOCALE SYSTEM_LOCALE_TABLE[] = { { "en", "AU", ENGLISH_AUSTRALIAN }, /* English (Australia) */ { "en", "BZ", ENGLISH_BELIZE }, /* English (Belize) */ { "en", "CA", ENGLISH_CANADIAN }, /* English (Canada) */ - { "en", "CB", ENGLISH_CARIBBEAN }, /* English (Carribean) */ + { "en", "CB", ENGLISH_CARIBBEAN }, /* English (Carribbean) */ { "en", "IN", ENGLISH_INDIA }, /* Windows Vista and later: English (India) */ { "en", "IE", ENGLISH_IRELAND }, /* English (Ireland) */ { "en", "JM", ENGLISH_JAMAICA }, /* English (Jamaica) */ diff --git a/libfreerdp/primitives/neon/prim_YUV_neon.c b/libfreerdp/primitives/neon/prim_YUV_neon.c index 1ee0be59c..08fc6969c 100644 --- a/libfreerdp/primitives/neon/prim_YUV_neon.c +++ b/libfreerdp/primitives/neon/prim_YUV_neon.c @@ -547,7 +547,7 @@ static pstatus_t neon_ChromaV1ToYUV444(const BYTE* WINPR_RESTRICT pSrcRaw[3], const UINT32 oddY = 1; const UINT32 evenY = 0; const UINT32 oddX = 1; - /* The auxilary frame is aligned to multiples of 16x16. + /* The auxiliary frame is aligned to multiples of 16x16. * We need the padded height for B4 and B5 conversion. */ const UINT32 padHeigth = nHeight + 16 - nHeight % 16; const UINT32 halfPad = halfWidth % 16; diff --git a/libfreerdp/primitives/neon/prim_colors_neon.c b/libfreerdp/primitives/neon/prim_colors_neon.c index 87e75d2da..25874dc54 100644 --- a/libfreerdp/primitives/neon/prim_colors_neon.c +++ b/libfreerdp/primitives/neon/prim_colors_neon.c @@ -62,7 +62,7 @@ neon_yCbCrToRGB_16s16s_P3P3(const INT16* WINPR_RESTRICT pSrc[3], INT32 srcStep, { /* In order to use NEON signed 16-bit integer multiplication we need to convert - the floating point factors to signed int without loosing information. + the floating point factors to signed int without losing information. The result of this multiplication is 32 bit and we have a NEON instruction that returns the hi word of the saturated double. Thus we will multiply the factors by the highest possible 2^n, take the diff --git a/libfreerdp/primitives/prim_YUV.c b/libfreerdp/primitives/prim_YUV.c index 5c671d432..6024d609b 100644 --- a/libfreerdp/primitives/prim_YUV.c +++ b/libfreerdp/primitives/prim_YUV.c @@ -154,7 +154,7 @@ static pstatus_t general_ChromaV1ToYUV444(const BYTE* WINPR_RESTRICT pSrcRaw[3], const UINT32 oddY = 1; const UINT32 evenY = 0; const UINT32 oddX = 1; - /* The auxilary frame is aligned to multiples of 16x16. + /* The auxiliary frame is aligned to multiples of 16x16. * We need the padded height for B4 and B5 conversion. */ const UINT32 padHeigth = nHeight + 16 - nHeight % 16; const BYTE* pSrc[3] = { pSrcRaw[0] + 1ULL * roi->top * srcStep[0] + roi->left, @@ -307,7 +307,7 @@ general_YUV444SplitToYUV420(const BYTE* WINPR_RESTRICT pSrc[3], const UINT32 src UINT32 vY = 0; UINT32 halfWidth = 0; UINT32 halfHeight = 0; - /* The auxilary frame is aligned to multiples of 16x16. + /* The auxiliary frame is aligned to multiples of 16x16. * We need the padded height for B4 and B5 conversion. */ const UINT32 padHeigth = roi->height + 16 - roi->height % 16; halfWidth = (roi->width + 1) / 2; @@ -1345,7 +1345,7 @@ static INLINE pstatus_t general_RGBToAVC444YUV_ANY( * B2: From U444 all pixels in even rows with even columns * B3: From V444 all pixels in even rows with even columns * - * Chroma420 frame (auxillary view): + * Chroma420 frame (auxiliary view): * B45: From U444 and V444 all pixels from all odd rows * (The odd U444 and V444 rows must be interleaved in 8-line blocks in B45 !!!) * B6: From U444 all pixels in even rows with odd columns @@ -1618,7 +1618,7 @@ static INLINE pstatus_t general_RGBToAVC444YUVv2_ANY( * B2: From U444 all pixels in even rows with even rows and columns * B3: From V444 all pixels in even rows with even rows and columns * - * Chroma420 frame (auxillary view): + * Chroma420 frame (auxiliary view): * B45: From U444 and V444 all pixels from all odd columns * B67: From U444 and V444 every 4th pixel in odd rows * B89: From U444 and V444 every 4th pixel (initial offset of 2) in odd rows diff --git a/libfreerdp/primitives/sse/prim_YUV_ssse3.c b/libfreerdp/primitives/sse/prim_YUV_ssse3.c index 4cfc90134..09785595d 100644 --- a/libfreerdp/primitives/sse/prim_YUV_ssse3.c +++ b/libfreerdp/primitives/sse/prim_YUV_ssse3.c @@ -1265,7 +1265,7 @@ static pstatus_t ssse3_ChromaV1ToYUV444(const BYTE* WINPR_RESTRICT pSrcRaw[3], const UINT32 oddY = 1; const UINT32 evenY = 0; const UINT32 oddX = 1; - /* The auxilary frame is aligned to multiples of 16x16. + /* The auxiliary frame is aligned to multiples of 16x16. * We need the padded height for B4 and B5 conversion. */ const UINT32 padHeigth = nHeight + 16 - nHeight % 16; const BYTE* pSrc[3] = { pSrcRaw[0] + 1ULL * roi->top * srcStep[0] + roi->left, diff --git a/libfreerdp/primitives/sse/prim_colors_sse2.c b/libfreerdp/primitives/sse/prim_colors_sse2.c index 4c495e6f1..d826de2f0 100644 --- a/libfreerdp/primitives/sse/prim_colors_sse2.c +++ b/libfreerdp/primitives/sse/prim_colors_sse2.c @@ -706,7 +706,7 @@ sse2_RGBToYCbCr_16s16s_P3P3(const INT16* WINPR_RESTRICT pSrc[3], int srcStep, { /* In order to use SSE2 signed 16-bit integer multiplication we * need to convert the floating point factors to signed int - * without loosing information. The result of this multiplication + * without losing information. The result of this multiplication * is 32 bit and using SSE2 we get either the product's hi or lo * word. Thus we will multiply the factors by the highest * possible 2^n and take the upper 16 bits of the signed 32-bit diff --git a/libfreerdp/utils/test/TestRingBuffer.c b/libfreerdp/utils/test/TestRingBuffer.c index 1b17dd988..ebe868128 100644 --- a/libfreerdp/utils/test/TestRingBuffer.c +++ b/libfreerdp/utils/test/TestRingBuffer.c @@ -143,12 +143,12 @@ int TestRingBuffer(int argc, char* argv[]) return -1; } - /* write some more bytes to have writePtr < readPtr and data splitted in 2 chunks */ + /* write some more bytes to have writePtr < readPtr and data split in 2 chunks */ if (!ringbuffer_write(&ringBuffer, tmpBuf, 6) || ringbuffer_peek(&ringBuffer, chunks, 11) != 2 || chunks[0].size != 10 || chunks[1].size != 1) { - (void)fprintf(stderr, "invalid read of splitted data\n"); + (void)fprintf(stderr, "invalid read of split data\n"); return -1; } diff --git a/rdtk/CMakeLists.txt b/rdtk/CMakeLists.txt index 66a7ae3ce..633eb5e78 100644 --- a/rdtk/CMakeLists.txt +++ b/rdtk/CMakeLists.txt @@ -62,7 +62,7 @@ include(CheckCCompilerFlag) include(CMakePackageConfigHelpers) include (SetFreeRDPCMakeInstallDir) -option(RDTK_FORCE_STATIC_BUILD "Force RDTK to be build as static libary (recommended)" OFF) +option(RDTK_FORCE_STATIC_BUILD "Force RDTK to be built as static library (recommended)" OFF) if (RDTK_FORCE_STATIC_BUILD) set(BUILD_SHARED_LIBS OFF) endif() diff --git a/scripts/OpenSSL-DownloadAndBuild.command b/scripts/OpenSSL-DownloadAndBuild.command index 5de1a31dc..104f17ba1 100755 --- a/scripts/OpenSSL-DownloadAndBuild.command +++ b/scripts/OpenSSL-DownloadAndBuild.command @@ -126,7 +126,7 @@ cd "openssl-$OPENSSLVERSION" case `pwd` in *\ * ) - echo "The build path (`pwd`) contains whitepsaces - fix this." + echo "The build path (`pwd`) contains whitespaces - fix this." exit 1 ;; esac @@ -146,8 +146,8 @@ echo "Copying header files ..." cp -r include/ ../../include/ echo -echo "Combining to unversal binary" +echo "Combining to universal binary" lipo -create ../../lib/libcrypto_*.a -o ../../lib/libcrypto.a lipo -create ../../lib/libssl_*.a -o ../../lib/libssl.a -echo "Finished. Please verify the contens of the openssl folder in \"$INSTALLDIR\"" +echo "Finished. Please verify the contents of the openssl folder in \"$INSTALLDIR\"" diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf index 8c911f039..166dbd2dc 100644 --- a/scripts/android-build-32.conf +++ b/scripts/android-build-32.conf @@ -1,13 +1,13 @@ #!/bin/bash # -# Android build confguration +# Android build configuration # # Note: This is a simple configuration to build all # architectures in one rush. # Since android 64 bit support was introduced with NDK API 21 # this is the minimal common denominator. # If you require support for older NDK API levels, -# create seperate configurations for each NDK API level +# create separate configurations for each NDK API level # and architecture you want to support. WITH_OPENH264=0 WITH_OPENSSL=1 diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf index 8043495ca..a85ab0e47 100644 --- a/scripts/android-build-64.conf +++ b/scripts/android-build-64.conf @@ -1,13 +1,13 @@ #!/bin/bash # -# Android build confguration +# Android build configuration # # Note: This is a simple configuration to build all # architectures in one rush. # Since android 64 bit support was introduced with NDK API 21 # this is the minimal common denominator. # If you require support for older NDK API levels, -# create seperate configurations for each NDK API level +# create separate configurations for each NDK API level # and architecture you want to support. WITH_OPENH264=1 WITH_OPENSSL=1 diff --git a/scripts/android-build-common.sh b/scripts/android-build-common.sh index 416a511ff..f1922c3fb 100644 --- a/scripts/android-build-common.sh +++ b/scripts/android-build-common.sh @@ -90,7 +90,7 @@ function common_run { RES=$? if [[ $RES -ne 0 ]]; then - echo "[ERROR] $@ retured $RES" + echo "[ERROR] $@ returned $RES" exit 1 fi } diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf index f178c3648..052c1dadd 100644 --- a/scripts/android-build-release.conf +++ b/scripts/android-build-release.conf @@ -1,13 +1,13 @@ #!/bin/bash # -# Android build confguration +# Android build configuration # # Note: This is a simple configuration to build all # architectures in one rush. # Since android 64 bit support was introduced with NDK API 21 # this is the minimal common denominator. # If you require support for older NDK API levels, -# create seperate configurations for each NDK API level +# create separate configurations for each NDK API level # and architecture you want to support. WITH_OPENH264=0 WITH_OPENSSL=1 diff --git a/scripts/android-build.conf b/scripts/android-build.conf index abc9a3a47..0db04e690 100644 --- a/scripts/android-build.conf +++ b/scripts/android-build.conf @@ -1,13 +1,13 @@ #!/bin/bash # -# Android build confguration +# Android build configuration # # Note: This is a simple configuration to build all # architectures in one rush. # Since android 64 bit support was introduced with NDK API 21 # this is the minimal common denominator. # If you require support for older NDK API levels, -# create seperate configurations for each NDK API level +# create separate configurations for each NDK API level # and architecture you want to support. WITH_OPENH264=0 WITH_OPENSSL=1 diff --git a/scripts/fetch_language_identifiers.py b/scripts/fetch_language_identifiers.py index a6c6adf41..a5f3b5aa5 100755 --- a/scripts/fetch_language_identifiers.py +++ b/scripts/fetch_language_identifiers.py @@ -58,7 +58,7 @@ def padhexa(v): def write_struct(fp, struct, name, url, base, inv = False, typemap = None): li = requests.get(url) if li.status_code != requests.codes.ok: - print('Could not fetch ' + str(url) + ', reponse code ' + str(li.status_code)) + print('Could not fetch ' + str(url) + ', response code ' + str(li.status_code)) sys.exit(1) headers, languages = parse_html(li.text) diff --git a/scripts/gprof_generate.sh.cmake b/scripts/gprof_generate.sh.cmake index 848989f2c..29bb35e82 100755 --- a/scripts/gprof_generate.sh.cmake +++ b/scripts/gprof_generate.sh.cmake @@ -39,7 +39,7 @@ if [ ! -f $ADB ] || [ ! -x $ADB ]; then exit -3 fi -# Do the acutal work in a temporary directory. +# Do the actual work in a temporary directory. SRC=`mktemp -d` cd $SRC $ADB $@ pull /sdcard/gmon.out diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c index 8647bb52d..958a53f73 100644 --- a/server/Sample/sfreerdp.c +++ b/server/Sample/sfreerdp.c @@ -1217,7 +1217,7 @@ static DWORD WINAPI test_peer_mainloop(LPVOID arg) if (WTSVirtualChannelManagerCheckFileDescriptor(context->vcm) != TRUE) break; - /* Handle dynamic virtual channel intializations */ + /* Handle dynamic virtual channel initializations */ if (WTSVirtualChannelManagerIsChannelJoined(context->vcm, DRDYNVC_SVC_CHANNEL_NAME)) { switch (WTSVirtualChannelManagerGetDrdynvcState(context->vcm)) diff --git a/server/Windows/wf_mirage.c b/server/Windows/wf_mirage.c index 524ff6e0e..91c5a41e4 100644 --- a/server/Windows/wf_mirage.c +++ b/server/Windows/wf_mirage.c @@ -98,7 +98,7 @@ BOOL wf_mirror_driver_display_device_attach(wfInfo* wfi, DWORD mode) WLog_DBG(TAG, "Error opening RegKey: status=0x%08lX", status); if (status == ERROR_ACCESS_DENIED) - WLog_DBG(TAG, "access denied. Do you have admin privleges?"); + WLog_DBG(TAG, "access denied. Do you have admin privileges?"); return FALSE; } @@ -111,7 +111,7 @@ BOOL wf_mirror_driver_display_device_attach(wfInfo* wfi, DWORD mode) WLog_DBG(TAG, "Error querying RegKey: status=0x%08lX", status); if (status == ERROR_ACCESS_DENIED) - WLog_DBG(TAG, "access denied. Do you have admin privleges?"); + WLog_DBG(TAG, "access denied. Do you have admin privileges?"); return FALSE; } @@ -127,7 +127,7 @@ BOOL wf_mirror_driver_display_device_attach(wfInfo* wfi, DWORD mode) WLog_DBG(TAG, "Error writing registry key: %ld", status); if (status == ERROR_ACCESS_DENIED) - WLog_DBG(TAG, "access denied. Do you have admin privleges?"); + WLog_DBG(TAG, "access denied. Do you have admin privileges?"); WLog_DBG(TAG, ""); return FALSE; diff --git a/server/Windows/wf_wasapi.c b/server/Windows/wf_wasapi.c index c7b4408f5..a3490b1c9 100644 --- a/server/Windows/wf_wasapi.c +++ b/server/Windows/wf_wasapi.c @@ -136,7 +136,7 @@ int wf_wasapi_get_device_string(LPWSTR pattern, LPWSTR* deviceStr) if (wcscmp(pattern, nameVar.pwszVal) < 0) { unsigned int devStrLen; - WLog_INFO(TAG, "Using sound ouput endpoint: [%s] (%s)", nameVar.pwszVal, pwszID); + WLog_INFO(TAG, "Using sound output endpoint: [%s] (%s)", nameVar.pwszVal, pwszID); // WLog_INFO(TAG, "matched %d characters", wcscmp(pattern, nameVar.pwszVal); devStrLen = wcslen(pwszID); *deviceStr = (LPWSTR)calloc(devStrLen + 1, 2); diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 18f5fdfb0..b022710b8 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -303,7 +303,7 @@ static BOOL rdpdr_process_server_header(BOOL server, wLog* log, wStream* s, UINT if (!Stream_CheckAndLogRequiredLengthRx(server, log, s, expect)) { RX_LOG(server, log, WLOG_WARN, - "RDPDR_HEADER[%s | %s] not enought data, expected %" PRIuz ", " + "RDPDR_HEADER[%s | %s] not enough data, expected %" PRIuz ", " "got %" PRIuz, rdpdr_component_string(component), rdpdr_packetid_string(PacketId), expect, Stream_GetRemainingLength(s)); diff --git a/server/proxy/cli/freerdp-proxy.1.in b/server/proxy/cli/freerdp-proxy.1.in index c41f97c41..ee4434bda 100644 --- a/server/proxy/cli/freerdp-proxy.1.in +++ b/server/proxy/cli/freerdp-proxy.1.in @@ -60,7 +60,7 @@ and map connecting users and credentials to target server users and credentials. 3. edit configurartion and: - * provide (preferrably absolute) paths for \fBCertificateFile\fP and \fBPrivateKeyFile\fP generated previously + * provide (preferably absolute) paths for \fBCertificateFile\fP and \fBPrivateKeyFile\fP generated previously * remove the \fBCertificateContents\fP and \fBPrivateKeyContents\fP * Adjust the \fB[Server]\fP settings \fBHost\fP and \fBPort\fP to bind a specific port on a network interface * Adjust the \fB[Target]\fP \fBHost\fP and \fBPort\fP settings to the \fBRDP\fP target server diff --git a/server/proxy/modules/README.md b/server/proxy/modules/README.md index f1d2206ec..db4322bac 100644 --- a/server/proxy/modules/README.md +++ b/server/proxy/modules/README.md @@ -18,7 +18,7 @@ so the proxy refuses to start if they are not found: Required = demo,cap ``` -Modules must be installed as shared libraris in the `/lib/freerdp3/proxy` folder and match the pattern +Modules must be installed as shared libraries in the `/lib/freerdp3/proxy` folder and match the pattern `proxy--plugin.` (e.g. `proxy-demo-plugin.so`) to be found. For security reasons loading by full path is not supported and only the installation path is used for lookup. diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 1255a4b5d..92da83abe 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -833,7 +833,7 @@ static DWORD WINAPI pf_client_thread_proc(pClientContext* pc) pdata = pc->pdata; WINPR_ASSERT(pdata); /* - * during redirection, freerdp's abort event might be overriden (reset) by the library, after + * during redirection, freerdp's abort event might be overridden (reset) by the library, after * the server set it in order to shutdown the connection. it means that the server might signal * the client to abort, but the library code will override the signal and the client will * continue its work instead of exiting. That's why the client must wait on `pdata->abort_event` diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index e5d5bbde1..7b8e4bf0a 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -290,7 +290,7 @@ BOOL pf_context_copy_settings(rdpSettings* dst, const rdpSettings* src) goto out_fail; } - /* We handle certificate management for this client ourselfes. */ + /* We handle certificate management for this client ourselves. */ rc = freerdp_settings_set_bool(dst, FreeRDP_ExternalCertificateManagement, TRUE); out_fail: diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index c876924df..c30d303c2 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -225,7 +225,7 @@ static BOOL pf_server_setup_channels(freerdp_peer* peer) channelContext = StaticChannelContext_new(ps, cname, channelId); if (!channelContext) { - PROXY_LOG_ERR(TAG, ps, "error seting up channelContext for '%s'", cname); + PROXY_LOG_ERR(TAG, ps, "error setting up channelContext for '%s'", cname); goto fail; } @@ -813,7 +813,7 @@ BOOL pf_server_start(proxyServer* server) WLog_ERR(TAG, "failed to start listener: address already in use!"); break; case EACCES: - WLog_ERR(TAG, "failed to start listener: insufficent permissions!"); + WLog_ERR(TAG, "failed to start listener: insufficient permissions!"); break; default: WLog_ERR(TAG, "failed to start listener: errno=%d", errno); @@ -852,7 +852,7 @@ BOOL pf_server_start_from_socket(proxyServer* server, int socket) WLog_ERR(TAG, "failed to start listener: address already in use!"); break; case EACCES: - WLog_ERR(TAG, "failed to start listener: insufficent permissions!"); + WLog_ERR(TAG, "failed to start listener: insufficient permissions!"); break; default: WLog_ERR(TAG, "failed to start listener: errno=%d", errno); diff --git a/server/shadow/shadow_encoder.c b/server/shadow/shadow_encoder.c index b569b6264..53739df21 100644 --- a/server/shadow/shadow_encoder.c +++ b/server/shadow/shadow_encoder.c @@ -56,7 +56,7 @@ UINT32 shadow_encoder_create_frame_id(rdpShadowEncoder* encoder) /* * Calculate preferred fps according to how much frames are - * in-progress. Note that it only works when subsytem implementation + * in-progress. Note that it only works when subsystem implementation * calls shadow_encoder_preferred_fps and takes the suggestion. */ if (inFlightFrames > 1) diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c index 936e7e8f4..6e7a90dad 100644 --- a/server/shadow/shadow_server.c +++ b/server/shadow/shadow_server.c @@ -681,7 +681,7 @@ int shadow_server_start(rdpShadowServer* server) /* Bind magic: * - * emtpy ... bind TCP all + * empty ... bind TCP all * ... bind local (IPC) * bind-socket,
... bind TCP to specified interface */ diff --git a/tools/smartcard-interpreter.py b/tools/smartcard-interpreter.py index 94eea7ebb..5946deb28 100644 --- a/tools/smartcard-interpreter.py +++ b/tools/smartcard-interpreter.py @@ -14,7 +14,7 @@ import codecs CMD_NAMES = { - 0x04: "DESACTIVATE FILE", + 0x04: "DEACTIVATE FILE", 0x0C: "ERASE RECORD", 0x0E: "ERASE BINARY", 0x0F: "ERASE BINARY", @@ -44,8 +44,8 @@ CMD_NAMES = { 0xB2: "READ RECORD", 0xB3: "READ RECORD", 0xC0: "GET RESPONSE", - 0xC2: "ENVELOPPE", - 0xC3: "ENVELOPPE", + 0xC2: "ENVELOPE", + 0xC3: "ENVELOPE", 0xCA: "GET DATA", 0xCB: "GET DATA", 0xD0: "WRITE BINARY", @@ -107,7 +107,7 @@ ERROR_CODES = { 0x6882: "Secure messaging not supported", 0x6985: "condition of use not satisfied", 0x6A80: "incorrect parameter cmd data field", - 0x6A81: "function not suppported", + 0x6A81: "function not supported", 0x6A82: "file or application not found", 0x6A83: "record not found", 0x6A88: "REFERENCE DATA NOT FOUND", diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt index cf39b9487..6b250f8cd 100644 --- a/uwac/CMakeLists.txt +++ b/uwac/CMakeLists.txt @@ -42,7 +42,7 @@ if (NOT FREERDP_UNIFIED_BUILD) endif() endif() -option(UWAC_FORCE_STATIC_BUILD "Force UWAC to be build as static libary (recommended)" OFF) +option(UWAC_FORCE_STATIC_BUILD "Force UWAC to be built as static library (recommended)" OFF) option(UWAC_HAVE_PIXMAN_REGION "Use PIXMAN or FreeRDP for region calculations" "NOT FREERDP_UNIFIED_BUILD") # Include our extra modules diff --git a/uwac/include/uwac/uwac.h b/uwac/include/uwac/uwac.h index 928e69312..e1db8de7d 100644 --- a/uwac/include/uwac/uwac.h +++ b/uwac/include/uwac/uwac.h @@ -458,7 +458,7 @@ extern "C" * * @param display the display to attach the window to * @param width the width of the window - * @param height the heigh of the window + * @param height the height of the window * @param format format to use for the SHM surface * @return the created UwacWindow, NULL if something failed (use UwacDisplayGetLastError() to *know more about this) @@ -643,7 +643,7 @@ extern "C" /** * @brief UwacSeatSetMouseCursor Sets the specified image as the new mouse cursor. - * Special values: If data == NULL && lenght == 0 + * Special values: If data == NULL && length == 0 * the cursor is hidden, if data == NULL && length != 0 * the default system cursor is used. * diff --git a/uwac/libuwac/uwac-input.c b/uwac/libuwac/uwac-input.c index 90ba46ff6..d70a2b5a1 100644 --- a/uwac/libuwac/uwac-input.c +++ b/uwac/libuwac/uwac-input.c @@ -112,7 +112,7 @@ static UwacReturnCode set_cursor_image(UwacSeat* seat, uint32_t serial) switch (seat->pointer_type) { - case 2: /* Custom poiner */ + case 2: /* Custom pointer */ image = seat->pointer_image; buffer = create_pointer_buffer(seat, seat->pointer_data, seat->pointer_size); if (!buffer) @@ -296,7 +296,7 @@ static void keyboard_handle_leave(void* data, struct wl_keyboard* keyboard, uint event->window = input->keyboard_focus; - /* we are currently loosing input focus of the main window: + /* we are currently losing input focus of the main window: * check if we currently have some keys pressed and release them as if we enter the window again * it will be still "virtually" pressed in remote even if in reality the key has been released */ diff --git a/uwac/protocols/ivi-application.xml b/uwac/protocols/ivi-application.xml index 8f2422688..54a203e90 100644 --- a/uwac/protocols/ivi-application.xml +++ b/uwac/protocols/ivi-application.xml @@ -87,7 +87,7 @@ - wl_surface already has an nother role. - ivi_id is already assigned to an another wl_surface. - If client destroys ivi_surface or wl_surface which is assigne to the ivi_surface, + If client destroys ivi_surface or wl_surface which is assigned to the ivi_surface, ivi_id which is assigned to the ivi_surface is free for reuse. diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 2f3006cd9..271d6094c 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -167,7 +167,7 @@ endif() set(WINPR_RESOURCE_ROOT ${CMAKE_INSTALL_FULL_DATAROOTDIR}) -# Quite the compatiblity show here (newest to oldest): +# Quite the compatibility show here (newest to oldest): # * [/]/[] # * [/]/WinPR[] # * /winpr diff --git a/winpr/include/winpr/cmdline.h b/winpr/include/winpr/cmdline.h index 50c92d4c9..1421f60a6 100644 --- a/winpr/include/winpr/cmdline.h +++ b/winpr/include/winpr/cmdline.h @@ -60,7 +60,7 @@ #define COMMAND_LINE_SEPARATOR_EQUAL 0x00000200 #define COMMAND_LINE_SEPARATOR_SPACE 0x00000400 -/* Supress COMMAND_LINE_ERROR_NO_KEYWORD return. */ +/* Suppress COMMAND_LINE_ERROR_NO_KEYWORD return. */ #define COMMAND_LINE_IGN_UNKNOWN_KEYWORD 0x00001000 #define COMMAND_LINE_SILENCE_PARSER 0x00002000 diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h index ab2c1a7a8..aa396651f 100644 --- a/winpr/include/winpr/collections.h +++ b/winpr/include/winpr/collections.h @@ -306,7 +306,7 @@ extern "C" * @param value The value to store for the \b key. May be \b NULL. if set cloned with \b * fnObjectNew * - * @return \b TRUE for successfull addition, \b FALSE for failure + * @return \b TRUE for successful addition, \b FALSE for failure */ WINPR_API BOOL ListDictionary_Add(wListDictionary* listDictionary, const void* key, const void* value); @@ -608,7 +608,7 @@ extern "C" */ WINPR_API void CountdownEvent_Free(wCountdownEvent* countdown); - /** @brief Allocte a CountdownEvent with \b initialCount + /** @brief Allocate a CountdownEvent with \b initialCount * * @param initialCount The initial value of the event * diff --git a/winpr/include/winpr/comm.h b/winpr/include/winpr/comm.h index abae58a39..c5532248c 100644 --- a/winpr/include/winpr/comm.h +++ b/winpr/include/winpr/comm.h @@ -355,7 +355,7 @@ extern "C" /* Extended API */ -/* FIXME: MAXULONG should be defined arround winpr/limits.h */ +/* FIXME: MAXULONG should be defined around winpr/limits.h */ #ifndef MAXULONG #define MAXULONG (4294967295UL) #endif @@ -376,7 +376,7 @@ extern "C" * About DefineCommDevice() / QueryDosDevice() * * Did something close to QueryDosDevice() and DefineDosDevice() but with - * folowing constraints: + * following constraints: * - mappings are stored in a static array. * - QueryCommDevice returns only the mappings that have been defined through * DefineCommDevice() diff --git a/winpr/include/winpr/image.h b/winpr/include/winpr/image.h index b01c2aaf6..71cd6d0f5 100644 --- a/winpr/include/winpr/image.h +++ b/winpr/include/winpr/image.h @@ -179,7 +179,7 @@ extern "C" * * @param imageA the first image for the comparison * @param imageB the second image for the comparison - * @param flags Comparions flags @ref WINPR_IMAGE_CMP_FLAGS + * @param flags Comparison flags @ref WINPR_IMAGE_CMP_FLAGS * * @since version 3.3.0 * diff --git a/winpr/include/winpr/json.h b/winpr/include/winpr/json.h index 830c86310..b3116ea93 100644 --- a/winpr/include/winpr/json.h +++ b/winpr/include/winpr/json.h @@ -127,7 +127,7 @@ extern "C" /** * @brief Return an error string - * @return A string describing the last error that occured or \b NULL + * @return A string describing the last error that occurred or \b NULL * @since version 3.6.0 */ WINPR_API const char* WINPR_JSON_GetErrorPtr(void); diff --git a/winpr/include/winpr/stream.h b/winpr/include/winpr/stream.h index bde437a40..4ff0a7058 100644 --- a/winpr/include/winpr/stream.h +++ b/winpr/include/winpr/stream.h @@ -1318,7 +1318,7 @@ extern "C" size_t utfBufferCharLength); /** \brief Writes a UTF-8 string UTF16 encoded to the stream. If the UTF-8 - * string is short, the remainig characters are filled up with '\0' + * string is short, the remaining characters are filled up with '\0' * * \param s The stream to write to * \param wcharLength the length (in WCHAR characters) to write diff --git a/winpr/include/winpr/string.h b/winpr/include/winpr/string.h index 579fc02ad..45a4098cc 100644 --- a/winpr/include/winpr/string.h +++ b/winpr/include/winpr/string.h @@ -240,7 +240,7 @@ extern "C" /** \brief Converts multistrings form UTF-16 to UTF-8 * * The function does string conversions of any input string of wlen characters. - * Any character in the buffer (incuding any '\0') is converted. + * Any character in the buffer (including any '\0') is converted. * * Supplying len = 0 will return the required size of the buffer in characters. * @@ -296,7 +296,7 @@ extern "C" /** \brief Converts multistrings form UTF-8 to UTF-16 * * The function does string conversions of any input string of len characters. - * Any character in the buffer (incuding any '\0') is converted. + * Any character in the buffer (including any '\0') is converted. * * Supplying wlen = 0 will return the required size of the buffer in characters. * @@ -342,7 +342,7 @@ extern "C" /** \brief Converts multistring form UTF-16 to UTF-8, returns an allocated string * * The function does string conversions of any input string of len characters. - * Any character in the buffer (incuding any '\0') is converted. + * Any character in the buffer (including any '\0') is converted. * * \param wstr A WCHAR string of \b len character length * \param wlen The (buffer) length in characters of \b str @@ -382,7 +382,7 @@ extern "C" /** \brief Converts multistring form UTF-8 to UTF-16, returns an allocated string * * The function does string conversions of any input string of len characters. - * Any character in the buffer (incuding any '\0') is converted. + * Any character in the buffer (including any '\0') is converted. * * \param str A CHAR string of \b len byte length * \param len The (buffer) length in characters of \b str @@ -436,7 +436,7 @@ extern "C" * terminated * * @param s The \b WCHAR string to copy - * @param n The numer of WCHAR to copy + * @param n The number of WCHAR to copy * * @return An allocated copy of \b s, always \b \0 terminated * @since version 3.10.0 diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c index bfecd4e80..fc56a7617 100644 --- a/winpr/libwinpr/clipboard/synthetic_file.c +++ b/winpr/libwinpr/clipboard/synthetic_file.c @@ -949,7 +949,7 @@ static BOOL register_file_formats_and_synthesizers(wClipboard* clipboard) See: GTK: https://docs.gtk.org/glib/struct.Uri.html uri syntax: https://www.rfc-editor.org/rfc/rfc3986#section-3 - uri-lists fomat: https://www.rfc-editor.org/rfc/rfc2483#section-5 + uri-lists format: https://www.rfc-editor.org/rfc/rfc2483#section-5 3. Gnome and others (Unity/XFCE/Nautilus < 3.30/Nautilus >= 40): TARGET: x-special/gnome-copied-files format: copy\nfile://path\n\0 diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index e14f6ded9..6a541709c 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -65,7 +65,7 @@ struct comm_device typedef struct comm_device COMM_DEVICE; /* FIXME: get a clever data structure, see also io.h functions */ -/* _CommDevices is a NULL-terminated array with a maximun of COMM_DEVICE_MAX COMM_DEVICE */ +/* _CommDevices is a NULL-terminated array with a maximum of COMM_DEVICE_MAX COMM_DEVICE */ #define COMM_DEVICE_MAX 128 static COMM_DEVICE** sCommDevices = NULL; static CRITICAL_SECTION sCommDevicesLock = { 0 }; @@ -181,7 +181,7 @@ static void CommInit(void) } /** - * Returns TRUE when the comm module is correctly intialized, FALSE otherwise + * Returns TRUE when the comm module is correctly initialized, FALSE otherwise * with ERROR_DLL_INIT_FAILED set as the last error. */ static BOOL CommInitialized(void) diff --git a/winpr/libwinpr/comm/comm_io.c b/winpr/libwinpr/comm/comm_io.c index 0306436f3..f15ba4587 100644 --- a/winpr/libwinpr/comm/comm_io.c +++ b/winpr/libwinpr/comm/comm_io.c @@ -92,11 +92,11 @@ BOOL CommReadFile(HANDLE hDevice, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, if (lpNumberOfBytesRead == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); /* since we doesn't suppport lpOverlapped != NULL */ + SetLastError(ERROR_INVALID_PARAMETER); /* since we doesn't support lpOverlapped != NULL */ goto return_false; } - *lpNumberOfBytesRead = 0; /* will be ajusted if required ... */ + *lpNumberOfBytesRead = 0; /* will be adjusted if required ... */ if (nNumberOfBytesToRead <= 0) /* N */ { @@ -125,10 +125,10 @@ BOOL CommReadFile(HANDLE hDevice, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, * N | Ti | INDEF | Blocks on first byte, then use Ti between bytes. MAXULONG | 0 | 0 * | 0 | 0 | 0 | Returns immediately with bytes available (don't block) MAXULONG | * MAXULONG | 0< Tc counters.tx) && /* at least a transmission occurred AND ...*/ - (pCommstatus->AmountInOutQueue == 0)) /* output bufer is now empty */ + (pCommstatus->AmountInOutQueue == 0)) /* output buffer is now empty */ { pComm->PendingEvents |= SERIAL_EV_TXEMPTY; } diff --git a/winpr/libwinpr/comm/test/TestCommConfig.c b/winpr/libwinpr/comm/test/TestCommConfig.c index 7bc829d87..fcba6efbc 100644 --- a/winpr/libwinpr/comm/test/TestCommConfig.c +++ b/winpr/libwinpr/comm/test/TestCommConfig.c @@ -59,9 +59,9 @@ int TestCommConfig(int argc, char* argv[]) } hComm = CreateFileA(lpFileName, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_WRITE, /* invalid parmaeter */ + FILE_SHARE_WRITE, /* invalid parameter */ NULL, CREATE_NEW, /* invalid parameter */ - 0, (HANDLE)1234); /* invalid parmaeter */ + 0, (HANDLE)1234); /* invalid parameter */ if (hComm != INVALID_HANDLE_VALUE) { (void)fprintf( @@ -139,7 +139,7 @@ int TestCommConfig(int argc, char* argv[]) (dcb.StopBits != ONESTOPBIT)) { (void)fprintf(stderr, - "Got an unexpeted value among: BaudRate: %" PRIu32 " ByteSize: %" PRIu8 + "Got an unexpected value among: BaudRate: %" PRIu32 " ByteSize: %" PRIu8 " Parity: %" PRIu8 " StopBits: %" PRIu8 "\n", dcb.BaudRate, dcb.ByteSize, dcb.Parity, dcb.StopBits); } diff --git a/winpr/libwinpr/comm/test/TestSetCommState.c b/winpr/libwinpr/comm/test/TestSetCommState.c index 1fd2e90c5..5b5d298d5 100644 --- a/winpr/libwinpr/comm/test/TestSetCommState.c +++ b/winpr/libwinpr/comm/test/TestSetCommState.c @@ -156,7 +156,7 @@ static BOOL test_SerialSys(HANDLE hComm) return FALSE; } - /* Test 2 using a defferent baud rate */ + /* Test 2 using a different baud rate */ dcb.BaudRate = CBR_57600; result = SetCommState(hComm, &dcb); diff --git a/winpr/libwinpr/crt/unicode_builtin.c b/winpr/libwinpr/crt/unicode_builtin.c index 501327be0..a011a3288 100644 --- a/winpr/libwinpr/crt/unicode_builtin.c +++ b/winpr/libwinpr/crt/unicode_builtin.c @@ -118,7 +118,7 @@ static const uint32_t offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2 * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed * into the first byte, depending on how many bytes follow. There are * as many entries in this table as there are UTF-8 sequence types. - * (I.e., one byte sequence, two byte... etc.). Remember that sequencs + * (I.e., one byte sequence, two byte... etc.). Remember that sequence * for *legal* UTF-8 will be 4 or fewer bytes total. */ static const uint8_t firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; diff --git a/winpr/libwinpr/file/pattern.c b/winpr/libwinpr/file/pattern.c index 33adf9f96..85e57a6dc 100644 --- a/winpr/libwinpr/file/pattern.c +++ b/winpr/libwinpr/file/pattern.c @@ -216,7 +216,7 @@ BOOL FilePatternMatchA(LPCSTR lpFileName, LPCSTR lpPattern) * '~*' DOS_STAR - matches 0 or more characters until encountering and matching final '.' * * '~?' DOS_QM - matches any single character, or upon encountering a period or end of name - * string, advances the expresssion to the end of the set of contiguous DOS_QMs. + * string, advances the expression to the end of the set of contiguous DOS_QMs. * * '~.' DOS_DOT - matches either a '.' or zero characters beyond name string. */ diff --git a/winpr/libwinpr/file/test/TestFileCreateFile.c b/winpr/libwinpr/file/test/TestFileCreateFile.c index e5cb58a76..0e6289111 100644 --- a/winpr/libwinpr/file/test/TestFileCreateFile.c +++ b/winpr/libwinpr/file/test/TestFileCreateFile.c @@ -31,7 +31,7 @@ int TestFileCreateFile(int argc, char* argv[]) if (!name) return -1; - /* On windows we would need '\\' or '/' as seperator. + /* On windows we would need '\\' or '/' as separator. * Single '\' do not work. */ hr = PathCchConvertStyleA(name, strlen(name), PATH_STYLE_UNIX); diff --git a/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h b/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h index 9b8c0270f..7dd318a03 100644 --- a/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h +++ b/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h @@ -352,7 +352,7 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE) #define CKF_EXCLUDE_PIN 0x00000010UL #define CKF_USER_FRIENDLY_OTP 0x00000020UL -/* CKF (paramters to functions) */ +/* CKF (parameters to functions) */ #define CKF_DONT_BLOCK 1 /* CKF (session) */ diff --git a/winpr/libwinpr/path/test/TestPathCchAddBackslash.c b/winpr/libwinpr/path/test/TestPathCchAddBackslash.c index ba8efecb1..d6f0e5a62 100644 --- a/winpr/libwinpr/path/test/TestPathCchAddBackslash.c +++ b/winpr/libwinpr/path/test/TestPathCchAddBackslash.c @@ -64,7 +64,7 @@ int TestPathCchAddBackslash(int argc, char* argv[]) if (SUCCEEDED(status)) { - _tprintf(_T("PathCchAddBackslash unexpectedly succeded with null buffer. Status: 0x%08") _T( + _tprintf(_T("PathCchAddBackslash unexpectedly succeeded with null buffer. Status: 0x%08") _T( PRIX32) _T("\n"), status); return -1; @@ -78,7 +78,7 @@ int TestPathCchAddBackslash(int argc, char* argv[]) if (SUCCEEDED(status)) { - _tprintf(_T("PathCchAddBackslash unexpectedly succeded with insufficient buffer size. ") + _tprintf(_T("PathCchAddBackslash unexpectedly succeeded with insufficient buffer size. ") _T("Status: 0x%08") _T(PRIX32) _T("\n"), status); return -1; diff --git a/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c b/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c index c24d0202e..d9d09c49f 100644 --- a/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c +++ b/winpr/libwinpr/path/test/TestPathCchAddBackslashEx.c @@ -67,7 +67,7 @@ int TestPathCchAddBackslashEx(int argc, char* argv[]) if (SUCCEEDED(status)) { _tprintf( - _T("PathCchAddBackslashEx unexpectedly succeded with null buffer. Status: 0x%08") _T( + _T("PathCchAddBackslashEx unexpectedly succeeded with null buffer. Status: 0x%08") _T( PRIX32) _T("\n"), status); return -1; @@ -81,7 +81,7 @@ int TestPathCchAddBackslashEx(int argc, char* argv[]) if (SUCCEEDED(status)) { - _tprintf(_T("PathCchAddBackslashEx unexpectedly succeded with insufficient buffer size. ") + _tprintf(_T("PathCchAddBackslashEx unexpectedly succeeded with insufficient buffer size. ") _T("Status: 0x%08") _T(PRIX32) _T("\n"), status); return -1; diff --git a/winpr/libwinpr/path/test/TestPathCchAppend.c b/winpr/libwinpr/path/test/TestPathCchAppend.c index e890b8141..bd47b1dce 100644 --- a/winpr/libwinpr/path/test/TestPathCchAppend.c +++ b/winpr/libwinpr/path/test/TestPathCchAppend.c @@ -142,7 +142,7 @@ int TestPathCchAppend(int argc, char* argv[]) status = PathCchAppend(Path, PATHCCH_MAX_CCH, _T("\\This cannot be appended to Path")); if (SUCCEEDED(status)) { - _tprintf(_T("PathCchAppend unexepectedly succeeded with status: 0x%08") _T(PRIX32) _T("\n"), + _tprintf(_T("PathCchAppend unexpectedly succeeded with status: 0x%08") _T(PRIX32) _T("\n"), status); return -1; } diff --git a/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c b/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c index 8e01b5550..5773763e9 100644 --- a/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c +++ b/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c @@ -18,7 +18,7 @@ */ #ifndef WITH_KRB5_HEIMDAL -#error "This file must ony be included with HEIMDAL kerberos" +#error "This file must only be included with HEIMDAL kerberos" #endif #include diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index 4eaffb8f3..d6da9c34a 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -265,7 +265,7 @@ static BOOL ntlm_read_message_header(wStream* s, NTLM_MESSAGE_HEADER* header, UI if (header->MessageType != expected) { - WLog_ERR(TAG, "NTLM_MESSAGE_HEADER Invalid message tyep, got %s, expected %s", + WLog_ERR(TAG, "NTLM_MESSAGE_HEADER Invalid message type, got %s, expected %s", ntlm_message_type_string(header->MessageType), ntlm_message_type_string(expected)); return FALSE; } diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index 1dabc3a93..b88050770 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -791,7 +791,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW( if (!negotiate_read_neg_token(input_buffer, &input_token)) return SEC_E_INVALID_TOKEN; - /* On first response check if the server doesn't like out prefered mech */ + /* On first response check if the server doesn't like out preferred mech */ if (context->state < NEGOTIATE_STATE_NEGORESP && input_token.supportedMech.len && !sspi_gss_oid_compare(&input_token.supportedMech, context->mech->oid)) { diff --git a/winpr/libwinpr/synch/sleep.c b/winpr/libwinpr/synch/sleep.c index 4a18402f7..7708393d2 100644 --- a/winpr/libwinpr/synch/sleep.c +++ b/winpr/libwinpr/synch/sleep.c @@ -135,7 +135,7 @@ VOID USleep(DWORD dwMicroseconds) QueryPerformanceFrequency(&freq); } - // in order to save cpu cyles we use Sleep() for the large share ... + // in order to save cpu cycles we use Sleep() for the large share ... if (dwMicroseconds >= 1000) { Sleep(dwMicroseconds / 1000); diff --git a/winpr/libwinpr/synch/test/TestSynchCritical.c b/winpr/libwinpr/synch/test/TestSynchCritical.c index 0cdd6b847..ff0b9cfe1 100644 --- a/winpr/libwinpr/synch/test/TestSynchCritical.c +++ b/winpr/libwinpr/synch/test/TestSynchCritical.c @@ -50,7 +50,7 @@ static UINT32 prand(UINT32 max) return tmp % (max - 1) + 1; } -/* this thread function shall increment the global dwTestValue until the PBOOL passsed in arg is +/* this thread function shall increment the global dwTestValue until the PBOOL passed in arg is * FALSE */ static DWORD WINAPI TestSynchCritical_Test1(LPVOID arg) { diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c index 854c93ac4..786dd8569 100644 --- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c +++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c @@ -224,7 +224,7 @@ static int read_file(const char* pathname, char* buffer, size_t buffsize) } #ifdef __arm__ -/* Extract the content of a the first occurence of a given field in +/* Extract the content of a the first occurrence of a given field in * the content of /proc/cpuinfo and return it as a heap-allocated * string that must be freed by the caller. * @@ -237,7 +237,7 @@ static char* extract_cpuinfo_field(const char* buffer, int buflen, const char* f char* result = NULL; int len; const char *p, *q; - /* Look for first field occurence, and ensures it starts the line. */ + /* Look for first field occurrence, and ensures it starts the line. */ p = buffer; for (;;) @@ -545,7 +545,7 @@ static void cpulist_read_from(CpuList* list, const char* filename) // // This code does *NOT* check for '__ANDROID_API__ >= 20' to support the // edge case where some NDK developers use headers for a platform that is -// newer than the one really targetted by their application. +// newer than the one really targeted by their application. // This is typically done to use newer native APIs only when running on more // recent Android versions, and requires careful symbol management. // @@ -1373,11 +1373,11 @@ int android_setCpuArm(int cpu_count, uint64_t cpu_features, uint32_t cpu_id) * | * ARCH_NEON_FP16 (+EXT_FP16) * - * -fpu= values and their correspondance with FPU architectures above: + * -fpu= values and their correspondence with FPU architectures above: * * {"vfp", FPU_ARCH_VFP_V2}, * {"vfp9", FPU_ARCH_VFP_V2}, - * {"vfp3", FPU_ARCH_VFP_V3}, // For backwards compatbility. + * {"vfp3", FPU_ARCH_VFP_V3}, // For backwards compatibility. * {"vfp10", FPU_ARCH_VFP_V2}, * {"vfp10-r0", FPU_ARCH_VFP_V1}, * {"vfpxd", FPU_ARCH_VFP_V1xD}, diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.h b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.h index 9520c8ac1..ffa39bfc2 100644 --- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.h +++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.h @@ -190,7 +190,7 @@ extern uint64_t android_getCpuFeatures(void); * This flag implies -mfpu=neon-vfpv4. * * -mcpu=iwmmxt - * Allows the use of iWMMXt instrinsics with GCC. + * Allows the use of iWMMXt intrinsics with GCC. * * IMPORTANT NOTE: These flags should only be tested when * android_getCpuFamily() returns ANDROID_CPU_FAMILY_ARM, i.e. this is a diff --git a/winpr/libwinpr/utils/android.c b/winpr/libwinpr/utils/android.c index 4c7113fc1..2918cc717 100644 --- a/winpr/libwinpr/utils/android.c +++ b/winpr/libwinpr/utils/android.c @@ -31,7 +31,7 @@ JavaVM* jniVm = NULL; WINPR_API jint JNI_OnLoad(JavaVM* vm, void* reserved) { - WLog_INFO(TAG, "Setting up JNI environement..."); + WLog_INFO(TAG, "Setting up JNI environment..."); jniVm = vm; return JNI_VERSION_1_6; @@ -40,7 +40,7 @@ WINPR_API jint JNI_OnLoad(JavaVM* vm, void* reserved) WINPR_API void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { JNIEnv* env = NULL; - WLog_INFO(TAG, "Tearing down JNI environement..."); + WLog_INFO(TAG, "Tearing down JNI environment..."); if ((*jniVm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_6) != JNI_OK) { diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c index fe498934f..c4ab6e3e0 100644 --- a/winpr/libwinpr/utils/ssl.c +++ b/winpr/libwinpr/utils/ssl.c @@ -255,7 +255,7 @@ static BOOL winpr_enable_fips(DWORD flags) s_winpr_openssl_provider_fips = OSSL_PROVIDER_load(NULL, "fips"); if (s_winpr_openssl_provider_fips == NULL) { - WLog_WARN(TAG, "OpenSSL FIPS provider failled to load"); + WLog_WARN(TAG, "OpenSSL FIPS provider failed to load"); } if (!EVP_default_properties_is_fips_enabled(NULL)) #else diff --git a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c index f26646c39..4e0702f97 100644 --- a/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c +++ b/winpr/libwinpr/wtsapi/test/TestWtsApiEnumerateProcesses.c @@ -37,7 +37,7 @@ int TestWtsApiEnumerateProcesses(int argc, char* argv[]) #if 0 { - printf("WTSEnumerateProcesses enumerated %"PRIu32" processs:\n", count); + printf("WTSEnumerateProcesses enumerated %"PRIu32" process:\n", count); for (DWORD i = 0; i < count; i++) printf("\t[%"PRIu32"]: %s (%"PRIu32")\n", i, pProcessInfo[i].pProcessName, pProcessInfo[i].ProcessId); } diff --git a/winpr/libwinpr/wtsapi/wtsapi.c b/winpr/libwinpr/wtsapi/wtsapi.c index a6b01feed..ec1459745 100644 --- a/winpr/libwinpr/wtsapi/wtsapi.c +++ b/winpr/libwinpr/wtsapi/wtsapi.c @@ -681,7 +681,7 @@ const CHAR* WTSSessionStateToString(WTS_CONNECTSTATE_CLASS state) BOOL WTSRegisterWtsApiFunctionTable(const WtsApiFunctionTable* table) { /* Use InitOnceExecuteOnce here as well - otherwise a table set with this - function is overriden on the first use of a WTS* API call (due to + function is overridden on the first use of a WTS* API call (due to wtsapiInitOnce not being set). */ union { diff --git a/winpr/libwinpr/wtsapi/wtsapi_win32.c b/winpr/libwinpr/wtsapi/wtsapi_win32.c index 75d44a6e6..b85f8898c 100644 --- a/winpr/libwinpr/wtsapi/wtsapi_win32.c +++ b/winpr/libwinpr/wtsapi/wtsapi_win32.c @@ -86,7 +86,7 @@ BOOL WINAPI Win32_WTSVirtualChannelClose(HANDLE hChannel); * our WinPR wtsapi functions. * * To be safe we only use the _wts_malloc, _wts_calloc, _wts_free wrappers - * for memory managment the code below. + * for memory management the code below. */ static void* _wts_malloc(size_t size) diff --git a/winpr/tools/hash-cli/winpr-hash.1.in b/winpr/tools/hash-cli/winpr-hash.1.in index 0b1f36a49..388b7fa6b 100644 --- a/winpr/tools/hash-cli/winpr-hash.1.in +++ b/winpr/tools/hash-cli/winpr-hash.1.in @@ -10,7 +10,7 @@ [\fB-v\fP { \fI1\fP | 2 }] .SH DESCRIPTION .B @MANPAGE_NAME@ -is a small utility that can be used to create a NTLM hash from a username and password pair. The created hash can be outputed as plain hash or in SAM format. +is a small utility that can be used to create a NTLM hash from a username and password pair. The created hash can be outputted as plain hash or in SAM format. .SH OPTIONS .IP "-u username" The username to use.