February 2021 - Wine-Commits

Steve Lhomme : widl: Never use the namespace ABI prefix for global types.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: a78053743dab9c116d20b0d0ecc48c9e08aa9b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a78053743dab9c116d20b0d0… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:57 2021 +0100 widl: Never use the namespace ABI prefix for global types. Otherwise we end up with types like ABI::IInspectable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 9d0b5576d45..40d987b7a28 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -105,9 +105,10 @@ static size_t append_namespace(char **buf, size_t *len, size_t pos, struct names static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix) { + int nested = namespace && !is_global_namespace(namespace); size_t n = 0; n += strappend(buf, len, pos + n, "%s", prefix); - n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); + if (nested) n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); n += strappend(buf, len, pos + n, "%s", suffix); return n; }

1 0

Steve Lhomme : widl: Define the C type name as an alias for the C++ qualified name.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 18f04f569bbd85734a1cabd32ed250720d15fadf URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f04f569bbd85734a1cabd3… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:59 2021 +0100 widl: Define the C type name as an alias for the C++ qualified name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index 5ab8a3cc26f..e1dcab9b75b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1482,6 +1482,8 @@ static void write_forward(FILE *header, type_t *iface) fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->c_name); fprintf(header, "typedef interface %s %s;\n", iface->c_name, iface->c_name); fprintf(header, "#ifdef __cplusplus\n"); + if (iface->namespace && !is_global_namespace(iface->namespace)) + fprintf(header, "#define %s %s\n", iface->c_name, iface->qualified_name); write_namespace_start(header, iface->namespace); if (strchr(iface->name, '<')) write_line(header, 0, "template<> struct %s;", iface->name); else write_line(header, 0, "interface %s;", iface->name);

1 0

Steve Lhomme : widl: Precompute qualified type names, and use them for C++ interfaces.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: fc533ddf32a8408db3f204dcb449f795bdbd3ce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc533ddf32a8408db3f204dc… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:58 2021 +0100 widl: Precompute qualified type names, and use them for C++ interfaces. This is what MIDL does and avoid mismatching and even fixes some compiling issues. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 ++-- tools/widl/parser.y | 6 ++++++ tools/widl/typetree.c | 15 +++++++++++++++ tools/widl/typetree.h | 1 + tools/widl/widltypes.h | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3c8ad09bd63..5ab8a3cc26f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -465,13 +465,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i case TYPE_INTERFACE: case TYPE_MODULE: case TYPE_COCLASS: - fprintf(h, "%s", name); + fprintf(h, "%s", type_get_qualified_name(t, name_type)); break; case TYPE_RUNTIMECLASS: fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); break; case TYPE_DELEGATE: - fprintf(h, "%s", type_get_name(type_delegate_get_iface(t), name_type)); + fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); break; case TYPE_VOID: fprintf(h, "void"); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4c115adf4ab..eb8035c39bc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2073,9 +2073,15 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt = xmalloc(sizeof(struct rtype)); nt->name = name; if (is_global_namespace(namespace)) + { type->c_name = name; + type->qualified_name = name; + } else + { type->c_name = format_namespace(namespace, "__x_", "_C", name, use_abi_namespace ? "ABI" : NULL); + type->qualified_name = format_namespace(namespace, "", "::", name, use_abi_namespace ? "ABI" : NULL); + } nt->type = type; nt->t = t; nt->next = namespace->type_hash[hash]; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 40d987b7a28..319dd4ae65a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -51,6 +51,7 @@ type_t *make_type(enum type_type type) t->attrs = NULL; t->c_name = NULL; t->signature = NULL; + t->qualified_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -91,6 +92,19 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } +const char *type_get_qualified_name(const type_t *type, enum name_type name_type) +{ + switch(name_type) { + case NAME_DEFAULT: + return type->qualified_name; + case NAME_C: + return type->c_name; + } + + assert(0); + return NULL; +} + static size_t append_namespace(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *separator, const char *abi_prefix) { int nested = namespace && !is_global_namespace(namespace); @@ -820,6 +834,7 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref iface->name = strmake("I%s", delegate->name); if (type) iface->c_name = format_parameterized_type_c_name(type, params, "I"); else iface->c_name = format_namespace(delegate->namespace, "__x_", "_C", iface->name, use_abi_namespace ? "ABI" : NULL); + iface->qualified_name = format_namespace(delegate->namespace, "", "::", iface->name, use_abi_namespace ? "ABI" : NULL); } type_t *type_delegate_declare(char *name, struct namespace *namespace) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index c8bccc2fec9..805e96a9305 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -75,6 +75,7 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t type_t *type_parameterized_type_specialize_define(type_t *type); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); +const char *type_get_qualified_name(const type_t *type, enum name_type name_type); char *gen_name(void); extern int is_attr(const attr_list_t *list, enum attr_type t); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e01bd122b45..81646cae1d1 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -503,6 +503,7 @@ struct _type_t { } details; const char *c_name; const char *signature; + const char *qualified_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

1 0

Hans Leidekker : secur32/tests: Add tests for renegotiating an SSL connection.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 3d1a98f48666e581b4ce0c10a4752f715fa06329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1a98f48666e581b4ce0c10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 16:58:58 2021 +0100 secur32/tests: Add tests for renegotiating an SSL connection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 338 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d1a98f48666e581b4ce…

1 0

