From 648612d6d3c9ed7803c10cbc264da4eb8ac20406 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 23 Jun 2022 08:27:17 +0200
Subject: [PATCH] Updated settings helper generator script

---
 tools/update-settings-tests | 68 +++++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 6 deletions(-)

diff --git a/tools/update-settings-tests b/tools/update-settings-tests
index 1d4319f88..ac4c68f88 100755
--- a/tools/update-settings-tests
+++ b/tools/update-settings-tests
@@ -53,6 +53,10 @@ def write_str(f, entry_dict):
     f.write('BOOL freerdp_settings_clone_keys(rdpSettings* dst, const rdpSettings* src)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(dst);\n')
+    f.write('\tWINPR_ASSERT(src);\n')
+    f.write('\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')
@@ -131,7 +135,13 @@ def write_str(f, entry_dict):
 
     f.write('BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* settings, const rdpSettings* other)\n')
     f.write('{\n')
+    f.write('\tBOOL rc = FALSE;\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(log);\n')
+    f.write('\tWINPR_ASSERT(settings);\n')
+    f.write('\tWINPR_ASSERT(other);\n')
+    f.write('\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')
@@ -142,7 +152,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tBOOL sval = freerdp_settings_get_bool(settings, cur->id);\n')
     f.write('\t\t\t\tBOOL cval = freerdp_settings_get_bool(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\t\tWLog_Print(log, level, "%s [BOOL]: %s -> %s", cur->str, sval ? "TRUE" : "FALSE", cval ? "TRUE" : "FALSE");\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 1: /* UINT16 */\n')
@@ -150,7 +163,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tUINT16 sval = freerdp_settings_get_uint16(settings, cur->id);\n')
     f.write('\t\t\t\tUINT16 cval = freerdp_settings_get_uint16(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [UINT16]: %" PRIu16 " -> %" PRIu16, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 2: /* INT16 */\n')
@@ -158,7 +174,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tINT16 sval = freerdp_settings_get_int16(settings, cur->id);\n')
     f.write('\t\t\t\tINT16 cval = freerdp_settings_get_int16(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [INT16]: %" PRId16 " -> %" PRId16, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 3: /* UINT32 */\n')
@@ -166,7 +185,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tUINT32 sval = freerdp_settings_get_uint32(settings, cur->id);\n')
     f.write('\t\t\t\tUINT32 cval = freerdp_settings_get_uint32(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [UINT32]: %" PRIu32 " -> %" PRIu32, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 4: /* INT32 */\n')
@@ -174,7 +196,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tINT32 sval = freerdp_settings_get_int32(settings, cur->id);\n')
     f.write('\t\t\t\tINT32 cval = freerdp_settings_get_int32(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [INT32]: %" PRId32 " -> %" PRId32, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 5: /* UINT64 */\n')
@@ -182,7 +207,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tUINT64 sval = freerdp_settings_get_uint64(settings, cur->id);\n')
     f.write('\t\t\t\tUINT64 cval = freerdp_settings_get_uint64(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [UINT64]: %" PRIu64 " -> %" PRIu64, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 6: /* INT64 */\n')
@@ -190,7 +218,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tINT64 sval = freerdp_settings_get_int64(settings, cur->id);\n')
     f.write('\t\t\t\tINT64 cval = freerdp_settings_get_int64(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc=TRUE;\n')
     f.write('\t\t\t\tWLog_Print(log, level, "%s [INT64]: %" PRId64 " -> %" PRId64, cur->str, sval, cval);\n')
+    f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
     f.write('\t\t\tcase 7: /* strings */\n')
@@ -200,7 +231,10 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tif (sval != cval)\n')
     f.write('\t\t\t\t{\n')
     f.write('\t\t\t\t\tif (!sval || !cval || (strcmp(sval, cval) != 0))\n')
+    f.write('\t\t\t\t\t{\n')
+    f.write('\t\t\t\t\trc = TRUE;\n')
     f.write('\t\t\t\t\t\tWLog_Print(log, level, "%s [STRING]: \'%s\' -> \'%s\'", cur->str, sval, cval);\n')
+    f.write('\t\t\t\t\t}\n')
     f.write('\t\t\t\t}\n')
     f.write('\t\t\t}\n')
     f.write('\t\t\tbreak;\n')
@@ -209,17 +243,28 @@ def write_str(f, entry_dict):
     f.write('\t\t\t\tconst void* sval = freerdp_settings_get_pointer(settings, cur->id);\n')
     f.write('\t\t\t\tconst void* cval = freerdp_settings_get_pointer(other, cur->id);\n')
     f.write('\t\t\t\tif (sval != cval)\n')
-    f.write('\t\t\t\tWLog_Print(log, level, "%s [POINTER]: \'%p\' -> \'%p\'", cur->str, sval, cval);\n')
+    f.write('\t\t\t\t{\n')
+    f.write('\t\t\t\t\tif ((sval && !cval) || (!sval && cval))\n')
+    f.write('\t\t\t\t\t{\n')
+    f.write('\t\t\t\t\t\trc=TRUE;\n')
+    f.write('\t\t\t\t\t\tWLog_Print(log, level, "%s [POINTER]: \'%p\' -> \'%p\'", cur->str, sval, cval);\n')
+    f.write('\t\t\t\t\t}\n')
+    f.write('\t\t\t\t}\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('\treturn rc;\n')
     f.write('}\n')
+    f.write('\n')
 
     f.write('void freerdp_settings_dump(wLog* log, DWORD level, const rdpSettings* settings)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(log);\n')
+    f.write('\tWINPR_ASSERT(settings);\n')
+    f.write('\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')
@@ -288,6 +333,9 @@ def write_str(f, entry_dict):
     f.write('void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(dst);\n')
+    f.write('\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')
@@ -307,6 +355,9 @@ def write_str(f, entry_dict):
     f.write('SSIZE_T freerdp_settings_get_key_for_name(const char* value)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(value);\n')
+    f.write('\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')
@@ -319,6 +370,9 @@ def write_str(f, entry_dict):
     f.write('SSIZE_T freerdp_settings_get_type_for_name(const char* value)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\n')
+    f.write('\tWINPR_ASSERT(value);\n')
+    f.write('\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')
@@ -331,6 +385,7 @@ def write_str(f, entry_dict):
     f.write('SSIZE_T freerdp_settings_get_type_for_key(size_t key)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\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')
@@ -343,6 +398,7 @@ def write_str(f, entry_dict):
     f.write('const char* freerdp_settings_get_name_for_key(size_t key)\n')
     f.write('{\n')
     f.write('\tsize_t x;\n')
+    f.write('\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')
@@ -424,10 +480,10 @@ def write_setter(f, entry_dict, entry_type, entry_name):
     else:
         f.write(')\n')
     f.write('{\n')
-    f.write('union\n')
-    f.write('{\n')
-    f.write('    void* v;\n')
-    f.write('    const void* cv;\n')
+    f.write('\tunion\n')
+    f.write('\t{\n')
+    f.write('\t\tvoid* v;\n')
+    f.write('\t\tconst void* cv;\n')
     if not isPointer:
         f.write('    ' + entry_type + ' c;\n')
         f.write('    const ' + entry_type + ' cc;\n')