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

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 2ab87290200553e90ec121651148ff4cdbb71e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab87290200553e90ec121651… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 19 23:30:35 2014 +0200 Assorted spelling/grammar fixes. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/dmusic/collection.c | 2 +- dlls/gdi32/region.c | 2 +- dlls/ole32/storage32.h | 2 +- dlls/shell32/tests/shlfolder.c | 4 ++-- dlls/usp10/usp10.c | 2 +- dlls/wininet/internet.c | 4 ++-- dlls/wintrust/tests/crypt.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 062fe02..b62d5f6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1890,7 +1890,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * * Returns * DD_OK on success - * DDERR_INVALIDPARAMS of free and total are NULL + * DDERR_INVALIDPARAMS if free and total are NULL * *****************************************************************************/ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, @@ -4174,7 +4174,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, * D3D_OK on success * DDERR_OUTOFMEMORY if memory allocation failed * The return value of IWineD3DDevice::CreateVertexBuffer if this call fails - * DDERR_INVALIDPARAMS if desc or vertex_buffer are NULL + * DDERR_INVALIDPARAMS if desc or vertex_buffer is NULL * *****************************************************************************/ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFERDESC *desc, diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5754884..ec9914f 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,7 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ DLSHEADER *pHeader; /* pool table */ POOLTABLE *pPoolTable; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93aa6a7..a5df6f1 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -891,7 +891,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - /* user requested buffer size with rgndata NULL */ + /* user requested buffer size with NULL rgndata */ return FIELD_OFFSET(RGNDATA, Buffer[size]); } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 108aad7..36cbc9d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -504,7 +504,7 @@ StgStreamImpl* StgStreamImpl_Construct( /* Range lock constants. * * The storage format reserves the region from 0x7fffff00-0x7fffffff for - * locking and synchronization. Unfortuantely, the spec doesn't say which bytes + * locking and synchronization. Unfortunately, the spec doesn't say which bytes * within that range are used, and for what. These are guesses based on testing. * In particular, ends of ranges may be wrong. diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 474f605..e58a863 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3642,8 +3642,8 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); /* BHID_Transfer - ITransferSource and ITransferDestination are accessible starting Vista, IUnknown is - supported start Win8. */ + ITransferSource and ITransferDestination are accessible starting from Vista, IUnknown is + supported starting from Win8. */ hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_ITransferSource, (void**)&punk); ok(hr == S_OK || broken(FAILED(hr)) /* pre-Vista */, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14feb6d..8769bd9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -904,7 +904,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0xc || str[index] == 0x20 || str[index] == 0x202f) return Script_CR; - /* These punctuation are separated out as Latin punctuation */ + /* These punctuation characters are separated out as Latin punctuation */ if (strchrW(latin_punc,str[index])) return Script_Punctuation2; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bb46a43..aa58e34 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2104,7 +2104,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); @@ -2130,7 +2130,7 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 55f9ece..0e77f93 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -240,7 +240,7 @@ static void test_context(void) * FIXME: * We don't want to mess too much with these for now so we should delete only the ones * that shouldn't be there like the deadbeef ones. We first have to figure out if it's - * save to remove files and directories from CatRoot/CatRoot2. + * safe to remove files and directories from CatRoot/CatRoot2. */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0);

1 0

Sebastian Lackner : ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 3aa62498da73d75464fa52a8937c787602572ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa62498da73d75464fa52a89… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 23:15:42 2014 +0200 ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables. --- dlls/ntdll/tests/exception.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 40cdea7..032cc0b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -434,38 +434,38 @@ static const BYTE call_unwind_code[] = { static void test_unwind(void) { - EXCEPTION_REGISTRATION_RECORD frame2, frame1; + EXCEPTION_REGISTRATION_RECORD frames[2], *frame2 = &frames[0], *frame1 = &frames[1]; DWORD (*func)(void* function, EXCEPTION_REGISTRATION_RECORD *pEndFrame, EXCEPTION_RECORD* record, DWORD retval) = code_mem; DWORD retval; memcpy(code_mem, call_unwind_code, sizeof(call_unwind_code)); /* add first unwind handler */ - frame1.Handler = unwind_handler; - frame1.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame1; + frame1->Handler = unwind_handler; + frame1->Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = frame1; /* add second unwind handler */ - frame2.Handler = unwind_handler; - frame2.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame2; + frame2->Handler = unwind_handler; + frame2->Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = frame2; /* test unwind to current frame */ unwind_expected_eax = 0xDEAD0000; - retval = func(pRtlUnwind, &frame2, NULL, 0xDEAD0000); + retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000); ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); - ok(pNtCurrentTeb()->Tib.ExceptionList == &frame2, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, &frame2); + ok(pNtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, frame2); /* unwind to frame1 */ unwind_expected_eax = 0xDEAD0000; - retval = func(pRtlUnwind, &frame1, NULL, 0xDEAD0000); + retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000); ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); - ok(pNtCurrentTeb()->Tib.ExceptionList == &frame1, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, &frame1); + ok(pNtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, frame1); /* restore original handler */ - pNtCurrentTeb()->Tib.ExceptionList = frame1.Prev; + pNtCurrentTeb()->Tib.ExceptionList = frame1->Prev; } static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,

