December 2021 - Wine-commits

Nikolay Sivov : include: Add print document package interfaces.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: f3977dc886e723487d2d35908663b31d3fc54139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3977dc886e723487d2d3590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 3 17:13:15 2021 +0300 include: Add print document package interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/documenttarget.idl | 113 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a869ae4bc73..c99b0e1e1c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -245,6 +245,7 @@ SOURCES = \ dmusics.h \ docobj.idl \ docobjectservice.idl \ + documenttarget.idl \ downloadmgr.idl \ dpaddr.h \ dpfilter.h \ diff --git a/include/documenttarget.idl b/include/documenttarget.idl new file mode 100644 index 00000000000..17c7cefe5b5 --- /dev/null +++ b/include/documenttarget.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +[ + object, + uuid(1b8efec4-3019-4c27-964e-367202156906), +] +interface IPrintDocumentPackageTarget : IUnknown +{ + HRESULT GetPackageTargetTypes( + [out] UINT32 *targetCount, + [out, size_is(, *targetCount)] GUID **targetTypes + ); + + HRESULT GetPackageTarget( + [in] REFGUID guidTargetType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvTarget + ); + + HRESULT Cancel(); +} + +typedef [v1_enum] enum PrintDocumentPackageCompletion +{ + PrintDocumentPackageCompletion_InProgress, + PrintDocumentPackageCompletion_Completed, + PrintDocumentPackageCompletion_Canceled, + PrintDocumentPackageCompletion_Failed +} PrintDocumentPackageCompletion; + +typedef struct +{ + UINT32 JobId; + INT32 CurrentDocument; + INT32 CurrentPage; + INT32 CurrentPageTotal; + PrintDocumentPackageCompletion Completion; + HRESULT PackageStatus; +} PrintDocumentPackageStatus; + +[ + object, + dual, + nonextensible, + uuid(ed90c8ad-5c34-4d05-a1ec-0e8a9b3ad7af), +] +interface IPrintDocumentPackageStatusEvent : IDispatch +{ + [id(1)] + HRESULT PackageStatusUpdated( + [in] PrintDocumentPackageStatus *packageStatus + ); +} + +[ + object, + uuid(d2959bf7-b31b-4a3d-9600-712eb1335ba4), +] +interface IPrintDocumentPackageTargetFactory : IUnknown +{ + HRESULT CreateDocumentPackageTargetForPrintJob( + [in, string] LPCWSTR printerName, + [in, string] LPCWSTR jobName, + [in] IStream *jobOutputStream, + [in] IStream *jobPrintTicketStream, + [out] IPrintDocumentPackageTarget **docPackageTarget + ); +} + +[ + version(1.0), + uuid(410d76f7-8bb5-4a7d-9d37-9c71b1b14d14), +] +library PrintDocumentTargetLib +{ + +[ + noncreatable, + uuid(4842669e-9947-46ea-8ba2-d8cce432c2ca), +] +coclass PrintDocumentPackageTarget +{ + [default] interface IPrintDocumentPackageTarget; + [source] dispinterface IPrintDocumentPackageStatusEvent; +} + +[ + uuid(348ef17d-6c81-4982-92b4-ee188a43867a) +] +coclass PrintDocumentPackageTargetFactory +{ + [default] interface IPrintDocumentPackageTargetFactory; +} + +} /* library */

1 0

