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

Jacek Caban : ws2_32: Use register_async for WS2_async_recv.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 57e93b72bb620306731ad44f5a2c9f88d913dd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e93b72bb620306731ad44f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:38:03 2017 +0200 ws2_32: Use register_async for WS2_async_recv. This changes behaviour in case when winsock attempts to use both completion routine and completion value. Tests from previous patch show that it should fail anyway. It will be possible to properly return error once APCs are passed to server in register_async request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 702d281..2a957ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7792,18 +7792,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_PENDING; iosb->Information = 0; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_recv ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent ); - req->async.cvalue = cvalue; - err = wine_server_call( req ); - } - SERVER_END_REQ; + if (wsa->completion_func) + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, NULL, + ws2_async_apc, wsa, iosb ); + else + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, lpOverlapped->hEvent, + NULL, (void *)cvalue, iosb ); if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); SetLastError(NtStatusToWSAError( err ));

1 0

Józef Kucia : wined3d: Simplify logic in wined3d_event_query_issue().
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 1d27b69f3219f3bd5ac9cf68dd0eebf0f0a86f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d27b69f3219f3bd5ac9cf68d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 5 15:38:06 2017 +0200 wined3d: Simplify logic in wined3d_event_query_issue(). 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/query.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1927e7e..685c5ce 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -214,27 +214,17 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) { + struct wined3d_context *context = NULL; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - if (query->context) - { - if (!(context = context_reacquire(device, query->context)) - && !query->context->gl_info->supported[ARB_SYNC]) - { - context_free_event_query(query); - context = context_acquire(device, NULL, 0); - context_alloc_event_query(context, query); - } - if (!context) - context = context_acquire(device, NULL, 0); - } - else - { + if (query->context && !(context = context_reacquire(device, query->context)) + && !query->context->gl_info->supported[ARB_SYNC]) + context_free_event_query(query); + if (!context) context = context_acquire(device, NULL, 0); - context_alloc_event_query(context, query); - } gl_info = context->gl_info; + if (!query->context) + context_alloc_event_query(context, query); if (gl_info->supported[ARB_SYNC]) {

1 0

Józef Kucia : wined3d: Avoid accessing "context-> current_rt" in wined3d_rendertarget_view_get_drawable_size().
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: c6168a526e967eb63be767cc35821444fe644684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6168a526e967eb63be767cc3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 5 15:38:04 2017 +0200 wined3d: Avoid accessing "context->current_rt" in wined3d_rendertarget_view_get_drawable_size(). 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/view.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 82fac25..f37b601 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -359,8 +359,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg /* The drawable size of an onscreen drawable is the surface size. * (Actually: The window size, but the surface is created in window * size.) */ - *width = context->current_rt.texture->resource.width; - *height = context->current_rt.texture->resource.height; + *width = texture->resource.width; + *height = texture->resource.height; } else if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { @@ -374,13 +374,12 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } else { - struct wined3d_surface *rt; + unsigned int level_idx = view->sub_resource_idx % texture->level_count; /* The drawable size of an FBO target is the OpenGL texture size, * which is the power of two size. */ - rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); - *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); + *width = wined3d_texture_get_level_pow2_width(texture, level_idx); + *height = wined3d_texture_get_level_pow2_height(texture, level_idx); } }

1 0

Michael Stefaniuc : dmsynth: Don' t store a SynthSink implementation in IDirectMusicSynth8Impl.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 44fd37a323e23c7a687dc96476edde8de4620307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd37a323e23c7a687dc9647… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:45 2017 +0200 dmsynth: Don't store a SynthSink implementation in IDirectMusicSynth8Impl. Avoids an unsafe interface to object transition. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index ed86ce0..db61e46 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -66,7 +66,7 @@ struct IDirectMusicSynth8Impl { DMUS_PORTCAPS pCaps; BOOL fActive; IReferenceClock* pLatencyClock; - IDirectMusicSynthSinkImpl* pSynthSink; + IDirectMusicSynthSink *synth_sink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 88ba53e..afeebda 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -310,7 +310,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 if (!clock) return E_POINTER; - if (!This->pSynthSink) + if (!This->synth_sink) return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; @@ -336,7 +336,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 if TRACE("(%p)->(%p)\n", iface, synth_sink); - This->pSynthSink = (IDirectMusicSynthSinkImpl*)synth_sink; + This->synth_sink = synth_sink; if (synth_sink) return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock);

