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

Jacek Caban : urlmon/tests: Added BindProtocol redirection handling tests.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 86f7c4c8f87003b26fb9a741a36af4b5aa88931f URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f7c4c8f87003b26fb9a741a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 13:31:39 2017 +0200 urlmon/tests: Added BindProtocol redirection handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 157 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86f7c4c8f87003b26fb9a…

1 0

Jacek Caban : mshtml: Added IBindCallbackRedirect implementation.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: a8a050e975346b0e344bb45011dd63e30a163a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a050e975346b0e344bb4501… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 16:10:49 2017 +0200 mshtml: Added IBindCallbackRedirect implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 9 ++++--- dlls/mshtml/navigate.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 11 ++++++++ 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 3a4e06b..f5b85e9 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -69,10 +69,11 @@ typedef struct { typedef struct BSCallbackVtbl BSCallbackVtbl; struct BSCallback { - IBindStatusCallback IBindStatusCallback_iface; - IServiceProvider IServiceProvider_iface; - IHttpNegotiate2 IHttpNegotiate2_iface; - IInternetBindInfo IInternetBindInfo_iface; + IBindStatusCallback IBindStatusCallback_iface; + IServiceProvider IServiceProvider_iface; + IHttpNegotiate2 IHttpNegotiate2_iface; + IInternetBindInfo IInternetBindInfo_iface; + IBindCallbackRedirect IBindCallbackRedirect_iface; const BSCallbackVtbl *vtbl; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cfa3753..d036364 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -248,6 +248,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { TRACE("(%p)->(IID_IInternetBindInfo %p)\n", This, ppv); *ppv = &This->IInternetBindInfo_iface; + }else if(IsEqualGUID(&IID_IBindCallbackRedirect, riid)) { + TRACE("(%p)->(IID_IBindCallbackRedirect %p)\n", This, ppv); + *ppv = &This->IBindCallbackRedirect_iface; } if(*ppv) { @@ -561,6 +564,63 @@ static const IInternetBindInfoVtbl InternetBindInfoVtbl = { InternetBindInfo_GetBindString }; +static inline BSCallback *impl_from_IBindCallbackRedirect(IBindCallbackRedirect *iface) +{ + return CONTAINING_RECORD(iface, BSCallback, IBindCallbackRedirect_iface); +} + +static HRESULT WINAPI BindCallbackRedirect_QueryInterface(IBindCallbackRedirect *iface, REFIID riid, void **ppv) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI BindCallbackRedirect_AddRef(IBindCallbackRedirect *iface) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *vbCancel) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + HTMLDocumentObj *doc_obj; + BOOL cancel = FALSE; + BSTR frame_name = NULL; + HRESULT hres = S_OK; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(url), vbCancel); + + if(This->window && This->window->base.outer_window && (doc_obj = This->window->base.outer_window->doc_obj) + && doc_obj->doc_object_service) { + if(This->window->base.outer_window != doc_obj->basedoc.window) { + hres = IHTMLWindow2_get_name(&This->window->base.IHTMLWindow2_iface, &frame_name); + if(FAILED(hres)) + return hres; + } + + hres = IDocObjectService_FireBeforeNavigate2(doc_obj->doc_object_service, NULL, url, 0x40, + frame_name, NULL, 0, NULL, TRUE, &cancel); + SysFreeString(frame_name); + } + + *vbCancel = cancel ? VARIANT_TRUE : VARIANT_FALSE; + return hres; +} + +static const IBindCallbackRedirectVtbl BindCallbackRedirectVtbl = { + BindCallbackRedirect_QueryInterface, + BindCallbackRedirect_AddRef, + BindCallbackRedirect_Release, + BindCallbackRedirect_Redirect +}; + static inline BSCallback *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, BSCallback, IServiceProvider_iface); @@ -610,6 +670,7 @@ void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMoniker *mon This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; This->IHttpNegotiate2_iface.lpVtbl = &HttpNegotiate2Vtbl; This->IInternetBindInfo_iface.lpVtbl = &InternetBindInfoVtbl; + This->IBindCallbackRedirect_iface.lpVtbl = &BindCallbackRedirectVtbl; This->vtbl = vtbl; This->ref = 1; This->bindf = bindf; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index dafc109..6964f6e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1469,6 +1469,8 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon REFIID riid, void **ppv) { IBindStatusCallback *callback = NULL; + IBindCallbackRedirect *redirect_callback; + IServiceProvider *service_provider; BINDINFO bindinfo; DWORD bindf; HRESULT hres; @@ -1511,6 +1513,15 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(bindinfo.pUnk == NULL, "bindinfo.pUnk=%p\n", bindinfo.pUnk); ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%d\n", bindinfo.dwReserved); + hres = IBindStatusCallback_QueryInterface(callback, &IID_IServiceProvider, (void**)&service_provider); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, (void**)&redirect_callback); + ok(hres == S_OK, "QueryService(IID_IBindCallbackRedirect) returned %08x\n", hres); + + IBindCallbackRedirect_Release(redirect_callback); + IServiceProvider_Release(service_provider); + hres = IBindStatusCallback_OnStartBinding(callback, 0, &Binding); ok(hres == S_OK, "OnStartBinding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION flag support.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 11d4969baa773d9ef7742cfe56b8a590d3abd711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d4969baa773d9ef7742cfe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 16:10:51 2017 +0200 mshtml: Added DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION flag support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index f5b85e9..71c477a 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -82,6 +82,7 @@ struct BSCallback { request_data_t request_data; ULONG readed; DWORD bindf; + DWORD bindinfo_options; BOOL bindinfo_ready; binding_bom_t bom; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d036364..9dec64d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -390,7 +390,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->cbstgmedData = This->request_data.post_data_len; pbindinfo->dwCodePage = CP_UTF8; - pbindinfo->dwOptions = 0x80000; + pbindinfo->dwOptions = This->bindinfo_options; if(This->request_data.post_data_len) { pbindinfo->dwBindVerb = BINDVERB_POST; @@ -674,6 +674,7 @@ void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMoniker *mon This->vtbl = vtbl; This->ref = 1; This->bindf = bindf; + This->bindinfo_options = BINDINFO_OPTIONS_USE_IE_ENCODING; This->bom = BOM_NONE; list_init(&This->entry); @@ -1312,8 +1313,15 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); nsChannel *nschannel = This->nschannel; + HTMLDocumentObj *doc_obj; HRESULT hres; + if(This->is_doc_channel && This->bsc.window && This->bsc.window->base.outer_window + && (doc_obj = This->bsc.window->base.outer_window->doc_obj)) { + if(doc_obj->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) + This->bsc.bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; + } + if(nschannel && nschannel->post_data_stream) { hres = read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, &nschannel->request_headers, &This->bsc.request_data);

1 0

Huw Davies : wineandroid: The event list may have been altered by a recursive call, so restart the loop from the beginning.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: eb04665281481688478206ef87b801ef394d5bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb04665281481688478206ef8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 7 16:09:14 2017 +0100 wineandroid: The event list may have been altered by a recursive call, so restart the loop from the beginning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 7dff297..e3fd865 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -360,6 +360,8 @@ static int process_events( DWORD mask ) } HeapFree( GetProcessHeap(), 0, event ); count++; + /* next may have been removed by a recursive call, so reset it to the beginning of the list */ + next = LIST_ENTRY( event_queue.next, struct java_event, entry ); } current_event = previous; return count;