Hans Leidekker : bcrypt: Return export size from export_gnutls_datum().
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: a226331851f1b9e1df503e6dbaccfd004e2a4182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a226331851f1b9e1df503e6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:28 2021 +0100 bcrypt: Return export size from export_gnutls_datum(). And make zero padding explicit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 77 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c94577f8acd..3a1eff1e7bd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -585,32 +585,31 @@ static NTSTATUS key_symmetric_destroy( void *args ) return STATUS_SUCCESS; } -static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d, BOOL zero_pad ) { ULONG size = d->size; UCHAR *src = d->data; - ULONG offset; + ULONG offset = 0; - assert( size <= length + 1 ); - if (size == length + 1) + assert( size <= buflen + 1 ); + if (size == buflen + 1) { - assert(!src[0]); - ++src; - --size; + assert( !src[0] ); + src++; + size--; } - if (actual_length) + if (zero_pad) { - offset = 0; - *actual_length = size; + offset = buflen - size; + if (buffer) memset( buffer, 0, offset ); + size = buflen; } - else - { - offset = length - size; - memset( buffer, 0, offset ); - } - memcpy( buffer + offset, src, size ); + + if (buffer) memcpy( buffer + offset, src, size ); + return size; } +#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; @@ -624,19 +623,19 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_INTERNAL_ERROR; } - if (*pubkey_len < sizeof(*rsa_blob) + e.size + m.size) + if (*pubkey_len < sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1)) { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, (ULONG)sizeof(*rsa_blob) + e.size + m.size ); + FIXME( "wrong pubkey len %u\n", *pubkey_len ); pgnutls_perror( ret ); free( e.data ); free( m.data ); return STATUS_BUFFER_TOO_SMALL; } dst = (UCHAR *)(rsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); + rsa_blob->cbPublicExp = export_gnutls_datum( dst, bitlen / 8, &e, 0 ); dst += rsa_blob->cbPublicExp; - export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); + rsa_blob->cbModulus = export_gnutls_datum( dst, bitlen / 8, &m, 1 ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; @@ -699,10 +698,10 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; @@ -738,16 +737,16 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(dsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); dst = dsa_blob->q; - export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, NULL ); + export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 ); dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; dsa_blob->cbKey = bitlen / 8; @@ -813,19 +812,19 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons dsskey->bitlen = bitlen; dst = (UCHAR *)(dsskey + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, Q_SIZE, &q, NULL ); + export_gnutls_datum( dst, Q_SIZE, &q, 1 ); reverse_bytes( dst, Q_SIZE ); dst += Q_SIZE; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; @@ -962,13 +961,13 @@ static NTSTATUS key_export_ecc( void *args ) ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); dst += size; - export_gnutls_datum( dst, size, &d, NULL ); + export_gnutls_datum( dst, size, &d, 1 ); } free( x.data ); free( y.data ); free( d.data ); @@ -1101,19 +1100,19 @@ static NTSTATUS key_export_dsa_capi( void *args ) pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - export_gnutls_datum( dst, size, &p, NULL ); + export_gnutls_datum( dst, size, &p, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &q, NULL ); + export_gnutls_datum( dst, 20, &q, 1 ); reverse_bytes( dst, 20 ); dst += 20; - export_gnutls_datum( dst, size, &g, NULL ); + export_gnutls_datum( dst, size, &g, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &x, NULL ); + export_gnutls_datum( dst, 20, &x, 1 ); reverse_bytes( dst, 20 ); dst += 20; @@ -1571,8 +1570,8 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output) { - export_gnutls_datum( output, sig_len / 2, &r, NULL ); - export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, NULL ); + export_gnutls_datum( output, sig_len / 2, &r, 1 ); + export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, 1 ); } free( r.data ); free( s.data );

1 0

Hans Leidekker : bcrypt: Add support for exporting RSA private keys.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 2795c7f99509a740dffa88b50acd689592a8da7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2795c7f99509a740dffa88b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:29 2021 +0100 bcrypt: Add support for exporting RSA private keys. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52060 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 + dlls/bcrypt/bcrypt_main.c | 15 +++- dlls/bcrypt/gnutls.c | 88 +++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 157 +++++++++++++++++++++++++++++++++++++++++- include/bcrypt.h | 2 + 5 files changed, 258 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2795c7f99509a740dffa…

1 0

Hans Leidekker : bcrypt/tests: Link directly to functions available since Windows 7.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: e6da4eed7e14cc6f8ade7f179b32d9d668827385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6da4eed7e14cc6f8ade7f17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:30 2021 +0100 bcrypt/tests: Link directly to functions available since Windows 7. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 886 +++++++++++++++++++++------------------------ 1 file changed, 405 insertions(+), 481 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6da4eed7e14cc6f8ade…

1 0

Hans Leidekker : bcrypt: Use CRT memory allocators.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: ab4edfd8621d4811ce9a74d066eef0904a45a74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4edfd8621d4811ce9a74d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:31 2021 +0100 bcrypt: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 90 +++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab4edfd8621d4811ce9a…

1 0

