February 2021 - Wine-Commits

Rémi Bernon : widl: Add explicit namespace parameter to find_type_or_error.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: f76f3d152fbe9ed09bde19bfba741090528e045c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f76f3d152fbe9ed09bde19bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:43 2021 +0100 widl: Add explicit namespace parameter to find_type_or_error. 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/parser.y | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2d527805c14..17a3727b114 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -75,7 +75,7 @@ static void append_chain_callconv(type_t *chain, char *callconv); static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type_or_error(const char *name); +static type_t *find_type_or_error(struct namespace *parent, const char *name); static var_t *reg_const(var_t *var); @@ -858,17 +858,17 @@ typename: aIDENTIFIER ident: typename { $$ = make_var($1); } ; -base_type: tBYTE { $$ = find_type_or_error($<str>1); } - | tWCHAR { $$ = find_type_or_error($<str>1); } +base_type: tBYTE { $$ = find_type_or_error(NULL, $<str>1); } + | tWCHAR { $$ = find_type_or_error(NULL, $<str>1); } | int_std | tSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), -1); } | tUNSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), 1); } | tUNSIGNED { $$ = type_new_int(TYPE_BASIC_INT, 1); } - | tFLOAT { $$ = find_type_or_error($<str>1); } - | tDOUBLE { $$ = find_type_or_error($<str>1); } - | tBOOLEAN { $$ = find_type_or_error($<str>1); } - | tERRORSTATUST { $$ = find_type_or_error($<str>1); } - | tHANDLET { $$ = find_type_or_error($<str>1); } + | tFLOAT { $$ = find_type_or_error(NULL, $<str>1); } + | tDOUBLE { $$ = find_type_or_error(NULL, $<str>1); } + | tBOOLEAN { $$ = find_type_or_error(NULL, $<str>1); } + | tERRORSTATUST { $$ = find_type_or_error(NULL, $<str>1); } + | tHANDLET { $$ = find_type_or_error(NULL, $<str>1); } ; m_int: @@ -887,12 +887,12 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } ; qualified_seq: - aKNOWNTYPE { $$ = find_type_or_error($1); } + aKNOWNTYPE { $$ = find_type_or_error(lookup_namespace, $1); } | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } ; qualified_type: - aKNOWNTYPE { $$ = find_type_or_error($1); } + aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } ; @@ -965,7 +965,7 @@ interfacedef: attributes interface inherit * definition of a derived class, I'll try to support it with this rule */ | attributes interface ':' aIDENTIFIER '{' import int_statements '}' - semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error($4), $7); } + semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error(current_namespace, $4), $7); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -1189,14 +1189,14 @@ acf_int_statements acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' - { type_t *type = find_type_or_error($3); + { type_t *type = find_type_or_error(current_namespace, $3); type->attrs = append_attr_list(type->attrs, $2); } ; acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' - { type_t *iface = find_type_or_error($3); + { type_t *iface = find_type_or_error(current_namespace, $3); if (type_get_type(iface) != TYPE_INTERFACE) error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); @@ -2034,13 +2034,12 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) return NULL; } -static type_t *find_type_or_error(const char *name) +static type_t *find_type_or_error(struct namespace *namespace, const char *name) { type_t *type; - if (!(type = find_type(name, current_namespace, 0)) && - !(type = find_type(name, lookup_namespace, 0))) + if (!(type = find_type(name, namespace, 0))) { - error_loc("type '%s' not found\n", name); + error_loc("type '%s' not found in %s namespace\n", name, namespace && namespace->name ? namespace->name : "global"); return NULL; } return type; @@ -2851,7 +2850,7 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->declspec.type = find_type_or_error("handle_t"); + idl_handle->declspec.type = find_type_or_error(NULL, "handle_t"); type_function_add_head_arg(func->declspec.type, idl_handle); } } @@ -3141,7 +3140,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls, int declonl LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type_or_error(var->name); + type_t *type = find_type_or_error(current_namespace, var->name); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL;

1 0

Nikolay Sivov : dwrite: Track attachment chain during cursive positioning.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: db3a258f97fc784ba8e579084e7e3ee17644df2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3a258f97fc784ba8e57908… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 8 10:09:40 2021 +0300 dwrite: Track attachment chain during cursive positioning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 ++ dlls/dwrite/opentype.c | 106 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ac870fd215c..fa36e92bde5 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -517,6 +517,8 @@ struct shaping_glyph_info unsigned int mask; /* Derived from glyph class, supplied by GDEF. */ unsigned int props; + /* Used for GPOS mark and cursive attachments. */ + int attach_chain; /* Only relevant for isClusterStart glyphs. Indicates text position for this cluster. */ unsigned int start_text_idx; }; @@ -649,6 +651,7 @@ struct scriptshaping_context unsigned int auto_zwj; unsigned int auto_zwnj; struct shaping_glyph_info *glyph_infos; + unsigned int has_gpos_attachment : 1; unsigned int cur; unsigned int glyph_count; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index dc5fb3f11e8..5fd341e8c94 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -470,21 +470,31 @@ enum gsub_gpos_lookup_flags LOOKUP_FLAG_IGNORE_BASE = 0x2, LOOKUP_FLAG_IGNORE_LIGATURES = 0x4, LOOKUP_FLAG_IGNORE_MARKS = 0x8, - LOOKUP_FLAG_IGNORE_MASK = 0xe, + LOOKUP_FLAG_IGNORE_MASK = 0xe, /* Combined LOOKUP_FLAG_IGNORE_* flags. */ LOOKUP_FLAG_USE_MARK_FILTERING_SET = 0x10, LOOKUP_FLAG_MARK_ATTACHMENT_TYPE = 0xff00, }; +enum attach_type +{ + GLYPH_ATTACH_NONE = 0, + GLYPH_ATTACH_CURSIVE, +}; + enum glyph_prop_flags { GLYPH_PROP_BASE = LOOKUP_FLAG_IGNORE_BASE, GLYPH_PROP_LIGATURE = LOOKUP_FLAG_IGNORE_LIGATURES, GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, + GLYPH_PROP_ZWNJ = 0x10, GLYPH_PROP_ZWJ = 0x20, GLYPH_PROP_IGNORABLE = 0x40, GLYPH_PROP_HIDDEN = 0x80, + + GLYPH_PROP_MARK_ATTACH_CLASS_MASK = 0xff00, /* Used with LOOKUP_FLAG_MARK_ATTACHMENT_TYPE. */ + GLYPH_PROP_ATTACH_TYPE_MASK = 0xff0000, }; enum gpos_lookup_type @@ -4036,6 +4046,43 @@ static void opentype_layout_gpos_get_anchor(const struct scriptshaping_context * WARN("Unknown anchor format %u.\n", format); } +static void opentype_set_glyph_attach_type(struct scriptshaping_context *context, unsigned int idx, + enum attach_type attach_type) +{ + context->glyph_infos[idx].props &= ~GLYPH_PROP_ATTACH_TYPE_MASK; + context->glyph_infos[idx].props |= attach_type << 16; +} + +static enum attach_type opentype_get_glyph_attach_type(const struct scriptshaping_context *context, unsigned int idx) +{ + return (context->glyph_infos[idx].props >> 16) & 0xff; +} + +static void opentype_reverse_cursive_offset(struct scriptshaping_context *context, unsigned int i, + unsigned int new_parent) +{ + enum attach_type type = opentype_get_glyph_attach_type(context, i); + int chain = context->glyph_infos[i].attach_chain; + unsigned int j; + + if (!chain || type != GLYPH_ATTACH_CURSIVE) + return; + + context->glyph_infos[i].attach_chain = 0; + + j = (int)i + chain; + if (j == new_parent) + return; + + opentype_reverse_cursive_offset(context, j, new_parent); + + /* FIXME: handle vertical flow direction */ + context->offsets[j].ascenderOffset = -context->offsets[i].ascenderOffset; + + context->glyph_infos[j].attach_chain = -chain; + opentype_set_glyph_attach_type(context, j, type); +} + static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -4049,9 +4096,10 @@ static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_c { WORD coverage_offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gpos_cursive_format1, coverage)); - unsigned int glyph_index, entry_count, entry_anchor, exit_anchor; + unsigned int glyph_index, entry_count, entry_anchor, exit_anchor, child, parent; float entry_x, entry_y, exit_x, exit_y, delta; struct glyph_iterator prev_iter; + float y_offset; if (!coverage_offset) return FALSE; @@ -4100,9 +4148,28 @@ static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_c } if (lookup->flags & LOOKUP_FLAG_RTL) - context->offsets[prev_iter.pos].ascenderOffset = entry_y - exit_y; + { + y_offset = entry_y - exit_y; + child = prev_iter.pos; + parent = context->cur; + } else - context->offsets[context->cur].ascenderOffset = exit_y - entry_y; + { + y_offset = exit_y - entry_y; + child = context->cur; + parent = prev_iter.pos; + } + + opentype_reverse_cursive_offset(context, child, parent); + + context->offsets[child].ascenderOffset = y_offset; + + opentype_set_glyph_attach_type(context, child, GLYPH_ATTACH_CURSIVE); + context->glyph_infos[child].attach_chain = (int)parent - (int)child; + context->has_gpos_attachment = 1; + + if (context->glyph_infos[parent].attach_chain == -context->glyph_infos[child].attach_chain) + context->glyph_infos[parent].attach_chain = 0; context->cur++; } @@ -4153,7 +4220,6 @@ static BOOL opentype_layout_apply_mark_array(struct scriptshaping_context *conte context->offsets[context->cur].advanceOffset = mark_x - base_x; else context->offsets[context->cur].advanceOffset = -context->advances[glyph_pos] + base_x - mark_x; - context->offsets[context->cur].ascenderOffset = base_y - mark_y; context->cur++; @@ -4711,6 +4777,30 @@ static void opentype_layout_apply_gpos_context_lookup(struct scriptshaping_conte opentype_layout_apply_gpos_lookup(context, &lookup); } +static void opentype_propagate_attachment_offsets(struct scriptshaping_context *context, unsigned int i) +{ + enum attach_type type = opentype_get_glyph_attach_type(context, i); + int chain = context->glyph_infos[i].attach_chain; + unsigned int j; + + if (!chain) + return; + + context->glyph_infos[i].attach_chain = 0; + + j = (int)i + chain; + if (j >= context->glyph_count) + return; + + opentype_propagate_attachment_offsets(context, j); + + if (type == GLYPH_ATTACH_CURSIVE) + { + /* FIXME: handle vertical direction. */ + context->offsets[i].ascenderOffset += context->offsets[j].ascenderOffset; + } +} + void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, struct shaping_features *features) { @@ -4751,6 +4841,12 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, } heap_free(lookups.lookups); + + if (context->has_gpos_attachment) + { + for (i = 0; i < context->glyph_count; ++i) + opentype_propagate_attachment_offsets(context, i); + } } static void opentype_layout_replace_glyph(struct scriptshaping_context *context, UINT16 glyph)

