- Wine-Commits - list.winehq.org

Piotr Caban : winedump: Don't dump volatile keys from regf file.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 2908537f3fe4fe583b16a5c21c5c222fdb0dd0ee URL: https://gitlab.winehq.org/wine/wine/-/commit/2908537f3fe4fe583b16a5c21c5c22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 17:58:41 2023 +0200 winedump: Don't dump volatile keys from regf file. --- tools/winedump/reg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index cce45fdb27a..baa298784e3 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -356,8 +356,6 @@ static BOOL dump_key(unsigned int hive_off, unsigned int off) if (key->sub_keys) ret = dump_subkeys(hive_off, key->sub_keys_list_off); - if (ret && key->volatile_sub_keys) - ret = dump_subkeys(hive_off, key->volatile_sub_keys_list_off); path_len -= key->name_size + 1; path[path_len] = 0;

1 0

Piotr Caban : winedump: Enlarge buffer in dump_want_n helper.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 1a58a7032a20af01e830123e29c336cab045d94d URL: https://gitlab.winehq.org/wine/wine/-/commit/1a58a7032a20af01e830123e29c336… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:58:24 2023 +0200 winedump: Enlarge buffer in dump_want_n helper. --- tools/winedump/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 1a97e3bb171..42916ac4fa3 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -65,7 +65,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix static char* dump_want_n(unsigned sz) { - static char buffer[4 * 1024]; + static char buffer[64 * 1024]; static unsigned idx; char* ret;

1 0

Piotr Caban : winedump: Support REG_MULTI_SZ values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: b4fb0aef0d21e10b3e776f43be69e1c52a798f90 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4fb0aef0d21e10b3e776f43be69e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:53:54 2023 +0200 winedump: Support REG_MULTI_SZ values in regf files. --- tools/winedump/reg.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 65426f540c0..2afde27e2d7 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -194,8 +194,8 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) { unsigned int i, len, data_size; const void *data = NULL; + const char *name, *str; const value_key *val; - const char *name; val = PRD(hive_off + off, sizeof(*val)); if (!val || memcmp(&val->signature, "vk", 2)) @@ -269,6 +269,22 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) assert(data_size == sizeof(DWORD)); printf("dword:%08x", *(unsigned int *)data); break; + case REG_MULTI_SZ: + printf("str(7):\""); + + while(data_size > sizeof(WCHAR)) + { + for (len = 0; len < data_size / sizeof(WCHAR); len++) + if (!((WCHAR *)data)[len]) + break; + str = get_unicode_str(data, len); + + printf("%.*s\\0", (unsigned int)strlen(str + 1) - 1, str + 1); + data = ((WCHAR *)data) + len + 1; + data_size -= (len + 1) * sizeof(WCHAR); + } + printf("\""); + break; default: printf("unhandled data type %d", val->data_type); }

1 0

Piotr Caban : winedump: Skip data blocks when dumping regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: bed6f9dfb3aeb9e2833a91df1374d7d582095452 URL: https://gitlab.winehq.org/wine/wine/-/commit/bed6f9dfb3aeb9e2833a91df1374d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 17:36:16 2023 +0200 winedump: Skip data blocks when dumping regf files. --- tools/winedump/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 2afde27e2d7..cce45fdb27a 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -206,6 +206,11 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("unsupported value flags: %x\n", val->flags); return FALSE; } + if (!(val->data_size & 0x80000000) && val->data_size > 4 * BLOCK_SIZE) + { + printf("Warning: data blocks not supported\n"); + return TRUE; + } if (val->name_size) {

1 0

Piotr Caban : winedump: Fix empty string handling in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 1727302892acabbcb815756008fb182fc060c347 URL: https://gitlab.winehq.org/wine/wine/-/commit/1727302892acabbcb815756008fb18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:14:17 2023 +0200 winedump: Fix empty string handling in regf files. --- tools/winedump/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 573c2dc7f1c..65bede34987 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -236,7 +236,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) switch (val->data_type) { case REG_SZ: - printf("%s", !data ? "" : + printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; case REG_DWORD: @@ -299,7 +299,7 @@ static BOOL dump_key(unsigned int hive_off, unsigned int off) } else { - printf("@=""\n"); + printf("@=\"\"\n"); } if (!ret) return FALSE;

