wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Sebastian Lackner : ntdll: Set correct number of arguments for breakpoint exceptions.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 123185c3a20a42b55b58e466de281d1162513e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=123185c3a20a42b55b58e466d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:09:17 2016 +0100 ntdll: Set correct number of arguments for breakpoint exceptions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5708aae..59dca6c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2170,6 +2170,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* fall through */ default: rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->NumberParameters = is_wow64 ? 1 : 3; + rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[1] = 0; /* FIXME */ + rec->ExceptionInformation[2] = 0; /* FIXME */ break; } } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 84802b2..1e88df3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2658,6 +2658,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* fall through */ default: rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = 0; break; } } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 670c37b..64f3dff 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2073,20 +2073,16 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) #ifdef __i386__ ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1, "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); - todo_wine ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); - todo_wine ok(rec->ExceptionInformation[0] == 0, "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #else ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); - todo_wine ok(rec->NumberParameters == 1, "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); - todo_wine ok(rec->ExceptionInformation[0] == 0, "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2;

1 0

Sebastian Lackner : ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: d0cc0dd69f029fcd54275784d3edc0f1426fc568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cc0dd69f029fcd54275784d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:42 2016 +0100 ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64. Similar to eab168cf9eaa6ed9f8800b25155d329376f2343f for x86. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index be5a342..84802b2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2482,6 +2482,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0f07404..670c37b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1911,7 +1911,6 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, @@ -1978,7 +1977,6 @@ static const BYTE call_debug_service_code[] = { static void test_debug_service(DWORD numexc) { - const BOOL is_win64 = (sizeof(void *) > sizeof(int)); DWORD (CDECL *func)(DWORD_PTR) = code_mem; DWORD expected_exc, expected_ret; void *vectored_handler; @@ -1999,7 +1997,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); @@ -2009,7 +2006,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); @@ -2019,7 +2015,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "invalid debug service generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "invalid debug service returned %u, expected %u\n", ret, expected_ret); @@ -2086,7 +2081,6 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); todo_wine

1 0

Sebastian Lackner : ntdll/tests: Add separate tests for exception handling of int $0x3.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 109e847f2ac79a31a4a39eaf854da8ee7c9ac9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=109e847f2ac79a31a4a39eaf8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:25 2016 +0100 ntdll/tests: Add separate tests for exception handling of int $0x3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 1871941..0f07404 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -954,6 +954,15 @@ static void test_debugger(void) if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 9 || stage == 10) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, + "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + ok((char *)ctx.Eip == (char *)code_mem_address + 2, + "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 2, ctx.Eip); + + if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2056,6 +2065,66 @@ static void test_debug_service(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD breakpoint_exceptions; + +static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_BREAKPOINT); + +#ifdef __i386__ + ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1, + "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); + todo_wine + ok(rec->NumberParameters == (is_wow64 ? 1 : 3), + "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + todo_wine + ok(rec->ExceptionInformation[0] == 0, + "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; +#else + todo_wine + ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, + "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); + todo_wine + ok(rec->NumberParameters == 1, + "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + todo_wine + ok(rec->ExceptionInformation[0] == 0, + "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2; +#endif + + breakpoint_exceptions++; + return (rec->ExceptionCode == EXCEPTION_BREAKPOINT) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static const BYTE breakpoint_code[] = { + 0xcd, 0x03, /* int $0x3 */ + 0xc3, /* ret */ +}; + +static void test_breakpoint(DWORD numexc) +{ + DWORD (CDECL *func)(void) = code_mem; + void *vectored_handler; + + memcpy(code_mem, breakpoint_code, sizeof(breakpoint_code)); + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &breakpoint_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + breakpoint_exceptions = 0; + func(); + ok(breakpoint_exceptions == numexc, "int $0x3 generated %u exceptions, expected %u\n", + breakpoint_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2179,6 +2248,10 @@ START_TEST(exception) test_debug_service(0); test_stage = 8; test_debug_service(1); + test_stage = 9; + test_breakpoint(0); + test_stage = 10; + test_breakpoint(1); } else skip( "RtlRaiseException not found\n" ); @@ -2194,6 +2267,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); test_debug_service(1); + test_breakpoint(1); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -2215,6 +2289,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); test_debug_service(1); + test_breakpoint(1); test_vectored_continue_handler(); test_virtual_unwind();

