December 2021 - Wine-Commits

Rémi Bernon : winejoystick.drv: Remove unnecessary driver.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: f9d7acbf45672b6e60abe9b3116d79cc8b73468d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9d7acbf45672b6e60abe9b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 10 09:44:49 2021 +0100 winejoystick.drv: Remove unnecessary driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 56 -- configure.ac | 25 - dlls/winejoystick.drv/Makefile.in | 10 - dlls/winejoystick.drv/joystick.c | 52 -- dlls/winejoystick.drv/joystick.h | 34 - dlls/winejoystick.drv/joystick_linux.c | 458 -------------- dlls/winejoystick.drv/joystick_osx.c | 935 ---------------------------- dlls/winejoystick.drv/winejoystick.drv.spec | 1 - include/config.h.in | 6 - tools/winapi/win32.api | 13 - 10 files changed, 1590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9d7acbf45672b6e60ab…

1 0

Alex Henrie : nsi: Use a whole byte for each nsi_ip_neighbour_dynamic flag.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: cba1faeef76b411e60c34db44986ca9f9ad56e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba1faeef76b411e60c34db4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 8 23:12:04 2021 -0700 nsi: Use a whole byte for each nsi_ip_neighbour_dynamic flag. Fixes the failure of the test at dlls/nsi/tests/nsi.c:679 on certain testbot machines. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/nsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8c3488dc19c..b8e59c7bf54 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -226,8 +226,8 @@ struct nsi_ip_neighbour_dynamic DWORD time; struct { - USHORT is_router : 1; - USHORT is_unreachable : 1; + BOOLEAN is_router; + BOOLEAN is_unreachable; } flags; USHORT phys_addr_len; DWORD unk;

1 0

Jinoh Kang : ntdll: Properly test for LLVM libunwind error codes.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: e60fdbf12453c3caf11d6638b03e53ef68641423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e60fdbf12453c3caf11d6638… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Dec 11 00:50:45 2021 +0900 ntdll: Properly test for LLVM libunwind error codes. Commit f37b953e07f (ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes., 2021-12-10) made an unsuccessful attempt to fix UNW_ENOINFO detection on LLVM libunwind. It turns out that UNW_ENOINFO is actually negative in LLVM, so there's no need to flip the sign. Fix this by flipping the return value sign only when UNW_ENOINFO < 0 (LLVM libunwind), and then comparing it against the negated error code. Overall, all flavours of libunwind return a negative value on error. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 6 +++--- dlls/ntdll/unix/signal_arm64.c | 6 +++--- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 6389fdde058..a1bcb0ddd32 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,13 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 01deb9ef8dd..94f280e218a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,13 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f3e6f8335d6..68e0c7ce66e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,13 +1415,13 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) return STATUS_UNSUCCESSFUL; TRACE( "ip %#lx function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n",

1 0

Eric Pouech : winedbg: Move C++ identifier detection to the lexer.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 61a2e527fc996199e1b6d14f9ed20ff179474a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a2e527fc996199e1b6d14f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:51 2021 +0100 winedbg: Move C++ identifier detection to the lexer. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 14 ++++---------- programs/winedbg/debug.l | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 46a643bfb47..79877b2c644 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -77,13 +77,13 @@ static void parser(const char*); %left '+' '-' %left '*' '/' '%' %left OP_SIGN '!' '~' OP_DEREF /* OP_INC OP_DEC OP_ADDR */ -%left '.' '[' OP_DRF OP_SCOPE +%left '.' '[' OP_DRF %nonassoc ':' %type <expression> expr lvalue %type <lvalue> expr_lvalue lvalue_addr %type <integer> expr_rvalue -%type <string> pathname identifier cpp_identifier +%type <string> pathname identifier %type <listing> list_arg %type <type> type_expr %type <strings> list_of_words @@ -162,15 +162,9 @@ pathname: | tPATH { $$ = $1; } ; -cpp_identifier: - tIDENTIFIER { $$ = $1; } - | identifier OP_SCOPE tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($3) + 1); - sprintf($$, "%s::%s", $1, $3); } - ; - identifier: - cpp_identifier { $$ = $1; } - | tIDENTIFIER '!' cpp_identifier { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); + tIDENTIFIER { $$ = $1; } + | tIDENTIFIER '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); sprintf($$, "%s!%s", $1, $3); } ; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 5c87f05abe5..a587a13fb70 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -99,6 +99,7 @@ DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* +SCOPED_IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]*"::" PATHNAME [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]* STRING \"(\\[^\n]|[^\\"\n])*\" @@ -135,7 +136,6 @@ STRING \"(\\[^\n]|[^\\"\n])*\" "<<" { return OP_SHL; } ">>" { return OP_SHR; } "->" { return OP_DRF; } -"::" { return OP_SCOPE; } "[" { return *yytext; } "]" { return *yytext; } @@ -243,7 +243,7 @@ union { return tUNION; } enum { return tENUM; } all { return tALL; } -{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; } +{SCOPED_IDENTIFIER}*{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; } "$"{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext+1); return tINTVAR; } <PATH_EXPECTED,PATH_ACCEPTED>{PATHNAME} { dbg_lval.string = lexeme_alloc(yytext); return tPATH; }