1 0

Michael Stefaniuc : comctl32/tests: Add an ImageList_Copy() test.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: a6a9ec4459d1ba912b4ce13671fe8ba0bfe531ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a9ec4459d1ba912b4ce1367… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:44 2017 +0200 comctl32/tests: Add an ImageList_Copy() test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 2b68b63..8cdef18 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2216,6 +2216,29 @@ static void test_color_table(UINT ilc) ImageList_Destroy(himl); } +static void test_copy(void) +{ + HIMAGELIST dst, src; + BOOL ret; + int count; + + dst = ImageList_Create(5, 11, ILC_COLOR, 1, 1); + count = ImageList_GetImageCount(dst); + ok(!count, "ImageList not empty.\n"); + src = createImageList(7, 13); + count = ImageList_GetImageCount(src); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* ImageList_Copy() cannot copy between two ImageLists */ + ret = ImageList_Copy(dst, 0, src, 2, ILCF_MOVE); + ok(!ret, "ImageList_Copy() should have returned FALSE\n"); + count = ImageList_GetImageCount(dst); + ok(count == 0, "Expected no image in dst ImageList, got %d\n", count); + + ImageList_Destroy(dst); + ImageList_Destroy(src); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2366,6 +2389,7 @@ START_TEST(imagelist) test_iconsize(); test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); + test_copy(); FreeLibrary(hComCtl32);

1 0

Hans Leidekker : webservices: Implement WsGetListenerProperty and WsSetListenerProperty.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 92fdb3ffb55fd408c5590b75b2f2c41d73a26dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fdb3ffb55fd408c5590b75b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 5 11:40:26 2017 +0200 webservices: Implement WsGetListenerProperty and WsSetListenerProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +-- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 205f7bc..4adddf4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -172,3 +172,78 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) LeaveCriticalSection( &listener->cs ); free_listener( listener ); } + +/************************************************************************** + * WsGetListenerProperty [webservices.@] + */ +HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + HRESULT hr = S_OK; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + switch (id) + { + case WS_LISTENER_PROPERTY_STATE: + if (!buf || size != sizeof(listener->state)) hr = E_INVALIDARG; + else *(WS_LISTENER_STATE *)buf = listener->state; + break; + + case WS_LISTENER_PROPERTY_CHANNEL_TYPE: + if (!buf || size != sizeof(listener->type)) hr = E_INVALIDARG; + else *(WS_CHANNEL_TYPE *)buf = listener->type; + break; + + case WS_LISTENER_PROPERTY_CHANNEL_BINDING: + if (!buf || size != sizeof(listener->binding)) hr = E_INVALIDARG; + else *(WS_CHANNEL_BINDING *)buf = listener->binding; + break; + + default: + hr = prop_get( listener->prop, listener->prop_count, id, buf, size ); + } + + LeaveCriticalSection( &listener->cs ); + return hr; +} + +/************************************************************************** + * WsSetListenerProperty [webservices.@] + */ +HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, const void *value, + ULONG size, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + HRESULT hr; + + TRACE( "%p %u %p %u\n", handle, id, value, size ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + hr = prop_set( listener->prop, listener->prop_count, id, value, size ); + + LeaveCriticalSection( &listener->cs ); + return hr; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9f1fc3e..7e8dbee 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -69,7 +69,7 @@ @ stub WsGetHeader @ stub WsGetHeaderAttributes @ stdcall WsGetHeapProperty(ptr long ptr long ptr) -@ stub WsGetListenerProperty +@ stdcall WsGetListenerProperty(ptr long ptr long ptr) @ stub WsGetMappedHeader @ stdcall WsGetMessageProperty(ptr long ptr long ptr) @ stub WsGetMetadataEndpoints @@ -152,7 +152,7 @@ @ stdcall WsSetHeader(ptr long long long ptr long ptr) @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) -@ stub WsSetListenerProperty +@ stdcall WsSetListenerProperty(ptr long ptr long ptr) @ stdcall WsSetMessageProperty(ptr long ptr long ptr) @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr)