1 0

Sebastian Lackner : ntdll/tests: Add additional tests for instruction pointer in debug service tests.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 4e878e9114e16cef656f92aa61cb026669077751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e878e9114e16cef656f92aa6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:10 2016 +0100 ntdll/tests: Add additional tests for instruction pointer in debug service tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94ccd7a..1871941 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -949,6 +949,8 @@ static void test_debugger(void) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + ok((char *)ctx.Eip == (char *)code_mem_address + 0x1d, + "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 0x1d, ctx.Eip); if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } @@ -1885,6 +1887,8 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) rec->ExceptionCode, EXCEPTION_BREAKPOINT); #ifdef __i386__ + ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 0x1c, + "expected Eip = %x, got %x\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip); ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, @@ -1898,6 +1902,9 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else + todo_wine + ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, + "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax,

1 0

Charles Davis : winemac.drv: Actually make the GL context current even if no drawables were given.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 02416314ab6fb7238b28f0047089adfee4a52abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=02416314ab6fb7238b28f0047… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 17:40:54 2016 -0700 winemac.drv: Actually make the GL context current even if no drawables were given. The spec for GL_ARB_framebuffer_object (and thus, OpenGL 3.x and up) is quite clear on what happens when a context is made current with no drawable(s). In fact, the WGL_ARB_create_context extension amends WGL_ARB_make_current_read (as well as the base spec for wglMakeCurrent) specifically to allow this. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 3 +++ dlls/winemac.drv/opengl.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index ec2b191..4694dfd 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -235,7 +235,10 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) } if (context) + { [context removeFromViews:YES]; + [context makeCurrentContext]; + } } [pool release]; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ab79a82..f0c7048 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3057,7 +3057,13 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if ((hwnd = WindowFromDC(draw_hdc))) + if (!draw_hdc && !read_hdc) + { + context->draw_hwnd = NULL; + context->draw_view = NULL; + context->draw_pbuffer = NULL; + } + else if ((hwnd = WindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) {

1 0

Nikolay Sivov : dwrite: Fix Unknown/Common/ Inherited script categories handling.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 7dd90faaa3061609a806feeba9858d02b7ff8a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd90faaa3061609a806feeba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:56:18 2016 +0300 dwrite: Fix Unknown/Common/Inherited script categories handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 50 +++-- dlls/dwrite/scripts.c | 446 ++++++++++++++++++++++++++------------------- dlls/dwrite/tests/layout.c | 3 +- tools/make_unicode | 15 +- 4 files changed, 299 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dd90faaa3061609a806f…

1 0

Nikolay Sivov : dwrite: Make SetBidiLevel() calls relative to initial text source position.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 6992f86591f36ff6f5fc2e708778506385070bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6992f86591f36ff6f5fc2e708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:56:17 2016 +0300 dwrite: Make SetBidiLevel() calls relative to initial text source position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 891ace4..9dc9df3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -244,19 +244,19 @@ static inline UINT16 get_char_script(WCHAR c) return script; } -static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; - UINT32 pos, i, length; + UINT32 pos, i, seq_length; - if (!len) return S_OK; + if (!length) return S_OK; sa.script = get_char_script(*text); pos = position; - length = 1; + seq_length = 1; - for (i = 1; i < len; i++) + for (i = 1; i < length; i++) { UINT16 script = get_char_script(text[i]); @@ -264,24 +264,24 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, ID if (sa.script == Script_Unknown) sa.script = script; if (script == Script_Unknown && sa.script != Script_Common) script = sa.script; /* this is a length of a sequence to be reported next */ - if (sa.script == script) length++; + if (sa.script == script) seq_length++; if (sa.script != script) { HRESULT hr; sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; - hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); + hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); if (FAILED(hr)) return hr; pos = position + i; - length = 1; + seq_length = 1; sa.script = script; } } - /* 1 length case or normal completion call */ + /* one char length case or normal completion call */ sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; - return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); + return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); } struct linebreaking_state { @@ -793,14 +793,14 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface { UINT8 *levels = NULL, *explicit = NULL; UINT8 baselevel, level, explicit_level; + UINT32 pos, i, seq_length; WCHAR *buff = NULL; const WCHAR *text; - UINT32 pos, i; HRESULT hr; TRACE("(%p %u %u %p)\n", source, position, length, sink); - if (length == 0) + if (!length) return S_OK; hr = get_text_source_ptr(source, position, length, &text, &buff); @@ -822,20 +822,25 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface level = levels[0]; explicit_level = explicit[0]; - pos = 0; + pos = position; + seq_length = 1; + for (i = 1; i < length; i++) { - if (levels[i] != level || explicit[i] != explicit_level) { - hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, i - pos, explicit_level, level); + if (levels[i] == level && explicit[i] == explicit_level) + seq_length++; + else { + hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, seq_length, explicit_level, level); if (FAILED(hr)) - break; + goto done; + + pos += seq_length; + seq_length = 1; level = levels[i]; explicit_level = explicit[i]; - pos = i; } - - if (i == length - 1) - hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, length - pos, explicit_level, level); } + /* one char length case or normal completion call */ + hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, seq_length, explicit_level, level); done: heap_free(explicit);