1 0

Zebediah Figura : ntdll: Check the output buffer length in NtAccessCheck().
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: be98f67f10c26b46acbf2fe98ea764c27efd3612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be98f67f10c26b46acbf2fe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 19:50:11 2021 -0600 ntdll: Check the output buffer length in NtAccessCheck(). Based on a patch by Qian Hong. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 20 ++++++-------------- dlls/ntdll/unix/security.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 764e0bb5ef6..e6d2f565943 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1368,11 +1368,11 @@ static void test_AccessCheck(void) ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); - todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + ok(ntret == STATUS_BUFFER_TOO_SMALL, "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); ok(err == 0xdeadbeef, "NtAccessCheck shouldn't set last error, got %d\n", err); - todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); @@ -1383,11 +1383,11 @@ static void test_AccessCheck(void) ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); - todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + ok(ntret == STATUS_BUFFER_TOO_SMALL, "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); ok(err == 0xdeadbeef, "NtAccessCheck shouldn't set last error, got %d\n", err); - todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } @@ -1517,11 +1517,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1532,11 +1530,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1544,16 +1540,16 @@ todo_wine SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed; PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + PrivSet->PrivilegeCount = 0xdeadbeef; ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(PrivSet->PrivilegeCount == 0xdeadbeef, "buffer contents should not be changed\n"); /* Valid PrivSet with minimal sufficient PrivSetLen */ SetLastError(0xdeadbeef); @@ -1630,11 +1626,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1645,11 +1639,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 0134b80e148..8838ca13ee4 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -709,11 +709,13 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ data_size_t len; OBJECT_ATTRIBUTES attr; NTSTATUS status; + ULONG priv_len; TRACE( "(%p, %p, %08x, %p, %p, %p, %p, %p)\n", descr, token, access, mapping, privs, retlen, access_granted, access_status ); if (!privs || !retlen) return STATUS_ACCESS_VIOLATION; + priv_len = *retlen; /* reuse the object attribute SD marshalling */ InitializeObjectAttributes( &attr, NULL, 0, 0, descr ); @@ -728,16 +730,20 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ req->mapping.exec = mapping->GenericExecute; req->mapping.all = mapping->GenericAll; wine_server_add_data( req, objattr + 1, objattr->sd_len ); - wine_server_set_reply( req, privs->Privilege, *retlen - offsetof( PRIVILEGE_SET, Privilege ) ); + wine_server_set_reply( req, privs->Privilege, priv_len - offsetof( PRIVILEGE_SET, Privilege ) ); status = wine_server_call( req ); if (status == STATUS_SUCCESS) { *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); - privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); - *access_status = reply->access_status; - *access_granted = reply->access_granted; + if (priv_len >= *retlen) + { + privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); + *access_status = reply->access_status; + *access_granted = reply->access_granted; + } + else status = STATUS_BUFFER_TOO_SMALL; } } SERVER_END_REQ;

1 0

Alexandre Julliard : server: Get the process entry point from the exe image info.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: a3c92a02cc7014cfdb1f90f1d070037868067097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c92a02cc7014cfdb1f90f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 12:10:49 2021 +0100 server: Get the process entry point from the exe image info. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 6 ++---- include/wine/server_protocol.h | 9 ++++----- server/process.c | 21 +++++++++++++++------ server/protocol.def | 4 +--- server/request.h | 10 ++++------ server/trace.c | 6 ++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 7b469959f66..6af8effe9e1 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1587,7 +1587,7 @@ void server_init_process_done(void) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = get_exe_nt_header(); - void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; + void *entry; NTSTATUS status; int suspend, needs_close, unixdir; @@ -1613,11 +1613,9 @@ void server_init_process_done(void) /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) { - req->module = wine_server_client_ptr( peb->ImageBaseAddress ); - req->entry = wine_server_client_ptr( entry ); - req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); suspend = reply->suspend; + entry = wine_server_get_ptr( reply->entry ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af9fa7a427f..c848b71423c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -900,15 +900,14 @@ struct get_startup_info_reply struct init_process_done_request { struct request_header __header; - int gui; - mod_handle_t module; - client_ptr_t entry; + char __pad_12[4]; }; struct init_process_done_reply { struct reply_header __header; + client_ptr_t entry; int suspend; - char __pad_12[4]; + char __pad_20[4]; }; @@ -6280,7 +6279,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 669 +#define SERVER_PROTOCOL_VERSION 670 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index ff3b47455d2..225a9e4f761 100644 --- a/server/process.c +++ b/server/process.c @@ -1349,31 +1349,40 @@ DECL_HANDLER(init_process_done) { struct process_dll *dll; struct process *process = current->process; + struct memory_view *view; + client_ptr_t base; + const pe_image_info_t *image_info; if (is_process_init_done(process)) { set_error( STATUS_INVALID_PARAMETER ); return; } - if (!(dll = find_process_dll( process, req->module ))) + if (!(view = get_exe_view( process ))) { set_error( STATUS_DLL_NOT_FOUND ); return; } + if (!(image_info = get_view_image_info( view, &base ))) return; - /* main exe is the first in the dll list */ - list_remove( &dll->entry ); - list_add_head( &process->dlls, &dll->entry ); + if ((dll = find_process_dll( process, base ))) + { + /* main exe is the first in the dll list */ + list_remove( &dll->entry ); + list_add_head( &process->dlls, &dll->entry ); + } process->start_time = current_time; - current->entry_point = req->entry; + current->entry_point = image_info->entry_point; init_process_tracing( process ); generate_startup_debug_events( process ); set_process_startup_state( process, STARTUP_DONE ); - if (req->gui) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); + if (image_info->subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI) + process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); if (process->debug_obj) set_process_debug_flag( process, 1 ); + reply->entry = image_info->entry_point; reply->suspend = (current->suspend || process->suspend); } diff --git a/server/protocol.def b/server/protocol.def index 76e7a5b941d..9fbe02f2f99 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -882,10 +882,8 @@ typedef struct /* Signal the end of the process initialization */ @REQ(init_process_done) - int gui; /* is it a GUI process? */ - mod_handle_t module; /* main module base address */ - client_ptr_t entry; /* process entry point */ @REPLY + client_ptr_t entry; /* process entry point */ int suspend; /* is process suspended? */ @END diff --git a/server/request.h b/server/request.h index 02c6121d291..39ba4377fd1 100644 --- a/server/request.h +++ b/server/request.h @@ -748,12 +748,10 @@ C_ASSERT( sizeof(struct new_thread_reply) == 16 ); C_ASSERT( sizeof(struct get_startup_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 8 ); C_ASSERT( sizeof(struct get_startup_info_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_request, gui) == 12 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_request, module) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 24 ); -C_ASSERT( sizeof(struct init_process_done_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 8 ); -C_ASSERT( sizeof(struct init_process_done_reply) == 16 ); +C_ASSERT( sizeof(struct init_process_done_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, entry) == 8 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 16 ); +C_ASSERT( sizeof(struct init_process_done_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, debug_level) == 20 ); diff --git a/server/trace.c b/server/trace.c index 53c5836ef22..e8636013b0e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1420,14 +1420,12 @@ static void dump_get_startup_info_reply( const struct get_startup_info_reply *re static void dump_init_process_done_request( const struct init_process_done_request *req ) { - fprintf( stderr, " gui=%d", req->gui ); - dump_uint64( ", module=", &req->module ); - dump_uint64( ", entry=", &req->entry ); } static void dump_init_process_done_reply( const struct init_process_done_reply *req ) { - fprintf( stderr, " suspend=%d", req->suspend ); + dump_uint64( " entry=", &req->entry ); + fprintf( stderr, ", suspend=%d", req->suspend ); } static void dump_init_first_thread_request( const struct init_first_thread_request *req )

1 0

Alexandre Julliard : server: Implement retrieving the debug object of a process.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 52d733b5c4876276d7a2dfc8d9a9bb72a853dfd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52d733b5c4876276d7a2dfc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 12:09:44 2021 +0100 server: Implement retrieving the debug object of a process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++-- dlls/ntdll/unix/process.c | 45 ++++++++++++++++++++++++++++-------------- include/wine/server_protocol.h | 23 ++++++++++++++++++--- server/process.c | 15 ++++++++++++-- server/protocol.def | 12 +++++++++-- server/request.h | 9 +++++++-- server/trace.c | 16 ++++++++++++++- 7 files changed, 97 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52d733b5c4876276d7a2…

1 0

Rémi Bernon : ntdll: Print a warning or an error for other exceptions.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: da3be6b0b60b509c00d39b479b4cfb21c7cf9c4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3be6b0b60b509c00d39b47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:30 2021 +0100 ntdll: Print a warning or an error for other exceptions. Depending on EH_NONCONTINUABLE. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 5 +++++ dlls/ntdll/signal_arm64.c | 5 +++++ dlls/ntdll/signal_i386.c | 5 +++++ dlls/ntdll/signal_x86_64.c | 5 +++++ include/wine/exception.h | 9 +++++++++ programs/winedbg/debugger.h | 9 --------- programs/winedbg/info.c | 6 +++--- 9 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 6b51be39be0..4594d12f8a0 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -61,6 +61,44 @@ static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0 static PRTL_EXCEPTION_FILTER unhandled_exception_filter; +const char *debugstr_exception_code( DWORD code ) +{ + switch (code) + { + case CONTROL_C_EXIT: return "CONTROL_C_EXIT"; + case DBG_CONTROL_C: return "DBG_CONTROL_C"; + case DBG_PRINTEXCEPTION_C: return "DBG_PRINTEXCEPTION_C"; + case DBG_PRINTEXCEPTION_WIDE_C: return "DBG_PRINTEXCEPTION_WIDE_C"; + case EXCEPTION_ACCESS_VIOLATION: return "EXCEPTION_ACCESS_VIOLATION"; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"; + case EXCEPTION_BREAKPOINT: return "EXCEPTION_BREAKPOINT"; + case EXCEPTION_DATATYPE_MISALIGNMENT: return "EXCEPTION_DATATYPE_MISALIGNMENT"; + case EXCEPTION_FLT_DENORMAL_OPERAND: return "EXCEPTION_FLT_DENORMAL_OPERAND"; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: return "EXCEPTION_FLT_DIVIDE_BY_ZERO"; + case EXCEPTION_FLT_INEXACT_RESULT: return "EXCEPTION_FLT_INEXACT_RESULT"; + case EXCEPTION_FLT_INVALID_OPERATION: return "EXCEPTION_FLT_INVALID_OPERATION"; + case EXCEPTION_FLT_OVERFLOW: return "EXCEPTION_FLT_OVERFLOW"; + case EXCEPTION_FLT_STACK_CHECK: return "EXCEPTION_FLT_STACK_CHECK"; + case EXCEPTION_FLT_UNDERFLOW: return "EXCEPTION_FLT_UNDERFLOW"; + case EXCEPTION_GUARD_PAGE: return "EXCEPTION_GUARD_PAGE"; + case EXCEPTION_ILLEGAL_INSTRUCTION: return "EXCEPTION_ILLEGAL_INSTRUCTION"; + case EXCEPTION_IN_PAGE_ERROR: return "EXCEPTION_IN_PAGE_ERROR"; + case EXCEPTION_INT_DIVIDE_BY_ZERO: return "EXCEPTION_INT_DIVIDE_BY_ZERO"; + case EXCEPTION_INT_OVERFLOW: return "EXCEPTION_INT_OVERFLOW"; + case EXCEPTION_INVALID_DISPOSITION: return "EXCEPTION_INVALID_DISPOSITION"; + case EXCEPTION_INVALID_HANDLE: return "EXCEPTION_INVALID_HANDLE"; + case EXCEPTION_NONCONTINUABLE_EXCEPTION: return "EXCEPTION_NONCONTINUABLE_EXCEPTION"; + case EXCEPTION_PRIV_INSTRUCTION: return "EXCEPTION_PRIV_INSTRUCTION"; + case EXCEPTION_SINGLE_STEP: return "EXCEPTION_SINGLE_STEP"; + case EXCEPTION_STACK_OVERFLOW: return "EXCEPTION_STACK_OVERFLOW"; + case EXCEPTION_WINE_ASSERTION: return "EXCEPTION_WINE_ASSERTION"; + case EXCEPTION_WINE_CXX_EXCEPTION: return "EXCEPTION_WINE_CXX_EXCEPTION"; + case EXCEPTION_WINE_NAME_THREAD: return "EXCEPTION_WINE_NAME_THREAD"; + case EXCEPTION_WINE_STUB: return "EXCEPTION_WINE_STUB"; + } + return "unknown"; +} + static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, PVECTORED_EXCEPTION_HANDLER func ) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 41e8666a25c..60b8ffc46d6 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -55,6 +55,7 @@ extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LD /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; +extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; /* init routines */ extern void version_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1b98dd5cc70..7c1fceb2bf0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -174,6 +174,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", context->R0, context->R1, context->R2, context->R3, context->R4, context->R5 ); TRACE( " r6=%08x r7=%08x r8=%08x r9=%08x r10=%08x r11=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 078fa947c42..e198f4e607e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -515,6 +515,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6ec696931e9..89ef938658c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -206,6 +206,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index df133d6fce9..7e90b109ad0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -552,6 +552,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index 3d28ff6b110..94796a78e4f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -308,6 +308,15 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) for more info. */ #define EXCEPTION_WINE_NAME_THREAD 0x406D1388 +/* used for C++ exceptions in msvcrt + * parameters: + * [0] CXX_FRAME_MAGIC + * [1] pointer to exception object + * [2] pointer to type + */ +#define EXCEPTION_WINE_CXX_EXCEPTION 0xe06d7363 +#define EXCEPTION_WINE_CXX_FRAME_MAGIC 0x19930520 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 05bf0c047ba..3bcf9d37f23 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -146,15 +146,6 @@ struct dbg_breakpoint struct expr* condition; }; -/* used for C++ exceptions in msvcrt - * parameters: - * [0] CXX_FRAME_MAGIC - * [1] pointer to exception object - * [2] pointer to type - */ -#define CXX_EXCEPTION 0xe06d7363 -#define CXX_FRAME_MAGIC 0x19930520 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 4e8580db0d4..e1f3d269649 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -951,11 +951,11 @@ void info_win32_exception(void) case EXCEPTION_FLT_STACK_CHECK: dbg_printf("floating point stack check"); break; - case CXX_EXCEPTION: - if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + case EXCEPTION_WINE_CXX_EXCEPTION: + if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = %p, type = %p, base = %p)", (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], (void*)rec->ExceptionInformation[3]);

1 0

Rémi Bernon : ntdll: Print a warning for debug print exceptions.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 30ecf517e42d173f93f1e86829d397b27b96f274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ecf517e42d173f93f1e868… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:29 2021 +0100 ntdll: Print a warning for debug print exceptions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 8 ++++++++ dlls/ntdll/signal_arm64.c | 8 ++++++++ dlls/ntdll/signal_i386.c | 8 ++++++++ dlls/ntdll/signal_x86_64.c | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f4da2e5c71d..1b98dd5cc70 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -164,6 +164,14 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 88e31d88f7b..078fa947c42 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -505,6 +505,14 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a570be10024..6ec696931e9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -196,6 +196,14 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7a3fd4be204..df133d6fce9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -542,6 +542,14 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",

1 0

Rémi Bernon : configure: Silence a linker warning about no-PIC .text relocations.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: ac14ce8c79ebb8a2a882a5b483fa59476392b036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac14ce8c79ebb8a2a882a5b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 11:19:48 2021 +0100 configure: Silence a linker warning about no-PIC .text relocations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 +++++++++++++++++++++++++++- configure.ac | 4 +++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3f17db20fd6..8d782ad0353 100755 --- a/configure +++ b/configure @@ -9274,7 +9274,33 @@ fi case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-PIC -Wl,-z,notext" >&5 +$as_echo_n "checking whether the compiler supports -fno-PIC -Wl,-z,notext... " >&6; } +if ${ac_cv_cflags__fno_PIC__Wl__z_notext+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-PIC -Wl,-z,notext" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_PIC__Wl__z_notext=yes +else + ac_cv_cflags__fno_PIC__Wl__z_notext=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_PIC__Wl__z_notext" >&5 +$as_echo "$ac_cv_cflags__fno_PIC__Wl__z_notext" >&6; } +if test "x$ac_cv_cflags__fno_PIC__Wl__z_notext" = xyes; then : + LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext" +fi + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;; diff --git a/configure.ac b/configure.ac index 19db4f60b28..9d8f831e0fc 100644 --- a/configure.ac +++ b/configure.ac @@ -912,7 +912,9 @@ case $host_os in case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + WINE_TRY_CFLAGS([-fno-PIC -Wl,-z,notext],[LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"]) + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;;

1 0

Rémi Bernon : ntdll: Print a warning for thread rename exceptions.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 6edf3d3b09efe8b8350bddf068b895dd8fbf07c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edf3d3b09efe8b8350bddf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:28 2021 +0100 ntdll: Print a warning for thread rename exceptions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++++ dlls/ntdll/signal_arm64.c | 4 ++++ dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 4 ++++ include/wine/exception.h | 6 ++++++ programs/winedbg/debugger.h | 6 ------ programs/winedbg/gdbproxy.c | 5 +++-- programs/winedbg/tgt_active.c | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b1544ba15fe..f4da2e5c71d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,6 +160,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9db8a8b17b4..88e31d88f7b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -501,6 +501,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 93e03ae5b8b..a570be10024 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -192,6 +192,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e39991ad1a..7a3fd4be204 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -538,6 +538,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index a2b0bb08dc3..3d28ff6b110 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -302,6 +302,12 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ +/* Wine extension; Windows doesn't have a name for this code. This is an + undocumented exception understood by MS VC debugger, allowing the program + to name a particular thread. Search google.com or deja.com for "0x406d1388" + for more info. */ +#define EXCEPTION_WINE_NAME_THREAD 0x406D1388 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..05bf0c047ba 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -155,12 +155,6 @@ struct dbg_breakpoint #define CXX_EXCEPTION 0xe06d7363 #define CXX_FRAME_MAGIC 0x19930520 -/* Wine extension; Windows doesn't have a name for this code. This is an - undocumented exception understood by MS VC debugger, allowing the program - to name a particular thread. Search google.com or deja.com for "0x406d1388" - for more info. */ -#define EXCEPTION_NAME_THREAD 0x406D1388 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..3c1b3e85df8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -63,6 +63,7 @@ #include "windef.h" #include "winbase.h" #include "tlhelp32.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -349,7 +350,7 @@ static unsigned char signal_from_debug_event(DEBUG_EVENT* de) return SIGALRM; /* should not be here */ case EXCEPTION_INVALID_HANDLE: - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: return SIGTRAP; default: ERR("Unknown exception code 0x%08x\n", ec); @@ -363,7 +364,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e switch (rec->ExceptionCode) { - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; struct dbg_thread *thread; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4e2d7d6347..e71f4615735 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -246,7 +246,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_SINGLE_STEP: is_debug = TRUE; break; - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread;

1 0

Rémi Bernon : windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 8f1122f8d2be5f6a383f2e73d88b9e41a735689f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1122f8d2be5f6a383f2e73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 09:11:01 2021 +0100 windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/tests/wmpformat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b0fcd34c742..89e352b8946 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -724,7 +724,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!ppIBitmapFrame) - return E_POINTER; + return E_INVALIDARG; EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/wmpformat.c b/dlls/windowscodecs/tests/wmpformat.c index c4f947d8acf..c1a320b6ec0 100644 --- a/dlls/windowscodecs/tests/wmpformat.c +++ b/dlls/windowscodecs/tests/wmpformat.c @@ -123,7 +123,7 @@ static void test_decode(void) ok(count == 1, "unexpected count %u\n", count); hr = IWICBitmapDecoder_GetFrame(decoder, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); for (j = 2; j > 0; --j) {

1 0