1 0

Huw Davies : wineandroid: Tell git diff about java files.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 745aed5700aae36cddc05c73c9670ff3b31f6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745aed5700aae36cddc05c73c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 7 16:13:16 2017 +0100 wineandroid: Tell git diff about java files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/.gitattributes b/dlls/wineandroid.drv/.gitattributes new file mode 100644 index 0000000..f57840b --- /dev/null +++ b/dlls/wineandroid.drv/.gitattributes @@ -0,0 +1 @@ +*.java diff=java

1 0

Owen Rudge : include: Add IWSDUdpMessageParameters interface declaration.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 9b44e8b37a5401a6bb96d7c504db22ee00c46af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b44e8b37a5401a6bb96d7c50… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 6 20:55:33 2017 +0100 include: Add IWSDUdpMessageParameters interface declaration. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdbase.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index 099dc87..6391ae8 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -99,3 +99,24 @@ interface IWSDMessageParameters : IUnknown HRESULT SetRemoteAddress([in] IWSDAddress* pAddress); HRESULT GetLowerParameters([out] IWSDMessageParameters** ppTxParams); } + +cpp_quote("HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxParams);") + +typedef struct _WSDUdpRetransmitParams +{ + ULONG ulSendDelay; + ULONG ulRepeat; + ULONG ulRepeatMinDelay; + ULONG ulRepeatMaxDelay; + ULONG ulRepeatUpperDelay; +} WSDUdpRetransmitParams; + +[ +uuid(9934149f-8f0c-447b-aa0b-73124b0ca7f0), +object +] +interface IWSDUdpMessageParameters : IWSDMessageParameters +{ + HRESULT SetRetransmitParams([in] const WSDUdpRetransmitParams *pParams); + HRESULT GetRetransmitParams([out] WSDUdpRetransmitParams *pParams); +}

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_Simplify().
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 208eb09e3c850cd63d719c2a23765b650fd306b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208eb09e3c850cd63d719c2a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:51 2017 +0200 d2d1: Implement d2d_transformed_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ab1d3ba..2d0cd1f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3159,10 +3159,17 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_Simplify(ID2D1Transfor D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1SimplifiedGeometrySink *sink) { - FIXME("iface %p, option %#x, transform %p, tolerance %.8e, sink %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; + + TRACE("iface %p, option %#x, transform %p, tolerance %.8e, sink %p.\n", iface, option, transform, tolerance, sink); - return E_NOTIMPL; + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_Simplify(geometry->u.transformed.src_geometry, option, &g, tolerance, sink); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_Tessellate(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7ad4d34..768f8e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2154,6 +2154,22 @@ static void test_rectangle_geometry(void) {SEGMENT_LINE, {{{35.0f, 45.0f}}}}, {SEGMENT_LINE, {{{35.0f, 45.0f}}}}, {SEGMENT_LINE, {{{30.0f, 45.0f}}}}, + /* Figure 4. */ + {SEGMENT_LINE, {{{ 1.07179585e+01f, 2.23205078e+02f}}}}, + {SEGMENT_LINE, {{{-5.85640755e+01f, 2.73205078e+02f}}}}, + {SEGMENT_LINE, {{{-7.85640717e+01f, 2.29903809e+02f}}}}, + /* Figure 5. */ + {SEGMENT_LINE, {{{40.0f, 20.0f}}}}, + {SEGMENT_LINE, {{{40.0f, 40.0f}}}}, + {SEGMENT_LINE, {{{30.0f, 40.0f}}}}, + /* Figure 6. */ + {SEGMENT_LINE, {{{ 2.14359169e+01f, 0.0f}}}}, + {SEGMENT_LINE, {{{-1.17128151e+02f, 0.0f}}}}, + {SEGMENT_LINE, {{{-1.57128143e+02f, 0.0f}}}}, + /* Figure 7. */ + {SEGMENT_LINE, {{{0.0f, 1.11602539e+02f}}}}, + {SEGMENT_LINE, {{{0.0f, 1.36602539e+02f}}}}, + {SEGMENT_LINE, {{{0.0f, 1.14951904e+02f}}}}, }; static const struct expected_geometry_figure expected_figures[] = { @@ -2161,6 +2177,11 @@ static void test_rectangle_geometry(void) {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {20.0f, 30.0f}, 3, &expected_segments[3]}, {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {25.0f, 15.0f}, 3, &expected_segments[6]}, {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {30.0f, 45.0f}, 3, &expected_segments[9]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {-9.28203964e+00f, 1.79903809e+02f}, + 3, &expected_segments[12]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {30.0f, 20.0f}, 3, &expected_segments[15]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {-1.85640793e+01f, 0.0f}, 3, &expected_segments[18]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {0.0f, 8.99519043e+01f}, 3, &expected_segments[21]}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -2322,6 +2343,18 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1); + geometry_sink_cleanup(&sink); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES, + NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); rotate_matrix(&matrix, M_PI / -3.0f); @@ -2331,6 +2364,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[5], 4); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); scale_matrix(&matrix, 2.0f, 0.0f); @@ -2339,6 +2378,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[6], 1); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); scale_matrix(&matrix, 0.0f, 0.5f); @@ -2347,6 +2392,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[7], 1); + geometry_sink_cleanup(&sink); ID2D1TransformedGeometry_Release(transformed_geometry); ID2D1RectangleGeometry_Release(geometry);

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_Simplify().
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 09ff685aa009a80af552ea7113d8b21e4d3c89ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ff685aa009a80af552ea711… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:52 2017 +0200 d2d1: Implement d2d_path_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 165 +++++++++++++- dlls/d2d1/tests/d2d1.c | 577 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 660 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09ff685aa009a80af552e…

1 0

Henri Verbeet : d2d1: Fix the segment count for open figures.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 4dcdc80ad58673f3aba48130d975c8b8d171d01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcdc80ad58673f3aba48130d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:53 2017 +0200 d2d1: Fix the segment count for open figures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 +- dlls/d2d1/tests/d2d1.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0a60561..31a3eda 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2105,7 +2105,6 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } geometry->u.path.state = D2D_GEOMETRY_STATE_FIGURE; - ++geometry->u.path.segment_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, @@ -2196,6 +2195,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; if (figure_end == D2D1_FIGURE_END_CLOSED) { + ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) --figure->vertex_count; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d1f8398..0adeef4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2528,6 +2528,9 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 2, "Got unexpected segment count %u.\n", count); geometry_sink_init(&simplify_sink); hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,

1 0

Henri Verbeet : wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: e0e4f9bbcda1243b9317dbfbeeff84a18b4e855c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e4f9bbcda1243b9317dbfbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:54 2017 +0200 wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e1d69e..c7df670 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2146,7 +2146,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r { struct wined3d_cs_update_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2157,10 +2157,10 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e07d07c..ded4af6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4216,6 +4216,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } + wined3d_resource_wait_idle(resource); + wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); }

1 0