1 0

Sebastian Lackner : ntdll/tests: Run crashing i386 exception tests as the last step.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 457f6af05747831f9b78488c23b84a98cb89ebaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=457f6af05747831f9b78488c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 10:06:36 2014 +0200 ntdll/tests: Run crashing i386 exception tests as the last step. --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 032cc0b..623a25e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1767,13 +1767,14 @@ START_TEST(exception) } test_unwind(); - test_prot_fault(); test_exceptions(); test_rtlraiseexception(); + test_outputdebugstring(); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); test_dpe_exceptions(); + test_prot_fault(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -1785,6 +1786,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); + test_outputdebugstring(); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) @@ -1794,7 +1796,5 @@ START_TEST(exception) #endif - test_outputdebugstring(); - VirtualFree(code_mem, 0, MEM_FREE); }

1 0

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

20 Jun '14

Module: wine Branch: master Commit: 15fa6111af44eebf313fe058e849f602db494e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fa6111af44eebf313fe058e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 21:18:31 2014 +0200 kernel32: Process OutputDebugString events like regular exceptions. --- dlls/kernel32/debugger.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 34ef30a..738b6f0 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -77,6 +77,14 @@ BOOL WINAPI WaitForDebugEvent( switch(data.code) { case EXCEPTION_DEBUG_EVENT: + if (data.exception.exc_code == DBG_PRINTEXCEPTION_C && data.exception.nb_params >= 2) + { + event->dwDebugEventCode = OUTPUT_DEBUG_STRING_EVENT; + event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.exception.params[1] ); + event->u.DebugString.fUnicode = FALSE; + event->u.DebugString.nDebugStringLength = data.exception.params[0]; + 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; @@ -120,11 +128,6 @@ BOOL WINAPI WaitForDebugEvent( case UNLOAD_DLL_DEBUG_EVENT: event->u.UnloadDll.lpBaseOfDll = wine_server_get_ptr( data.unload_dll.base ); break; - case OUTPUT_DEBUG_STRING_EVENT: - event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.output_string.string ); - event->u.DebugString.fUnicode = FALSE; - event->u.DebugString.nDebugStringLength = data.output_string.length; - break; case RIP_EVENT: event->u.RipInfo.dwError = data.rip_info.error; event->u.RipInfo.dwType = data.rip_info.type; @@ -251,10 +254,12 @@ void WINAPI OutputDebugStringA( LPCSTR str ) { static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; + BOOL caught_by_dbg = TRUE; if (!str) str = ""; + WARN("%s\n", debugstr_a(str)); - /* raise fake exception to make copy protections happy */ + /* raise exception, WaitForDebugEvent() will generate a corresponding debug event */ __TRY { ULONG_PTR args[2]; @@ -264,25 +269,12 @@ void WINAPI OutputDebugStringA( LPCSTR str ) } __EXCEPT(debug_exception_handler) { + caught_by_dbg = FALSE; } __ENDTRY - - /* send string to attached debugger */ - /* FIXME should only send to debugger if exception is not caught by user-mode application */ - - SERVER_START_REQ( output_debug_string ) - { - req->string = wine_server_client_ptr( str ); - req->length = strlen(str) + 1; - wine_server_call( req ); - } - SERVER_END_REQ; - - WARN("%s\n", debugstr_a(str)); + if (caught_by_dbg) return; /* send string to a system-wide monitor */ - /* FIXME should only send to monitor if no debuggers are attached */ - if (!mutex_inited) { /* first call to OutputDebugString, initialize mutex handle */

1 0

Sebastian Lackner : server: Remove output_debug_string request.
by Alexandre Julliard 20 Jun '14

20 Jun '14

Module: wine Branch: master Commit: 2f9fdec310a69aa0d8773c923fd58df1b40a83ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9fdec310a69aa0d8773c923… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 20 15:23:04 2014 +0200 server: Remove output_debug_string request. --- include/wine/server_protocol.h | 24 +----------------------- server/debugger.c | 20 +------------------- server/protocol.def | 13 ------------- server/request.h | 5 ----- server/trace.c | 14 -------------- 5 files changed, 2 insertions(+), 74 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d69ad3..a5ecb20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,12 +115,6 @@ typedef union struct { int code; - data_size_t length; - client_ptr_t string; - } output_string; - struct - { - int code; int error; int type; } rip_info; @@ -2261,19 +2255,6 @@ struct get_exception_status_reply -struct output_debug_string_request -{ - struct request_header __header; - data_size_t length; - client_ptr_t string; -}; -struct output_debug_string_reply -{ - struct reply_header __header; -}; - - - struct continue_debug_event_request { struct request_header __header; @@ -5171,7 +5152,6 @@ enum request REQ_wait_debug_event, REQ_queue_exception_event, REQ_get_exception_status, - REQ_output_debug_string, REQ_continue_debug_event, REQ_debug_process, REQ_debug_break, @@ -5433,7 +5413,6 @@ union generic_request struct wait_debug_event_request wait_debug_event_request; struct queue_exception_event_request queue_exception_event_request; struct get_exception_status_request get_exception_status_request; - struct output_debug_string_request output_debug_string_request; struct continue_debug_event_request continue_debug_event_request; struct debug_process_request debug_process_request; struct debug_break_request debug_break_request; @@ -5693,7 +5672,6 @@ union generic_reply struct wait_debug_event_reply wait_debug_event_reply; struct queue_exception_event_reply queue_exception_event_reply; struct get_exception_status_reply get_exception_status_reply; - struct output_debug_string_reply output_debug_string_reply; struct continue_debug_event_reply continue_debug_event_reply; struct debug_process_reply debug_process_reply; struct debug_break_reply debug_break_reply; @@ -5862,6 +5840,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 454 +#define SERVER_PROTOCOL_VERSION 455 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 0bb9fb8..3315f6e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -209,13 +209,6 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) return 1; } -static int fill_output_debug_string_event( struct debug_event *event, const void *arg ) -{ - const debug_event_t *data = arg; - event->data.output_string = data->output_string; - return 1; -} - typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); #define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ @@ -228,8 +221,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = fill_exit_thread_event, /* EXIT_THREAD_DEBUG_EVENT */ fill_exit_process_event, /* EXIT_PROCESS_DEBUG_EVENT */ fill_load_dll_event, /* LOAD_DLL_DEBUG_EVENT */ - fill_unload_dll_event, /* UNLOAD_DLL_DEBUG_EVENT */ - fill_output_debug_string_event /* OUTPUT_DEBUG_STRING_EVENT */ + fill_unload_dll_event /* UNLOAD_DLL_DEBUG_EVENT */ }; @@ -695,16 +687,6 @@ DECL_HANDLER(get_exception_status) } } -/* send an output string to the debugger */ -DECL_HANDLER(output_debug_string) -{ - debug_event_t data; - - data.output_string.string = req->string; - data.output_string.length = req->length; - generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); -} - /* simulate a breakpoint in a process */ DECL_HANDLER(debug_break) { diff --git a/server/protocol.def b/server/protocol.def index fec5e75..61b9ed5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -130,12 +130,6 @@ typedef union } unload_dll; struct { - int code; /* OUTPUT_DEBUG_STRING_EVENT */ - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ - } output_string; - struct - { int code; /* RIP_EVENT */ int error; /* ??? */ int type; /* ??? */ @@ -1728,13 +1722,6 @@ enum char_info_mode @END -/* Send an output string to the debugger */ -(a)REQ(output_debug_string) - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ -(a)END - - /* Continue a debug event */ @REQ(continue_debug_event) process_id_t pid; /* process id to continue */ diff --git a/server/request.h b/server/request.h index 8e35b0d..e25e327 100644 --- a/server/request.h +++ b/server/request.h @@ -194,7 +194,6 @@ DECL_HANDLER(next_thread); DECL_HANDLER(wait_debug_event); DECL_HANDLER(queue_exception_event); DECL_HANDLER(get_exception_status); -DECL_HANDLER(output_debug_string); DECL_HANDLER(continue_debug_event); DECL_HANDLER(debug_process); DECL_HANDLER(debug_break); @@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_wait_debug_event, (req_handler)req_queue_exception_event, (req_handler)req_get_exception_status, - (req_handler)req_output_debug_string, (req_handler)req_continue_debug_event, (req_handler)req_debug_process, (req_handler)req_debug_break, @@ -1228,9 +1226,6 @@ C_ASSERT( sizeof(struct queue_exception_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_request) == 16 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index b792494..0887daf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,11 +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 OUTPUT_DEBUG_STRING_EVENT: - fprintf( stderr, "%s{output_string", prefix ); - dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",len=%u}", event.output_string.length ); - break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, event.rip_info.error, event.rip_info.type ); @@ -2174,12 +2169,6 @@ static void dump_get_exception_status_reply( const struct get_exception_status_r dump_varargs_context( " context=", cur_size ); } -static void dump_output_debug_string_request( const struct output_debug_string_request *req ) -{ - fprintf( stderr, " length=%u", req->length ); - dump_uint64( ", string=", &req->string ); -} - static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4184,7 +4173,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_wait_debug_event_request, (dump_func)dump_queue_exception_event_request, (dump_func)dump_get_exception_status_request, - (dump_func)dump_output_debug_string_request, (dump_func)dump_continue_debug_event_request, (dump_func)dump_debug_process_request, (dump_func)dump_debug_break_request, @@ -4444,7 +4432,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_reply, NULL, NULL, - NULL, (dump_func)dump_debug_break_reply, NULL, (dump_func)dump_read_process_memory_reply, @@ -4700,7 +4687,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "wait_debug_event", "queue_exception_event", "get_exception_status", - "output_debug_string", "continue_debug_event", "debug_process", "debug_break",

1 0

Jacek Caban : wininet: Use current server in HTTP_GetRedirectURL.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 153abe0fa7f654a9030915724fafa287e3eb9d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153abe0fa7f654a9030915724… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:45 2014 +0200 wininet: Use current server in HTTP_GetRedirectURL. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bea7308..6c60c3a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3973,9 +3973,9 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; urlComponents.dwSchemeLength = 0; - urlComponents.lpszHostName = session->hostName; + urlComponents.lpszHostName = request->server->name; urlComponents.dwHostNameLength = 0; - urlComponents.nPort = session->hostPort; + urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName; urlComponents.dwUserNameLength = 0; urlComponents.lpszPassword = NULL;

1 0

Vincent Povirk : windowscodecs: Fix leak in test_QueryCapability.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 1aa6e581d74df95c74b17ffddd1f52d451d3dc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa6e581d74df95c74b17ffdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 16:02:05 2014 -0500 windowscodecs: Fix leak in test_QueryCapability. --- dlls/windowscodecs/tests/tiffformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 5e01562..cee8882 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -235,6 +235,9 @@ static void test_QueryCapability(void) todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); + if (SUCCEEDED(hr)) + IWICBitmapDecoder_Release(decoder); + pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr);

1 0

Sebastian Lackner : ntdll/tests: Add exception tests for RtlUnwind on i386.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 0828715179cf28b05fe3e3dce74a9d76709a1679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0828715179cf28b05fe3e3dce… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 10:06:36 2014 +0200 ntdll/tests: Add exception tests for RtlUnwind on i386. --- dlls/ntdll/tests/exception.c | 80 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 05bc15c..40cdea7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -43,6 +43,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); +static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); @@ -390,6 +391,83 @@ static void test_rtlraiseexception(void) run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); } +static DWORD unwind_expected_eax; + +static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + trace("exception: %08x flags:%x addr:%p context: Eip:%x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip); + + ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, STATUS_UNWIND); + ok(rec->ExceptionAddress == (char *)code_mem + 0x22, "ExceptionAddress at %p instead of %p\n", + rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n", + context->Eax, unwind_expected_eax); + + context->Eax += 1; + return ExceptionContinueSearch; +} + +static const BYTE call_unwind_code[] = { + 0x55, /* push %ebp */ + 0x53, /* push %ebx */ + 0x56, /* push %esi */ + 0x57, /* push %edi */ + 0xe8, 0x00, 0x00, 0x00, 0x00, /* call 0 */ + 0x58, /* 0: pop %eax */ + 0x05, 0x1e, 0x00, 0x00, 0x00, /* add $0x1e,%eax */ + 0xff, 0x74, 0x24, 0x20, /* push 0x20(%esp) */ + 0xff, 0x74, 0x24, 0x20, /* push 0x20(%esp) */ + 0x50, /* push %eax */ + 0xff, 0x74, 0x24, 0x24, /* push 0x24(%esp) */ + 0x8B, 0x44, 0x24, 0x24, /* mov 0x24(%esp),%eax */ + 0xff, 0xd0, /* call *%eax */ + 0x5f, /* pop %edi */ + 0x5e, /* pop %esi */ + 0x5b, /* pop %ebx */ + 0x5d, /* pop %ebp */ + 0xc3, /* ret */ + 0xcc, /* int $3 */ +}; + +static void test_unwind(void) +{ + EXCEPTION_REGISTRATION_RECORD frame2, frame1; + DWORD (*func)(void* function, EXCEPTION_REGISTRATION_RECORD *pEndFrame, EXCEPTION_RECORD* record, DWORD retval) = code_mem; + DWORD retval; + + memcpy(code_mem, call_unwind_code, sizeof(call_unwind_code)); + + /* add first unwind handler */ + frame1.Handler = unwind_handler; + frame1.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame1; + + /* add second unwind handler */ + frame2.Handler = unwind_handler; + frame2.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame2; + + /* test unwind to current frame */ + unwind_expected_eax = 0xDEAD0000; + retval = func(pRtlUnwind, &frame2, NULL, 0xDEAD0000); + ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); + ok(pNtCurrentTeb()->Tib.ExceptionList == &frame2, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, &frame2); + + /* unwind to frame1 */ + unwind_expected_eax = 0xDEAD0000; + retval = func(pRtlUnwind, &frame1, NULL, 0xDEAD0000); + ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); + ok(pNtCurrentTeb()->Tib.ExceptionList == &frame1, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, &frame1); + + /* restore original handler */ + pNtCurrentTeb()->Tib.ExceptionList = frame1.Prev; +} + static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { @@ -1625,6 +1703,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, @@ -1687,6 +1766,7 @@ START_TEST(exception) return; } + test_unwind(); test_prot_fault(); test_exceptions(); test_rtlraiseexception();

