December 2017 - Wine-commits

Nikolay Sivov : comctl32/tests: Some tests for focus handling in owner-data listviews.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 3fe501fb602981876e09c9d396eb164b821740a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe501fb602981876e09c9d39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 12:09:44 2017 +0300 comctl32/tests: Some tests for focus handling in owner-data listviews. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 122 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0e12362..4e2efe4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -193,6 +193,12 @@ static const struct message empty_seq[] = { { 0 } }; +static const struct message parent_focus_change_ownerdata_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { 0 } +}; + static const struct message forward_erasebkgnd_parent_seq[] = { { WM_ERASEBKGND, sent }, { 0 } @@ -5996,6 +6002,7 @@ static void test_oneclickactivate(void) static void test_callback_mask(void) { + LVITEMA item; DWORD mask; HWND hwnd; BOOL ret; @@ -6012,6 +6019,121 @@ static void test_callback_mask(void) ok(mask == ~0u, "got 0x%08x\n", mask); DestroyWindow(hwnd); + + /* LVS_OWNERDATA, mask LVIS_FOCUSED */ + hwnd = create_listview_control(LVS_REPORT | LVS_OWNERDATA); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == 0, "Unexpected callback mask %#x.\n", mask); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, LVIS_FOCUSED, 0); + ok(ret, "Failed to set callback mask, %d\n", ret); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == LVIS_FOCUSED, "Unexpected callback mask %#x.\n", mask); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); +todo_wine + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + ok(ret == 0, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 1", FALSE); + + /* LVS_OWNDERDATA, empty mask */ + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, 0, 0); + ok(ret, "Failed to set callback mask, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == 0, "Unexpected selection mark, %d\n", ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); +todo_wine + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 2", TRUE); + + /* 2 items, focus on index 0, reduce to 1 item. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 2, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_focus_change_ownerdata_seq, + "parent seq, owner data/focus 3", TRUE); + + DestroyWindow(hwnd); } START_TEST(listview)

1 0

Nikolay Sivov : wininet/tests: Fix some leaks (Coverity).
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: aeb43942996e103f0a4fa0a898df394f8a2f4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb43942996e103f0a4fa0a89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 15:49:54 2017 +0300 wininet/tests: Fix some leaks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/ftp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 567545d..d2118fa 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -112,6 +112,7 @@ static void test_connect(HINTERNET hInternet) ok ( hFtp != NULL, "InternetConnect failed : %d\n", GetLastError()); ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); SetLastError(0xdeadbeef); hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", NULL, @@ -125,6 +126,7 @@ static void test_connect(HINTERNET hInternet) { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); } }

1 0

Austin English : iexplore: Move WineHQ URLs to https.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 956a65347bf8aed0c1121e2d49bcd7eddf9db26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=956a65347bf8aed0c1121e2d4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:08 2017 -0600 iexplore: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 1886352..68c17e3 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -26,11 +26,11 @@ HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet [Settings.Reg] -HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" -HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"https://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" HKCR,"Applications\iexplore.exe\shell\open\command",,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" -HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

1 0

Alexandre Julliard : ntdll: Start process execution directly at the kernel32 process entry point.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 23ec3ce2a3edc046872709733940dc51e77e0e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ec3ce2a3edc046872709733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 13:13:05 2017 +0100 ntdll: Start process execution directly at the kernel32 process entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 39 +++++++++++++++++++++++++++++++-------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 12 +++++++----- dlls/ntdll/signal_arm64.c | 16 +++++++++------- dlls/ntdll/signal_i386.c | 35 ++--------------------------------- dlls/ntdll/signal_powerpc.c | 16 +++++++++------- dlls/ntdll/signal_x86_64.c | 23 ++--------------------- dlls/ntdll/thread.c | 2 +- 8 files changed, 62 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23ec3ce2a3edc04687270…

1 0

