August 2020 - Wine-commits - list.winehq.org

Rémi Bernon : dinput8: Stop using LL hooks for mouse devices.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 447bce4117a58910690a0d2610ebcbdd49ae9127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447bce4117a58910690a0d26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 10 11:04:17 2020 +0200 dinput8: Stop using LL hooks for mouse devices. LL hooks are heavy and using them cause performance hit with high polling rate mice. We don't need them anymore since we now use rawinput API for mouse device. This also uses a separate list for rawinput mouse devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1c4a26987f..45023fc104 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -104,6 +104,7 @@ static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); +static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); @@ -116,7 +117,7 @@ void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection( &dinput_hook_crit ); if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) - list_add_tail( &acquired_mouse_list, &dev->entry ); + list_add_tail( dev->use_raw_input ? &acquired_rawmouse_list : &acquired_mouse_list, &dev->entry ); else if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) list_add_tail( &acquired_keyboard_list, &dev->entry ); else @@ -657,11 +658,8 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR else if (ri.header.dwType == RIM_TYPEMOUSE) { EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) - { - if (!dev->use_raw_input) continue; + LIST_FOR_EACH_ENTRY( dev, &acquired_rawmouse_list, IDirectInputDeviceImpl, entry ) dinput_mouse_rawinput_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam, &ri ); - } LeaveCriticalSection( &dinput_hook_crit ); } } @@ -1720,7 +1718,6 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) { - if (dev->use_raw_input) continue; TRACE("calling dinput_mouse_hook (%p %lx %lx)\n", dev, wparam, lparam); skip |= dinput_mouse_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); } @@ -1764,6 +1761,14 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); } } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_rawmouse_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) { if (msg->hwnd == dev->win && msg->hwnd != foreground)

1 0