1 0

Nikolay Sivov : kernel32/tests: Additional test for GetStringTypeW() and Zl/Zp categories.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 10caa6295c2e9e80eba6f376dda863a6f0bd360a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10caa6295c2e9e80eba6f376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:39:07 2016 +0300 kernel32/tests: Additional test for GetStringTypeW() and Zl/Zp categories. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0117a39..57dc418 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3667,8 +3667,8 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + WCHAR ch[2]; BOOL ret; - WCHAR ch; int i; /* NULL src */ @@ -3743,19 +3743,27 @@ static void test_GetStringTypeW(void) ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); /* surrogate pairs */ - ch = 0xd800; + ch[0] = 0xd800; memset(types, 0, sizeof(types)); - GetStringTypeW(CT_CTYPE3, &ch, 1, types); + GetStringTypeW(CT_CTYPE3, ch, 1, types); if (types[0] == C3_NOTAPPLICABLE) win_skip("C3_HIGHSURROGATE/C3_LOWSURROGATE are not supported.\n"); else { ok(types[0] == C3_HIGHSURROGATE, "got %x\n", types[0]); - ch = 0xdc00; + ch[0] = 0xdc00; memset(types, 0, sizeof(types)); - GetStringTypeW(CT_CTYPE3, &ch, 1, types); + GetStringTypeW(CT_CTYPE3, ch, 1, types); ok(types[0] == C3_LOWSURROGATE, "got %x\n", types[0]); } + + /* Zl, Zp categories */ + ch[0] = 0x2028; + ch[1] = 0x2029; + memset(types, 0, sizeof(types)); + GetStringTypeW(CT_CTYPE1, ch, 2, types); + ok(types[0] == (C1_DEFINED|C1_SPACE), "got %x\n", types[0]); + ok(types[1] == (C1_DEFINED|C1_SPACE), "got %x\n", types[1]); } static void test_IdnToNameprepUnicode(void)

1 0

