From 5a4a1a40ad9406d322041b593667b6c0aaa03733 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 3 Sep 2024 11:04:32 +0200 Subject: [PATCH] fix declaration and implementation parameter names --- client/SDL/SDL2/dialogs/sdl_buttons.hpp | 2 +- client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp | 2 +- client/SDL/SDL2/dialogs/sdl_input.cpp | 4 ++-- client/SDL/SDL2/dialogs/sdl_input.hpp | 4 ++-- client/SDL/SDL2/sdl_monitor.hpp | 2 +- client/SDL/SDL2/sdl_window.hpp | 2 +- client/SDL/SDL3/dialogs/sdl_buttons.hpp | 2 +- client/SDL/SDL3/dialogs/sdl_input.cpp | 4 ++-- client/SDL/SDL3/dialogs/sdl_input.hpp | 4 ++-- client/SDL/SDL3/sdl_monitor.hpp | 2 +- client/SDL/SDL3/sdl_window.hpp | 2 +- client/Wayland/wlf_cliprdr.h | 2 +- client/X11/xf_floatbar.h | 2 +- client/X11/xf_utils.c | 4 ++-- client/common/client_cliprdr_file.c | 4 ++-- libfreerdp/cache/bitmap.c | 2 +- libfreerdp/cache/glyph.c | 10 +++++----- libfreerdp/cache/offscreen.c | 3 +-- libfreerdp/core/mcs.h | 2 +- server/proxy/pf_channel.h | 2 +- server/shadow/shadow_client.h | 2 +- winpr/libwinpr/thread/apc.c | 3 ++- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/client/SDL/SDL2/dialogs/sdl_buttons.hpp b/client/SDL/SDL2/dialogs/sdl_buttons.hpp index dfbd478ba..379cdae3e 100644 --- a/client/SDL/SDL2/dialogs/sdl_buttons.hpp +++ b/client/SDL/SDL2/dialogs/sdl_buttons.hpp @@ -13,7 +13,7 @@ class SdlButtonList bool populate(SDL_Renderer* renderer, const std::vector& labels, const std::vector& ids, Sint32 total_width, Sint32 offsetY, Sint32 width, - Sint32 heigth); + Sint32 height); bool update(SDL_Renderer* renderer); SdlButton* get_selected(const SDL_MouseButtonEvent& button); diff --git a/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp b/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp index 9bc605e94..7d29153b9 100644 --- a/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp +++ b/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp @@ -82,7 +82,7 @@ class SDLConnectionDialog bool setTimer(Uint32 timeoutMS = 15000); void resetTimer(); - static Uint32 timeout(Uint32 intervalMS, void* _this); + static Uint32 timeout(Uint32 intervalMS, void* pvthis); struct widget_cfg_t { diff --git a/client/SDL/SDL2/dialogs/sdl_input.cpp b/client/SDL/SDL2/dialogs/sdl_input.cpp index 50184c2ac..9019307c8 100644 --- a/client/SDL/SDL2/dialogs/sdl_input.cpp +++ b/client/SDL/SDL2/dialogs/sdl_input.cpp @@ -134,13 +134,13 @@ bool SdlInputWidget::remove_str(SDL_Renderer* renderer, size_t count) return update_input(renderer); } -bool SdlInputWidget::append_str(SDL_Renderer* renderer, const std::string& str) +bool SdlInputWidget::append_str(SDL_Renderer* renderer, const std::string& text) { assert(renderer); if (readonly()) return true; - _text.append(str); + _text.append(text); if (!resize_input(_text.size())) return false; return update_input(renderer); diff --git a/client/SDL/SDL2/dialogs/sdl_input.hpp b/client/SDL/SDL2/dialogs/sdl_input.hpp index f5a81b8af..d78730189 100644 --- a/client/SDL/SDL2/dialogs/sdl_input.hpp +++ b/client/SDL/SDL2/dialogs/sdl_input.hpp @@ -42,7 +42,7 @@ class SdlInputWidget bool update_label(SDL_Renderer* renderer); bool set_mouseover(SDL_Renderer* renderer, bool mouseOver); - bool set_highlight(SDL_Renderer* renderer, bool hightlight); + bool set_highlight(SDL_Renderer* renderer, bool highlight); bool update_input(SDL_Renderer* renderer); bool resize_input(size_t size); @@ -56,7 +56,7 @@ class SdlInputWidget [[nodiscard]] bool readonly() const; protected: - bool update_input(SDL_Renderer* renderer, SDL_Color fgclor); + bool update_input(SDL_Renderer* renderer, SDL_Color fgcolor); private: SdlInputWidget(const SdlInputWidget& other) = delete; diff --git a/client/SDL/SDL2/sdl_monitor.hpp b/client/SDL/SDL2/sdl_monitor.hpp index 1605a82b3..56be9b9fb 100644 --- a/client/SDL/SDL2/sdl_monitor.hpp +++ b/client/SDL/SDL2/sdl_monitor.hpp @@ -25,5 +25,5 @@ #include "sdl_types.hpp" int sdl_list_monitors(SdlContext* sdl); -BOOL sdl_detect_monitors(SdlContext* sdl, UINT32* pWidth, UINT32* pHeight); +BOOL sdl_detect_monitors(SdlContext* sdl, UINT32* pMaxWidth, UINT32* pMaxHeight); INT64 sdl_monitor_id_for_index(SdlContext* sdl, UINT32 index); diff --git a/client/SDL/SDL2/sdl_window.hpp b/client/SDL/SDL2/sdl_window.hpp index 97bb92a78..0b63d0bb1 100644 --- a/client/SDL/SDL2/sdl_window.hpp +++ b/client/SDL/SDL2/sdl_window.hpp @@ -46,7 +46,7 @@ class SdlWindow void setBordered(bool bordered); void raise(); void resizeable(bool use); - void fullscreen(bool use); + void fullscreen(bool enter); bool fill(Uint8 r = 0x00, Uint8 g = 0x00, Uint8 b = 0x00, Uint8 a = 0xff); bool blit(SDL_Surface* surface, SDL_Rect src, SDL_Rect& dst); diff --git a/client/SDL/SDL3/dialogs/sdl_buttons.hpp b/client/SDL/SDL3/dialogs/sdl_buttons.hpp index dfbd478ba..379cdae3e 100644 --- a/client/SDL/SDL3/dialogs/sdl_buttons.hpp +++ b/client/SDL/SDL3/dialogs/sdl_buttons.hpp @@ -13,7 +13,7 @@ class SdlButtonList bool populate(SDL_Renderer* renderer, const std::vector& labels, const std::vector& ids, Sint32 total_width, Sint32 offsetY, Sint32 width, - Sint32 heigth); + Sint32 height); bool update(SDL_Renderer* renderer); SdlButton* get_selected(const SDL_MouseButtonEvent& button); diff --git a/client/SDL/SDL3/dialogs/sdl_input.cpp b/client/SDL/SDL3/dialogs/sdl_input.cpp index c51d722bc..74b42cf67 100644 --- a/client/SDL/SDL3/dialogs/sdl_input.cpp +++ b/client/SDL/SDL3/dialogs/sdl_input.cpp @@ -135,13 +135,13 @@ bool SdlInputWidget::remove_str(SDL_Renderer* renderer, size_t count) return update_input(renderer); } -bool SdlInputWidget::append_str(SDL_Renderer* renderer, const std::string& str) +bool SdlInputWidget::append_str(SDL_Renderer* renderer, const std::string& text) { assert(renderer); if (readonly()) return true; - _text.append(str); + _text.append(text); if (!resize_input(_text.size())) return false; return update_input(renderer); diff --git a/client/SDL/SDL3/dialogs/sdl_input.hpp b/client/SDL/SDL3/dialogs/sdl_input.hpp index 627fd60f2..a6b3fbd56 100644 --- a/client/SDL/SDL3/dialogs/sdl_input.hpp +++ b/client/SDL/SDL3/dialogs/sdl_input.hpp @@ -42,7 +42,7 @@ class SdlInputWidget bool update_label(SDL_Renderer* renderer); bool set_mouseover(SDL_Renderer* renderer, bool mouseOver); - bool set_highlight(SDL_Renderer* renderer, bool hightlight); + bool set_highlight(SDL_Renderer* renderer, bool highlight); bool update_input(SDL_Renderer* renderer); bool resize_input(size_t size); @@ -56,7 +56,7 @@ class SdlInputWidget [[nodiscard]] bool readonly() const; protected: - bool update_input(SDL_Renderer* renderer, SDL_Color fgclor); + bool update_input(SDL_Renderer* renderer, SDL_Color fgcolor); private: SdlInputWidget(const SdlInputWidget& other) = delete; diff --git a/client/SDL/SDL3/sdl_monitor.hpp b/client/SDL/SDL3/sdl_monitor.hpp index 1605a82b3..1b58fcd16 100644 --- a/client/SDL/SDL3/sdl_monitor.hpp +++ b/client/SDL/SDL3/sdl_monitor.hpp @@ -25,5 +25,5 @@ #include "sdl_types.hpp" int sdl_list_monitors(SdlContext* sdl); -BOOL sdl_detect_monitors(SdlContext* sdl, UINT32* pWidth, UINT32* pHeight); +BOOL sdl_detect_monitors(SdlContext* sdl, UINT32* pMaxWidth, UINT32* ppMaxHeight); INT64 sdl_monitor_id_for_index(SdlContext* sdl, UINT32 index); diff --git a/client/SDL/SDL3/sdl_window.hpp b/client/SDL/SDL3/sdl_window.hpp index 5533edc6b..94d4cc532 100644 --- a/client/SDL/SDL3/sdl_window.hpp +++ b/client/SDL/SDL3/sdl_window.hpp @@ -46,7 +46,7 @@ class SdlWindow void setBordered(bool bordered); void raise(); void resizeable(bool use); - void fullscreen(bool use); + void fullscreen(bool enter); bool fill(Uint8 r = 0x00, Uint8 g = 0x00, Uint8 b = 0x00, Uint8 a = 0xff); bool blit(SDL_Surface* surface, const SDL_Rect& src, SDL_Rect& dst); diff --git a/client/Wayland/wlf_cliprdr.h b/client/Wayland/wlf_cliprdr.h index a1131400e..07d58bcff 100644 --- a/client/Wayland/wlf_cliprdr.h +++ b/client/Wayland/wlf_cliprdr.h @@ -25,7 +25,7 @@ #include -wfClipboard* wlf_clipboard_new(wlfContext* wlc); +wfClipboard* wlf_clipboard_new(wlfContext* wfc); void wlf_clipboard_free(wfClipboard* clipboard); BOOL wlf_cliprdr_init(wfClipboard* clipboard, CliprdrClientContext* cliprdr); diff --git a/client/X11/xf_floatbar.h b/client/X11/xf_floatbar.h index 1ac7c9160..f2e262ec7 100644 --- a/client/X11/xf_floatbar.h +++ b/client/X11/xf_floatbar.h @@ -30,7 +30,7 @@ xfFloatbar* xf_floatbar_new(xfContext* xfc, Window window, const char* title, DW BOOL xf_floatbar_is_locked(xfFloatbar* floatbar); BOOL xf_floatbar_event_process(xfFloatbar* floatbar, const XEvent* event); BOOL xf_floatbar_check_event(xfFloatbar* floatbar, const XEvent* event); -BOOL xf_floatbar_toggle_fullscreen(xfFloatbar* floatbar, bool visible); +BOOL xf_floatbar_toggle_fullscreen(xfFloatbar* floatbar, bool fullscreen); BOOL xf_floatbar_hide_and_show(xfFloatbar* floatbar); BOOL xf_floatbar_set_root_y(xfFloatbar* floatbar, int y); diff --git a/client/X11/xf_utils.c b/client/X11/xf_utils.c index 2f99a3ad7..1fe52a163 100644 --- a/client/X11/xf_utils.c +++ b/client/X11/xf_utils.c @@ -40,9 +40,9 @@ static void write_log(wLog* log, DWORD level, const char* fname, const char* fkt va_end(ap); } -char* Safe_XGetAtomNameEx(wLog* log, Display* display, Atom atom, const char* atomvar) +char* Safe_XGetAtomNameEx(wLog* log, Display* display, Atom atom, const char* varname) { - WLog_Print(log, log_level, "XGetAtomName(%s, 0x%08" PRIx32 ")", atomvar, atom); + WLog_Print(log, log_level, "XGetAtomName(%s, 0x%08" PRIx32 ")", varname, atom); if (atom == None) return strdup("Atom_None"); return XGetAtomName(display, atom); diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c index 7c21cdaa6..00d676e90 100644 --- a/client/common/client_cliprdr_file.c +++ b/client/common/client_cliprdr_file.c @@ -2303,7 +2303,7 @@ fail: return rc; } -CliprdrLocalStream* cliprdr_local_stream_new(CliprdrFileContext* context, UINT32 lockId, +CliprdrLocalStream* cliprdr_local_stream_new(CliprdrFileContext* context, UINT32 streamID, const char* data, size_t size) { WINPR_ASSERT(context); @@ -2315,7 +2315,7 @@ CliprdrLocalStream* cliprdr_local_stream_new(CliprdrFileContext* context, UINT32 if (!cliprdr_local_stream_update(stream, data, size)) goto fail; - stream->lockId = lockId; + stream->lockId = streamID; return stream; fail: diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index 4e35ceef1..24c6da953 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -40,7 +40,7 @@ #define TAG FREERDP_TAG("cache.bitmap") static rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index); -static BOOL bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index, +static BOOL bitmap_cache_put(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index, rdpBitmap* bitmap); static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index 9383d0bb9..5cd5ba464 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -34,12 +34,12 @@ #define TAG FREERDP_TAG("cache.glyph") -static rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index); -static BOOL glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* entry); +static rdpGlyph* glyph_cache_get(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index); +static BOOL glyph_cache_put(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index, rdpGlyph* glyph); -static const void* glyph_cache_fragment_get(rdpGlyphCache* glyph, UINT32 index, UINT32* count); -static BOOL glyph_cache_fragment_put(rdpGlyphCache* glyph, UINT32 index, UINT32 count, - const void* entry); +static const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UINT32* size); +static BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 size, + const void* fragment); static UINT32 update_glyph_offset(const BYTE* data, size_t length, UINT32 index, INT32* x, INT32* y, UINT32 ulCharInc, UINT32 flAccel) diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c index 3b8b43e74..da41a98f5 100644 --- a/libfreerdp/cache/offscreen.c +++ b/libfreerdp/cache/offscreen.c @@ -44,8 +44,7 @@ struct rdp_offscreen_cache rdpContext* context; }; -static void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, UINT32 index, - rdpBitmap* bitmap); +static void offscreen_cache_put(rdpOffscreenCache* offscreenCache, UINT32 index, rdpBitmap* bitmap); static void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index); static BOOL diff --git a/libfreerdp/core/mcs.h b/libfreerdp/core/mcs.h index 6f78b7da9..54b82af28 100644 --- a/libfreerdp/core/mcs.h +++ b/libfreerdp/core/mcs.h @@ -155,7 +155,7 @@ struct rdp_mcs #define MCS_TYPE_CONNECT_RESPONSE 0x66 const char* mcs_domain_pdu_string(DomainMCSPDU pdu); -BOOL mcs_server_apply_to_settings(const rdpMcs* msc, rdpSettings* settings); +BOOL mcs_server_apply_to_settings(const rdpMcs* mcs, rdpSettings* settings); FREERDP_LOCAL BOOL mcs_recv_connect_initial(rdpMcs* mcs, wStream* s); FREERDP_LOCAL BOOL mcs_recv_connect_response(rdpMcs* mcs, wStream* s); diff --git a/server/proxy/pf_channel.h b/server/proxy/pf_channel.h index 9e0da7e0f..7414b61fc 100644 --- a/server/proxy/pf_channel.h +++ b/server/proxy/pf_channel.h @@ -57,7 +57,7 @@ PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* UINT32 flags, size_t totalSize); PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, - BOOL toFront); + BOOL toBack); BOOL pf_channel_setup_generic(pServerStaticChannelContext* channel); diff --git a/server/shadow/shadow_client.h b/server/shadow/shadow_client.h index 9334924fc..d3044f483 100644 --- a/server/shadow/shadow_client.h +++ b/server/shadow/shadow_client.h @@ -26,7 +26,7 @@ extern "C" { #endif - BOOL shadow_client_accepted(freerdp_listener* instance, freerdp_peer* client); + BOOL shadow_client_accepted(freerdp_listener* instance, freerdp_peer* peer); #ifdef __cplusplus } diff --git a/winpr/libwinpr/thread/apc.c b/winpr/libwinpr/thread/apc.c index 96ff8c30f..b775f23cc 100644 --- a/winpr/libwinpr/thread/apc.c +++ b/winpr/libwinpr/thread/apc.c @@ -184,10 +184,11 @@ out: return ret; } -int apc_executeCompletions(WINPR_THREAD* thread, WINPR_POLL_SET* set, size_t idx) +int apc_executeCompletions(WINPR_THREAD* thread, WINPR_POLL_SET* set, size_t startIndex) { APC_QUEUE* apc = NULL; WINPR_APC_ITEM* nextItem = NULL; + size_t idx = startIndex; int ret = 0; WINPR_ASSERT(thread);