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

Hans Leidekker : secur32: Also copy user function tables in nego_SpInitLsaModeContext() and nego_SpAcceptLsaModeContext().
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: ff5db66c43015468c616e58b127fb09000038212 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff5db66c43015468c616e58b127fb0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 4 10:23:24 2023 +0200 secur32: Also copy user function tables in nego_SpInitLsaModeContext() and nego_SpAcceptLsaModeContext(). --- dlls/secur32/negotiate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 323d14e9eaa..0f7d047dd60 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -225,6 +225,8 @@ static NTSTATUS NTAPI nego_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_ if (!(new_ctxt = ctxt = calloc( 1, sizeof(*ctxt) ))) return SEC_E_INSUFFICIENT_MEMORY; ctxt->krb = cred->krb; ctxt->ntlm = cred->ntlm; + ctxt->user_krb = cred->user_krb; + ctxt->user_ntlm = cred->user_ntlm; } if (!handle) return SEC_E_INVALID_HANDLE; @@ -278,6 +280,8 @@ static NTSTATUS NTAPI nego_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LS if (!(new_ctxt = ctxt = calloc( 1, sizeof(*ctxt) ))) return SEC_E_INSUFFICIENT_MEMORY; ctxt->krb = cred->krb; ctxt->ntlm = cred->ntlm; + ctxt->user_krb = cred->user_krb; + ctxt->user_ntlm = cred->user_ntlm; } if (!handle) return SEC_E_INVALID_HANDLE;

1 0

Gabriel Ivăncescu : mshtml: Unlink variants using a helper function.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 392a15cdc9b6797c64c54126acb72ea932b6d41e URL: https://gitlab.winehq.org/wine/wine/-/commit/392a15cdc9b6797c64c54126acb72e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Unlink variants using a helper function. And move the clear to the destructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++-- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 6 ++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 09782fb83c9..6bd2c9cf6cb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2030,8 +2030,8 @@ void dispex_unlink(DispatchEx *This) return; for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { - VariantClear(&prop->var); prop->flags |= DYNPROP_DELETED; + unlink_variant(&prop->var); } if(This->dynamic_data->func_disps) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2c518464246..6b5ea716a75 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2462,7 +2462,14 @@ static void DOMCustomEvent_unlink(DispatchEx *dispex) { DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); DOMEvent_unlink(&custom_event->event.dispex); + unlink_variant(&custom_event->detail); +} + +static void DOMCustomEvent_destructor(DispatchEx *dispex) +{ + DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); VariantClear(&custom_event->detail); + DOMEvent_destructor(dispex); } typedef struct { @@ -2607,7 +2614,14 @@ static void DOMMessageEvent_unlink(DispatchEx *dispex) { DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); DOMEvent_unlink(&message_event->event.dispex); + unlink_variant(&message_event->data); +} + +static void DOMMessageEvent_destructor(DispatchEx *dispex) +{ + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); VariantClear(&message_event->data); + DOMEvent_destructor(dispex); } static void DOMMessageEvent_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) @@ -3038,7 +3052,7 @@ static dispex_static_data_t DOMPageTransitionEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = { - DOMEvent_destructor, + DOMCustomEvent_destructor, DOMCustomEvent_unlink }; @@ -3056,7 +3070,7 @@ static dispex_static_data_t DOMCustomEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = { - DOMEvent_destructor, + DOMMessageEvent_destructor, DOMMessageEvent_unlink }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9ebea7f8b57..a90a0da2dde 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3777,7 +3777,7 @@ static void HTMLWindow_unlink(DispatchEx *dispex) IHTMLStorage_Release(local_storage); } IHTMLPerformanceTiming_Release(&This->performance_timing->IHTMLPerformanceTiming_iface); - VariantClear(&This->performance); + unlink_variant(&This->performance); } static void HTMLWindow_destructor(DispatchEx *dispex) @@ -3785,6 +3785,8 @@ static void HTMLWindow_destructor(DispatchEx *dispex) HTMLInnerWindow *This = impl_from_DispatchEx(dispex); unsigned i; + VariantClear(&This->performance); + for(i = 0; i < This->global_prop_cnt; i++) free(This->global_props[i].name); free(This->global_props); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ff6294749cd..6d57a314870 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1497,6 +1497,12 @@ static inline void unlink_ref(void *p) } } +static inline void unlink_variant(VARIANT *v) +{ + if(V_VT(v) == VT_DISPATCH || V_VT(v) == VT_UNKNOWN) + unlink_ref(&V_UNKNOWN(v)); +} + #ifdef __i386__ extern void *call_thiscall_func; #endif

1 0

Vitaly Lipatov : include: Update SECURITY_LOGON_TYPE and SECURITY_LOGON_SESSION_DATA in ntsecapi.h.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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 04 Aug '23

04 Aug '23

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

Piotr Caban : winedump: Add support for decoding data stored in offset in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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

Piotr Caban : winedump: Support REG_DWORD values in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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: Support dumping default values without VAL_COMP_NAME flag.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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: Fix empty string handling in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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 04 Aug '23

04 Aug '23

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_NONE values in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

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