wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Martin Storsjo : ntdll: Fix arm64 sigcontext access for darwin.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 8f3bd63b52f03ff05e9d2a00a2e129a0b0092969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3bd63b52f03ff05e9d2a00… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 21:56:45 2020 +0300 ntdll: Fix arm64 sigcontext access for darwin. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index cbb6a019e5..7fe40d4ea1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -110,6 +110,24 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) return 0; } +#elif defined(__APPLE__) + +/* All Registers access - only for local access */ +# define REG_sig(reg_name, context) ((context)->uc_mcontext->__ss.__ ## reg_name) +# define REGn_sig(reg_num, context) ((context)->uc_mcontext->__ss.__x[reg_num]) + +/* Special Registers access */ +# define SP_sig(context) REG_sig(sp, context) /* Stack pointer */ +# define PC_sig(context) REG_sig(pc, context) /* Program counter */ +# define PSTATE_sig(context) REG_sig(cpsr, context) /* Current State Register */ +# define FP_sig(context) REG_sig(fp, context) /* Frame pointer */ +# define LR_sig(context) REG_sig(lr, context) /* Link Register */ + +static DWORD64 get_fault_esr( ucontext_t *sigcontext ) +{ + return sigcontext->uc_mcontext->__es.__esr; +} + #endif /* linux */ static pthread_key_t teb_key; @@ -328,6 +346,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) */ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) { +#ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; @@ -335,6 +354,12 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) context->Fpcr = fp->fpcr; context->Fpsr = fp->fpsr; memcpy( context->V, fp->vregs, sizeof(context->V) ); +#elif defined(__APPLE__) + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->Fpcr = sigcontext->uc_mcontext->__ns.__fpcr; + context->Fpsr = sigcontext->uc_mcontext->__ns.__fpsr; + memcpy( context->V, sigcontext->uc_mcontext->__ns.__v, sizeof(context->V) ); +#endif } @@ -345,12 +370,18 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) */ static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) { +#ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; fp->fpcr = context->Fpcr; fp->fpsr = context->Fpsr; memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->V) ); +#endif }

1 0

Martin Storsjo : ntdll: Fix the arm64 use of libunwind for macOS.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 7f8224411c39242fe751524816b1349002066c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f8224411c39242fe7515248… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:16 2020 +0300 ntdll: Fix the arm64 use of libunwind for macOS. MacOS uses the LLVM libunwind, which doesn't expose quite as much internals of the cursor as GNU libunwind, and uses slightly different names for the arch specific register enums (for get/set registers). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index b4fe46f25a..cbb6a019e5 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -156,11 +156,27 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_proc_info_t info; int rc; +#ifdef __APPLE__ + rc = unw_getcontext( &unw_context ); + if (rc == UNW_ESUCCESS) + rc = unw_init_local( &cursor, &unw_context ); + if (rc == UNW_ESUCCESS) + { + int i; + for (i = 0; i <= 28; i++) + unw_set_reg( &cursor, UNW_ARM64_X0 + i, context->u.X[i] ); + unw_set_reg( &cursor, UNW_ARM64_FP, context->u.s.Fp ); + unw_set_reg( &cursor, UNW_ARM64_LR, context->u.s.Lr ); + unw_set_reg( &cursor, UNW_ARM64_SP, context->Sp ); + unw_set_reg( &cursor, UNW_REG_IP, context->Pc ); + } +#else memcpy( unw_context.uc_mcontext.regs, context->u.X, sizeof(context->u.X) ); unw_context.uc_mcontext.sp = context->Sp; unw_context.uc_mcontext.pc = context->Pc; rc = unw_init_local( &cursor, &unw_context ); +#endif if (rc != UNW_ESUCCESS) { WARN( "setup failed: %d\n", rc ); @@ -198,6 +214,16 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON dispatch->LanguageHandler = (void *)info.handler; dispatch->HandlerData = (void *)info.lsda; dispatch->EstablisherFrame = context->Sp; +#ifdef __APPLE__ + { + int i; + for (i = 0; i <= 28; i++) + unw_get_reg( &cursor, UNW_ARM64_X0 + i, (unw_word_t *)&context->u.X[i] ); + } + unw_get_reg( &cursor, UNW_ARM64_FP, (unw_word_t *)&context->u.s.Fp ); + unw_get_reg( &cursor, UNW_ARM64_X30, (unw_word_t *)&context->u.s.Lr ); + unw_get_reg( &cursor, UNW_ARM64_SP, (unw_word_t *)&context->Sp ); +#else unw_get_reg( &cursor, UNW_AARCH64_X0, (unw_word_t *)&context->u.s.X0 ); unw_get_reg( &cursor, UNW_AARCH64_X1, (unw_word_t *)&context->u.s.X1 ); unw_get_reg( &cursor, UNW_AARCH64_X2, (unw_word_t *)&context->u.s.X2 ); @@ -230,6 +256,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); +#endif unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL;