1 0

Eric Pouech : winedbg: Correctly store integers into a bitfield.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 0ed8cac2cd7ccda76ce20d6e06d6caf398656b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed8cac2cd7ccda76ce20d6e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:32 2021 +0100 winedbg: Correctly store integers into a bitfield. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1cf8726f467..6dffcc9db45 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -317,6 +317,23 @@ BOOL memory_store_integer(const struct dbg_lvalue* lvalue, dbg_lgint_t val) { DWORD64 size; if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size)) return FALSE; + if (lvalue->bitlen) + { + struct dbg_lvalue alt_lvalue = *lvalue; + dbg_lguint_t mask, dst; + + /* FIXME: this test isn't sufficient, depending on start of bitfield + * (ie a 64 bit field can spread across 9 bytes) + */ + if (lvalue->bitlen > 8 * sizeof(dbg_lgint_t)) return FALSE; + /* mask is 1 where bitfield is present, 0 outside */ + mask = (~(dbg_lguint_t)0 >> (sizeof(val) * 8 - lvalue->bitlen)) << (lvalue->bitstart & 7); + alt_lvalue.addr.Offset += lvalue->bitstart >> 3; + val <<= lvalue->bitstart & 7; + if (!memory_read_value(&alt_lvalue, (unsigned)size, &dst)) return FALSE; + val = (dst & ~mask) | (val & mask); + return memory_write_value(&alt_lvalue, (unsigned)size, &val); + } /* this is simple if we're on a little endian CPU */ return memory_write_value(lvalue, (unsigned)size, &val); }

1 0

