August 2023 - Wine-Commits - list.winehq.org

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

Piotr Caban : winedump: Add support for decoding data stored in offset in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: b17fed0255ebeda633d5da26117e81cb17a7355d URL: https://gitlab.winehq.org/wine/wine/-/commit/b17fed0255ebeda633d5da26117e81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 14:00:46 2023 +0200 winedump: Add support for decoding data stored in offset in regf files. --- tools/winedump/reg.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 338e37133e0..92ab3839de8 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -193,6 +193,7 @@ static BOOL dump_subkeys(unsigned int hive_off, unsigned int off) static BOOL dump_value(unsigned int hive_off, unsigned int off) { const void *data = NULL; + unsigned int data_size; const value_key *val; const char *name; @@ -219,9 +220,15 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("@="); } - if (val->data_size) + data_size = val->data_size; + if (data_size & 0x80000000) + { + data = &val->data_off; + data_size &= ~0x80000000; + } + else if (data_size) { - data = PRD(hive_off + val->data_off + sizeof(unsigned int), val->data_size); + data = PRD(hive_off + val->data_off + sizeof(unsigned int), data_size); if (!data) return FALSE; } @@ -230,7 +237,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) { case REG_SZ: printf("%s", !data ? "" : - get_unicode_str((const WCHAR *)data, val->data_size / sizeof(WCHAR))); + get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; default: printf("unhandled data type %d", val->data_type);

1 0

Vitaly Lipatov : include: Update SECURITY_LOGON_TYPE and SECURITY_LOGON_SESSION_DATA in ntsecapi.h.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 982f1983c47cce7fb0f3552953d462a92bec6308 URL: https://gitlab.winehq.org/wine/wine/-/commit/982f1983c47cce7fb0f3552953d462… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Tue Jul 11 00:36:58 2023 +0300 include: Update SECURITY_LOGON_TYPE and SECURITY_LOGON_SESSION_DATA in ntsecapi.h. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> --- include/ntsecapi.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index ded31b41e56..b06a9628e61 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -121,11 +121,19 @@ typedef NTSTATUS *PNTSTATUS; typedef enum _SECURITY_LOGON_TYPE { + UndefinedLogonType = 0, Interactive = 2, Network, Batch, Service, - Proxy + Proxy, + Unlock, + NetworkCleartext, + NewCredentials, + RemoteInteractive, + CachedInteractive, + CachedRemoteInteractive, + CachedUnlock } SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; typedef enum _POLICY_AUDIT_EVENT_TYPE @@ -249,6 +257,12 @@ typedef struct _POLICY_MODIFICATION_INFO LARGE_INTEGER DatabaseCreationTime; } POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO; +typedef struct _LSA_LAST_INTER_LOGON_INFO { + LARGE_INTEGER LastSuccessfulLogon; + LARGE_INTEGER LastFailedLogon; + ULONG FailedAttemptCountSinceLastSuccessfulLogon; +} LSA_LAST_INTER_LOGON_INFO, *PLSA_LAST_INTER_LOGON_INFO; + typedef struct _SECURITY_LOGON_SESSION_DATA { ULONG Size; LUID LogonId; @@ -262,6 +276,17 @@ typedef struct _SECURITY_LOGON_SESSION_DATA { LSA_UNICODE_STRING LogonServer; LSA_UNICODE_STRING DnsDomainName; LSA_UNICODE_STRING Upn; + ULONG UserFlags; + LSA_LAST_INTER_LOGON_INFO LastLogonInfo; + LSA_UNICODE_STRING LogonScript; + LSA_UNICODE_STRING ProfilePath; + LSA_UNICODE_STRING HomeDirectory; + LSA_UNICODE_STRING HomeDirectoryDrive; + LARGE_INTEGER LogoffTime; + LARGE_INTEGER KickOffTime; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; } SECURITY_LOGON_SESSION_DATA, *PSECURITY_LOGON_SESSION_DATA; typedef struct @@ -636,6 +661,8 @@ typedef struct _KERB_PURGE_TKT_CACHE_REQUEST #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 +#define LSA_SUCCESS(Error) ((LONG)(Error) >= 0) + WINADVAPI BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID*,ULONG,AUDIT_POLICY_INFORMATION**); WINADVAPI BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); WINADVAPI NTSTATUS WINAPI RtlEncryptMemory(PVOID,ULONG,ULONG);

1 0

Piotr Caban : winedump: Fix non null terminated strings printing in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 8885aea089dd7b82680b4b6dc525f285473dad1a URL: https://gitlab.winehq.org/wine/wine/-/commit/8885aea089dd7b82680b4b6dc525f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 13:44:02 2023 +0200 winedump: Fix non null terminated strings printing 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 1c6c6293415..338e37133e0 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -212,7 +212,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) if (!name) return FALSE; - printf("\"%*s\"=", val->name_size, name); + printf("\"%.*s\"=", val->name_size, name); } else { @@ -315,7 +315,7 @@ void reg_dump(void) return; printf("File Header\n"); - printf(" %-20s %4s\n", "signature:", (char*)&hdr->signature); + printf(" %-20s %.4s\n", "signature:", (char*)&hdr->signature); printf(" %-20s %u\n", "primary sequence:", hdr->seq_prim); printf(" %-20s %u\n", "secondary sequence:", hdr->seq_sec); printf(" %-20s %s\n", "modification time:", filetime_str(hdr->modif_time));

1 0

Mohamad Al-Jaf : widl: Add support for default_overload attribute.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 0b3b28c245a7523ba10285334945816a2ff4314d URL: https://gitlab.winehq.org/wine/wine/-/commit/0b3b28c245a7523ba1028533494581… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 02:23:26 2023 -0400 widl: Add support for default_overload attribute. Needed for IDeviceInformationStatics. --- tools/widl/attribute.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 1 + 5 files changed, 6 insertions(+) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index 5ea13a01175..bcd804e272f 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -153,6 +153,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" }, + /* ATTR_DEFAULT_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "default_overload" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index afbdf7151f0..951998de381 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -254,6 +254,7 @@ static void winrt_enable( int ns_prefix ) control { return tCONTROL; } custom { return tCUSTOM; } decode { return tDECODE; } + default_overload { return tDEFAULT_OVERLOAD; } defaultbind { return tDEFAULTBIND; } defaultcollelem { return tDEFAULTCOLLELEM; } defaultvalue { return tDEFAULTVALUE; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 26385a578b0..f66dc62492f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -196,6 +196,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tDECLARE %token tDECODE tDEFAULT tDEFAULTBIND %token tDELEGATE +%token tDEFAULT_OVERLOAD %token tDEFAULTCOLLELEM %token tDEFAULTVALUE %token tDEFAULTVTABLE @@ -662,6 +663,7 @@ attribute } | tDECODE { $$ = attr_int( @$, ATTR_DECODE, 0 ); } | tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); } + | tDEFAULT_OVERLOAD { $$ = attr_int( @$, ATTR_DEFAULT_OVERLOAD, 0 ); } | tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); } | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } | tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b92c8c15e68..1a26bb77cad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -92,6 +92,7 @@ enum attr_type ATTR_CUSTOM, ATTR_DECODE, ATTR_DEFAULT, + ATTR_DEFAULT_OVERLOAD, ATTR_DEFAULTBIND, ATTR_DEFAULTCOLLELEM, ATTR_DEFAULTVALUE, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a757af8adc9..063e293cdc4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1418,6 +1418,7 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) break; case ATTR_OUT: break; + case ATTR_DEFAULT_OVERLOAD: case ATTR_OVERLOAD: break; case ATTR_PROPGET:

1 0