April 2021 - Wine-commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: af1016ca59454782ab5ebdbc6e2ee365f3cf0531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1016ca59454782ab5ebdbc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 21 09:20:16 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index f7d9e48c687..689e63aacd1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-09 19:27+0300\n" +"PO-Revision-Date: 2021-04-21 09:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14685,10 +14685,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Netinkamas sisteminis raktas [%1]\n" +msgstr "reg: Netinkamas sisteminis raktas\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?"

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 258f7b36045aa8c07f8c4b9e7b0f97a8ad72531c URL: https://source.winehq.org/git/wine.git/?a=commit;h=258f7b36045aa8c07f8c4b9e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 21 09:28:01 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 51d7f73cb8f..5ee44aa2c56 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-09 10:15+0200\n" +"PO-Revision-Date: 2021-04-21 09:20+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14761,10 +14761,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Foutieve systeemsleutel [%1]\n" +msgstr "reg: Foutieve systeemsleutel\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?"

1 0

Rémi Bernon : ntdll/tests: Add committed / reserved thread stack sizes tests.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 94dcca8a0efb5daf8008fdd40652296575e0e331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94dcca8a0efb5daf8008fdd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 31 12:23:36 2021 +0200 ntdll/tests: Add committed / reserved thread stack sizes tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 264 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94dcca8a0efb5daf8008…

1 0

Rémi Bernon : ntdll: Clear the first ~1MB of stack in signal_start_thread.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 96f5968a651609aa22ba482d4b244e6599095735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f5968a651609aa22ba482d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 31 12:23:37 2021 +0200 ntdll: Clear the first ~1MB of stack in signal_start_thread. Instead of the whole stack. Stack creation in virtual_alloc_thread_stack and RtlCreateUserStack, as well as Windows rounding logic, enforce a minimum reserved size of 1MB. There's a few guard and canary pages used on the bottom, plus a few more on the top for initial context, and we have to keep a bit of space if we ever need a stack while doing this, so we clear a bit less than 1MB to be safe. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 9 ++++----- dlls/ntdll/signal_x86_64.c | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 635b8f4de81..59d9e1d0df9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -504,13 +504,12 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, */ __ASM_GLOBAL_FUNC( signal_start_thread, "movl 4(%esp),%esi\n\t" /* context */ - "leal -12(%esi),%ecx\n\t" + "leal -12(%esi),%edi\n\t" /* clear the thread stack */ - "andl $~0xfff,%ecx\n\t" /* round down to page size */ - "movl %fs:8,%edi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ - "addl $0x1000,%edi\n\t" + "andl $~0xfff,%edi\n\t" /* round down to page size */ + "movl $0xf0000,%ecx\n\t" + "subl %ecx,%edi\n\t" "movl %edi,%esp\n\t" - "subl %edi,%ecx\n\t" "xorl %eax,%eax\n\t" "shrl $2,%ecx\n\t" "rep; stosl\n\t" diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d88f7ae553a..c5a6666f4d2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1544,9 +1544,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movq %rcx,%rbx\n\t" /* context */ /* clear the thread stack */ "andq $~0xfff,%rcx\n\t" /* round down to page size */ - "movq %gs:0x30,%rax\n\t" - "movq 0x10(%rax),%rdi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ - "addq $0x2000,%rdi\n\t" + "leaq -0xf0000(%rcx),%rdi\n\t" "movq %rdi,%rsp\n\t" "subq %rdi,%rcx\n\t" "xorl %eax,%eax\n\t"

1 0