1 0

Henri Verbeet : usp10: Return early if the number of positioning operations is 0 in GPOS_apply_ChainContextPos ().
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 038976856805c9bec00291e6784310f24e9168f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038976856805c9bec00291e67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 5 10:21:29 2017 +0200 usp10: Return early if the number of positioning operations is 0 in GPOS_apply_ChainContextPos(). This preserves the current logic, but I wonder if we're not supposed to always return "input_count". Returning 1 seems questionable if we matched more input glyphs than that, and so does including the lookahead count. 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 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 9c1d596..0d98253 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2226,7 +2226,7 @@ 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; + WORD backtrack_count, input_count, lookahead_count, positioning_count; int k; const GPOS_ChainContextPosFormat3_2 *input; const GPOS_ChainContextPosFormat3_3 *lookahead; @@ -2286,20 +2286,19 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, continue; TRACE("Matched LookAhead\n"); - if (GET_BE_WORD(positioning->PosCount)) + if (!(positioning_count = GET_BE_WORD(positioning->PosCount))) + return 1; + + for (k = 0; k < positioning_count; ++k) { - for (k = 0; k < GET_BE_WORD(positioning->PosCount); ++k) - { - int lookupIndex = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex) * write_dir; + WORD lookup_index = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); + WORD sequence_index = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex) * write_dir; - TRACE("Position: %i -> %i %i\n",k, SequenceIndex, lookupIndex); - GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, - glyphs, glyph_index + SequenceIndex, glyph_count, goffset); - } - return input_count + lookahead_count; + TRACE("Position: %u -> %u %u.\n", k, sequence_index, lookup_index); + GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookup_index, + glyphs, glyph_index + sequence_index, glyph_count, goffset); } - else return 1; + return input_count + lookahead_count; } else FIXME("Unhandled Chaining Contextual Positioning Format %#x.\n", GET_BE_WORD(backtrack->PosFormat));

1 0

Henri Verbeet : usp10: Range check glyph counts in GPOS_apply_ChainContextPos().
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 7dfe9b9c94e5c57a2b6c0b1252e72b78a17a678d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfe9b9c94e5c57a2b6c0b125… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 5 10:21:28 2017 +0200 usp10: Range check glyph counts in GPOS_apply_ChainContextPos(). I.e., avoid accessing outside the "glyphs" array. If we're particularly unlucky we may actually get a match against data outside the array. 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b5ee5d1..9c1d596 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2235,10 +2235,22 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n"); backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + k = glyph_index + dirBacktrack * backtrack_count; + if (k < 0 || k >= glyph_count) + continue; + input = (const GPOS_ChainContextPosFormat3_2 *)&backtrack->Coverage[backtrack_count]; input_count = GET_BE_WORD(input->InputGlyphCount); + k = glyph_index + write_dir * (input_count - 1); + if (k < 0 || k >= glyph_count) + continue; + lookahead = (const GPOS_ChainContextPosFormat3_3 *)&input->Coverage[input_count]; lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + k = glyph_index + dirLookahead * (input_count + lookahead_count - 1); + if (k < 0 || k >= glyph_count) + continue; + positioning = (const GPOS_ChainContextPosFormat3_4 *)&lookahead->Coverage[lookahead_count]; for (k = 0; k < backtrack_count; ++k)

1 0