Paul Gofman : ntdll: Support UWOP_PUSH_MACHFRAME opcode in RtlVirtualUnwind() on x64.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 76556bc5885b45f88ca436fb2f04cdf79bc29af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76556bc5885b45f88ca436fb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 12 23:19:54 2020 +0300 ntdll: Support UWOP_PUSH_MACHFRAME opcode in RtlVirtualUnwind() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 28 ++++++++++++++++++--- dlls/ntdll/tests/exception.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 36a7b03380..3ed8952689 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -792,6 +792,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, ULONG64 frame, off; struct UNWIND_INFO *info; unsigned int i, prolog_offset; + BOOL mach_frame = FALSE; TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); if (TRACE_ON(seh)) dump_unwind_info( base, function ); @@ -864,7 +865,23 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, set_float_reg( context, ctx_ptr, info->opcodes[i].info, (M128A *)off ); break; case UWOP_PUSH_MACHFRAME: - FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); + if (info->flags & UNW_FLAG_CHAININFO) + { + FIXME("PUSH_MACHFRAME with chained unwind info.\n"); + break; + } + if (i + get_opcode_size(info->opcodes[i]) < info->count ) + { + FIXME("PUSH_MACHFRAME is not the last opcode.\n"); + break; + } + + if (info->opcodes[i].info) + context->Rsp += 0x8; + + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp = *(ULONG64 *)(context->Rsp + 24); + mach_frame = TRUE; break; case UWOP_EPILOG: if (info->version == 2) @@ -879,9 +896,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, function = &handler_data->chain; /* restart with the chained info */ } - /* now pop return address */ - context->Rip = *(ULONG64 *)context->Rsp; - context->Rsp += sizeof(ULONG64); + if (!mach_frame) + { + /* now pop return address */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + } if (!(info->flags & type)) return NULL; /* no matching handler */ if (prolog_offset != ~0) return NULL; /* inside prolog */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d5b8040857..f74ddde0f2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2021,11 +2021,15 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (j == rsp) /* rsp is special */ { + ULONG64 expected_rsp; + ok( !ctx_ptr.IntegerContext[j], "%u/%u: rsp should not be set in ctx_ptr\n", testnum, i ); - ok( context.Rsp == (ULONG64)fake_stack + test->results[i].regs[k][1], + expected_rsp = test->results[i].regs[k][1] < 0 + ? -test->results[i].regs[k][1] : (ULONG64)fake_stack + test->results[i].regs[k][1]; + ok( context.Rsp == expected_rsp, "%u/%u: register rsp wrong %p/%p\n", - testnum, i, (void *)context.Rsp, (char *)fake_stack + test->results[i].regs[k][1] ); + testnum, i, (void *)context.Rsp, (void *)expected_rsp ); continue; } @@ -2159,10 +2163,60 @@ static void test_virtual_unwind(void) { 0x16, 0x50, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, }; + static const BYTE function_2[] = + { + 0x55, /* 00: push %rbp */ + 0x90, 0x90, /* 01: nop; nop */ + 0x5d, /* 03: pop %rbp */ + 0xc3 /* 04: ret */ + }; + + static const BYTE unwind_info_2[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 2, /* opcode count */ + 0, /* frame reg */ + + 0x01, UWOP(PUSH_NONVOL, rbp), /* 02: push %rbp */ + 0x00, UWOP(PUSH_MACHFRAME, 0), /* 00 */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_2[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x008, 0x000, { {rsp,-0x020}, {rbp,0x000}, {-1,-1} }}, + }; + + static const BYTE unwind_info_3[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 2, /* opcode count */ + 0, /* frame reg */ + + 0x01, UWOP(PUSH_NONVOL, rbp), /* 02: push %rbp */ + 0x00, UWOP(PUSH_MACHFRAME, 1), /* 00 */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_3[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x010, 0x000, { {rsp,-0x028}, {rbp,0x000}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, - { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) } + { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, + { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, + { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) }, }; unsigned int i;

1 0

Paul Gofman : ntdll: Fix unwind from call_consolidate_callback() for PE build on x64.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: c76dc32feffaeed260bf73499e43012b69bee1b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c76dc32feffaeed260bf7349… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 12 23:19:55 2020 +0300 ntdll: Fix unwind from call_consolidate_callback() for PE build on x64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49698 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 71 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3ed8952689..28e4ec8ca6 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1011,8 +1011,8 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT * Wrapper function to call a consolidate callback from a fake frame. * If the callback executes RtlUnwindEx (like for example done in C++ handlers), * we have to skip all frames which were already processed. To do that we - * trick the unwinding functions into thinking the call came from somewhere - * else. All CFI instructions are either DW_CFA_def_cfa_expression or + * trick the unwinding functions into thinking the call came from the specified + * context. All CFI instructions are either DW_CFA_def_cfa_expression or * DW_CFA_expression, and the expressions have the following format: * * DW_OP_breg6; sleb128 0x10 | Load %rbp + 0x10 @@ -1025,15 +1025,26 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rbp\n\t" - __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" - __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x20,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x20\n\t") + + /* Setup SEH machine frame. */ + "subq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq 0xf8(%rcx),%rax\n\t" /* Context->Rip */ + "movq %rax,(%rsp)\n\t" + "movq 0x98(%rcx),%rax\n\t" /* context->Rsp */ + "movq %rax,0x18(%rsp)\n\t" + __ASM_SEH(".seh_pushframe\n\t") __ASM_SEH(".seh_endprologue\n\t") + + "subq $0xf8,%rsp\n\t" /* 10*16 (float regs) + 7*8 (int regs) + 32 (shadow store). */ + __ASM_SEH(".seh_stackalloc 0xf8\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0xf8\n\t") + + /* Setup CFI unwind to context. */ "movq %rcx,0x10(%rbp)\n\t" __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI(".cfi_escape 0x0f,0x07,0x76,0x10,0x06,0x23,0x98,0x01,0x06\n\t") /* CFA */ @@ -1056,9 +1067,57 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_escape 0x10,0x1e,0x06,0x76,0x10,0x06,0x23,0xf0,0x04\n\t") /* %xmm13 */ __ASM_CFI(".cfi_escape 0x10,0x1f,0x06,0x76,0x10,0x06,0x23,0x80,0x05\n\t") /* %xmm14 */ __ASM_CFI(".cfi_escape 0x10,0x20,0x06,0x76,0x10,0x06,0x23,0x90,0x05\n\t") /* %xmm15 */ + + /* Setup SEH unwind registers restore. */ + "movq 0x90(%rcx),%rax\n\t" /* context->Rbx */ + "movq %rax,0x20(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rbx, 0x20\n\t") + "movq 0xa8(%rcx),%rax\n\t" /* context->Rsi */ + "movq %rax,0x28(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rsi, 0x28\n\t") + "movq 0xb0(%rcx),%rax\n\t" /* context->Rdi */ + "movq %rax,0x30(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rdi, 0x30\n\t") + + "movq 0xd8(%rcx),%rax\n\t" /* context->R12 */ + "movq %rax,0x38(%rsp)\n\t" + __ASM_SEH(".seh_savereg %r12, 0x38\n\t") + "movq 0xe0(%rcx),%rax\n\t" /* context->R13 */ + "movq %rax,0x40(%rsp)\n\t" + __ASM_SEH(".seh_savereg %r13, 0x40\n\t") + "movq 0xe8(%rcx),%rax\n\t" /* context->R14 */ + "movq %rax,0x48(%rsp)\n\t" + __ASM_SEH(".seh_savereg %r14, 0x48\n\t") + "movq 0xf0(%rcx),%rax\n\t" /* context->R15 */ + "movq %rax,0x50(%rsp)\n\t" + __ASM_SEH(".seh_savereg %r15, 0x50\n\t") + "pushq %rsi\n\t" + "pushq %rdi\n\t" + "leaq 0x200(%rcx),%rsi\n\t" + "leaq 0x60(%rsp),%rdi\n\t" + "movq $0x14,%rcx\n\t" + "cld\n\t" + "rep; movsq\n\t" + "popq %rdi\n\t" + "popq %rsi\n\t" + __ASM_SEH(".seh_savexmm %xmm6, 0x60\n\t") + __ASM_SEH(".seh_savexmm %xmm7, 0x70\n\t") + __ASM_SEH(".seh_savexmm %xmm8, 0x80\n\t") + __ASM_SEH(".seh_savexmm %xmm9, 0x90\n\t") + __ASM_SEH(".seh_savexmm %xmm10, 0xa0\n\t") + __ASM_SEH(".seh_savexmm %xmm11, 0xb0\n\t") + __ASM_SEH(".seh_savexmm %xmm12, 0xc0\n\t") + __ASM_SEH(".seh_savexmm %xmm13, 0xd0\n\t") + __ASM_SEH(".seh_savexmm %xmm14, 0xe0\n\t") + __ASM_SEH(".seh_savexmm %xmm15, 0xf0\n\t") + + /* call the callback. */ "movq %r8,%rcx\n\t" "callq *%rdx\n\t" __ASM_CFI(".cfi_restore_state\n\t") + "nop\n\t" /* Otherwise RtlVirtualUnwind() will think we are inside epilogue and + * interpret / execute the rest of opcodes here instead of unwind through + * machine frame. */ "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t"

