April 2017 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Implement WsResetChannel.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 29d4c50391cdd5a129d84cc41838bd8714128aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d4c50391cdd5a129d84cc41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:22 2017 +0200 webservices: Implement WsResetChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 65 ++++++++++++++++++++++++++++++--------- dlls/webservices/tests/channel.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 111 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index d44fcc0..d82aa67 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -121,14 +121,27 @@ static struct channel *alloc_channel(void) return ret; } -static void free_channel( struct channel *channel ) +static void reset_channel( struct channel *channel ) { - WsFreeWriter( channel->writer ); - WsFreeReader( channel->reader ); + channel->state = WS_CHANNEL_STATE_CREATED; + heap_free( channel->addr.url.chars ); + channel->addr.url.chars = NULL; + channel->addr.url.length = 0; + WinHttpCloseHandle( channel->http_request ); + channel->http_request = NULL; WinHttpCloseHandle( channel->http_connect ); + channel->http_connect = NULL; WinHttpCloseHandle( channel->http_session ); - heap_free( channel->addr.url.chars ); + channel->http_session = NULL; +} + +static void free_channel( struct channel *channel ) +{ + reset_channel( channel ); + + WsFreeWriter( channel->writer ); + WsFreeReader( channel->reader ); channel->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &channel->cs ); @@ -226,6 +239,38 @@ void WINAPI WsFreeChannel( WS_CHANNEL *handle ) } /************************************************************************** + * WsResetChannel [webservices.@] + */ +HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!channel) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if (channel->state != WS_CHANNEL_STATE_CREATED && channel->state != WS_CHANNEL_STATE_CLOSED) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } + + reset_channel( channel ); + + LeaveCriticalSection( &channel->cs ); + return S_OK; +} + +/************************************************************************** * WsGetChannelProperty [webservices.@] */ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID id, void *buf, @@ -343,17 +388,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end static HRESULT close_channel( struct channel *channel ) { - WinHttpCloseHandle( channel->http_request ); - channel->http_request = NULL; - WinHttpCloseHandle( channel->http_connect ); - channel->http_connect = NULL; - WinHttpCloseHandle( channel->http_session ); - channel->http_session = NULL; - - heap_free( channel->addr.url.chars ); - channel->addr.url.chars = NULL; - channel->addr.url.length = 0; - + reset_channel( channel ); channel->state = WS_CHANNEL_STATE_CLOSED; return S_OK; } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index f053c15..74cef3b 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -103,8 +103,68 @@ static void test_WsOpenChannel(void) WsFreeChannel( channel ); } +static void test_WsResetChannel(void) +{ + WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t'}; + HRESULT hr; + WS_CHANNEL *channel; + WS_CHANNEL_STATE state; + WS_CHANNEL_TYPE type; + WS_ENDPOINT_ADDRESS addr; + ULONG size, timeout; + + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetChannel( channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + timeout = 5000; + size = sizeof(timeout); + hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.chars = url; + addr.headers = NULL; + addr.extensions = NULL; + addr.identity = NULL; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetChannel( channel, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetChannel( channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + type = 0xdeadbeef; + size = sizeof(type); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_REQUEST, "got %u\n", type ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 5000, "got %u\n", timeout ); + + WsFreeChannel( channel ); +} + START_TEST(channel) { test_WsCreateChannel(); test_WsOpenChannel(); + test_WsResetChannel(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index fd4a831..0a3057d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -133,7 +133,7 @@ @ stub WsRemoveNode @ stub WsRequestReply @ stub WsRequestSecurityToken -@ stub WsResetChannel +@ stdcall WsResetChannel(ptr ptr) @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) @ stub WsResetListener

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 5488acf1d37ed64de4b516951d2c24529259a04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5488acf1d37ed64de4b516951… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:21 2017 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5488acf1d37ed64de4b51…

1 0

Henri Verbeet : usp10: Simplify the chaining context table assignments in GPOS_apply_ChainContextPos ().
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: f6c0146499cf0b0c632c1c14ba910dfdce57db6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c0146499cf0b0c632c1c14b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 5 10:21:27 2017 +0200 usp10: Simplify the chaining context table assignments in GPOS_apply_ChainContextPos(). And avoid some endian conversions in the process. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fd8fe91..b5ee5d1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2226,57 +2226,54 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, } else if (GET_BE_WORD(backtrack->PosFormat) == 3) { + WORD backtrack_count, input_count, lookahead_count; int k; - int indexGlyphs; const GPOS_ChainContextPosFormat3_2 *input; const GPOS_ChainContextPosFormat3_3 *lookahead; const GPOS_ChainContextPosFormat3_4 *positioning; TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n"); - for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) + backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + input = (const GPOS_ChainContextPosFormat3_2 *)&backtrack->Coverage[backtrack_count]; + input_count = GET_BE_WORD(input->InputGlyphCount); + lookahead = (const GPOS_ChainContextPosFormat3_3 *)&input->Coverage[input_count]; + lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + positioning = (const GPOS_ChainContextPosFormat3_4 *)&lookahead->Coverage[lookahead_count]; + + for (k = 0; k < backtrack_count; ++k) { offset = GET_BE_WORD(backtrack->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, glyphs[glyph_index + (dirBacktrack * (k + 1))]) == -1) break; } - if (k != GET_BE_WORD(backtrack->BacktrackGlyphCount)) + if (k != backtrack_count) continue; TRACE("Matched Backtrack\n"); - input = (const GPOS_ChainContextPosFormat3_2 *)((BYTE *)backtrack + - FIELD_OFFSET(GPOS_ChainContextPosFormat3_1, Coverage[GET_BE_WORD(backtrack->BacktrackGlyphCount)])); - - indexGlyphs = GET_BE_WORD(input->InputGlyphCount); - for (k = 0; k < indexGlyphs; k++) + for (k = 0; k < input_count; ++k) { offset = GET_BE_WORD(input->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, glyphs[glyph_index + (write_dir * k)]) == -1) break; } - if (k != indexGlyphs) + if (k != input_count) continue; TRACE("Matched IndexGlyphs\n"); - lookahead = (const GPOS_ChainContextPosFormat3_3 *)((BYTE *)input + - FIELD_OFFSET(GPOS_ChainContextPosFormat3_2, Coverage[GET_BE_WORD(input->InputGlyphCount)])); - - for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k) + for (k = 0; k < lookahead_count; ++k) { offset = GET_BE_WORD(lookahead->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, - glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) + glyphs[glyph_index + (dirLookahead * (input_count + k))]) == -1) break; } - if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) + if (k != lookahead_count) continue; TRACE("Matched LookAhead\n"); - positioning = (const GPOS_ChainContextPosFormat3_4 *)((BYTE *)lookahead + - FIELD_OFFSET(GPOS_ChainContextPosFormat3_3, Coverage[GET_BE_WORD(lookahead->LookaheadGlyphCount)])); - if (GET_BE_WORD(positioning->PosCount)) { for (k = 0; k < GET_BE_WORD(positioning->PosCount); ++k) @@ -2288,7 +2285,7 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, goffset); } - return indexGlyphs + GET_BE_WORD(lookahead->LookaheadGlyphCount); + return input_count + lookahead_count; } else return 1; }

1 0

Nikolay Sivov : dwrite: Fix explicit levels returned for LRE and RLE control characters.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: abfc973c85290d8c30bf0c7d19b03a2ef85e7208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfc973c85290d8c30bf0c7d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:06 2017 +0300 dwrite: Fix explicit levels returned for LRE and RLE control characters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 4 ++-- dlls/dwrite/tests/analyzer.c | 6 ------ dlls/dwrite/tests/layout.c | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 3a7367e..d4ee2ca 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -278,7 +278,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels /* X2 */ case RLE: least_odd = get_greater_odd_level(stack[stack_top].level); - levels[i] = stack[stack_top].level; + levels[i] = valid_level(least_odd) ? least_odd : stack[stack_top].level; if (valid_level(least_odd)) push_stack(least_odd, NI, FALSE); else if (overflow_isolate_count == 0) @@ -288,7 +288,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels /* X3 */ case LRE: least_even = get_greater_even_level(stack[stack_top].level); - levels[i] = stack[stack_top].level; + levels[i] = valid_level(least_even) ? least_even : stack[stack_top].level; if (valid_level(least_even)) push_stack(least_even, NI, FALSE); else if (overflow_isolate_count == 0) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7af19d7..2e2a2e9 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2282,42 +2282,36 @@ static const struct bidi_test bidi_tests[] = { DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 2, 2, 0, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', LRE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 0, 2, 2, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { RLE, PDF, 'a', 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 1, 1, 0, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', RLE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 0, 1, 1, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', RLE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, { 1, 3, 3, 1 }, { 2, 2, 2, 2 }, - TRUE }, { { LRE, PDF, 'a', 'b', 0 }, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, { 2, 2, 1, 1 }, { 1, 1, 2, 2 }, - TRUE }, { { PDF, 'a', 'b', 0 }, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ecc57df..38b818c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1648,7 +1648,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", TRUE); + ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", FALSE); IDWriteTextLayout_Release(layout); /* strikethrough splits ranges from renderer point of view, but doesn't break

1 0

Nikolay Sivov : dwrite: Classify direction control characters as complex.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: a42a9940cf310a9f083e80b0dcc671733b4e0f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42a9940cf310a9f083e80b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:03 2017 +0300 dwrite: Classify direction control characters as complex. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 +++- dlls/dwrite/tests/analyzer.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 14a93e8..27a11f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1524,7 +1524,9 @@ static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyze static inline BOOL is_char_from_simple_script(WCHAR c) { - if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c)) + if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c) || + /* LRM, RLM, LRE, RLE, PDF, LRO, RLO */ + c == 0x200e || c == 0x200f || (c >= 0x202a && c <= 0x202e)) return FALSE; else { UINT16 script = get_char_script(c); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index a0dbb186..21809ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,7 +1197,13 @@ static const struct textcomplexity_test textcomplexity_tests[] = { { {0x610,0x610,'C','D',0}, 2, FALSE, 2 }, { {0xd800,'A','B',0}, 1, FALSE, 1 }, { {0xd800,'A','B',0}, 2, FALSE, 1 }, - { {0xdc00,'A','B',0}, 2, FALSE, 1 } + { {0xdc00,'A','B',0}, 2, FALSE, 1 }, + { {0x202a,'A',0x202c,0}, 3, FALSE, 1 }, + { {0x200e,'A',0}, 2, FALSE, 1 }, + { {0x200f,'A',0}, 2, FALSE, 1 }, + { {0x202d,'A',0}, 2, FALSE, 1 }, + { {0x202e,'A',0}, 2, FALSE, 1 }, + }; static void test_GetTextComplexity(void)

1 0

Huw Davies : riched20: Don' t compare the colours if the old and new states are both auto.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 5f3772a730073b950ff42d43015a6d72608e3f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3772a730073b950ff42d430… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 14:02:08 2017 +0100 riched20: Don't compare the colours if the old and new states are both auto. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d579084..6b654ca 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -769,14 +769,14 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOBACKCOLOR || - old_fmt->crBackColor != fmt->crBackColor) + (!(fmt->dwEffects & CFE_AUTOBACKCOLOR) && old_fmt->crBackColor != fmt->crBackColor)) { if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crBackColor, &i ); sprintf(props + strlen(props), "\\cb%u", i); } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR || - old_fmt->crTextColor != fmt->crTextColor) + (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor)) { if (fmt->dwEffects & CFE_AUTOCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crTextColor, &i );

1 0

Józef Kucia : wined3d: Recognize SM5 ibfe opcode.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 132b3d4dce0fc37cb4178797b3e8b43e1bba40ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=132b3d4dce0fc37cb4178797b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:53 2017 +0200 wined3d: Recognize SM5 ibfe opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4eb603f..446d649 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5131,6 +5131,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_HS_JOIN_PHASE */ NULL, /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IBFE */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 20a2208..d36d99c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9963,6 +9963,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_HS_JOIN_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, + /* WINED3DSIH_IBFE */ NULL, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ab8d85c..e96c15f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase", /* WINED3DSIH_HS_JOIN_PHASE */ "hs_join_phase", /* WINED3DSIH_IADD */ "iadd", + /* WINED3DSIH_IBFE */ "ibfe", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 770ef18..3e8b1f2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -240,6 +240,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_FIRSTBIT_LO = 0x88, WINED3D_SM5_OP_FIRSTBIT_SHI = 0x89, WINED3D_SM5_OP_UBFE = 0x8a, + WINED3D_SM5_OP_IBFE = 0x8b, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, @@ -974,6 +975,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_FIRSTBIT_LO, WINED3DSIH_FIRSTBIT_LO, "u", "u"}, {WINED3D_SM5_OP_FIRSTBIT_SHI, WINED3DSIH_FIRSTBIT_SHI, "u", "i"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, + {WINED3D_SM5_OP_IBFE, WINED3DSIH_IBFE, "i", "iii"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0211d8e..4acb94f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -767,6 +767,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_HS_FORK_PHASE, WINED3DSIH_HS_JOIN_PHASE, WINED3DSIH_IADD, + WINED3DSIH_IBFE, WINED3DSIH_IEQ, WINED3DSIH_IF, WINED3DSIH_IFC,

1 0

Nikolay Sivov : dwrite: Use transformed glyph origins in glyph run analysis.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: da697572dca0663fd010cc78db342328757f54ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=da697572dca0663fd010cc78d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:17 2017 +0300 dwrite: Use transformed glyph origins in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 207 +++++++++++++++++------------------------------------ 1 file changed, 64 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da697572dca0663fd010c…

1 0

Daniel Lehman : ucrtbase: Add _iswblank_l.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 111637a3c6905ccebdbbc97abbe335078348e587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111637a3c6905ccebdbbc97ab… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 13:25:26 2017 -0700 ucrtbase: Add _iswblank_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index fe3ae54..0f30b05 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -21,7 +21,7 @@ @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -113,7 +113,7 @@ @ cdecl iswalnum(long) ucrtbase.iswalnum @ cdecl iswalpha(long) ucrtbase.iswalpha @ cdecl iswascii(long) ucrtbase.iswascii -@ stub iswblank +@ cdecl iswblank(long) ucrtbase.iswblank @ cdecl iswcntrl(long) ucrtbase.iswcntrl @ cdecl iswctype(long long) ucrtbase.iswctype @ cdecl iswdigit(long) ucrtbase.iswdigit diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1701c4a..d73a603 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1369,7 +1369,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2228,7 +2228,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 023aa00..942d212 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1234,7 +1234,7 @@ @ cdecl _isupper_l(long ptr) msvcr120._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -1891,7 +1891,7 @@ @ cdecl iswalnum(long) msvcr120.iswalnum @ cdecl iswalpha(long) msvcr120.iswalpha @ cdecl iswascii(long) msvcr120.iswascii -@ stub iswblank +@ cdecl iswblank(long) msvcr120.iswblank @ cdecl iswcntrl(long) msvcr120.iswcntrl @ cdecl iswctype(long long) msvcr120.iswctype @ cdecl iswdigit(long) msvcr120.iswdigit diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 89c4152..a3429ea 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1866,6 +1866,22 @@ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__l } /********************************************************************* + * _iswblank_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswblank_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, locale ); +} + +/********************************************************************* + * iswblank (MSVCRT.@) + */ +INT CDECL MSVCRT_iswblank( MSVCRT_wchar_t wc ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, NULL ); +} + +/********************************************************************* * wcscpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5a1f8dc..213700f 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -90,6 +90,8 @@ static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); static int (CDECL *p__iswctype_l)(int,int,_locale_t); +static int (CDECL *p_iswblank)(int); +static int (CDECL *p__iswblank_l)(wint_t,_locale_t); static void test__initialize_onexit_table(void) { @@ -388,6 +390,8 @@ static BOOL init(void) p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); + p_iswblank = (void*)GetProcAddress(module, "iswblank"); + p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); return TRUE; } @@ -493,9 +497,13 @@ static void test_isblank(void) todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); + ok(p_iswblank(c), "%d should be blank\n", c); + ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { todo_wine_if(c == 0xa0) { ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9c0b807..79ba494 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -508,7 +508,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2362,7 +2362,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit

1 0

Michael Stefaniuc : kernel32/tests: Test HeapReAlloc with size 0.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 14e7febc52a2dc33e65ec85862867149aea0d5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e7febc52a2dc33e65ec8586… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 4 14:52:14 2017 +0200 kernel32/tests: Test HeapReAlloc with size 0. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2f7edc8..0acf109 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -118,6 +118,13 @@ static void test_heap(void) HeapFree(GetProcessHeap(), 0, mem); mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); + mem = HeapAlloc(GetProcessHeap(), 0, 17); + msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0); + ok(msecond != NULL, "HeapReAlloc(0) should have succeeded\n"); + size = HeapSize(GetProcessHeap(), 0, msecond); + ok(size == 0 || broken(size == 1) /* some vista and win7 */, + "HeapSize should have returned 0 instead of %lu\n", size); + HeapFree(GetProcessHeap(), 0, msecond); /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);

1 0