Charles Davis : quartz: Remove unused variable (Clang).
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 51ed908467ecd8299333456ef8b2fcfb7a13ea56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ed908467ecd8299333456ef… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 13:22:34 2016 -0700 quartz: Remove unused variable (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0a2c507..7212807 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -844,25 +844,3 @@ HRESULT WINAPI PullPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl PullPin_Vtbl = -{ - PullPin_QueryInterface, - BasePinImpl_AddRef, - PullPin_Release, - BaseInputPinImpl_Connect, - PullPin_ReceiveConnection, - PullPin_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - PullPin_EndOfStream, - PullPin_BeginFlush, - PullPin_EndFlush, - PullPin_NewSegment -};

1 0

Charles Davis : secur32: Don't print 32-bit values as long integers (Clang ).
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: c1d61f649d9c7fc6b6d6a78adebbe68c4b4a88af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d61f649d9c7fc6b6d6a78ad… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 15:08:02 2016 -0700 secur32: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index cfd2371..1c9b35d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -362,14 +362,14 @@ static const struct cipher_suite* get_cipher_suite(SSLCipherSuite cipher_suite) static DWORD schan_get_session_protocol(struct mac_session* s) { SSLProtocol protocol; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedProtocolVersion(s->context, &protocol); if (status != noErr) { - ERR("Failed to get session protocol: %ld\n", status); + ERR("Failed to get session protocol: %d\n", status); return 0; } @@ -652,7 +652,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre { struct mac_session *s; unsigned i; - OSStatus status; + int status; TRACE("(%p)\n", session); @@ -663,21 +663,21 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { - ERR("Failed to create session context: %ld\n", (long)status); + ERR("Failed to create session context: %d\n", status); goto fail; } status = SSLSetConnection(s->context, s); if (status != noErr) { - ERR("Failed to set session connection: %ld\n", (long)status); + ERR("Failed to set session connection: %d\n", status); goto fail; } status = SSLSetEnableCertVerify(s->context, FALSE); if (status != noErr) { - ERR("Failed to disable certificate verification: %ld\n", (long)status); + ERR("Failed to disable certificate verification: %d\n", status); goto fail; } @@ -689,7 +689,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) != 0); if (status != noErr) { - ERR("Failed to set SSL version %d: %ld\n", protocol_priority_flags[i].mac_version, (long)status); + ERR("Failed to set SSL version %d: %d\n", protocol_priority_flags[i].mac_version, status); goto fail; } } @@ -697,7 +697,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLSetIOFuncs(s->context, schan_pull_adapter, schan_push_adapter); if (status != noErr) { - ERR("Failed to set session I/O funcs: %ld\n", (long)status); + ERR("Failed to set session I/O funcs: %d\n", status); goto fail; } @@ -714,13 +714,13 @@ fail: void schan_imp_dispose_session(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLDisposeContext(s->context); if (status != noErr) - ERR("Failed to dispose of session context: %ld\n", status); + ERR("Failed to dispose of session context: %d\n", status); HeapFree(GetProcessHeap(), 0, s); } @@ -746,7 +746,7 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); @@ -768,7 +768,7 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) } else { - ERR("Handshake failed: %ld\n", (long)status); + ERR("Handshake failed: %d\n", status); cssmPerror("SSLHandshake", status); return SEC_E_INTERNAL_ERROR; } @@ -782,14 +782,14 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return 0; } @@ -838,14 +838,14 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p, %p)\n", s, s->context, info); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -883,7 +883,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session PCCERT_CONTEXT cert = NULL; SecCertificateRef mac_cert; CFArrayRef cert_array; - OSStatus status; + int status; CFIndex cnt, i; CFDataRef data; BOOL res; @@ -897,7 +897,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session #endif if (status != noErr || !cert_array) { - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + WARN("SSLCopyPeerCertificates failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -942,7 +942,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -961,7 +961,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, } else { - WARN("SSLWrite failed: %ld\n", (long)status); + WARN("SSLWrite failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -972,7 +972,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -991,7 +991,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, } else { - WARN("SSLRead failed: %ld\n", (long)status); + WARN("SSLRead failed: %d\n", status); return SEC_E_INTERNAL_ERROR; }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
76
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 February 2016