1 0

Rémi Bernon : wbemprox: Use empty strings instead of NULL.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 75fb68e42423362ae945c0c0554f0dcd4d2e169b URL: https://source.winehq.org/git/wine.git/?a=commit;h=75fb68e42423362ae945c0c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 15:35:16 2020 +0200 wbemprox: Use empty strings instead of NULL. For Win32_PhysicalMemory PartNumber and Serial properties. Injustice 2 calls SysStringLen directly on the value without checking its type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4edda854b5..4326822193 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2920,8 +2920,8 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ - rec->partnumber = NULL; - rec->serial = NULL; + rec->partnumber = L""; + rec->serial = L""; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Serge Gautherie : winapi_test: PshpackN.h can only be 1/2/4/8.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 44df633d1914180b8ed1b0c61d4c7e39be5030a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44df633d1914180b8ed1b0c6… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Aug 12 05:40:44 2020 +0200 winapi_test: PshpackN.h can only be 1/2/4/8. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 9d016fff28..1ad94a6103 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -409,7 +409,7 @@ foreach my $file (@files) { my $preprocessor = shift; #print "found_preprocessor: $begin_line: [$_]\n"; - if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d+)\.h[\">]$/) { + if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d)\.h[\">]$/) { push @packs, $1 unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found pack $1 on line $begin_line\n"; } elsif($preprocessor =~ /^\#\s*include\s+[\"<]poppack\.h[\">]$/) {

1 0

Serge Gautherie : winapi_test: Escape parentheses in regexp, Allow spaces around them.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 4cd1aa12b947bb85a1e25d736c520594fa357046 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cd1aa12b947bb85a1e25d73… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Aug 12 05:41:02 2020 +0200 winapi_test: Escape parentheses in regexp, Allow spaces around them. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 1ad94a6103..e9e5fe43ec 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { push @ifdefs, ($pointer_size == 4); - } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { push @ifdefs, 2;

1 0

Serge Gautherie : winapi_test: '* long *' is 4 bytes, not pointer size, on Windows.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 78e9192d07dcae6b903a6fdbe3d8098a073e4e69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78e9192d07dcae6b903a6fdb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Aug 12 05:41:16 2020 +0200 winapi_test: '* long *' is 4 bytes, not pointer size, on Windows. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index e9e5fe43ec..8c566776e3 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -231,9 +231,10 @@ sub _find_align_kind_size($) { $kind = "float"; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { - $align = $pointer_size; + # 'long' is always 4 bytes on Windows. + $align = 4; $kind = defined($1) ? $1 : "signed"; - $size = $pointer_size; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed";

1 0

Serge Gautherie : winapi_test: Minor $pointer_size check consistency tweak.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 84458b1927441fa418d984bb4b5f56b8b0e54bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84458b1927441fa418d984bb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Aug 12 05:41:31 2020 +0200 winapi_test: Minor $pointer_size check consistency tweak. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8c566776e3..fd80157289 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { - push @ifdefs, ($pointer_size == 4); + push @ifdefs, ($pointer_size != 8); } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) {

1 0

Nikolay Sivov : shell32: Silence Destination List QueryInterface() failure message.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 9d57c5f56c1c40ae0293ec05db5cb5cd9d0b16be URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d57c5f56c1c40ae0293ec05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 14:32:16 2020 +0300 shell32: Silence Destination List QueryInterface() failure message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b9e4903a97..9d565ab074 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1446,7 +1446,7 @@ static HRESULT WINAPI CustomDestinationList_QueryInterface(ICustomDestinationLis *obj = &This->ICustomDestinationList_iface; } else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("Unsupported interface %s.\n", shdebugstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; }

1 0

Gabriel Ivăncescu : msscript.ocx/tests: Add initial tests for Script Procedures.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 697a44a7950da66f151b4fa9843955606e38e379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=697a44a7950da66f151b4fa9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:37 2020 +0300 msscript.ocx/tests: Add initial tests for Script Procedures. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 607 ++++++++++++++++++++++++++++++++++++- 1 file changed, 605 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=697a44a7950da66f151b…

1 0