1 0

Martin Storsjo : ntdll: Trust libunwind's returned pc value on arm64.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: cffd06ea67f34a8f6379c78330c40d55ba83223f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cffd06ea67f34a8f6379c783… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:15 2020 +0300 ntdll: Trust libunwind's returned pc value on arm64. Use this instead of manually copying LR to PC. With GNU libunwind, both registers are equal after unw_step. With the LLVM libunwind (which Apple uses), the return address isn't reflected at all in LR, only in UNW_REG_IP. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d5ced2172a..b4fe46f25a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -230,7 +230,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); - context->Pc = context->u.s.Lr; + unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" );

1 0

Martin Storsjo : winebuild: Use the right arm64 page/pageoff relocation syntax for darwin.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 849d08b0aed1b256ac459347cb488ef3db5ce3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849d08b0aed1b256ac459347… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:14 2020 +0300 winebuild: Use the right arm64 page/pageoff relocation syntax for darwin. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 34 ++++++++++++++++++---------------- tools/winebuild/spec32.c | 4 ++-- tools/winebuild/utils.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e1d2e5edf8..03715af956 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -291,6 +291,8 @@ extern const char *get_asm_export_section(void); extern const char *get_asm_rodata_section(void); extern const char *get_asm_rsrc_section(void); extern const char *get_asm_string_section(void); +extern const char *arm64_page( const char *sym ); +extern const char *arm64_pageoff( const char *sym ); extern void output_function_size( const char *name ); extern void output_gnu_stack_note(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index da9ad62022..751335f36f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -761,8 +761,8 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: - output( "\tadrp x9, %s\n", table ); - output( "\tadd x9, x9, #:lo12:%s\n", table ); + output( "\tadrp x9, %s\n", arm64_page( table ) ); + output( "\tadd x9, x9, #%s\n", arm64_pageoff( table ) ); if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); @@ -1080,8 +1080,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x29, sp\n" ); - output( "\tadrp x9, %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tadd x9, x9, #:lo12:%s\n", asm_name("__wine_spec_delay_load") ); + output( "\tadrp x9, %s\n", arm64_page( asm_name("__wine_spec_delay_load") ) ); + output( "\tadd x9, x9, #%s\n", arm64_pageoff( asm_name("__wine_spec_delay_load") ) ); output( "\tblr x9\n" ); output( "\tmov x9, x0\n" ); output( "\tldp x29, x30, [sp],#16\n" ); @@ -1367,17 +1367,19 @@ void output_stubs( DLLSPEC *spec ) else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadrp x0, .L__wine_spec_file_name\n" ); - output( "\tadd x0, x0, #:lo12:.L__wine_spec_file_name\n" ); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_file_name") ); if (exp_name) { - output( "\tadrp x1, .L%s_string\n", name ); - output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); + char *sym = strmake( ".L%s_string", name ); + output( "\tadrp x1, %s\n", arm64_page( sym ) ); + output( "\tadd x1, x1, #%s\n", arm64_pageoff( sym ) ); + free( sym ); } else output( "\tmov x1, %u\n", odp->ordinal ); - output( "\tadrp x2, %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "\tadd x2, x2, #:lo12:%s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tadrp x2, %s\n", arm64_page( asm_name("__wine_spec_unimplemented_stub") ) ); + output( "\tadd x2, x2, #%s\n", arm64_pageoff( asm_name("__wine_spec_unimplemented_stub") ) ); output( "\tblr x2\n" ); break; default: @@ -1627,8 +1629,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tldr x20, [x19]\n" ); /* prev frame */ output( "\tstr x20, [sp, #88]\n" ); output( "\tstr x29, [x19]\n" ); /* syscall frame */ - output( "\tadrp x16, .Lsyscall_args\n" ); - output( "\tadd x16, x16, #:lo12:.Lsyscall_args\n" ); + output( "\tadrp x16, %s\n", arm64_page(".Lsyscall_args") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".Lsyscall_args") ); output( "\tldrb w9, [x16, x8]\n" ); output( "\tsubs x9, x9, #64\n" ); output( "\tbls 2f\n" ); @@ -1640,8 +1642,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tldr x10, [x11, x9]\n" ); output( "\tstr x10, [sp, x9]\n" ); output( "\tcbnz x9, 1b\n" ); - output( "2:\tadrp x16, .Lsyscall_table\n" ); - output( "\tadd x16, x16, #:lo12:.Lsyscall_table\n" ); + output( "2:\tadrp x16, %s\n", arm64_page(".Lsyscall_table") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".Lsyscall_table") ); output( "\tldr x16, [x16, x8, lsl 3]\n" ); output( "\tblr x16\n" ); output( "\tmov sp, x29\n" ); @@ -1741,8 +1743,8 @@ void output_syscalls( DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x8, #%u\n", i ); - output( "\tadrp x16, %s\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tldr x16, [x16, #:lo12:%s]\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tadrp x16, %s\n", arm64_page( asm_name("__wine_syscall_dispatcher") ) ); + output( "\tldr x16, [x16, #%s]\n", arm64_pageoff( asm_name("__wine_syscall_dispatcher") ) ); output( "\tblr x16\n"); output( "\tldp x29, x30, [sp], #16\n" ); output( "\tret\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c85249b2a9..efb136a8e6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -339,8 +339,8 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tstp x8, x9, [SP,#-16]!\n" ); output( "\tmov w1, #%u\n", odp->u.func.args_str_offset << 16 ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); - output( "\tadrp x0, .L__wine_spec_relay_descr\n"); - output( "\tadd x0, x0, #:lo12:.L__wine_spec_relay_descr\n"); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_relay_descr") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_relay_descr") ); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); output( "\tadd SP, SP, #16\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 07ef2ed298..1af42f1000 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1291,3 +1291,35 @@ const char *get_asm_string_section(void) default: return ".section .rodata"; } } + +const char *arm64_page( const char *sym ) +{ + static char *buffer; + + switch (target_platform) + { + case PLATFORM_APPLE: + free( buffer ); + buffer = strmake( "%s@PAGE", sym ); + return buffer; + default: + return sym; + } +} + +const char *arm64_pageoff( const char *sym ) +{ + static char *buffer; + + free( buffer ); + switch (target_platform) + { + case PLATFORM_APPLE: + buffer = strmake( "%s@PAGEOFF", sym ); + break; + default: + buffer = strmake( ":lo12:%s", sym ); + break; + } + return buffer; +}