1 0

Vincent Povirk : windowscodecs: Fix leak in test_propertybag_getpropertyinfo.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: ed92450d6f7474311561f0bc6322fd39a2c57b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92450d6f7474311561f0bc6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 15:48:36 2014 -0500 windowscodecs: Fix leak in test_propertybag_getpropertyinfo. --- dlls/windowscodecs/tests/propertybag.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index b3cf191..55f5f65 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -67,10 +67,12 @@ static void test_propertybag_getpropertyinfo(IPropertyBag2 *property, ULONG expe ok(pb[0].vt == VT_UI1, "Invalid variant type, pb[0].vt=%x\n", pb[0].vt); ok(pb[0].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[0].dwType=%x\n", pb[0].dwType); ok(lstrcmpW(pb[0].pstrName, wszTestProperty1) == 0, "Invalid property name, pb[0].pstrName=%s\n", wine_dbgstr_w(pb[0].pstrName)); + CoTaskMemFree(pb[0].pstrName); ok(pb[1].vt == VT_R4, "Invalid variant type, pb[1].vt=%x\n", pb[1].vt); ok(pb[1].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[1].dwType=%x\n", pb[1].dwType); ok(lstrcmpW(pb[1].pstrName, wszTestProperty2) == 0, "Invalid property name, pb[1].pstrName=%s\n", wine_dbgstr_w(pb[1].pstrName)); + CoTaskMemFree(pb[1].pstrName); } static void test_propertybag_countproperties(IPropertyBag2 *property, ULONG expected_count)

1 0

Vincent Povirk : windowscodecs: Fix leak in test_QueryCapability.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 0f2efcf0c528f9c6b831e5f13d495a26a38734e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2efcf0c528f9c6b831e5f13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 16:02:05 2014 -0500 windowscodecs: Fix leak in test_QueryCapability. --- dlls/windowscodecs/tests/tiffformat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index aac6618..5e01562 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -239,6 +239,8 @@ todo_wine hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + IWICBitmapDecoder_Release(decoder); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0