June 2014 - Wine-commits - list.winehq.org

Sebastian Lackner : server: Avoid invalid memory access when thread is killed while in wake_up(). ( Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 35e56fb042e60d2182caa0ee25ad9ddba515e12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e56fb042e60d2182caa0ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 21 21:50:40 2014 +0200 server: Avoid invalid memory access when thread is killed while in wake_up(). (Valgrind). --- server/thread.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/thread.c b/server/thread.c index b310e93..50d6940 100644 --- a/server/thread.c +++ b/server/thread.c @@ -700,7 +700,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s } /* attempt to wake up a thread */ -/* return >0 if OK, 0 if the wait condition is still not satisfied */ +/* return >0 if OK, 0 if the wait condition is still not satisfied and -1 on error */ int wake_thread( struct thread *thread ) { int signaled, count; @@ -714,7 +714,10 @@ int wake_thread( struct thread *thread ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ - break; + { + if (!count) count = -1; + break; + } } return count; } @@ -865,12 +868,13 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c void wake_up( struct object *obj, int max ) { struct list *ptr; + int ret; LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (!wake_thread( get_wait_queue_thread( entry ))) continue; - if (max && !--max) break; + if (!(ret = wake_thread( get_wait_queue_thread( entry )))) continue; + if (ret > 0 && max && !--max) break; /* restart at the head of the list since a wake up can change the object wait queue */ ptr = &obj->wait_queue; }

1 0

Sebastian Lackner : kernel32: Fix a valgrind warning in format_add_char() . (Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 87a78ed8788e002afb4abd652fc40f1599a77c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a78ed8788e002afb4abd652… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:05:41 2014 +0200 kernel32: Fix a valgrind warning in format_add_char(). (Valgrind). --- dlls/kernel32/format_msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 37dcdb3..aee7d7a 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -297,7 +297,7 @@ static void format_add_char(struct _format_message_data *fmd, WCHAR c) LPWSTR notspace; if (fmd->space) { notspace = fmd->space; - while (*notspace == ' ' && notspace != fmd->t) + while (notspace != fmd->t && *notspace == ' ') notspace++; } else notspace = fmd->space = fmd->t;

1 0

Sebastian Lackner : kernel32/tests: Add missing HeapFree() in doChildren() . (Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: e5e4ef07b6e2a54000bb8572fb8bf69953cdfaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e4ef07b6e2a54000bb8572f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:47:52 2014 +0200 kernel32/tests: Add missing HeapFree() in doChildren(). (Valgrind). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 011ed5f..a802784 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -718,6 +718,8 @@ static void doChildren(int argc, char **argv) blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + + HeapFree(GetProcessHeap(), 0, cmd); } static void test_debug_children(char *name, DWORD flag, BOOL debug_child)

1 0

Sebastian Lackner : comctl32: Allocate new memory in notify_forward_header () to avoid Free() on wrong pointer. (Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 392321f4f68cb3d26453680c78aaa81910e15846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392321f4f68cb3d26453680c7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:30:45 2014 +0200 comctl32: Allocate new memory in notify_forward_header() to avoid Free() on wrong pointer. (Valgrind). --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7670f18..bc748c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -784,6 +784,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; + lpnmh->pitem->pszText = NULL; Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ @@ -791,6 +792,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } }

1 0

