mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix declaration and implementation parameter names

Browse Source
This commit is contained in:
akallabeth 2024-09-03 11:04:32 +02:00
parent f7fd817d1c
commit 5a4a1a40ad
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
22 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/SDL/SDL2/dialogs/sdl_buttons.hpp
View File

@ -13,7 +13,7 @@ class SdlButtonList
bool populate(SDL_Renderer* renderer, const std::vector<std::string>& labels, bool populate(SDL_Renderer* renderer, const std::vector<std::string>& labels,
const std::vector<int>& ids, Sint32 total_width, Sint32 offsetY, Sint32 width, const std::vector<int>& ids, Sint32 total_width, Sint32 offsetY, Sint32 width,
Sint32 heigth); Sint32 height);
bool update(SDL_Renderer* renderer); bool update(SDL_Renderer* renderer);
SdlButton* get_selected(const SDL_MouseButtonEvent& button); SdlButton* get_selected(const SDL_MouseButtonEvent& button);

2
client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp
View File

@ -82,7 +82,7 @@ class SDLConnectionDialog
bool setTimer(Uint32 timeoutMS = 15000); bool setTimer(Uint32 timeoutMS = 15000);
void resetTimer(); void resetTimer();
static Uint32 timeout(Uint32 intervalMS, void* _this); static Uint32 timeout(Uint32 intervalMS, void* pvthis);
struct widget_cfg_t struct widget_cfg_t
{ {

4
client/SDL/SDL2/dialogs/sdl_input.cpp
View File

@ -134,13 +134,13 @@ bool SdlInputWidget::remove_str(SDL_Renderer* renderer, size_t count)
return update_input(renderer); 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); assert(renderer);
if (readonly()) if (readonly())
return true; return true;
_text.append(str); _text.append(text);
if (!resize_input(_text.size())) if (!resize_input(_text.size()))
return false; return false;
return update_input(renderer); return update_input(renderer);

4
client/SDL/SDL2/dialogs/sdl_input.hpp
View File

@ -42,7 +42,7 @@ class SdlInputWidget
bool update_label(SDL_Renderer* renderer); bool update_label(SDL_Renderer* renderer);
bool set_mouseover(SDL_Renderer* renderer, bool mouseOver); 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 update_input(SDL_Renderer* renderer);
bool resize_input(size_t size); bool resize_input(size_t size);
@ -56,7 +56,7 @@ class SdlInputWidget
[[nodiscard]] bool readonly() const; [[nodiscard]] bool readonly() const;
protected: protected:
bool update_input(SDL_Renderer* renderer, SDL_Color fgclor); bool update_input(SDL_Renderer* renderer, SDL_Color fgcolor);
private: private:
SdlInputWidget(const SdlInputWidget& other) = delete; SdlInputWidget(const SdlInputWidget& other) = delete;

2
client/SDL/SDL2/sdl_monitor.hpp
View File

@ -25,5 +25,5 @@
#include "sdl_types.hpp" #include "sdl_types.hpp"
int sdl_list_monitors(SdlContext* sdl); 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); INT64 sdl_monitor_id_for_index(SdlContext* sdl, UINT32 index);

2
client/SDL/SDL2/sdl_window.hpp
View File

@ -46,7 +46,7 @@ class SdlWindow
void setBordered(bool bordered); void setBordered(bool bordered);
void raise(); void raise();
void resizeable(bool use); 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 fill(Uint8 r = 0x00, Uint8 g = 0x00, Uint8 b = 0x00, Uint8 a = 0xff);
bool blit(SDL_Surface* surface, SDL_Rect src, SDL_Rect& dst); bool blit(SDL_Surface* surface, SDL_Rect src, SDL_Rect& dst);

2
client/SDL/SDL3/dialogs/sdl_buttons.hpp
View File