1 0

Piotr Caban : winedump: Support REG_EXPAND_SZ values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: c6c844f1727fdd176fa41881968c3bbaaecd9a89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6c844f1727fdd176fa41881968c3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:30:57 2023 +0200 winedump: Support REG_EXPAND_SZ values in regf files. --- tools/winedump/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 65bede34987..28b6160e9cd 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -235,6 +235,9 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) switch (val->data_type) { + case REG_EXPAND_SZ: + printf("str(2):"); + /* fall through */ case REG_SZ: printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR)));

1 0

Piotr Caban : winedump: Support REG_BINARY values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 037677932b8349a7682c55ac7b3c56f3a04b8925 URL: https://gitlab.winehq.org/wine/wine/-/commit/037677932b8349a7682c55ac7b3c56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:30:17 2023 +0200 winedump: Support REG_BINARY values in regf files. --- tools/winedump/reg.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 46841a9d342..65426f540c0 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -192,8 +192,8 @@ static BOOL dump_subkeys(unsigned int hive_off, unsigned int off) static BOOL dump_value(unsigned int hive_off, unsigned int off) { + unsigned int i, len, data_size; const void *data = NULL; - unsigned int data_size; const value_key *val; const char *name; @@ -246,6 +246,25 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; + case REG_BINARY: + printf("hex:"); + len = val->name_size + 7; /* strlen("\"\"=hex:") */ + for (i = 0; i < data_size; i++) + { + if (i) + { + printf(","); + len += 1; + } + if (len > 76) + { + printf("\\\n "); + len = 2; + } + printf("%02x", ((BYTE *)data)[i]); + len += 2; + } + break; case REG_DWORD: assert(data_size == sizeof(DWORD)); printf("dword:%08x", *(unsigned int *)data);

1 0

Piotr Caban : winedump: Support REG_NONE values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 814d8d74f6172f488d8a2c8dfd44dce8412078aa URL: https://gitlab.winehq.org/wine/wine/-/commit/814d8d74f6172f488d8a2c8dfd44dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:34:22 2023 +0200 winedump: Support REG_NONE values in regf files. --- tools/winedump/reg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 28b6160e9cd..46841a9d342 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -235,6 +235,10 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) switch (val->data_type) { + case REG_NONE: + /* TODO: dump as REG_NONE value. */ + printf("hex:"); + break; case REG_EXPAND_SZ: printf("str(2):"); /* fall through */

1 0

Piotr Caban : winedump: Support dumping default values without VAL_COMP_NAME flag.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 654a83a5837d29e47fe77867a1ceb24daecb227e URL: https://gitlab.winehq.org/wine/wine/-/commit/654a83a5837d29e47fe77867a1ceb2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:10:28 2023 +0200 winedump: Support dumping default values without VAL_COMP_NAME flag. --- tools/winedump/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 52036452990..573c2dc7f1c 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -201,7 +201,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) if (!val || memcmp(&val->signature, "vk", 2)) return FALSE; - if (!(val->flags & VAL_COMP_NAME)) + if (!(val->flags & VAL_COMP_NAME) && val->name_size) { printf("unsupported value flags: %x\n", val->flags); return FALSE;

1 0

Piotr Caban : winedump: Support REG_DWORD values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 8242dbe5a02cc57685562638f638d2e1a0763748 URL: https://gitlab.winehq.org/wine/wine/-/commit/8242dbe5a02cc57685562638f638d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:06:28 2023 +0200 winedump: Support REG_DWORD values in regf files. --- tools/winedump/reg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 92ab3839de8..52036452990 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -239,6 +239,10 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("%s", !data ? "" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; + case REG_DWORD: + assert(data_size == sizeof(DWORD)); + printf("dword:%08x", *(unsigned int *)data); + break; default: printf("unhandled data type %d", val->data_type); }

1 0