Henri Verbeet : wined3d: Send rendertarget view clears through the command stream.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 3e3f5e88e6aa27ce3838d0faed9de135532f10a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3f5e88e6aa27ce3838d0fae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 5 10:21:25 2017 +0200 wined3d: Send rendertarget view clears through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 62 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/device.c | 16 ++--------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 841ceca..c408eb0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -81,6 +81,9 @@ struct wined3d_cs_clear { enum wined3d_cs_op opcode; DWORD flags; + unsigned int rt_count; + struct wined3d_fb_state *fb; + RECT draw_rect; struct wined3d_color color; float depth; DWORD stencil; @@ -420,24 +423,25 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) device = cs->device; wined3d_get_draw_rect(state, &draw_rect); - device->blitter->ops->blitter_clear(device->blitter, device, device->adapter->gl_info.limits.buffers, - state->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); + device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, + op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < op->rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_release(state->fb->render_targets[i]->resource); + if (op->fb->render_targets[i]) + wined3d_resource_release(op->fb->render_targets[i]->resource); } } if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_release(state->fb->depth_stencil->resource); + wined3d_resource_release(op->fb->depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { + unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_clear *op; unsigned int i; @@ -445,6 +449,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count])); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; + op->rt_count = rt_count; + op->fb = &cs->fb; + wined3d_get_draw_rect(state, &op->draw_rect); op->color = *color; op->depth = depth; op->stencil = stencil; @@ -453,7 +460,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * if (flags & WINED3DCLEAR_TARGET) { - for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -465,6 +472,47 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } +void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +{ + struct wined3d_cs_clear *op; + struct + { + struct wined3d_rendertarget_view *rt; + struct wined3d_fb_state fb; + } *extra; + + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(*extra)); + extra = (void *)&op->rects[1]; + extra->fb.render_targets = &extra->rt; + op->fb = &extra->fb; + + op->opcode = WINED3D_CS_OP_CLEAR; + op->flags = flags; + if (flags & WINED3DCLEAR_TARGET) + { + op->rt_count = 1; + op->fb->render_targets[0] = view; + op->fb->depth_stencil = NULL; + op->color = *color; + } + else + { + op->rt_count = 0; + op->fb->render_targets[0] = NULL; + op->fb->depth_stencil = view; + op->depth = depth; + op->stencil = stencil; + } + SetRect(&op->draw_rect, 0, 0, view->width, view->height); + op->rect_count = 1; + op->rects[0] = *rect; + + wined3d_resource_acquire(view->resource); + + cs->ops->submit(cs); +} + static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11a56f2..ffc99b1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4148,7 +4148,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_resource *resource; - RECT draw_rect, r; + RECT r; TRACE("device %p, view %p, rect %s, flags %#x, color %s, depth %.8e, stencil %u.\n", device, view, wine_dbgstr_rect(rect), flags, debug_color(color), depth, stencil); @@ -4185,19 +4185,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return hr; } - SetRect(&draw_rect, 0, 0, view->width, view->height); - if (flags == WINED3DCLEAR_TARGET) - { - struct wined3d_fb_state fb = {&view, NULL}; - device->blitter->ops->blitter_clear(device->blitter, device, 1, &fb, - 1, rect, &draw_rect, flags, color, depth, stencil); - } - else - { - struct wined3d_fb_state fb = {NULL, view}; - device->blitter->ops->blitter_clear(device->blitter, device, 0, &fb, - 1, rect, &draw_rect, flags, color, depth, stencil); - } + wined3d_cs_emit_clear_rendertarget_view(device->cs, view, rect, flags, color, depth, stencil); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4acb94f..82aecf7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3228,6 +3228,8 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base_vertex_idx,

1 0

Nikolay Sivov : dwrite/tests: Test number of lines for a failing drawing test.
by Alexandre Julliard April 5, 2017

April 5, 2017

Module: wine Branch: master Commit: 862503df704c7033e9fda2480df3973f0ec57382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862503df704c7033e9fda2480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:04 2017 +0300 dwrite/tests: Test number of lines for a failing drawing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index daffd81..ecc57df 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1636,6 +1636,10 @@ static void test_Draw(void) 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_seq2, "draw test 2", TRUE); + hr = IDWriteTextLayout_GetMetrics(layout, &tm); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(tm.lineCount == 6, "got %u\n", tm.lineCount); IDWriteTextLayout_Release(layout); /* string with control characters */

1 0