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

[settings] add unused values and sign correct keys

Browse Source 
* add -1 as unused enum entry
* change key parameter type from size_t to SSIZE_T
This commit is contained in:
Armin Novak
2023-10-16 20:44:25 +02:00
committed by akallabeth
parent 6e6559c41a
commit 704ee8bc4b
5 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/CMakeLists.txt
View File

@@ -88,33 +88,16 @@ foreach(KEY ${SETTINGS_KEYS})
endif()
endforeach()
if (NOT SETTINGS_KEYS_BOOL)
set(SETTINGS_KEYS_BOOL "FreeRDP_BOOL_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_INT16)
set(SETTINGS_KEYS_INT16 "FreeRDP_INT16_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_UINT16)
set(SETTINGS_KEYS_UINT16 "FreeRDP_UINT16_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_INT32)
set(SETTINGS_KEYS_INT32 "FreeRDP_INT32_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_UINT32)
set(SETTINGS_KEYS_UINT32 "FreeRDP_UINT32_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_INT64)
set(SETTINGS_KEYS_INT64 "FreeRDP_INT64_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_UINT64)
set(SETTINGS_KEYS_UINT64 "FreeRDP_UINT64_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_STRING)
set(SETTINGS_KEYS_STRING "FreeRDP_STRING_UNUSED = -1")
endif()
if (NOT SETTINGS_KEYS_POINTER)
set(SETTINGS_KEYS_POINTER "FreeRDP_POINTER_UNUSED = -1")
endif()
list(APPEND SETTINGS_KEYS_BOOL "FreeRDP_BOOL_UNUSED = -1")
list(APPEND SETTINGS_KEYS_INT16 "FreeRDP_INT16_UNUSED = -1")
list(APPEND SETTINGS_KEYS_UINT16 "FreeRDP_UINT16_UNUSED = -1")
list(APPEND SETTINGS_KEYS_INT32 "FreeRDP_INT32_UNUSED = -1")
list(APPEND SETTINGS_KEYS_UINT32 "FreeRDP_UINT32_UNUSED = -1")
list(APPEND SETTINGS_KEYS_INT64 "FreeRDP_INT64_UNUSED = -1")
list(APPEND SETTINGS_KEYS_UINT64 "FreeRDP_UINT64_UNUSED = -1")
list(APPEND SETTINGS_KEYS_STRING "FreeRDP_STRING_UNUSED = -1")
list(APPEND SETTINGS_KEYS_POINTER "FreeRDP_POINTER_UNUSED = -1")
string(REPLACE ";" ",\n\t" SETTINGS_KEYS_BOOL "${SETTINGS_KEYS_BOOL}")
string(REPLACE ";" ",\n\t" SETTINGS_KEYS_INT16 "${SETTINGS_KEYS_INT16}")
string(REPLACE ";" ",\n\t" SETTINGS_KEYS_UINT16 "${SETTINGS_KEYS_UINT16}")

8
include/freerdp/settings.h
View File

@@ -118,7 +118,7 @@ typedef struct rdp_settings rdpSettings;
*/
FREERDP_API BOOL freerdp_settings_copy_item(rdpSettings* dst, const rdpSettings* src,
size_t id);
SSIZE_T id);
/** \brief Free a settings struct with all data in it
*
@@ -564,11 +564,11 @@ typedef struct rdp_settings rdpSettings;
* \return The key type (e.g. FREERDP_SETTINGS_TYPE_BOOL) or -1 in case of an error (e.g. name
* does not exist)
*/
FREERDP_API SSIZE_T freerdp_settings_get_type_for_key(size_t key);
FREERDP_API const char* freerdp_settings_get_type_name_for_key(size_t key);
FREERDP_API SSIZE_T freerdp_settings_get_type_for_key(SSIZE_T key);
FREERDP_API const char* freerdp_settings_get_type_name_for_key(SSIZE_T key);
FREERDP_API const char* freerdp_settings_get_type_name_for_type(SSIZE_T type);
FREERDP_API const char* freerdp_settings_get_name_for_key(size_t key);
FREERDP_API const char* freerdp_settings_get_name_for_key(SSIZE_T key);
FREERDP_API UINT32 freerdp_settings_get_codecs_flags(const rdpSettings* settings);
/** \brief Parse capability data and apply to settings