wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Sebastian Lackner : ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 9d82ee5cac7c5c260e757f8ac1cda6afcdb4ab04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d82ee5cac7c5c260e757f8ac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:04:20 2014 +0200 ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events. --- dlls/ntdll/tests/exception.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5fc21de..2074f0a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -968,6 +968,26 @@ static void test_debugger(void) if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (de.dwDebugEventCode == RIP_EVENT) + { + int stage; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 5 || stage == 6) + { + ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n", + de.u.RipInfo.dwError, 0x11223344); + ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n", + de.u.RipInfo.dwType, 0x55667788); + } + else + ok(FALSE, "unexpected stage %x\n", stage); + + if (stage == 6) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1719,6 +1739,55 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD ripevent_exceptions; + +static LONG CALLBACK ripevent_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, DBG_RIPEXCEPTION); + ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[0], 0x11223344); + ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[1], 0x55667788); + + ripevent_exceptions++; + return (rec->ExceptionCode == DBG_RIPEXCEPTION) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_ripevent(DWORD numexc) +{ + EXCEPTION_RECORD record; + PVOID vectored_handler; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &ripevent_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + record.ExceptionCode = DBG_RIPEXCEPTION; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 2; + record.ExceptionInformation[0] = 0x11223344; + record.ExceptionInformation[1] = 0x55667788; + + ripevent_exceptions = 0; + pRtlRaiseException(&record); + ok(ripevent_exceptions == numexc, "RtlRaiseException generated %d exceptions, expected %d\n", + ripevent_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1792,6 +1861,10 @@ START_TEST(exception) test_outputdebugstring(0, FALSE); test_stage = 4; test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ + test_stage = 5; + test_ripevent(0); + test_stage = 6; + test_ripevent(1); } else skip( "RtlRaiseException not found\n" ); @@ -1804,6 +1877,7 @@ START_TEST(exception) test_exceptions(); test_rtlraiseexception(); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1821,6 +1895,7 @@ START_TEST(exception) "RtlLookupFunctionEntry" ); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Sebastian Lackner : server: Get rid of RIP_EVENT union elements.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 9696ea506309b4ee4b72c456085a785b5d59c2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9696ea506309b4ee4b72c4560… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:02:31 2014 +0200 server: Get rid of RIP_EVENT union elements. --- include/wine/server_protocol.h | 8 +------- server/debugger.c | 2 +- server/protocol.def | 6 ------ server/trace.c | 4 ---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a5ecb20..57ab839 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -112,12 +112,6 @@ typedef union int __pad; mod_handle_t base; } unload_dll; - struct - { - int code; - int error; - int type; - } rip_info; } debug_event_t; @@ -5840,6 +5834,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 455 +#define SERVER_PROTOCOL_VERSION 456 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 3ccec29..374f2ad 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -211,7 +211,7 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); -#define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ +#define NB_DEBUG_EVENTS UNLOAD_DLL_DEBUG_EVENT static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = { diff --git a/server/protocol.def b/server/protocol.def index 61b9ed5..a8c1fb9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -128,12 +128,6 @@ typedef union int __pad; mod_handle_t base; /* base address of the dll */ } unload_dll; - struct - { - int code; /* RIP_EVENT */ - int error; /* ??? */ - int type; /* ??? */ - } rip_info; } debug_event_t; /* supported CPU types */ diff --git a/server/trace.c b/server/trace.c index 0887daf..4834354 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,10 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; - case RIP_EVENT: - fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, - event.rip_info.error, event.rip_info.type ); - break; case 0: /* zero is the code returned on timeouts */ fprintf( stderr, "%s{}", prefix ); break;

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

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/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

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

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

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

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 : 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

← Newer
1
...
6
7
8
9
10
11
12
...
38
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 June 2014