1 0

Zebediah Figura : quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 0beda8a480d4e5ced02841f0410c0724f7fb39d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0beda8a480d4e5ced02841f0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 15 16:43:35 2020 -0500 quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters(). Primarily to avoid unnecessarily creating filters like the VMR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2c32b3bc43..4cef1004bd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1130,7 +1130,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *middle_sink, IPin *sink, - BOOL render_to_existing, BOOL allow_renderers, unsigned int recursion_depth) + BOOL render_to_existing, unsigned int recursion_depth) { BOOL any = FALSE, all = TRUE; IPin *middle_source, *peer; @@ -1195,7 +1195,7 @@ static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, if (!sink) { - if (all && (any || allow_renderers)) + if (all) return S_OK; if (any) return VFW_S_PARTIAL_RENDER; @@ -1209,7 +1209,7 @@ err: static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *sink, BOOL render_to_existing, - BOOL allow_renderers, unsigned int recursion_depth) + unsigned int recursion_depth) { IEnumPins *sink_enum; IPin *filter_sink; @@ -1223,7 +1223,7 @@ static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, while (IEnumPins_Next(sink_enum, 1, &filter_sink, NULL) == S_OK) { hr = autoplug_through_sink(graph, source, filter, filter_sink, sink, - render_to_existing, allow_renderers, recursion_depth); + render_to_existing, recursion_depth); IPin_Release(filter_sink); if (SUCCEEDED(hr)) { @@ -1271,7 +1271,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter, - sink, render_to_existing, TRUE, recursion_depth))) + sink, render_to_existing, recursion_depth))) return hr; } @@ -1295,8 +1295,9 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, DeleteMediaType(mt); - if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, 0, FALSE, - MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL))) + if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, + 0, FALSE, MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, + render_to_existing, 0, NULL, NULL, NULL))) goto out; while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) @@ -1346,8 +1347,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, continue; } - hr = autoplug_through_filter(graph, source, filter, sink, - render_to_existing, !render_to_existing, recursion_depth); + hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth); if (SUCCEEDED(hr)) { IBaseFilter_Release(filter);

1 0

Piotr Caban : msvcrt: Fix acosf implementation when returning Pi or Pi/2.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: cb7b23a3f06824c43dd492f41abab78b96a53b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb7b23a3f06824c43dd492f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 18 18:19:50 2020 +0200 msvcrt: Fix acosf implementation when returning Pi or Pi/2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49718 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index abb9ef0a9c..a75b551210 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -259,7 +259,7 @@ float CDECL MSVCRT_acosf( float x ) if (ix >= 0x3f800000) { if (ix == 0x3f800000) { if (hx >> 31) - return 2 * pio2_hi + 7.5231638453e-37; + return 2 * pio2_lo + 2 * pio2_hi + 7.5231638453e-37; return 0; } if (MSVCRT__isnanf(x)) return x; @@ -268,7 +268,7 @@ float CDECL MSVCRT_acosf( float x ) /* |x| < 0.5 */ if (ix < 0x3f000000) { if (ix <= 0x32800000) /* |x| < 2**-26 */ - return pio2_hi + 7.5231638453e-37; + return pio2_lo + pio2_hi + 7.5231638453e-37; return pio2_hi - (x - (pio2_lo - x * acosf_R(x * x))); } /* x < -0.5 */

1 0

Dmitry Timoshkov : kernelbase: Native machine is optional for IsWow64Process2.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 3786462a568b6827d1ba1cc1ab2ced117817dcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3786462a568b6827d1ba1cc1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 17:59:01 2020 +0300 kernelbase: Native machine is optional for IsWow64Process2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49716 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 +++++++++++++++ dlls/kernelbase/process.c | 11 ++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index eaa5da2e95..3162ba3c53 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2238,6 +2238,12 @@ static void test_IsWow64Process2(void) ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); ok(native_machine == expect_native, "got %#x\n", native_machine); + SetLastError(0xdeadbeef); + machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, NULL); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); + ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess error\n"); @@ -2263,6 +2269,15 @@ static void test_IsWow64Process2(void) ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); ok(native_machine == expect_native, "got %#x\n", native_machine); } + + SetLastError(0xdeadbeef); + machine = 0xdead; + ret = pIsWow64Process2(GetCurrentProcess(), &machine, NULL); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + if (is_wow64) + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + else + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); } static void test_SystemInfo(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 936eed4d18..2b9b1c019e 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -899,8 +899,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, if (wow64) { - GetNativeSystemInfo( &si ); - if (process != GetCurrentProcess()) { #if defined(__i386__) || defined(__x86_64__) @@ -916,15 +914,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); *machine = nt->FileHeader.Machine; } + + if (!native_machine) return TRUE; + + GetNativeSystemInfo( &si ); } else { + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + + if (!native_machine) return TRUE; + #ifdef _WIN64 GetSystemInfo( &si ); #else GetNativeSystemInfo( &si ); #endif - *machine = IMAGE_FILE_MACHINE_UNKNOWN; } switch (si.u.s.wProcessorArchitecture)