Hans Leidekker : kerberos: Move support for SpQueryContextAttributes to the Unix library.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: ed517857444df621e9f2137119c48d787a216e72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed517857444df621e9f21371… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:27 2021 +0200 kerberos: Move support for SpQueryContextAttributes to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 18 +----------------- dlls/kerberos/unixlib.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 3 +++ 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index f3cbf34ee81..61833b4e040 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -927,23 +927,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, X(SECPKG_ATTR_TARGET_INFORMATION); case SECPKG_ATTR_SIZES: { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; - ULONG size_max_signature = 37, size_security_trailer = 49; -#ifdef SONAME_LIBGSSAPI_KRB5 - gss_ctx_id_t ctxt_handle; - - if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_INVALID_HANDLE; - if (is_dce_style_context( ctxt_handle )) - { - size_max_signature = 28; - size_security_trailer = 76; - } -#endif - sizes->cbMaxToken = KERBEROS_MAX_BUF; - sizes->cbMaxSignature = size_max_signature; - sizes->cbBlockSize = 1; - sizes->cbSecurityTrailer = size_security_trailer; - return SEC_E_OK; + return krb5_funcs->query_context_attributes( context, attribute, buffer ); } case SECPKG_ATTR_NEGOTIATION_INFO: { diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 06f0ffc8a04..34da8460406 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -211,6 +211,13 @@ fail: return FALSE; } +static BOOL is_dce_style_context( gss_ctx_id_t ctx ) +{ + OM_uint32 ret, minor_status, flags; + ret = pgss_inquire_context( &minor_status, ctx, NULL, NULL, NULL, NULL, &flags, NULL, NULL ); + return (ret == GSS_S_COMPLETE && (flags & GSS_C_DCE_STYLE)); +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -587,6 +594,45 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg return status_gss_to_sspi( ret ); } +#define KERBEROS_MAX_SIGNATURE 37 +#define KERBEROS_SECURITY_TRAILER 49 +#define KERBEROS_MAX_SIGNATURE_DCE 28 +#define KERBEROS_SECURITY_TRAILER_DCE 76 + +static NTSTATUS CDECL query_context_attributes( LSA_SEC_HANDLE context, ULONG attr, void *buf ) +{ + switch (attr) + { + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buf; + ULONG size_max_signature, size_security_trailer; + gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( context ); + + if (is_dce_style_context( ctx )) + { + size_max_signature = KERBEROS_MAX_SIGNATURE_DCE; + size_security_trailer = KERBEROS_SECURITY_TRAILER_DCE; + } + else + { + size_max_signature = KERBEROS_MAX_SIGNATURE; + size_security_trailer = KERBEROS_SECURITY_TRAILER; + } + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = size_max_signature; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = size_security_trailer; + return SEC_E_OK; + } + default: + FIXME( "unhandled attribute %u\n", attr ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) { OM_uint32 ret, minor_status; @@ -618,6 +664,7 @@ static const struct krb5_funcs funcs = free_credentials_handle, initialize_context, make_signature, + query_context_attributes, verify_signature, }; diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 6a73444aae8..8fd562a28d7 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define KERBEROS_MAX_BUF 12000 + struct krb5_funcs { NTSTATUS (CDECL *accept_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, SecBufferDesc *, LSA_SEC_HANDLE *, @@ -30,6 +32,7 @@ struct krb5_funcs NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); + NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); };

1 0

Hans Leidekker : kerberos: Move support for SpSealMessage to the Unix library.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 9120045653eab18136f92a80b11ea994c0399e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9120045653eab18136f92a80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:28 2021 +0200 kerberos: Move support for SpSealMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 107 +----------------------------------------------- dlls/kerberos/unixlib.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 104 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9120045653eab18136f9…

1 0

Hans Leidekker : kerberos: Move support for SpUnsealMessage to the Unix library.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 44593a6364bb34ed4710c18cd149e5f9037cffb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44593a6364bb34ed4710c18c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:29 2021 +0200 kerberos: Move support for SpUnsealMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 248 +----------------------------------------------- dlls/kerberos/unixlib.c | 76 +++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 78 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44593a6364bb34ed4710…

1 0

Hans Leidekker : kerberos: Move support for KerbQueryTicketCacheMessage to the Unix library.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 0eb53443c8cf5b523fa15e0126e87f869c6ec075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb53443c8cf5b523fa15e01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:30 2021 +0200 kerberos: Move support for KerbQueryTicketCacheMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 428 ++++++------------------------------------------ dlls/kerberos/unixlib.c | 164 +++++++++++++++++++ dlls/kerberos/unixlib.h | 8 + 3 files changed, 219 insertions(+), 381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eb53443c8cf5b523fa1…

1 0

Hans Leidekker : kerberos: Build with msvcrt.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 455e37850be14a45c3cf38075e8ad6e81e3863b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=455e37850be14a45c3cf3807… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:31 2021 +0200 kerberos: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 2 ++ dlls/kerberos/krb5_ap.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index ab5e6b59976..acfd9030955 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,6 +1,8 @@ MODULE = kerberos.dll EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ krb5_ap.c \ unixlib.c diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 792ee974983..6e3135a9f02 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -34,7 +34,6 @@ #include "winternl.h" #include "wine/heap.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(kerberos); @@ -397,8 +396,8 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) { SecPkgInfoW *ret; - DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); - DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities;

1 0

Hans Leidekker : kerberos: Use wide character string literals.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 1a16994a65aac5d1373fac1732602d9cc3f9b6ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a16994a65aac5d1373fac17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:32 2021 +0200 kerberos: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 6e3135a9f02..239d6a1bded 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -61,8 +61,8 @@ const struct krb5_funcs *krb5_funcs = NULL; | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) -static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; -static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static WCHAR kerberos_name_W[] = L"Kerberos"; +static WCHAR kerberos_comment_W[] = L"Microsoft Kerberos V1.0"; static const SecPkgInfoW infoW = { KERBEROS_CAPS,

1 0