Sebastian Lackner : ntdll: Fix leaking activation context when terminating via exit_thread(). ( Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: cfd09b09675a9365f8f876b77947912e8f832861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd09b09675a9365f8f876b77… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 03:27:31 2014 +0200 ntdll: Fix leaking activation context when terminating via exit_thread(). (Valgrind). --- dlls/kernel32/thread.c | 1 - dlls/ntdll/thread.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5d87cdd..5b9a683 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -150,7 +150,6 @@ HANDLE WINAPI OpenThread( DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwTh */ void WINAPI ExitThread( DWORD code ) /* [in] Exit code for this thread */ { - RtlFreeThreadActivationContextStack(); RtlExitUserThread( code ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 56ea033..6e2ed67 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -376,6 +376,7 @@ void exit_thread( int status ) } LdrShutdownThread(); + RtlFreeThreadActivationContextStack(); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL );

1 0

Thomas Faber : msvcrt: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 1ab9c79dcae558da0f3c5c65bbef1b2f7cfacd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c79dcae558da0f3c5c65b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 22 15:15:10 2014 +0200 msvcrt: Do not omit mandatory argument to VirtualProtect. --- dlls/msvcrt/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c07005a..4e67cba 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -394,9 +394,10 @@ unsigned int CDECL _set_output_format(unsigned int new_output_format) int CDECL MSVCRT__resetstkoflw(void) { int stack_addr; + DWORD oldprot; /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */ - return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL ); + return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } /*********************************************************************

1 0

Michael Stefaniuc : comctl32: Functions using setjmp can never be inlined.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: c1cd60957e6bd12938a396e34476bbe219f69812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cd60957e6bd12938a396e34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 22 23:51:25 2014 +0200 comctl32: Functions using setjmp can never be inlined. --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4e0a58d..645068d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -135,7 +135,7 @@ static inline HIMAGELIST impl_from_IImageList2(IImageList2 *iface) static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); -static inline BOOL is_valid(HIMAGELIST himl); +static BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this:

1 0

Sebastian Lackner : kernel32/tests: Add missing ReleaseActCtx() calls. ( Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: c936e505e515f685606a1104f37686679df9883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c936e505e515f685606a1104f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 04:29:05 2014 +0200 kernel32/tests: Add missing ReleaseActCtx() calls. (Valgrind). --- dlls/kernel32/tests/thread.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 1ea5fb3..d3ecd2a 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1578,6 +1578,7 @@ static void test_thread_actctx(void) b = pGetCurrentActCtx(&handle); ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); + pReleaseActCtx(handle); param.handle = NULL; b = pGetCurrentActCtx(&param.handle); @@ -1590,6 +1591,7 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + pReleaseActCtx(param.thread_context); CloseHandle(thread); /* similar test for CreateRemoteThread() */ @@ -1600,8 +1602,11 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + pReleaseActCtx(param.thread_context); CloseHandle(thread); + pReleaseActCtx(param.handle); + b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); pReleaseActCtx(context);

1 0

Sebastian Lackner : ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 2fcecdb72e11b7adb03dc797c2ccc60fcb487fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcecdb72e11b7adb03dc797c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 22:25:52 2014 +0200 ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind). --- dlls/ntdll/thread.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6e2ed67..c8461b0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -520,8 +520,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * frame->ActivationContext = actctx; frame->Flags = 0; teb->ActivationContextStack.ActiveFrame = frame; - - RtlAddRefActivationContext(actctx); } info = (struct startup_info *)(teb + 1);

1 0

Sebastian Lackner : kernel32: Process DBG_RIPEXCEPTION events like regular exceptions.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 0114be0978b66371f708487c7a1c311a268be753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0114be0978b66371f708487c7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 02:56:12 2014 +0200 kernel32: Process DBG_RIPEXCEPTION events like regular exceptions. --- dlls/kernel32/debugger.c | 11 +++++++---- include/ntstatus.h | 1 + include/winnt.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 738b6f0..d4d66b2 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -85,6 +85,13 @@ BOOL WINAPI WaitForDebugEvent( event->u.DebugString.nDebugStringLength = data.exception.params[0]; break; } + else if (data.exception.exc_code == DBG_RIPEXCEPTION && data.exception.nb_params >= 2) + { + event->dwDebugEventCode = RIP_EVENT; + event->u.RipInfo.dwError = data.exception.params[0]; + event->u.RipInfo.dwType = data.exception.params[1]; + break; + } event->u.Exception.dwFirstChance = data.exception.first; event->u.Exception.ExceptionRecord.ExceptionCode = data.exception.exc_code; event->u.Exception.ExceptionRecord.ExceptionFlags = data.exception.flags; @@ -128,10 +135,6 @@ BOOL WINAPI WaitForDebugEvent( case UNLOAD_DLL_DEBUG_EVENT: event->u.UnloadDll.lpBaseOfDll = wine_server_get_ptr( data.unload_dll.base ); break; - case RIP_EVENT: - event->u.RipInfo.dwError = data.rip_info.error; - event->u.RipInfo.dwType = data.rip_info.type; - break; } done: /* nothing */ ; diff --git a/include/ntstatus.h b/include/ntstatus.h index 9a7ca7a..325ce55 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1212,6 +1212,7 @@ #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) #define DBG_PRINTEXCEPTION_C ((NTSTATUS) 0x40010006) +#define DBG_RIPEXCEPTION ((NTSTATUS) 0x40010007) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) diff --git a/include/winnt.h b/include/winnt.h index e9e330d..709a93f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -623,6 +623,7 @@ typedef DWORD FLONG; #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005) #define DBG_PRINTEXCEPTION_C ((DWORD) 0x40010006) +#define DBG_RIPEXCEPTION ((DWORD) 0x40010007) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001)

1 0