1 0

Jacek Caban : conhost: Build with -mwindows.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: cd9f30f35bd4ef815f37a3eefb723b6e1b2dc3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9f30f35bd4ef815f37a3ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 16:21:19 2020 +0200 conhost: Build with -mwindows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 75ec7dfc41..b88a5cc45e 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,6 +1,6 @@ MODULE = conhost.exe -EXTRADLLFLAGS = -mconsole -municode -mno-cygwin +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = conhost.c

1 0

Gijs Vermeulen : shell32: Free original_dos_name with correct function in TRASH_GetDetails() (Coverity).
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 48038508f5ee0b5670a3a0fa2377938ab6bbca6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=48038508f5ee0b5670a3a0fa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 18 16:12:07 2020 +0200 shell32: Free original_dos_name with correct function in TRASH_GetDetails() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/trash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 93b4ee4588..f34b106bd6 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -662,7 +662,7 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN if (original_dos_name != NULL) { lstrcpynW(data->cFileName, original_dos_name, MAX_PATH); - SHFree(original_dos_name); + heap_free(original_dos_name); } else {

1 0

Francois Gouget : winapi: Update win16.api.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: fb5cd3cf16322c4e06fa3ed29e2375e2ee82f7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5cd3cf16322c4e06fa3ed2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 18 12:22:37 2020 +0200 winapi: Update win16.api. Wine no longer has winedos16.dll and wprocs.dll and display.drv, keyboard.drv and mouse.drv have a .drv extension, not a .dll one. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/win16.api | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index ea646c9ec8..5e78e544da 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -217,7 +217,7 @@ LPSTR WORD -%%display.dll +%%display.drv %long @@ -362,7 +362,7 @@ INT16 UINT16 WORD -%%keyboard.dll +%%keyboard.drv %long @@ -628,7 +628,7 @@ MMRESULT16 UINT16 WORD -%%mouse.dll +%%mouse.drv %ptr @@ -1408,12 +1408,6 @@ CONTEXT86 * void -%%winedos16.dll - -%void - -void - %%wineps16.drv %long @@ -1556,13 +1550,3 @@ HWTHOOK16 INT16 UINT16 WPARAM16 - -%%wprocs.dll - -%ptr - -CONTEXT86 * - -%void - -void

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020