Eric Pouech : winedbg: Add helper to compare types and use it to detect wrong assigments.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: c4548c04eb8e1e7e94b10ad42b59831f6687f4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4548c04eb8e1e7e94b10ad4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:21 2021 +0100 winedbg: Add helper to compare types and use it to detect wrong assigments. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 + programs/winedbg/types.c | 190 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 186 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index cd7a723f176..1d08c0e1262 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -493,6 +493,8 @@ extern BOOL types_get_info(const struct dbg_type*, IMAGEHLP_SYMBOL_T extern BOOL types_get_real_type(struct dbg_type* type, DWORD* tag); extern struct dbg_type types_find_pointer(const struct dbg_type* type); extern struct dbg_type types_find_type(DWORD64 linear, const char* name, enum SymTagEnum tag); +extern BOOL types_compare(const struct dbg_type, const struct dbg_type, BOOL* equal); +extern BOOL types_is_integral_type(const struct dbg_lvalue*); /* winedbg.c */ extern void dbg_outputW(const WCHAR* buffer, int len); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 8f16a535606..1fafaac8c80 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -164,16 +164,33 @@ BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lv { dbg_lgint_t val; DWORD64 size; + BOOL equal; - if (!types_get_info(&lvalue_to->type, TI_GET_LENGTH, &size)) return FALSE; - if (sizeof(val) < size) + if (!lvalue_to->bitlen && !lvalue_from->bitlen) { - dbg_printf("Insufficient size\n"); - return FALSE; + if (!types_compare(lvalue_to->type, lvalue_from->type, &equal)) return FALSE; + if (equal) + { + if (!types_get_info(&lvalue_to->type, TI_GET_LENGTH, &size)) return FALSE; + if (sizeof(val) < size) + { + return memory_read_value(lvalue_from, size, &val) && + memory_write_value(lvalue_to, size, &val); + } + dbg_printf("NIY\n"); + /* else: should allocate intermediate buffer... */ + return FALSE; + } + } + if (types_is_integral_type(lvalue_from) && types_is_integral_type(lvalue_to)) + { + /* doing integer conversion (about sign, size) */ + val = types_extract_as_integer(lvalue_from); + return memory_store_integer(lvalue_to, val); } /* FIXME: should support floats as well */ - val = types_extract_as_integer(lvalue_from); - return memory_store_integer(lvalue_to, val); + dbg_printf("Cannot assign (different types)\n"); return FALSE; + return FALSE; } /****************************************************************** @@ -910,3 +927,164 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v #undef X return TRUE; } + +static BOOL types_compare_name(struct dbg_type type1, struct dbg_type type2, BOOL* equal) +{ + LPWSTR name1, name2; + BOOL ret; + + if (types_get_info(&type1, TI_GET_SYMNAME, &name1)) + { + if (types_get_info(&type2, TI_GET_SYMNAME, &name2)) + { + *equal = !wcscmp(name1, name2); + ret = TRUE; + HeapFree(GetProcessHeap(), 0, name2); + } + else ret = FALSE; + HeapFree(GetProcessHeap(), 0, name1); + } + else ret = FALSE; + return ret; +} + +static BOOL types_compare_children(struct dbg_type type1, struct dbg_type type2, BOOL* equal, DWORD tag) +{ + DWORD count1, count2, i; + DWORD* children; + BOOL ret; + + if (!types_get_info(&type1, TI_GET_CHILDRENCOUNT, &count1) || + !types_get_info(&type2, TI_GET_CHILDRENCOUNT, &count2)) return FALSE; + if (count1 != count2) {*equal = FALSE; return TRUE;} + if (!count1) return *equal = TRUE; + if ((children = malloc(sizeof(*children) * 2 * count1)) == NULL) return FALSE; + if (types_get_info(&type1, TI_FINDCHILDREN, &children[0]) && + types_get_info(&type2, TI_FINDCHILDREN, &children[count1])) + { + for (i = 0; i < count1; ++i) + { + type1.id = children[i]; + type2.id = children[count1 + i]; + switch (tag) + { + case SymTagFunctionType: ret = types_compare(type1, type2, equal); break; + case SymTagUDT: + /* each child is a SymTagData that describes the member */ + ret = types_compare_name(type1, type2, equal); + if (ret && *equal) + { + /* compare type of member */ + ret = types_get_info(&type1, TI_GET_TYPE, &type1.id) && + types_get_info(&type2, TI_GET_TYPE, &type2.id); + if (ret) ret = types_compare(type1, type2, equal); + /* FIXME should compare bitfield info when present */ + } + break; + default: ret = FALSE; break; + } + if (!ret || !*equal) break; + } + if (i == count1) ret = *equal = TRUE; + } + else ret = FALSE; + + free(children); + return ret; +} + +BOOL types_compare(struct dbg_type type1, struct dbg_type type2, BOOL* equal) +{ + DWORD tag1, tag2; + DWORD64 size1, size2; + DWORD bt1, bt2; + DWORD count1, count2; + BOOL ret; + + do + { + if (type1.module == type2.module && type1.id == type2.id) + return *equal = TRUE; + + if (!types_get_real_type(&type1, &tag1) || + !types_get_real_type(&type2, &tag2)) return FALSE; + + if (type1.module == type2.module && type1.id == type2.id) + return *equal = TRUE; + + if (tag1 != tag2) return !(*equal = FALSE); + + switch (tag1) + { + case SymTagBaseType: + if (!types_get_info(&type1, TI_GET_BASETYPE, &bt1) || + !types_get_info(&type2, TI_GET_BASETYPE, &bt2) || + !types_get_info(&type1, TI_GET_LENGTH, &size1) || + !types_get_info(&type2, TI_GET_LENGTH, &size2)) + return FALSE; + *equal = bt1 == bt2 && size1 == size2; + return TRUE; + case SymTagPointerType: + /* compare sub types */ + break; + case SymTagUDT: + case SymTagEnum: + ret = types_compare_name(type1, type2, equal); + if (!ret || !*equal) return ret; + ret = types_compare_children(type1, type2, equal, tag1); + if (!ret || !*equal) return ret; + if (tag1 == SymTagUDT) return TRUE; + /* compare underlying type for enums */ + break; + case SymTagArrayType: + if (!types_get_info(&type1, TI_GET_LENGTH, &size1) || + !types_get_info(&type2, TI_GET_LENGTH, &size2) || + !types_get_info(&type1, TI_GET_COUNT, &count1) || + !types_get_info(&type2, TI_GET_COUNT, &count2)) return FALSE; + if (size1 == size2 && count1 == count2) + { + struct dbg_type subtype1 = type1, subtype2 = type2; + if (!types_get_info(&type1, TI_GET_ARRAYINDEXTYPEID, &subtype1.id) || + !types_get_info(&type2, TI_GET_ARRAYINDEXTYPEID, &subtype2.id)) return FALSE; + if (!types_compare(subtype1, subtype2, equal)) return FALSE; + if (!*equal) return TRUE; + } + else return !(*equal = FALSE); + /* compare subtypes */ + break; + case SymTagFunctionType: + if (!types_compare_children(type1, type2, equal, tag1)) return FALSE; + if (!*equal) return TRUE; + /* compare return:ed type */ + break; + case SymTagFunctionArgType: + /* compare argument type */ + break; + default: + dbg_printf("Unsupported yet tag %d\n", tag1); + return FALSE; + } + } while (types_get_info(&type1, TI_GET_TYPE, &type1.id) && + types_get_info(&type2, TI_GET_TYPE, &type2.id)); + return FALSE; +} + +static BOOL is_basetype_char(DWORD bt) +{ + return bt == btChar || bt == btWChar || bt == btChar8 || bt == btChar16 || bt == btChar32; +} + +static BOOL is_basetype_integer(DWORD bt) +{ + return is_basetype_char(bt) || bt == btInt || bt == btUInt || bt == btLong || bt == btULong; +} + +BOOL types_is_integral_type(const struct dbg_lvalue* lv) +{ + struct dbg_type type = lv->type; + DWORD tag, bt; + if (lv->bitlen) return TRUE; + if (!types_get_real_type(&type, &tag) || + !types_get_info(&type, TI_GET_BASETYPE, &bt)) return FALSE; + return is_basetype_integer(bt); +}