Alexandre Julliard : ntdll: Pass the stack pointer to virtual_clear_thread_stack().
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: b526a48a245c866a1e3e18234a82aeca09561e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b526a48a245c866a1e3e18234… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 13:56:32 2017 +0100 ntdll: Pass the stack pointer to virtual_clear_thread_stack(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 63 ++++++++++++++++++++++------------------------ dlls/ntdll/signal_x86_64.c | 30 +++++++++------------- dlls/ntdll/virtual.c | 8 +++--- 4 files changed, 47 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 72c33fe..c9c79fb 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,7 +168,7 @@ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_H extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T extra_size ) DECLSPEC_HIDDEN; -extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; +extern void virtual_clear_thread_stack( void *stack_end ) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 8623152..351b67c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1312,7 +1312,7 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, * * Set the new CPU context. Used by NtSetContextThread. */ -static void set_cpu_context( const CONTEXT *context ) +void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_i386; @@ -2867,28 +2867,37 @@ __ASM_GLOBAL_FUNC( start_thread, "movl %ebp,(%eax)\n\t" /* build initial context on thread stack */ "movl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */ - "leal -0x2dc(%eax),%ecx\n\t" /* sizeof(context) + 16 */ - "movl $0x10007,(%ecx)\n\t" /* context->ContextFlags = CONTEXT_FULL */ - "movw %cs,0xbc(%ecx)\n\t" /* context->SegCs */ - "movw %ds,0x98(%ecx)\n\t" /* context->SegDs */ - "movw %es,0x94(%ecx)\n\t" /* context->SegEs */ - "movw %fs,0x90(%ecx)\n\t" /* context->SegFs */ - "movw %gs,0x8c(%ecx)\n\t" /* context->SegGs */ - "movw %ss,0xc8(%ecx)\n\t" /* context->SegSs */ + "leal -0x2dc(%eax),%esi\n\t" /* sizeof(context) + 16 */ + "movl $0x10007,(%esi)\n\t" /* context->ContextFlags = CONTEXT_FULL */ + "movw %cs,0xbc(%esi)\n\t" /* context->SegCs */ + "movw %ds,0x98(%esi)\n\t" /* context->SegDs */ + "movw %es,0x94(%esi)\n\t" /* context->SegEs */ + "movw %fs,0x90(%esi)\n\t" /* context->SegFs */ + "movw %gs,0x8c(%esi)\n\t" /* context->SegGs */ + "movw %ss,0xc8(%esi)\n\t" /* context->SegSs */ "movl 8(%ebp),%eax\n\t" - "movl %eax,0xb0(%ecx)\n\t" /* context->Eax = entry */ + "movl %eax,0xb0(%esi)\n\t" /* context->Eax = entry */ "movl 12(%ebp),%eax\n\t" - "movl %eax,0xa4(%ecx)\n\t" /* context->Ebx = arg */ + "movl %eax,0xa4(%esi)\n\t" /* context->Ebx = arg */ "movl 20(%ebp),%eax\n\t" - "movl %eax,0xb8(%ecx)\n\t" /* context->Eip = relay */ - "leal 0x2cc(%ecx),%eax\n\t" - "movl %eax,0xc4(%ecx)\n\t" /* context->Esp */ - /* switch to thread stack and call thread_startup() */ - "leal -12(%ecx),%esp\n\t" + "movl %eax,0xb8(%esi)\n\t" /* context->Eip = relay */ + "leal 0x2cc(%esi),%eax\n\t" + "movl %eax,0xc4(%esi)\n\t" /* context->Esp */ + /* switch to thread stack */ + "leal -12(%esi),%esp\n\t" + /* attach dlls */ "pushl 16(%ebp)\n\t" /* suspend */ - "pushl %ecx\n\t" /* context */ + "pushl %esi\n\t" /* context */ "xorl %ebp,%ebp\n\t" - "call " __ASM_NAME("thread_startup") ) + "call " __ASM_NAME("attach_dlls") "\n\t" + "addl $20,%esp\n\t" + /* clear the stack */ + "leal -0xd24(%esi),%eax\n\t" /* round down to page size */ + "pushl %eax\n\t" + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "movl %esi,(%esp)\n\t" + "call " __ASM_NAME("set_cpu_context") ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); __ASM_GLOBAL_FUNC( call_thread_exit_func, @@ -2951,24 +2960,13 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) /*********************************************************************** - * thread_startup - */ -void DECLSPEC_HIDDEN thread_startup( CONTEXT *context, BOOL suspend ) -{ - attach_dlls( context, suspend ); - virtual_clear_thread_stack(); - set_cpu_context( context ); -} - -/*********************************************************************** * signal_start_thread * * Thread startup sequence: * signal_start_thread() * -> start_thread() - * -> thread_startup() - * -> call_thread_entry() - * -> call_thread_func() + * -> call_thread_entry() + * -> call_thread_func() */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { @@ -2981,8 +2979,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend * Process startup sequence: * signal_start_process() * -> start_thread() - * -> thread_startup() - * -> kernel32_start_process() + * -> kernel32_start_process() */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 83521ee..c955c4c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1889,7 +1889,7 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, * * Set the new CPU context. Used by NtSetContextThread. */ -static void set_cpu_context( const CONTEXT *context ) +void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; @@ -4103,11 +4103,18 @@ __ASM_GLOBAL_FUNC( start_thread, "movq %rax,0x98(%r10)\n\t" /* context->Rsp */ "movq %rcx,0xf8(%r10)\n\t" /* context->Rip = relay */ "fxsave 0x100(%r10)\n\t" /* context->FtlSave */ - /* switch to thread stack and call thread_startup() */ + /* switch to thread stack */ "movq %r10,%rsp\n\t" + /* attach dlls */ "movq %r10,%rdi\n\t" /* context */ "movq %rdx,%rsi\n\t" /* suspend */ - "call " __ASM_NAME("thread_startup") ) + "call " __ASM_NAME("attach_dlls") "\n\t" + /* clear the stack */ + "leaq -0xb00(%rsp),%rdi\n\t" /* round down to page size */ + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "movq %rsp,%rdi\n\t" + "call " __ASM_NAME("set_cpu_context") ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); __ASM_GLOBAL_FUNC( call_thread_exit_func, @@ -4123,24 +4130,12 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, /*********************************************************************** - * thread_startup - */ -void DECLSPEC_HIDDEN thread_startup( CONTEXT *context, BOOL suspend ) -{ - attach_dlls( context, suspend ); - virtual_clear_thread_stack(); - set_cpu_context( context ); -} - - -/*********************************************************************** * signal_start_thread * * Thread startup sequence: * signal_start_thread() * -> start_thread() - * -> thread_startup() - * -> call_thread_func() + * -> call_thread_func() */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { @@ -4155,8 +4150,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend * Process startup sequence: * signal_start_process() * -> start_thread() - * -> thread_startup() - * -> kernel32_start_process() + * -> kernel32_start_process() */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8325b28..1156fc1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1825,13 +1825,13 @@ done: * * Clear the stack contents before calling the main entry point, some broken apps need that. */ -void virtual_clear_thread_stack(void) +void virtual_clear_thread_stack( void *stack_end ) { void *stack = NtCurrentTeb()->Tib.StackLimit; - size_t size = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + size_t size = (char *)stack_end - (char *)stack; - wine_anon_mmap( stack, size - page_size, PROT_READ | PROT_WRITE, MAP_FIXED ); - if (force_exec_prot) mprotect( stack, size - page_size, PROT_READ | PROT_WRITE | PROT_EXEC ); + wine_anon_mmap( stack, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); }

1 0

Fabian Maurer : msvcrt: Don' t crash if _vsnwprintf gets NULL as format string and add test.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 058be4304eb0c0e5f264e166b68991808a21001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=058be4304eb0c0e5f264e166b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Dec 1 18:19:31 2017 +0100 msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00..85dd80b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02ba..ee8120e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else

1 0

Fabian Maurer : wined3d: Unbind currently bound FBOs before dispatching compute shaders.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 0d45106054b8fedd8b05bada8e0e589c11bf6375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d45106054b8fedd8b05bada8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 4 17:30:24 2017 +0330 wined3d: Unbind currently bound FBOs before dispatching compute shaders. Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8af9e4b..23f63aa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4013,6 +4013,16 @@ void context_apply_compute_state(struct wined3d_context *context, context->update_unordered_access_view_bindings = 1; } + /* Updates to currently bound render targets aren't necessarily coherent + * between the graphics and compute pipelines. Unbind any currently bound + * FBO here to ensure preceding updates to its attachments by the graphics + * pipeline are visible to the compute pipeline. + * + * Without this, the bloom effect in Nier:Automata is too bright on the + * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ + context_bind_fbo(context, GL_FRAMEBUFFER, 0); + context_invalidate_state(context, STATE_FRAMEBUFFER); + context->last_was_blit = FALSE; }

1 0

Henri Verbeet : wined3d: Really remove an outdated comment.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 89d038e189515f08ec1d23a3abfb6ec5647aacf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d038e189515f08ec1d23a3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 4 17:30:25 2017 +0330 wined3d: Really remove an outdated comment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 04ab66b..5d08c00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2713,10 +2713,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } -/***************************************************************************** - * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - ****************************************************************************/ - /* Prototypes */ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src);

1 0

Nikolay Sivov : user32/tests: Added some tests for WM_GETTEXTLENGTH/ WM_GETTEXT after EM_GETHANDLE was used.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 71eac4a70b56ce5a8b20a0e10bacc7dcf7638627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eac4a70b56ce5a8b20a0e10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 21:31:35 2017 +0300 user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0926a58..783ced6 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2735,6 +2735,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2783,6 +2784,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Nikolay Sivov : mshtml: Avoid potential moniker instance leak.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 2b37b97d0c6356f8b89401183295222123e4b619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b37b97d0c6356f8b89401183… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 14:56:15 2017 +0300 mshtml: Avoid potential moniker instance leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 25767ef..b82750a 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -918,10 +918,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -976,10 +975,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; }

1 0