@ -13,7 +13,7 @@ class SdlButtonList
bool populate(SDL_Renderer* renderer, const std::vector<std::string>& labels, bool populate(SDL_Renderer* renderer, const std::vector<std::string>& labels,
const std::vector<int>& ids, Sint32 total_width, Sint32 offsetY, Sint32 width, const std::vector<int>& ids, Sint32 total_width, Sint32 offsetY, Sint32 width,
Sint32 heigth); Sint32 height);
bool update(SDL_Renderer* renderer); bool update(SDL_Renderer* renderer);
SdlButton* get_selected(const SDL_MouseButtonEvent& button); SdlButton* get_selected(const SDL_MouseButtonEvent& button);

4
client/SDL/SDL3/dialogs/sdl_input.cpp
View File

@ -135,13 +135,13 @@ bool SdlInputWidget::remove_str(SDL_Renderer* renderer, size_t count)
return update_input(renderer); 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); assert(renderer);
if (readonly()) if (readonly())
return true; return true;
_text.append(str); _text.append(text);
if (!resize_input(_text.size())) if (!resize_input(_text.size()))
return false; return false;
return update_input(renderer); return update_input(renderer);

4
client/SDL/SDL3/dialogs/sdl_input.hpp
View File

@ -42,7 +42,7 @@ class SdlInputWidget
bool update_label(SDL_Renderer* renderer); bool update_label(SDL_Renderer* renderer);
bool set_mouseover(SDL_Renderer* renderer, bool mouseOver); 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 update_input(SDL_Renderer* renderer);
bool resize_input(size_t size); bool resize_input(size_t size);
@ -56,7 +56,7 @@ class SdlInputWidget
[[nodiscard]] bool readonly() const; [[nodiscard]] bool readonly() const;
protected: protected:
bool update_input(SDL_Renderer* renderer, SDL_Color fgclor); bool update_input(SDL_Renderer* renderer, SDL_Color fgcolor);
private: private:
SdlInputWidget(const SdlInputWidget& other) = delete; SdlInputWidget(const SdlInputWidget& other) = delete;

2
client/SDL/SDL3/sdl_monitor.hpp
View File

@ -25,5 +25,5 @@
#include "sdl_types.hpp" #include "sdl_types.hpp"
int sdl_list_monitors(SdlContext* sdl); 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); INT64 sdl_monitor_id_for_index(SdlContext* sdl, UINT32 index);

2
client/SDL/SDL3/sdl_window.hpp
View File

@ -46,7 +46,7 @@ class SdlWindow
void setBordered(bool bordered); void setBordered(bool bordered);
void raise(); void raise();
void resizeable(bool use); 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 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); bool blit(SDL_Surface* surface, const SDL_Rect& src, SDL_Rect& dst);

2
client/Wayland/wlf_cliprdr.h
View File

@ -25,7 +25,7 @@
#include <freerdp/client/cliprdr.h> #include <freerdp/client/cliprdr.h>
wfClipboard* wlf_clipboard_new(wlfContext* wlc); wfClipboard* wlf_clipboard_new(wlfContext* wfc);
void wlf_clipboard_free(wfClipboard* clipboard); void wlf_clipboard_free(wfClipboard* clipboard);
BOOL wlf_cliprdr_init(wfClipboard* clipboard, CliprdrClientContext* cliprdr); BOOL wlf_cliprdr_init(wfClipboard* clipboard, CliprdrClientContext* cliprdr);

2
client/X11/xf_floatbar.h
View File

@ -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_is_locked(xfFloatbar* floatbar);
BOOL xf_floatbar_event_process(xfFloatbar* floatbar, const XEvent* event); BOOL xf_floatbar_event_process(xfFloatbar* floatbar, const XEvent* event);
BOOL xf_floatbar_check_event(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_hide_and_show(xfFloatbar* floatbar);
BOOL xf_floatbar_set_root_y(xfFloatbar* floatbar, int y); BOOL xf_floatbar_set_root_y(xfFloatbar* floatbar, int y);

4
client/X11/xf_utils.c
View File

@ -40,9 +40,9 @@ static void write_log(wLog* log, DWORD level, const char* fname, const char* fkt
va_end(ap); 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) if (atom == None)
return strdup("Atom_None"); return strdup("Atom_None");
return XGetAtomName(display, atom); return XGetAtomName(display, atom);

4
client/common/client_cliprdr_file.c
View File

@ -2303,7 +2303,7 @@ fail:
return rc; 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) const char* data, size_t size)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
@ -2315,7 +2315,7 @@ CliprdrLocalStream* cliprdr_local_stream_new(CliprdrFileContext* context, UINT32
if (!cliprdr_local_stream_update(stream, data, size)) if (!cliprdr_local_stream_update(stream, data, size))
goto fail; goto fail;
stream->lockId = lockId; stream->lockId = streamID;
return stream; return stream;
fail: fail:

2
libfreerdp/cache/bitmap.c vendored
View File

@ -40,7 +40,7 @@
#define TAG FREERDP_TAG("cache.bitmap") #define TAG FREERDP_TAG("cache.bitmap")
static rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index); 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); rdpBitmap* bitmap);
static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt)

10
libfreerdp/cache/glyph.c vendored
View File

@ -34,12 +34,12 @@
#define TAG FREERDP_TAG("cache.glyph") #define TAG FREERDP_TAG("cache.glyph")
static rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index); static rdpGlyph* glyph_cache_get(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index);
static BOOL glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* entry); 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 const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UINT32* size);
static BOOL glyph_cache_fragment_put(rdpGlyphCache* glyph, UINT32 index, UINT32 count, static BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 size,
const void* entry); const void* fragment);
static UINT32 update_glyph_offset(const BYTE* data, size_t length, UINT32 index, INT32* x, INT32* y, static UINT32 update_glyph_offset(const BYTE* data, size_t length, UINT32 index, INT32* x, INT32* y,
UINT32 ulCharInc, UINT32 flAccel) UINT32 ulCharInc, UINT32 flAccel)

3
libfreerdp/cache/offscreen.c vendored
View File

@ -44,8 +44,7 @@ struct rdp_offscreen_cache
rdpContext* context; rdpContext* context;
}; };
static void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, UINT32 index, static void offscreen_cache_put(rdpOffscreenCache* offscreenCache, UINT32 index, rdpBitmap* bitmap);
rdpBitmap* bitmap);
static void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index); static void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index);
static BOOL static BOOL

2
libfreerdp/core/mcs.h
View File

@ -155,7 +155,7 @@ struct rdp_mcs
#define MCS_TYPE_CONNECT_RESPONSE 0x66 #define MCS_TYPE_CONNECT_RESPONSE 0x66
const char* mcs_domain_pdu_string(DomainMCSPDU pdu); 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_initial(rdpMcs* mcs, wStream* s);
FREERDP_LOCAL BOOL mcs_recv_connect_response(rdpMcs* mcs, wStream* s); FREERDP_LOCAL BOOL mcs_recv_connect_response(rdpMcs* mcs, wStream* s);

2
server/proxy/pf_channel.h
View File

@ -57,7 +57,7 @@ PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE*
UINT32 flags, size_t totalSize); UINT32 flags, size_t totalSize);
PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last,
BOOL toFront); BOOL toBack);
BOOL pf_channel_setup_generic(pServerStaticChannelContext* channel); BOOL pf_channel_setup_generic(pServerStaticChannelContext* channel);

2
server/shadow/shadow_client.h
View File

@ -26,7 +26,7 @@ extern "C"
{ {
#endif #endif
BOOL shadow_client_accepted(freerdp_listener* instance, freerdp_peer* client); BOOL shadow_client_accepted(freerdp_listener* instance, freerdp_peer* peer);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
winpr/libwinpr/thread/apc.c
View File

@ -184,10 +184,11 @@ out:
return ret; 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; APC_QUEUE* apc = NULL;
WINPR_APC_ITEM* nextItem = NULL; WINPR_APC_ITEM* nextItem = NULL;
size_t idx = startIndex;
int ret = 0; int ret = 0;
WINPR_ASSERT(thread); WINPR_ASSERT(thread);