1 0

Alexandre Julliard : wmc: Don't catch SIGSEGV.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: aaa5216a3a4ddc96b3a43845ad9b07e737cb50ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa5216a3a4ddc96b3a43845… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:11:33 2021 +0100 wmc: Don't catch SIGSEGV. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/wmc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 2d3dcaf328c..f3cd8840276 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -136,8 +136,6 @@ static const struct long_option long_options[] = { NULL } }; -static void segvhandler(int sig); - static void cleanup_files(void) { if (output_name) unlink( output_name ); @@ -241,7 +239,6 @@ int main(int argc,char *argv[]) struct strarray files; atexit( cleanup_files ); - signal(SIGSEGV, segvhandler); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); #ifdef SIGHUP @@ -337,11 +334,3 @@ int main(int argc,char *argv[]) header_name = NULL; return 0; } - -static void segvhandler(int sig) -{ - fprintf(stderr, "\n%s:%d: Oops, segment violation\n", input_name, line_number); - fflush(stdout); - fflush(stderr); - abort(); -}

1 0

Francois Gouget : server: Fix the spelling of a comment.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 7afb9b7d0c77ba6feae1198c6f421a7067e1479f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7afb9b7d0c77ba6feae1198c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 10 16:16:56 2021 +0100 server: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 296f7a5d265..467ccd1f0db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,7 +33,7 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H -/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +/* FreeBSD needs this for cpu_set_t instead of its cpuset_t */ #define _WITH_CPU_SET_T #include <sched.h> #endif

1 0

Hans Leidekker : msi: GetBinaryType() doesn't accept DLLs.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 4aa858c9badfb35bcc3cdd38abfd40dc5b06c696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aa858c9badfb35bcc3cdd38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:51:43 2021 +0100 msi: GetBinaryType() doesn't accept DLLs. With help from Dmitry Timoshkov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51790 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fb03958eb11..19ad3917265 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -697,6 +700,51 @@ static DWORD WINAPI custom_client_thread(void *arg) return rc; } +/* based on kernel32.GetBinaryTypeW() */ +static BOOL get_binary_type( const WCHAR *name, DWORD *type ) +{ + HANDLE hfile, mapping; + NTSTATUS status; + + hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, NULL, NULL, PAGE_READONLY, + SEC_IMAGE, hfile ); + CloseHandle( hfile ); + + switch (status) + { + case STATUS_SUCCESS: + { + SECTION_IMAGE_INFORMATION info; + + status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); + CloseHandle( mapping ); + if (status) return FALSE; + switch (info.Machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: + *type = SCS_32BIT_BINARY; + return TRUE; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } + } + case STATUS_INVALID_IMAGE_WIN_64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } +} + static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -744,7 +792,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->package->rpc_server_started = 1; } - ret = GetBinaryTypeW(source, &info->arch); + ret = get_binary_type(source, &info->arch); if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);

1 0

Huw Davies : maintainers: Add the nsi include file.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: acabb7d078da474798d60b7fbebeff9d7286c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=acabb7d078da474798d60b7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 10 11:43:32 2021 +0000 maintainers: Add the nsi include file. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ea27dc41af3..d1f92c3a50b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,6 +221,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/iphlpapi/ F: dlls/nsi/ F: dlls/nsiproxy.sys/ +F: include/wine/nsi.h OLE Embedding M: Huw Davies <huw(a)codeweavers.com>

1 0