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

[common,settings] drop MonitorLocalShiftX|Y compat

Browse Source
This commit is contained in:
Armin Novak
2025-02-12 12:53:51 +01:00
parent 0e006e31fe
commit ac1599333e
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tools/update-settings-tests
View File

@@ -79,11 +79,14 @@ def write_str(f, entry_dict):
f.write('};\n\n')
f.write('\n')
def write_getter_case(f, val, cast):
f.write('\t\tcase FreeRDP_' + val + ':\n')
def write_getter_case(f, val, cast, typestr):
f.write('\t\tcase ')
if typestr:
f.write('(' + typestr + ')')
f.write('FreeRDP_' + val + ':\n')
f.write('\t\t\treturn ' + cast + 'settings->' + val + ';\n\n')
def write_getter_body(f, values, ret, keys, isPointer):
def write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, entry_type):
f.write('{\n')
f.write('\tWINPR_ASSERT(settings);\n\n')
f.write('\tswitch (id)\n')
@@ -96,7 +99,12 @@ def write_getter_body(f, values, ret, keys, isPointer):
key = keys[i]
if key != 'void*':
cast = '(void*)'
write_getter_case(f, val, cast)
write_getter_case(f, val, cast, None)
if compat_values:
for i in range(len(compat_values)):
val = compat_values[i]
cast = '(' + entry_type + ')'
write_getter_case(f, val, cast, typestr)
f.write('\t\tdefault:\n')
f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n')
f.write('\t\t\tWINPR_ASSERT(FALSE);\n')
@@ -104,11 +112,12 @@ def write_getter_body(f, values, ret, keys, isPointer):
f.write('\t}\n')
f.write('}\n\n')
def write_getter(f, entry_dict, entry_type, entry_name, postfix):
def write_getter(f, entry_dict, entry_type, entry_name, postfix, compat_dict):
isString = 'string' in entry_name
isPointer = 'pointer' in entry_name
copy = dict(entry_dict)
values = get_values(entry_dict, entry_type)
compat_values = get_values(compat_dict, entry_type)
keys = get_keys(copy, entry_type, values)
typestr = 'FreeRDP_Settings_Keys_' + entry_name.capitalize()
@@ -132,11 +141,11 @@ def write_getter(f, entry_dict, entry_type, entry_name, postfix):
else:
ret = '0';
write_getter_body(f, values, ret, keys, isPointer)
write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, entry_type)
if isString:
f.write('char* freerdp_settings_get_' + entry_name.lower() + '_writable(rdpSettings* settings, ' + typestr + ' id)\n')
write_getter_body(f, values, ret, keys, isPointer)
write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, entry_type)
def write_setter_case(f, val, postfix, isPointer, cast):
f.write('\t\tcase FreeRDP_' + val + ':\n')
@@ -325,26 +334,29 @@ try:
setter_list = dict(type_list)
setter_list2 = dict(type_list)
# Compatibility with older 3.x releases where the value was wrongly an unsigned type
getter_list['UINT32'].append('MonitorLocalShiftX')
getter_list['UINT32'].append('MonitorLocalShiftY')
write_getter(f, getter_list, 'BOOL', 'bool', '')
compat_getter_list = dict()
compat_getter_list['UINT32'] = list()
compat_getter_list['UINT32'].append('MonitorLocalShiftX')
compat_getter_list['UINT32'].append('MonitorLocalShiftY')
write_getter(f, getter_list, 'BOOL', 'bool', '', compat_getter_list)
write_setter(f, setter_list, 'BOOL', 'bool', '')
write_getter(f, getter_list, 'UINT16', 'uint16', '')
write_getter(f, getter_list, 'UINT16', 'uint16', '', compat_getter_list)
write_setter(f, setter_list, 'UINT16', 'uint16', '')
write_getter(f, getter_list, 'INT16', 'int16', '')
write_getter(f, getter_list, 'INT16', 'int16', '', compat_getter_list)
write_setter(f, setter_list, 'INT16', 'int16', '')
write_getter(f, getter_list, 'UINT32', 'uint32', '')
write_getter(f, getter_list, 'UINT32', 'uint32', '', compat_getter_list)
write_setter(f, setter_list, 'UINT32', 'uint32', '')
write_getter(f, getter_list, 'INT32', 'int32', '')
write_getter(f, getter_list, 'INT32', 'int32', '', compat_getter_list)
write_setter(f, setter_list, 'INT32', 'int32', '')
write_getter(f, getter_list, 'UINT64', 'uint64', '')
write_getter(f, getter_list, 'UINT64', 'uint64', '', compat_getter_list)
write_setter(f, setter_list, 'UINT64', 'uint64', '')
write_getter(f, getter_list, 'INT64', 'int64', '')
write_getter(f, getter_list, 'INT64', 'int64', '', compat_getter_list)
write_setter(f, setter_list, 'INT64', 'int64', '')
write_getter(f, getter_list, 'char*', 'string', '_')
write_getter(f, getter_list, 'char*', 'string', '_', compat_getter_list)
write_setter(f, setter_list, 'char*', 'string', '_')
write_setter(f, setter_list2, 'char*', 'string', '_copy_')
write_getter(f, getter_list, '*', 'pointer', '')
write_getter(f, getter_list, '*', 'pointer', '', compat_getter_list)
write_setter(f, setter_list, '*', 'pointer', '')
f.write('\n')