mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-15 00:44:19 +09:00
Refactored settings clone/free, extended tests
This commit is contained in:
akallabeth
@@ -49,6 +49,103 @@ def write_str(f, entry_dict):
|
||||
for val in values:
|
||||
write_str_case(f, entry_types.index(entry_type), val)
|
||||
f.write('};\n\n')
|
||||
f.write('\n')
|
||||
f.write('BOOL freerdp_settings_clone_keys(rdpSettings* dst, const rdpSettings* src)\n')
|
||||
f.write('{\n')
|
||||
f.write('\tsize_t x;\n')
|
||||
f.write('\tfor(x=0; x<ARRAYSIZE(settings_map); x++)\n')
|
||||
f.write('\t{\n')
|
||||
f.write('\t\tconst struct settings_str_entry* cur = &settings_map[x];\n')
|
||||
f.write('\t\tswitch(cur->type)\n')
|
||||
f.write('\t\t{\n')
|
||||
f.write('\t\t\tcase 0: /* bool */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tBOOL sval = freerdp_settings_get_bool(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_bool(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 1: /* UINT16 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tUINT16 sval = freerdp_settings_get_uint16(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_uint16(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 2: /* INT16 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tINT16 sval = freerdp_settings_get_int16(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_int16(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 3: /* UINT32 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tUINT32 sval = freerdp_settings_get_uint32(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_uint32(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 4: /* INT32 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tINT32 sval = freerdp_settings_get_int32(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_int32(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 5: /* UINT64 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tUINT64 sval = freerdp_settings_get_uint64(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_uint64(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 6: /* INT64 */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tINT64 sval = freerdp_settings_get_int64(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_int64(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 7: /* strings */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tconst char* sval = freerdp_settings_get_string(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_string_(dst, cur->id, sval, FALSE))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 8: /* pointer */\n')
|
||||
f.write('\t\t\t{\n')
|
||||
f.write('\t\t\t\tconst void* sval = freerdp_settings_get_pointer(src, cur->id);\n')
|
||||
f.write('\t\t\t\tif (!freerdp_settings_set_pointer(dst, cur->id, sval))\n')
|
||||
f.write('\t\t\t\t\treturn FALSE;\n')
|
||||
f.write('\t\t\t}\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
|
||||
f.write('\t\t}\n')
|
||||
f.write('\t}\n')
|
||||
f.write('\treturn TRUE;\n')
|
||||
f.write('}\n')
|
||||
f.write('\n')
|
||||
f.write('void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup)\n')
|
||||
f.write('{\n')
|
||||
f.write('\tsize_t x;\n')
|
||||
f.write('\tfor(x=0; x<ARRAYSIZE(settings_map); x++)\n')
|
||||
f.write('\t{\n')
|
||||
f.write('\t\tconst struct settings_str_entry* cur = &settings_map[x];\n')
|
||||
f.write('\t\tswitch(cur->type)\n')
|
||||
f.write('\t\t{\n')
|
||||
f.write('\t\t\tcase 7: /* strings */\n')
|
||||
f.write('\t\t\t\tfreerdp_settings_set_string_(dst, cur->id, NULL, cleanup);\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t\tcase 8: /* pointer */\n')
|
||||
f.write('\t\t\t\tfreerdp_settings_set_pointer(dst, cur->id, NULL);\n')
|
||||
f.write('\t\t\tbreak;\n')
|
||||
f.write('\t\t}\n')
|
||||
f.write('\t}\n')
|
||||
f.write('}\n')
|
||||
f.write('\n')
|
||||
|
||||
f.write('SSIZE_T freerdp_settings_get_key_for_name(const char* value)\n')
|
||||
f.write('{\n')
|
||||
f.write('\tsize_t x;\n')
|
||||
@@ -130,11 +227,15 @@ def write_getter(f, entry_dict, entry_type, entry_name):
|
||||
|
||||
def write_setter_case(f, val, isString, isPointer):
|
||||
f.write('\t\tcase FreeRDP_' + val + ':\n')
|
||||
if not isString:
|
||||
if isPointer:
|
||||
f.write('\t\t\tsettings->' + val + ' = (void*)val;\n')
|
||||
f.write('\t\t\tbreak;\n\n')
|
||||
elif not isString:
|
||||
f.write('\t\t\tsettings->' + val + ' = val;\n')
|
||||
f.write('\t\t\tbreak;\n\n')
|
||||
else:
|
||||
f.write('\t\t\tfree(settings->' + val + ');\n')
|
||||
f.write('\t\t\tif (cleanup)\n')
|
||||
f.write('\t\t\t\tfree(settings->' + val + ');\n')
|
||||
f.write('\t\t\tsettings->' + val + ' = (val ? _strdup(val) : NULL);\n')
|
||||
f.write('\t\t\treturn (!val || settings->' + val + ' != NULL);\n\n')
|
||||
|
||||
@@ -143,13 +244,20 @@ def write_setter(f, entry_dict, entry_type, entry_name):
|
||||
isPointer = 'pointer' in entry_name
|
||||
values = get_values(entry_dict, entry_type)
|
||||
|
||||
f.write('BOOL freerdp_settings_set_' + entry_name.lower() + '(rdpSettings* settings, size_t id, ')
|
||||
f.write('BOOL freerdp_settings_set_' + entry_name.lower())
|
||||
if isString:
|
||||
f.write('_')
|
||||
f.write('(rdpSettings* settings, size_t id, ')
|
||||
if isString or isPointer:
|
||||
f.write('const ')
|
||||
if not isPointer:
|
||||
f.write(entry_type + ' val)\n')
|
||||
f.write(entry_type + ' val')
|
||||
else:
|
||||
f.write('void* val)\n')
|
||||
f.write('void* val')
|
||||
if isString:
|
||||
f.write(', BOOL cleanup)\n')
|
||||
else:
|
||||
f.write(')\n')
|
||||
f.write('{\n')
|
||||
f.write('\tif (!settings)\n')
|
||||
f.write('\t\treturn FALSE;\n\n')
|
||||
@@ -164,6 +272,20 @@ def write_setter(f, entry_dict, entry_type, entry_name):
|
||||
f.write('\t}\n')
|
||||
f.write('\treturn TRUE;\n')
|
||||
f.write('}\n\n')
|
||||
f.write('\n')
|
||||
if isString:
|
||||
f.write('BOOL freerdp_settings_set_' + entry_name.lower() + '(rdpSettings* settings, size_t id, ')
|
||||
if isString or isPointer:
|
||||
f.write('const ')
|
||||
if not isPointer:
|
||||
f.write(entry_type + ' val')
|
||||
else:
|
||||
f.write('void* val')
|
||||
f.write(')\n')
|
||||
f.write('{\n')
|
||||
f.write('\treturn freerdp_settings_set_' + entry_name.lower() + '_(settings, id, val, TRUE);\n')
|
||||
f.write('}\n')
|
||||
f.write('\n')
|
||||
|
||||
name = os.path.dirname(os.path.realpath(__file__))
|
||||
begin = "WARNING: this data structure is carefully padded for ABI stability!"
|
||||
@@ -230,7 +352,7 @@ try:
|
||||
write_getter(f, getter_list, 'char*', 'string')
|
||||
write_setter(f, setter_list, 'char*', 'string')
|
||||
write_getter(f, getter_list, '*', 'pointer')
|
||||
# write_setter(f, setter_list, '*', 'pointer')
|
||||
write_setter(f, setter_list, '*', 'pointer')
|
||||
|
||||
f.write('\n')
|
||||
|
||||
@@ -238,6 +360,7 @@ try:
|
||||
f.write('/* Generated by ' + '' + ' */\n\n')
|
||||
f.write('#include <freerdp/settings.h>\n')
|
||||
f.write('#include <freerdp/log.h>\n\n')
|
||||
f.write('#include "../core/settings.h"\n\n')
|
||||
f.write('#define TAG FREERDP_TAG("common.settings")\n\n')
|
||||
|
||||
getter_list = dict(type_list)
|
||||
|
||||
Reference in New Issue
Block a user