September 2019 - Wine-commits

Francois Gouget : dwrite: A couple of spelling fixes in comments.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: f38c260ce76c834d92a141b11e0f513c02720c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38c260ce76c834d92a141b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:19:38 2019 +0200 dwrite: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index f614f4ad8f..03c655ef68 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -67,7 +67,7 @@ extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3f11b1d3ad..8dad94d25d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5402,7 +5402,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit *ret = NULL; - /* Check rendering, antialising, measuring, and grid fitting modes. */ + /* Check rendering, antialiasing, measuring, and grid fitting modes. */ if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED || desc->rendering_mode == DWRITE_RENDERING_MODE1_OUTLINE || desc->rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT)

1 0

Akihiro Sagawa : dwrite: Avoid a magic constant.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 9597ed5375367b466eddee5772204186417456d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9597ed5375367b466eddee57… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 11 23:04:43 2019 +0900 dwrite: Avoid a magic constant. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8dad94d25d..604c67f565 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2507,7 +2507,7 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (j = 0; j < count; j++) { WCHAR buffer[255]; - hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); + hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, ARRAY_SIZE(buffer)); if (SUCCEEDED(hr) && !strcmpiW(buffer, name)) return i; }

1 0

Dmitry Timoshkov : ole32: Turn FIXME into a TRACE for clipboard backend of QueryGetData.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 6f7d91c64a86d23c54870c304acb2b2583aa063c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7d91c64a86d23c54870c30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 10 16:05:42 2019 +0800 ole32: Turn FIXME into a TRACE for clipboard backend of QueryGetData. This one seems to be implemented. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3464e2ca6a..0c02d02a65 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1602,7 +1602,7 @@ end: */ static HRESULT WINAPI snapshot_QueryGetData(IDataObject *iface, FORMATETC *fmt) { - FIXME("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); + TRACE("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); if (!fmt) return E_INVALIDARG;

1 0

Alexandre Julliard : Release 4.16.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 3bf7473b880eea8b8dcaa43487afda2d7b1fbd03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf7473b880eea8b8dcaa434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 22:32:49 2019 +0200 Release 4.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 634 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 292 insertions(+), 364 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf7473b880eea8b8dca…

1 0

Tag wine-4.16 : Alexandre Julliard : Release 4.16
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: refs/tags/wine-4.16 Tag: 6ab81dee1654637dac674a2d680a936934421bdf URL: https://source.winehq.org/git/wine.git/?a=tag;h=6ab81dee1654637dac674a2d680… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 22:32:49 2019 +0200 Release 4.16

1 0

Francois Gouget : testbot/Engine: Clean up left-over VM child deadlines.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: tools Branch: master Commit: 4bec6e75d7823e6f4053f03cc28eec025a004c7b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bec6e75d7823e6f4053f03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:06:20 2019 +0200 testbot/Engine: Clean up left-over VM child deadlines. Normally the ChildDeadline gets unset whenever ChildPid is unset. But if it does remain set the scheduler will eventually see a deadline in the past, causing it to reschedule every second, until a new child process gets created for that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 39d2342..3ec51d2 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -350,7 +350,7 @@ sub _CheckAndClassifyVMs() } else { - if (defined $VM->ChildPid or + if (defined $VM->ChildPid or defined $VM->ChildDeadline or $VM->Status =~ /^(?:running|reverting|sleeping)$/) { # The VM is missing its child process or it died unexpectedly. Mark

1 0

Francois Gouget : testbot: Document where parameters get untainted.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: tools Branch: master Commit: 7e94278bcdc46f9fbd61d6344efa6a80fc055caf URL: https://source.winehq.org/git/tools.git/?a=commit;h=7e94278bcdc46f9fbd61d63… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:06:38 2019 +0200 testbot: Document where parameters get untainted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e348834..46b2793 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) } } -# Check parameters +# Check and untaint parameters my $VM; if (!defined $Usage) { @@ -120,7 +120,7 @@ if (!defined $Usage) } elsif ($VMKey =~ /^([a-zA-Z0-9_]+)$/) { - $VMKey = $1; + $VMKey = $1; # untaint $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 4b9a4b9..37c20d1 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -329,7 +329,7 @@ if (!defined $Usage) } elsif ($BaseTag =~ m/^([\w_.\-]+)$/) { - $BaseTag = $1; + $BaseTag = $1; # untaint } else {

1 0

Francois Gouget : testbot/LibvirtTool: No need to wait for other TestBot processes.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: tools Branch: master Commit: 15486048713f333f213249840730b8e5ba77bc05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=15486048713f333f2132498… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:07:14 2019 +0200 testbot/LibvirtTool: No need to wait for other TestBot processes. The pid of any process started by the Engine is recorded in the VM's ChildPid field. Also the Engine kills any tool that would still be running before clearing the ChildPid field. So the Engine would not have started LibvirtTool if another process was using that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 46b2793..f031c78 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -297,18 +297,7 @@ sub Monitor() if ($IsPoweredOn) { $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - } - else - { - # Another process might have been trying to connect to the VM's - # TestAgent server. Wait for it to time out so it does not set the - # VM offline right after we have put it back online. - LogMsg "Powered off $VMKey. Sleep until all other processes accessing it are gone.\n"; - sleep(3 * $WaitForToolsInVM); - } + Error "$ErrMessage\n" if (defined $ErrMessage); $IsPoweredOn = undef; } }

1 0

Philip Rebohle : vkd3d-shader: Enable DemoteToHelperInvocation capability.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: vkd3d Branch: master Commit: ae44e06debdd07c044179e93405bd3866e4a8924 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae44e06debdd07c044179e9… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu Sep 12 15:46:27 2019 +0200 vkd3d-shader: Enable DemoteToHelperInvocation capability. Fixes validation errors complaining about invalid shader modules. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0fb499e..fe8935c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6510,6 +6510,7 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) { + vkd3d_spirv_enable_capability(builder, SpvCapabilityDemoteToHelperInvocationEXT); vkd3d_spirv_build_op_demote_to_helper_invocation(builder); vkd3d_spirv_build_op_branch(builder, merge_block_id); }

1 0

Alexandre Julliard : ntdll: Handle ATL thunk emulation in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 5501055ed585a9f0045d387a69ab5049af5797d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5501055ed585a9f0045d387a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 20:50:16 2019 +0200 ntdll: Handle ATL thunk emulation in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 109 +++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 66 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 587940c032..11ef7c393a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1682,9 +1682,9 @@ union atl_thunk * * Check if code destination is an ATL thunk, and emulate it if so. */ -static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) +static BOOL check_atl_thunk( ucontext_t *sigcontext, struct stack_layout *stack ) { - const union atl_thunk *thunk = (const union atl_thunk *)rec->ExceptionInformation[1]; + const union atl_thunk *thunk = (const union atl_thunk *)stack->rec.ExceptionInformation[1]; union atl_thunk thunk_copy; SIZE_T thunk_len; @@ -1694,62 +1694,61 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) if (thunk_len >= sizeof(thunk_copy.t1) && thunk_copy.t1.movl == 0x042444c7 && thunk_copy.t1.jmp == 0xe9) { - if (!virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + if (!virtual_uninterrupted_write_memory( (DWORD *)stack->context.Esp + 1, &thunk_copy.t1.this, sizeof(DWORD) )) { - context->Eip = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; + EIP_sig(sigcontext) = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; TRACE( "emulating ATL thunk type 1 at %p, func=%08x arg=%08x\n", - thunk, context->Eip, thunk_copy.t1.this ); + thunk, EIP_sig(sigcontext), thunk_copy.t1.this ); return TRUE; } } else if (thunk_len >= sizeof(thunk_copy.t2) && thunk_copy.t2.movl == 0xb9 && thunk_copy.t2.jmp == 0xe9) { - context->Ecx = thunk_copy.t2.this; - context->Eip = (DWORD_PTR)(&thunk->t2.func + 1) + thunk_copy.t2.func; + ECX_sig(sigcontext) = thunk_copy.t2.this; + EIP_sig(sigcontext) = (DWORD_PTR)(&thunk->t2.func + 1) + thunk_copy.t2.func; TRACE( "emulating ATL thunk type 2 at %p, func=%08x ecx=%08x\n", - thunk, context->Eip, context->Ecx ); + thunk, EIP_sig(sigcontext), ECX_sig(sigcontext) ); return TRUE; } else if (thunk_len >= sizeof(thunk_copy.t3) && thunk_copy.t3.movl1 == 0xba && thunk_copy.t3.movl2 == 0xb9 && thunk_copy.t3.jmp == 0xe1ff) { - context->Edx = thunk_copy.t3.this; - context->Ecx = thunk_copy.t3.func; - context->Eip = thunk_copy.t3.func; + EDX_sig(sigcontext) = thunk_copy.t3.this; + ECX_sig(sigcontext) = thunk_copy.t3.func; + EIP_sig(sigcontext) = thunk_copy.t3.func; TRACE( "emulating ATL thunk type 3 at %p, func=%08x ecx=%08x edx=%08x\n", - thunk, context->Eip, context->Ecx, context->Edx ); + thunk, EIP_sig(sigcontext), ECX_sig(sigcontext), EDX_sig(sigcontext) ); return TRUE; } else if (thunk_len >= sizeof(thunk_copy.t4) && thunk_copy.t4.movl1 == 0xb9 && thunk_copy.t4.movl2 == 0xb8 && thunk_copy.t4.jmp == 0xe0ff) { - context->Ecx = thunk_copy.t4.this; - context->Eax = thunk_copy.t4.func; - context->Eip = thunk_copy.t4.func; + ECX_sig(sigcontext) = thunk_copy.t4.this; + EAX_sig(sigcontext) = thunk_copy.t4.func; + EIP_sig(sigcontext) = thunk_copy.t4.func; TRACE( "emulating ATL thunk type 4 at %p, func=%08x eax=%08x ecx=%08x\n", - thunk, context->Eip, context->Eax, context->Ecx ); + thunk, EIP_sig(sigcontext), EAX_sig(sigcontext), ECX_sig(sigcontext) ); return TRUE; } else if (thunk_len >= sizeof(thunk_copy.t5) && thunk_copy.t5.inst1 == 0xff515859 && thunk_copy.t5.inst2 == 0x0460) { - DWORD func, stack[2]; - if (virtual_uninterrupted_read_memory( (DWORD *)context->Esp, - stack, sizeof(stack) ) == sizeof(stack) && - virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1, - &func, sizeof(DWORD) ) == sizeof(DWORD) && - !virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, &stack[0], sizeof(stack[0]) )) + DWORD func, sp[2]; + if (virtual_uninterrupted_read_memory( (DWORD *)stack->context.Esp, sp, sizeof(sp) ) == sizeof(sp) && + virtual_uninterrupted_read_memory( (DWORD *)sp[1] + 1, &func, sizeof(DWORD) ) == sizeof(DWORD) && + !virtual_uninterrupted_write_memory( (DWORD *)stack->context.Esp + 1, &sp[0], sizeof(sp[0]) )) { - context->Ecx = stack[0]; - context->Eax = stack[1]; - context->Esp = context->Esp + sizeof(DWORD); - context->Eip = func; + ECX_sig(sigcontext) = sp[0]; + EAX_sig(sigcontext) = sp[1]; + ESP_sig(sigcontext) += sizeof(DWORD); + EIP_sig(sigcontext) = func; TRACE( "emulating ATL thunk type 5 at %p, func=%08x eax=%08x ecx=%08x esp=%08x\n", - thunk, context->Eip, context->Eax, context->Ecx, context->Esp ); + thunk, EIP_sig(sigcontext), EAX_sig(sigcontext), + ECX_sig(sigcontext), ESP_sig(sigcontext) ); return TRUE; } } @@ -1901,41 +1900,6 @@ static inline DWORD get_fpu_code( const CONTEXT *context ) } -/********************************************************************** - * raise_segv_exception - */ -static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - switch(rec->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - if (rec->NumberParameters == 2) - { - if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) - { - ULONG flags; - NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, - &flags, sizeof(flags), NULL ); - - if (!(flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) && check_atl_thunk( rec, context )) - goto done; - - /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ - if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) - rec->ExceptionInformation[0] = EXCEPTION_READ_FAULT; - } - } - break; - } - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -done: - set_cpu_context( context ); -} - - /********************************************************************** * raise_generic_exception * @@ -2065,9 +2029,22 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = (get_error_code(context) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], FALSE ))) - return; + stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], + stack->rec.ExceptionInformation[0], FALSE ); + if (!stack->rec.ExceptionCode) return; + if (stack->rec.ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + stack->rec.ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) + { + ULONG flags; + NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &flags, sizeof(flags), NULL ); + if (!(flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) && check_atl_thunk( context, stack )) + return; + + /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ + if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) + stack->rec.ExceptionInformation[0] = EXCEPTION_READ_FAULT; + } break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ /* FIXME: pass through exception handler first? */ @@ -2091,7 +2068,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } done: - setup_raise_exception( context, stack, raise_segv_exception ); + setup_raise_exception( context, stack, raise_generic_exception ); }

1 0