Steve Lhomme : widl: Use C name when writing UUID declarations.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 49a1cc10d2db6ed7257b2e3a70d41d09dbff5ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49a1cc10d2db6ed7257b2e3a… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:04:00 2021 +0100 widl: Use C name when writing UUID declarations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e1dcab9b75b..82aad0f11ca 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -135,15 +135,13 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { - char *name = format_namespace(type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", - name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], + type->c_name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); fprintf(f, "#endif\n"); - free(name); } static const char *uuid_string(const UUID *uuid)

1 0

Rémi Bernon : secur32: Return STREAM_HEADER/TRAILER buffers on SEC_I_RENEGOTIATE.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 86ab322377e11f9670c1dc1af1935d1b8f501096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ab322377e11f9670c1dc1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 19 16:58:57 2021 +0100 secur32: Return STREAM_HEADER/TRAILER buffers on SEC_I_RENEGOTIATE. And don't print an error anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2d135a85227..d47c4d79258 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1336,6 +1336,7 @@ static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { + SECURITY_STATUS status = SEC_E_OK; struct schan_context *ctx; SecBuffer *buffer; SIZE_T data_size; @@ -1385,10 +1386,16 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle while (received < data_size) { SIZE_T length = data_size - received; - SECURITY_STATUS status = schan_imp_recv(ctx->session, data + received, &length); + status = schan_imp_recv(ctx->session, data + received, &length); + + if (status == SEC_I_RENEGOTIATE) + break; if (status == SEC_I_CONTINUE_NEEDED) + { + status = SEC_E_OK; break; + } if (status != SEC_E_OK) { @@ -1421,7 +1428,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer->BufferType = SECBUFFER_STREAM_HEADER; buffer->cbBuffer = 5; - return SEC_E_OK; + return status; } static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context_handle)

1 0

Alexandre Julliard : ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: d89b304eb703a7eb0eefb3b759497a7747f5cc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89b304eb703a7eb0eefb3b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 17:20:02 2021 +0100 ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3ea315d83da..a166a6cc071 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2898,41 +2898,26 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count #elif defined(__arm__) case IMAGE_REL_BASED_THUMB_MOV32: { - DWORD inst = *(INT_PTR *)((char *)page + offset); - DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - DWORD hi_delta; - - if ((inst & 0x8000fbf0) != 0x0000f240) - ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); - - imm16 += LOWORD(delta); - hi_delta = HIWORD(delta) + HIWORD(imm16); - *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - - if (hi_delta != 0) - { - inst = *(INT_PTR *)((char *)page + offset + 4); - imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - - if ((inst & 0x8000fbf0) != 0x0000f2c0) - ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - - imm16 += hi_delta; - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); - *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + - ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - } - } + DWORD *inst = (DWORD *)((char *)page + offset); + WORD lo = ((inst[0] << 1) & 0x0800) + ((inst[0] << 12) & 0xf000) + + ((inst[0] >> 20) & 0x0700) + ((inst[0] >> 16) & 0x00ff); + WORD hi = ((inst[1] << 1) & 0x0800) + ((inst[1] << 12) & 0xf000) + + ((inst[1] >> 20) & 0x0700) + ((inst[1] >> 16) & 0x00ff); + DWORD imm = MAKELONG( lo, hi ) + delta; + + lo = LOWORD( imm ); + hi = HIWORD( imm ); + + if ((inst[0] & 0x8000fbf0) != 0x0000f240 || (inst[1] & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction @%p %08x:%08x, expected MOVW/MOVT\n", + inst, inst[0], inst[1] ); + + inst[0] = (inst[0] & 0x8f00fbf0) + ((lo >> 1) & 0x0400) + ((lo >> 12) & 0x000f) + + ((lo << 20) & 0x70000000) + ((lo << 16) & 0xff0000); + inst[1] = (inst[1] & 0x8f00fbf0) + ((hi >> 1) & 0x0400) + ((hi >> 12) & 0x000f) + + ((hi << 20) & 0x70000000) + ((hi << 16) & 0xff0000); break; + } #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type);

1 0

Alexandre Julliard : ntdll: Print the version mismatch error from the Unix side.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 3f3f673c29937e8bdec2de590b21b18a1747f398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3f673c29937e8bdec2de59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 15:24:49 2021 +0100 ntdll: Print the version mismatch error from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/unix/process.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index abc2c3f828c..3ea315d83da 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4108,7 +4108,7 @@ static NTSTATUS process_init(void) */ NTSTATUS CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) { - assert( version == NTDLL_UNIXLIB_VERSION ); + if (version != NTDLL_UNIXLIB_VERSION) return STATUS_REVISION_MISMATCH; unix_funcs = funcs; return process_init(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6b7cbcd9c1a..083a3a82a1d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -701,6 +701,9 @@ done: case STATUS_INVALID_IMAGE_NOT_MZ: ERR( "%s not supported on this system\n", debugstr_us(&params->ImagePathName) ); break; + case STATUS_REVISION_MISMATCH: + ERR( "ntdll library version mismatch\n" ); + break; default: ERR( "failed to load %s error %x\n", debugstr_us(&params->ImagePathName), status ); break;

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetInlineObject().
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 352df1151636e580113171b4bbd79a4b761556f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352df1151636e580113171b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:47 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetInlineObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7b9d521c29a..3793f1ed8cb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3542,9 +3542,6 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout4 *iface TRACE("%p, %u, %p, %p.\n", iface, position, object, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *object = range->object; if (*object) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8d74056af2f..b37cdfbf5ba 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6224,11 +6224,9 @@ todo_wine object = NULL; hr = IDWriteTextLayout_GetInlineObject(layout, 10, &object, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); - if (object) - IDWriteInlineObject_Release(object); + IDWriteInlineObject_Release(object); range.startPosition = 0; range.length = ~0u;

1 0

Nikolay Sivov : dwrite/layout: Check text range boundaries when setting properties.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 4fd206adba28979f2ea31089af93bff5c4b0cabb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd206adba28979f2ea31089… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:45 2021 +0300 dwrite/layout: Check text range boundaries when setting properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 + dlls/dwrite/tests/layout.c | 386 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 389 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd206adba28979f2ea3…

1 0