Paul Gofman : ntdll: Set rcx on exit from syscall dispatcher on x64.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 3f20261eaf188e923d0b4c5df854204088ed0dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f20261eaf188e923d0b4c5d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 1 15:38:18 2021 +0300 ntdll: Set rcx on exit from syscall dispatcher on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 11 +++--- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5ebb6f25f8b..dd4f4a35344 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4916,6 +4916,81 @@ static void test_unwind_from_apc(void) ok(pass == 4, "Got unexpected pass %d.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } + +static void test_syscall_clobbered_regs(void) +{ + struct regs + { + UINT64 rcx; + }; + static const BYTE code[] = + { + 0x48, 0x8d, 0x05, 0x00, 0x10, 0x00, 0x00, + /* leaq 0x1000(%rip),%rax */ + 0x48, 0x25, 0x00, 0xf0, 0xff, 0xff, + /* andq $~0xfff,%rax */ + 0x48, 0x83, 0xe8, 0x08, /* subq $8,%rax */ + 0x48, 0x89, 0x20, /* movq %rsp,0(%rax) */ + 0x48, 0x89, 0xc4, /* movq %rax,%rsp */ + 0x41, 0x50, /* push %r8 */ + 0x53, 0x55, 0x57, 0x56, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, + /* push %rbx, %rbp, %rdi, %rsi, %r12, %r13, %r14, %r15 */ + 0x41, 0xff, 0xd1, /* callq *r9 */ + 0x41, 0x5f, 0x41, 0x5e, 0x41, 0x5d, 0x41, 0x5c, 0x5e, 0x5f, 0x5d, 0x5b, + /* pop %r15, %r14, %r13, %r12, %rsi, %rdi, %rbp, %rbx */ + 0x41, 0x58, /* pop %r8 */ + 0x49, 0x89, 0x48, 0x00, /* mov %rcx,(%r8) */ + 0x5c, /* pop %rsp */ + 0xc3, /* ret */ + }; + + NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); + NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + struct regs regs; + CONTEXT context; + NTSTATUS status; + + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); + ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + memset(&regs, 0, sizeof(regs)); + status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + /* After the syscall instruction rcx contains the address of the instruction next after syscall. */ + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + context.ContextFlags = CONTEXT_CONTROL; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + context.ContextFlags = CONTEXT_INTEGER; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20, + "Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread); + +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10657,6 +10732,7 @@ START_TEST(exception) test_extended_context(); test_copy_context(); test_unwind_from_apc(); + test_syscall_clobbered_regs(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9972faf799c..9e9a96db832 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3226,18 +3226,21 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" "movq 0x88(%rcx),%rsp\n\t" - "jmpq *0x70(%rcx)\n" /* frame->rip */ + "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ + "jmpq *%rcx\n\t" "1:\tleaq 0x70(%rcx),%rsp\n\t" "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ - "jz 1f\n\t" - "movq 0x00(%rcx),%rax\n\t" + "jnz 1f\n\t" + "movq (%rsp),%rcx\n\t" /* frame->rip */ + "iretq\n" + "1:\tmovq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%rdx\n\t" "movq 0x30(%rcx),%r8\n\t" "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" "movq 0x10(%rcx),%rcx\n" - "1:\tiretq\n" + "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t"

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: b3bea80d61cc314401282891cd55235cd6770d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bea80d61cc314401282891… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Thu Dec 2 20:40:31 2021 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 118 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3bea80d61cc31440128…

1 0

Alexandre Julliard : Release 6.23.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 3f6102080e632b9f4d8a97c0f0b1231fbd8e759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f6102080e632b9f4d8a97c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1076 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 550 insertions(+), 547 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6102080e632b9f4d8a…

1 0

Tag wine-6.23 : Alexandre Julliard : Release 6.23
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: refs/tags/wine-6.23 Tag: c7086213cbb4c55c082a699e12054873974af70d URL: https://source.winehq.org/git/wine.git/?a=tag;h=c7086213cbb4c55c082a699e120… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23

1 0

Zebediah Figura : configure: Try to detect MinGW libtiff using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 089dd8560b2518f7dfdda8ef5276d896589f3ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=089dd8560b2518f7dfdda8ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:08 2021 -0600 configure: Try to detect MinGW libtiff using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index ffde96cb40e..4fc23fb058d 100755 --- a/configure +++ b/configure @@ -12904,6 +12904,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version." fi + if ${TIFF_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + TIFF_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libtiff-4 2>/dev/null` +fi +fi +if ${TIFF_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + TIFF_PE_LIBS=`$MINGW_PKG_CONFIG --libs libtiff-4 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $TIFF_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW tiffio.h" >&5 +printf %s "checking for MinGW tiffio.h... " >&6; } +if test ${ac_cv_mingw_header_tiffio_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <tiffio.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_tiffio_h=yes +else $as_nop + ac_cv_mingw_header_tiffio_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_tiffio_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_tiffio_h" >&6; } +if test "x$ac_cv_mingw_header_tiffio_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in MinGW -ltiff" >&5 +printf %s "checking for TIFFClientOpen in MinGW -ltiff... " >&6; } +if test ${ac_cv_mingw_lib_tiff+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-ltiff $TIFF_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char TIFFClientOpen (); +int +main (void) +{ +return TIFFClientOpen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_tiff=yes +else $as_nop + ac_cv_mingw_lib_tiff=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_tiff" >&5 +printf "%s\n" "$ac_cv_mingw_lib_tiff" >&6; } +if test "x$ac_cv_mingw_lib_tiff" = xyes +then : + : +else $as_nop + TIFF_PE_CFLAGS=""; TIFF_PE_LIBS="" +fi +else $as_nop + TIFF_PE_CFLAGS=""; TIFF_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$TIFF_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libtiff ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index d6c57bd41ad..e935a5ae27e 100644 --- a/configure.ac +++ b/configure.ac @@ -1082,6 +1082,15 @@ then WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(TIFF,[libtiff-4],, + [WINE_CHECK_MINGW_HEADER(tiffio.h, + [WINE_CHECK_MINGW_LIB(tiff,TIFFClientOpen,[:],[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""],[$TIFF_PE_LIBS])], + [TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])]) + if test "x$TIFF_PE_LIBS" = "x" + then + WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0