morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[macro] fix use of WINPR_DEPRECATED

Browse Source
This commit is contained in:
akallabeth
2025-02-17 11:04:03 +01:00
parent 84fbfa17e2
commit e259eee0df
13 changed files with 82 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/freerdp/channels/channels.h
View File

@@ -43,10 +43,10 @@ extern "C"
FREERDP_API int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings,
const char* name, void* data);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR(
"Use freerdp_channels_get_event_handle",
BOOL freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds,
int* read_count, void** write_fds, int* write_count));
WINPR_DEPRECATED_VAR("Use freerdp_channels_get_event_handle",
FREERDP_API BOOL freerdp_channels_get_fds(
rdpChannels* channels, freerdp* instance, void** read_fds,
int* read_count, void** write_fds, int* write_count));
#endif
FREERDP_API BOOL freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance);

6
include/freerdp/channels/wtsvc.h
View File

@@ -59,9 +59,9 @@ extern "C"
* WTSVirtualChannelManager functions are FreeRDP extensions to the API.
*/
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR(
"Use WTSVirtualChannelManagerGetEventHandle",
void WTSVirtualChannelManagerGetFileDescriptor(HANDLE hServer, void** fds, int* fds_count));
WINPR_DEPRECATED_VAR("Use WTSVirtualChannelManagerGetEventHandle",
FREERDP_API void WTSVirtualChannelManagerGetFileDescriptor(
HANDLE hServer, void** fds, int* fds_count));
#endif
FREERDP_API BOOL WTSVirtualChannelManagerOpen(HANDLE hServer);
FREERDP_API BOOL WTSVirtualChannelManagerCheckFileDescriptor(HANDLE hServer);

29
include/freerdp/client.h
View File

@@ -209,20 +209,18 @@ extern "C"
const ChannelDisconnectedEventArgs* e);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR("Use client_cli_authenticate_ex",
BOOL client_cli_authenticate(freerdp* instance,
WINPR_DEPRECATED_VAR("Use client_cli_authenticate_ex",
FREERDP_API BOOL client_cli_authenticate(freerdp* instance,
char** username, char** password,
char** domain));
FREERDP_API
WINPR_DEPRECATED_VAR("Use client_cli_authenticate_ex",
BOOL client_cli_gw_authenticate(freerdp* instance, char** username,
char** password, char** domain));
FREERDP_API BOOL client_cli_gw_authenticate(
freerdp* instance, char** username, char** password, char** domain));
FREERDP_API WINPR_DEPRECATED_VAR(
"Use client_cli_verify_certificate_ex",
DWORD client_cli_verify_certificate(freerdp* instance, const char* common_name,
const char* subject, const char* issuer,
const char* fingerprint, BOOL host_mismatch));
WINPR_DEPRECATED_VAR("Use client_cli_verify_certificate_ex",
FREERDP_API DWORD client_cli_verify_certificate(
freerdp* instance, const char* common_name, const char* subject,
const char* issuer, const char* fingerprint, BOOL host_mismatch));
#endif
FREERDP_API DWORD client_cli_verify_certificate_ex(freerdp* instance, const char* host,
@@ -231,12 +229,11 @@ extern "C"
const char* fingerprint, DWORD flags);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR("Use client_cli_verify_changed_certificate_ex",
DWORD client_cli_verify_changed_certificate(
freerdp* instance, const char* common_name,
const char* subject, const char* issuer,
const char* fingerprint, const char* old_subject,
const char* old_issuer, const char* old_fingerprint));
WINPR_DEPRECATED_VAR("Use client_cli_verify_changed_certificate_ex",
FREERDP_API DWORD client_cli_verify_changed_certificate(
freerdp* instance, const char* common_name, const char* subject,
const char* issuer, const char* fingerprint, const char* old_subject,
const char* old_issuer, const char* old_fingerprint));
#endif
FREERDP_API DWORD client_cli_verify_changed_certificate_ex(

4
include/freerdp/codec/nsc.h
View File

@@ -45,8 +45,8 @@ extern "C"
typedef struct S_NSC_CONTEXT NSC_CONTEXT;
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR("Use nsc_context_set_parameters(NSC_COLOR_FORMAT)",
BOOL nsc_context_set_pixel_format(NSC_CONTEXT* context,
WINPR_DEPRECATED_VAR("Use nsc_context_set_parameters(NSC_COLOR_FORMAT)",
FREERDP_API BOOL nsc_context_set_pixel_format(NSC_CONTEXT* context,
UINT32 pixel_format));
#endif

9
include/freerdp/codecs.h
View File

@@ -86,11 +86,12 @@ extern "C"
WINPR_ATTR_MALLOC(freerdp_client_codecs_free, 1)
FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags);
FREERDP_API WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
void codecs_free(rdpCodecs* codecs));
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
FREERDP_API void codecs_free(rdpCodecs* codecs));
FREERDP_API WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_new",
rdpCodecs* codecs_new(rdpContext* context));
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_new",
WINPR_ATTR_MALLOC(codecs_free, 1)
FREERDP_API rdpCodecs* codecs_new(rdpContext* context));
#ifdef __cplusplus
}

4
include/freerdp/freerdp.h
View File

@@ -601,8 +601,8 @@ owned by rdpRdp */
FREERDP_API UINT freerdp_channels_detach(freerdp* instance);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_get_event_handles",
BOOL freerdp_get_fds(freerdp* instance, void** rfds,
WINPR_DEPRECATED_VAR("Use freerdp_get_event_handles",
FREERDP_API BOOL freerdp_get_fds(freerdp* instance, void** rfds,
int* rcount, void** wfds, int* wcount));
#endif

14
include/freerdp/server/shadow.h
View File

@@ -302,9 +302,9 @@ extern "C"
FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
FREERDP_API WINPR_DEPRECATED_VAR(
WINPR_DEPRECATED_VAR(
"[since 3.4.0] Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
int shadow_subsystem_pointer_convert_alpha_pointer_data(
FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data(
const BYTE* WINPR_RESTRICT pixels, BOOL premultiplied, UINT32 width, UINT32 height,
SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor));
@@ -346,11 +346,11 @@ extern "C"
FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip);
FREERDP_API WINPR_DEPRECATED_VAR(
"[since 3.4.0] Use shadow_capture_compare_with_format",
int shadow_capture_compare(const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,
UINT32 nHeight, const BYTE* WINPR_RESTRICT pData2, UINT32 nStep2,
RECTANGLE_16* WINPR_RESTRICT rect));
WINPR_DEPRECATED_VAR("[since 3.4.0] Use shadow_capture_compare_with_format",
FREERDP_API int shadow_capture_compare(
const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,
UINT32 nHeight, const BYTE* WINPR_RESTRICT pData2, UINT32 nStep2,
RECTANGLE_16* WINPR_RESTRICT rect));
/** @brief Compare two framebuffer images of possibly different formats with each other
*

44
include/freerdp/settings.h
View File

@@ -209,7 +209,7 @@ extern "C"
FREERDP_API ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings,
const char* name);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED(ADDIN_ARGV* freerdp_static_channel_clone(ADDIN_ARGV* channel));
WINPR_DEPRECATED(FREERDP_API ADDIN_ARGV* freerdp_static_channel_clone(ADDIN_ARGV* channel));
#endif
FREERDP_API void freerdp_static_channel_collection_free(rdpSettings* settings);
@@ -222,7 +222,7 @@ extern "C"
const char* name);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED(ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel));
WINPR_DEPRECATED(FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel));
#endif
FREERDP_API void freerdp_dynamic_channel_collection_free(rdpSettings* settings);
@@ -251,39 +251,39 @@ extern "C"
* use freerdp_settings_get_* and freerdp_settings_set_* as a replacement!
*/
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_get_bool instead",
BOOL freerdp_get_param_bool(const rdpSettings* settings,
WINPR_DEPRECATED_VAR("Use freerdp_settings_get_bool instead",
FREERDP_API BOOL freerdp_get_param_bool(const rdpSettings* settings,
int id));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_bool instead",
int freerdp_set_param_bool(rdpSettings* settings, int id,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_bool instead",
FREERDP_API int freerdp_set_param_bool(rdpSettings* settings, int id,
BOOL param));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_get_int[16|32] instead",
int freerdp_get_param_int(const rdpSettings* settings,
WINPR_DEPRECATED_VAR("Use freerdp_settings_get_int[16|32] instead",
FREERDP_API int freerdp_get_param_int(const rdpSettings* settings,
int id));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_int[16|32] instead",
int freerdp_set_param_int(rdpSettings* settings, int id,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_int[16|32] instead",
FREERDP_API int freerdp_set_param_int(rdpSettings* settings, int id,
int param));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint32 instead",
UINT32 freerdp_get_param_uint32(const rdpSettings* settings,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint32 instead",
FREERDP_API UINT32 freerdp_get_param_uint32(const rdpSettings* settings,
int id));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint32 instead",
int freerdp_set_param_uint32(rdpSettings* settings, int id,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint32 instead",
FREERDP_API int freerdp_set_param_uint32(rdpSettings* settings, int id,
UINT32 param));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_get_uint64 instead",
UINT64 freerdp_get_param_uint64(const rdpSettings* settings,
WINPR_DEPRECATED_VAR("Use freerdp_settings_get_uint64 instead",
FREERDP_API UINT64 freerdp_get_param_uint64(const rdpSettings* settings,
int id));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint64 instead",
int freerdp_set_param_uint64(rdpSettings* settings, int id,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_uint64 instead",
FREERDP_API int freerdp_set_param_uint64(rdpSettings* settings, int id,
UINT64 param));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_get_string instead",
char* freerdp_get_param_string(const rdpSettings* settings,
WINPR_DEPRECATED_VAR("Use freerdp_settings_get_string instead",
FREERDP_API char* freerdp_get_param_string(const rdpSettings* settings,
int id));
FREERDP_API WINPR_DEPRECATED_VAR("Use freerdp_settings_set_string instead",
int freerdp_set_param_string(rdpSettings* settings, int id,
WINPR_DEPRECATED_VAR("Use freerdp_settings_set_string instead",
FREERDP_API int freerdp_set_param_string(rdpSettings* settings, int id,
const char* param));
#endif

4
winpr/include/winpr/collections.h
View File

@@ -240,7 +240,7 @@ extern "C"
WINPR_API BOOL ArrayList_Contains(wArrayList* arrayList, const void* obj);
#if defined(WITH_WINPR_DEPRECATED)
WINPR_API WINPR_DEPRECATED(int ArrayList_Add(wArrayList* arrayList, const void* obj));
WINPR_DEPRECATED(WINPR_API int ArrayList_Add(wArrayList* arrayList, const void* obj));
#endif
WINPR_API BOOL ArrayList_Append(wArrayList* arrayList, const void* obj);
@@ -628,7 +628,7 @@ extern "C"
WINPR_API size_t HashTable_Count(wHashTable* table);
#if defined(WITH_WINPR_DEPRECATED)
WINPR_API WINPR_DEPRECATED(int HashTable_Add(wHashTable* table, const void* key,
WINPR_DEPRECATED(WINPR_API int HashTable_Add(wHashTable* table, const void* key,
const void* value));
#endif

12
winpr/include/winpr/custom-crypto.h
View File

@@ -264,12 +264,12 @@ extern "C"
WINPR_API void winpr_Cipher_Free(WINPR_CIPHER_CTX* ctx);
WINPR_ATTR_MALLOC(winpr_Cipher_Free, 1)
WINPR_API WINPR_DEPRECATED_VAR("[since 3.10.0] use winpr_Cipher_NewEx",
WINPR_CIPHER_CTX* winpr_Cipher_New(WINPR_CIPHER_TYPE cipher,
WINPR_CRYPTO_OPERATION op,
const void* key,
const void* iv));
WINPR_DEPRECATED_VAR("[since 3.10.0] use winpr_Cipher_NewEx",
WINPR_ATTR_MALLOC(winpr_Cipher_Free, 1)
WINPR_API WINPR_CIPHER_CTX* winpr_Cipher_New(WINPR_CIPHER_TYPE cipher,
WINPR_CRYPTO_OPERATION op,
const void* key,
const void* iv));
/** @brief Create a new \b WINPR_CIPHER_CTX
*

12
winpr/include/winpr/stream.h
View File

@@ -1275,12 +1275,12 @@ extern "C"
#define Stream_GetPointerAs(_s, _p) _p = Stream_PointerAs(_s, __typeof(_p))
#if defined(WITH_WINPR_DEPRECATED)
WINPR_API WINPR_DEPRECATED_VAR("Use Stream_SetPosition instead",
BOOL Stream_SetPointer(wStream* _s, BYTE* _p));
WINPR_API WINPR_DEPRECATED_VAR("Use Stream_New(buffer, capacity) instead",
BOOL Stream_SetBuffer(wStream* _s, BYTE* _b));
WINPR_API WINPR_DEPRECATED_VAR("Use Stream_New(buffer, capacity) instead",
void Stream_SetCapacity(wStream* _s, size_t capacity));
WINPR_DEPRECATED_VAR("Use Stream_SetPosition instead",
WINPR_API BOOL Stream_SetPointer(wStream* _s, BYTE* _p));
WINPR_DEPRECATED_VAR("Use Stream_New(buffer, capacity) instead",
WINPR_API BOOL Stream_SetBuffer(wStream* _s, BYTE* _b));
WINPR_DEPRECATED_VAR("Use Stream_New(buffer, capacity) instead",
WINPR_API void Stream_SetCapacity(wStream* _s, size_t capacity));
#endif
static INLINE size_t Stream_Length(const wStream* _s)

16
winpr/include/winpr/string.h
View File

@@ -185,13 +185,13 @@ extern "C"
/* Unicode Conversion */
#if defined(WITH_WINPR_DEPRECATED)
WINPR_API WINPR_DEPRECATED_VAR("Use ConvertUtf8ToWChar instead",
int MultiByteToWideChar(UINT CodePage, DWORD dwFlags,
WINPR_DEPRECATED_VAR("Use ConvertUtf8ToWChar instead",
WINPR_API int MultiByteToWideChar(UINT CodePage, DWORD dwFlags,
LPCSTR lpMultiByteStr, int cbMultiByte,
LPWSTR lpWideCharStr, int cchWideChar));
WINPR_API WINPR_DEPRECATED_VAR("Use ConvertWCharToUtf8 instead",
int WideCharToMultiByte(UINT CodePage, DWORD dwFlags,
WINPR_DEPRECATED_VAR("Use ConvertWCharToUtf8 instead",
WINPR_API int WideCharToMultiByte(UINT CodePage, DWORD dwFlags,
LPCWSTR lpWideCharStr, int cchWideChar,
LPSTR lpMultiByteStr, int cbMultiByte,
LPCSTR lpDefaultChar,
@@ -406,13 +406,13 @@ extern "C"
WINPR_API const WCHAR* InitializeConstWCharFromUtf8(const char* str, WCHAR* buffer, size_t len);
#if defined(WITH_WINPR_DEPRECATED)
WINPR_API WINPR_DEPRECATED_VAR("Use ConvertUtf8ToWChar functions instead",
int ConvertToUnicode(UINT CodePage, DWORD dwFlags,
WINPR_DEPRECATED_VAR("Use ConvertUtf8ToWChar functions instead",
WINPR_API int ConvertToUnicode(UINT CodePage, DWORD dwFlags,
LPCSTR lpMultiByteStr, int cbMultiByte,
LPWSTR* lpWideCharStr, int cchWideChar));
WINPR_API WINPR_DEPRECATED_VAR("Use ConvertWCharToUtf8 functions instead",
int ConvertFromUnicode(UINT CodePage, DWORD dwFlags,
WINPR_DEPRECATED_VAR("Use ConvertWCharToUtf8 functions instead",
WINPR_API int ConvertFromUnicode(UINT CodePage, DWORD dwFlags,
LPCWSTR lpWideCharStr, int cchWideChar,
LPSTR* lpMultiByteStr, int cbMultiByte,
LPCSTR lpDefaultChar,

4
winpr/include/winpr/wlog.h
View File

@@ -221,9 +221,9 @@ extern "C"
#if defined(WITH_WINPR_DEPRECATED)
/** Deprecated */
WINPR_API WINPR_DEPRECATED(BOOL WLog_Init(void));
WINPR_DEPRECATED(WINPR_API BOOL WLog_Init(void));
/** Deprecated */
WINPR_API WINPR_DEPRECATED(BOOL WLog_Uninit(void));
WINPR_DEPRECATED(WINPR_API BOOL WLog_Uninit(void));
#endif
typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg);