June 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Trace script name in shaping methods.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 0e913c4abc62e97b812ca808bb86578197394b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e913c4abc62e97b812ca808b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 07:43:24 2016 +0300 dwrite: Trace script name in shaping methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 9ae0cca..8660e9b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -966,9 +966,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, HRESULT hr = S_OK; UINT16 script; - TRACE("(%s:%u %p %d %d %p %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), - length, fontface, is_sideways, is_rtl, analysis, debugstr_w(locale), substitution, features, feature_range_len, - feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, glyph_props, actual_glyph_count); + TRACE("(%s:%u %p %d %d %s %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), + length, fontface, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), substitution, + features, feature_range_len, feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, + glyph_props, actual_glyph_count); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; @@ -1099,9 +1100,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), + TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, - is_rtl, analysis, debugstr_w(locale), features, feature_range_len, feature_ranges, advances, offsets); + is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), features, feature_range_len, + feature_ranges, advances, offsets); if (glyph_count == 0) return S_OK; @@ -1147,10 +1149,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), + TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, - transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, - feature_ranges, advances, offsets); + transform, use_gdi_natural, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), + features, feature_range_lengths, feature_ranges, advances, offsets); if (glyph_count == 0) return S_OK;

1 0

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 0626559c531e70d98023a082d4f600234d3394af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0626559c531e70d98023a082d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:38 2016 +0200 d3d11: Validate "ViewDimension" field in D3D11_DEPTH_STENCIL_VIEW_DESC. 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/d3d11/view.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 905996d..2210394 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -121,7 +121,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 } } -static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; @@ -130,14 +130,36 @@ static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resour ID3D11Resource_GetType(resource, &dimension); switch (dimension) { + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1D + && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1DARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + + FIXME("Unhandled 1D texture resource.\n"); + return S_OK; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { const struct d3d_texture2d *texture; + if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2D + && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DARRAY + && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DMS + && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -145,8 +167,14 @@ static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resour break; } + case D3D11_RESOURCE_DIMENSION_BUFFER: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; + default: - return; + ERR("Unhandled resource dimension %#x.\n", dimension); + return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -172,6 +200,8 @@ static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resour default: break; } + + return S_OK; } static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) @@ -972,14 +1002,15 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st if (!desc) { - if (FAILED(hr = set_dsdesc_from_resource(&view->desc, resource))) - return hr; + hr = set_dsdesc_from_resource(&view->desc, resource); } else { view->desc = *desc; - normalize_dsv_desc(&view->desc, resource); + hr = normalize_dsv_desc(&view->desc, resource); } + if (FAILED(hr)) + return hr; wined3d_mutex_lock(); if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource)))

1 0

Józef Kucia : wined3d: Fix error code returned when render target view description is invalid.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 3c090180bd98478debd1becb654dfdff9344840d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c090180bd98478debd1becb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:36 2016 +0200 wined3d: Fix error code returned when render target view description is invalid. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 6a9800c..ae58b62 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -120,7 +120,7 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * || desc->u.texture.layer_idx >= depth_or_layer_count || !desc->u.texture.layer_count || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) - return WINED3DERR_INVALIDCALL; + return E_INVALIDARG; view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D)

1 0

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 8f366a5673ec8acb726353c3c2cc1384f0244188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f366a5673ec8acb726353c3c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:33 2016 +0200 d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC. 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/d3d11/view.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c0b17dc..905996d 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -486,7 +486,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I } } -static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { unsigned int miplevel_count, layer_count; D3D11_RESOURCE_DIMENSION dimension; @@ -495,14 +495,49 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso ID3D11Resource_GetType(resource, &dimension); switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + if (desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFER + && desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFEREX) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + return S_OK; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1D + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1DARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + + FIXME("Unhandled 1D texture resource.\n"); + return S_OK; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { const struct d3d_texture2d *texture; + if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2D + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DARRAY + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMS + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURECUBE + && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURECUBEARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -515,10 +550,16 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso { const struct d3d_texture3d *texture; + if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE3D) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -528,7 +569,8 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso } default: - return; + ERR("Unhandled resource dimension %#x.\n", dimension); + return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -585,6 +627,8 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso default: break; } + + return S_OK; } /* ID3D11DepthStencilView methods */ @@ -1818,14 +1862,15 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi if (!desc) { - if (FAILED(hr = set_srdesc_from_resource(&view->desc, resource))) - return hr; + hr = set_srdesc_from_resource(&view->desc, resource); } else { view->desc = *desc; - normalize_srv_desc(&view->desc, resource); + hr = normalize_srv_desc(&view->desc, resource); } + if (FAILED(hr)) + return hr; if (FAILED(hr = wined3d_shader_resource_view_desc_from_d3d11(&wined3d_desc, &view->desc))) return hr;

1 0

Józef Kucia : wined3d: Fix error codes returned when creating shader resource views.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: b44b0690d3174b39078ac0c1b9ade60b903025b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44b0690d3174b39078ac0c1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:31 2016 +0200 wined3d: Fix error codes returned when creating shader resource views. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 95e1162..68b134f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -279,7 +279,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (view_format->id == view_format->typeless_id) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); - return E_FAIL; + return E_INVALIDARG; } view->refcount = 1; @@ -302,7 +302,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) - return E_FAIL; + return E_INVALIDARG; view->target = texture->target; for (i = 0; i < ARRAY_SIZE(view_types); ++i)

1 0

Nikolay Sivov : msscript: Added IConnectionPointContainer stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: d6a389dc95a2ff9febcfad5f07165d3851d6b789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a389dc95a2ff9febcfad5f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 12:17:11 2016 +0300 msscript: Added IConnectionPointContainer stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 54 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 29 ++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 5a03f0c..6465104 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -34,6 +34,7 @@ struct ScriptControl { IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; IOleControl IOleControl_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; SIZEL extent; @@ -140,6 +141,11 @@ static inline ScriptControl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleControl_iface); } +static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -165,6 +171,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleControl, riid)) { TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); *ppv = &This->IOleControl_iface; + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = &This->IConnectionPointContainer_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -856,6 +865,50 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IConnectionPointContainer(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + ScriptControl *This = impl_from_IConnectionPointContainer(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + ScriptControl *This = impl_from_IConnectionPointContainer(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, IEnumConnectionPoints **enum_points) +{ + ScriptControl *This = impl_from_IConnectionPointContainer(iface); + + FIXME("(%p)->(%p)\n", This, enum_points); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **cp) +{ + ScriptControl *This = impl_from_IConnectionPointContainer(iface); + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); + + return E_NOTIMPL; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -873,6 +926,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; + script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 9c9a483..be5fee2 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -93,6 +93,15 @@ DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static IActiveScriptSite *site; static SCRIPTSTATE state; @@ -769,7 +778,26 @@ if (hr == S_OK) } else skip("Could not register TestScript engine\n"); +} + +static void test_connectionpoints(void) +{ + IConnectionPointContainer *container; + IScriptControl *sc; + HRESULT hr; + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(sc, 1); + hr = IScriptControl_QueryInterface(sc, &IID_IConnectionPointContainer, (void**)&container); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(sc, 2); + EXPECT_REF(container, 2); + + IConnectionPointContainer_Release(container); + IScriptControl_Release(sc); } START_TEST(msscript) @@ -791,6 +819,7 @@ START_TEST(msscript) test_persiststreaminit(); test_olecontrol(); test_Language(); + test_connectionpoints(); CoUninitialize(); }

1 0

Michael Cronenworth : secur32: Provide a static declaration for gnutls_cipher_get_block_size.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: bf5ac531a030bce9e798ab66bc53e84a65ca8fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ac531a030bce9e798ab66b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jun 16 00:21:13 2016 -0500 secur32: Provide a static declaration for gnutls_cipher_get_block_size. Instead of providing an extern provide a static declaration. The function return type changed from signed to unsigned in GnuTLS 3.5. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b10b629..bcadd47 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ -extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); +static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); -MAKE_FUNCPTR(gnutls_cipher_get_block_size); MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit);

1 0

Alexandre Julliard : gdi32: Take the transform rotation into account to compute pen width.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 7cfcd2387861cf1570fc3099a633a576a6ca84ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfcd2387861cf1570fc3099a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:19:08 2016 +0900 gdi32: Take the transform rotation into account to compute pen width. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f954def..a14c062 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1734,7 +1734,7 @@ static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) pts[0].x = pts[0].y = pts[1].y = 0; pts[1].x = width; LPtoDP( pdev->dev.hdc, pts, 2 ); - width = abs( pts[1].x - pts[0].x ); + width = floor( hypot( pts[1].x - pts[0].x, pts[1].y - pts[0].y )); return max( width, 1 ); }

1 0

Alexandre Julliard : winex11: Implement FillPath, StrokeAndFillPath and StrokePath.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 10b526733f1cde028ba8e5b2451a9e24284944cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b526733f1cde028ba8e5b24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:15:05 2016 +0900 winex11: Implement FillPath, StrokeAndFillPath and StrokePath. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/graphics.c | 101 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 6 +-- dlls/winex11.drv/x11drv.h | 3 ++ 3 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index f23a502..e8c59f9 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1227,6 +1227,107 @@ BOOL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO return TRUE; } +/* helper for path stroking and filling functions */ +static BOOL x11drv_stroke_and_fill_path( PHYSDEV dev, BOOL stroke, BOOL fill ) +{ + X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); + POINT *points; + BYTE *flags; + BOOL ret = FALSE; + XPoint *xpoints; + int i, j, size; + + FlattenPath( dev->hdc ); + if ((size = GetPath( dev->hdc, NULL, NULL, 0 )) == -1) return FALSE; + if (!size) + { + AbortPath( dev->hdc ); + return TRUE; + } + xpoints = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(*xpoints) ); + points = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*points) ); + flags = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*flags) ); + if (!points || !flags || !xpoints) goto done; + if (GetPath( dev->hdc, points, flags, size ) == -1) goto done; + LPtoDP( dev->hdc, points, size ); + + if (fill && X11DRV_SetupGCForBrush( physDev )) + { + XRectangle *rect; + HRGN hrgn = PathToRegion( dev->hdc ); + RGNDATA *data = X11DRV_GetRegionData( hrgn, 0 ); + + DeleteObject( hrgn ); + if (!data) goto done; + rect = (XRectangle *)data->Buffer; + for (i = 0; i < data->rdh.nCount; i++) + { + rect[i].x += physDev->dc_rect.left; + rect[i].y += physDev->dc_rect.top; + } + + XFillRectangles( gdi_display, physDev->drawable, physDev->gc, rect, data->rdh.nCount ); + HeapFree( GetProcessHeap(), 0, data ); + } + + if (stroke && X11DRV_SetupGCForPen ( physDev )) + { + for (i = j = 0; i < size; i++, j++) + { + if (flags[i] == PT_MOVETO) + { + if (j > 1) + { + if (fill || (flags[i - 1] & PT_CLOSEFIGURE)) xpoints[j++] = xpoints[0]; + XDrawLines( gdi_display, physDev->drawable, physDev->gc, xpoints, j, CoordModeOrigin ); + } + j = 0; + } + xpoints[j].x = physDev->dc_rect.left + points[i].x; + xpoints[j].y = physDev->dc_rect.top + points[i].y; + } + if (j > 1) + { + if (fill || (flags[i - 1] & PT_CLOSEFIGURE)) xpoints[j++] = xpoints[0]; + XDrawLines( gdi_display, physDev->drawable, physDev->gc, xpoints, j, CoordModeOrigin ); + } + } + + add_pen_device_bounds( physDev, points, size ); + AbortPath( dev->hdc ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, xpoints ); + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, flags ); + return ret; +} + +/********************************************************************** + * X11DRV_FillPath + */ +BOOL X11DRV_FillPath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, FALSE, TRUE ); +} + +/********************************************************************** + * X11DRV_StrokeAndFillPath + */ +BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, TRUE, TRUE ); +} + +/********************************************************************** + * X11DRV_StrokePath + */ +BOOL X11DRV_StrokePath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, TRUE, FALSE ); +} + /********************************************************************** * X11DRV_InternalFloodFill diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6bc4fb3..af2fd92 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -494,7 +494,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */ - NULL, /* pFillPath */ + X11DRV_FillPath, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ @@ -589,8 +589,8 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pStartPage */ X11DRV_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ - NULL, /* pStrokeAndFillPath */ - NULL, /* pStrokePath */ + X11DRV_StrokeAndFillPath, /* pStrokeAndFillPath */ + X11DRV_StrokePath, /* pStrokePath */ X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 23f4ab6..2180851 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -150,6 +150,7 @@ extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, extern BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; extern DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, @@ -183,6 +184,8 @@ extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDE extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; /* X11 driver internal functions */

1 0

Alexandre Julliard : gdi32: Implement FillPath, StrokeAndFillPath and StrokePath in the DIB driver.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: b5cf73edd952ef91a525871d9b330fd51831197e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cf73edd952ef91a525871d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:06:48 2016 +0900 gdi32: Implement FillPath, StrokeAndFillPath and StrokePath in the DIB driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 6 +-- dlls/gdi32/dibdrv/dibdrv.h | 3 ++ dlls/gdi32/dibdrv/graphics.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/path.c | 57 ++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 4aa1d1d..314c651 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -424,7 +424,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ dibdrv_ExtTextOut, /* pExtTextOut */ - NULL, /* pFillPath */ + dibdrv_FillPath, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ @@ -519,8 +519,8 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pStartPage */ dibdrv_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ - NULL, /* pStrokeAndFillPath */ - NULL, /* pStrokePath */ + dibdrv_StrokeAndFillPath, /* pStrokeAndFillPath */ + dibdrv_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ dibdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c64058b..fc28acc 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -120,6 +120,7 @@ extern BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT b extern BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN; extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; @@ -150,6 +151,8 @@ extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HID extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern struct opengl_funcs *dibdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 2c865c0..bfb3451 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -402,6 +402,73 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, return ret; } +/* helper for path stroking and filling functions */ +static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) +{ + POINT *points; + BYTE *types; + BOOL ret = TRUE; + HRGN outline = 0, interior = 0; + int i, pos, total; + + if (dev->brush.style == BS_NULL) fill = FALSE; + + total = get_gdi_flat_path( dev->dev.hdc, &points, &types, fill ? &interior : NULL ); + if (total == -1) return FALSE; + if (!total) goto done; + + if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); + + /* if not using a region, paint the interior first so the outline can overlap it */ + if (interior && !outline) + { + ret = brush_region( dev, interior ); + DeleteObject( interior ); + interior = 0; + } + + if (stroke) + { + pos = 0; + for (i = 1; i < total; i++) + { + if (types[i] != PT_MOVETO) continue; + if (i > pos + 1) + { + reset_dash_origin( dev ); + dev->pen_lines( dev, i - pos, points + pos, + fill || types[i - 1] & PT_CLOSEFIGURE, outline ); + } + pos = i; + } + if (i > pos + 1) + { + reset_dash_origin( dev ); + dev->pen_lines( dev, i - pos, points + pos, + fill || types[i - 1] & PT_CLOSEFIGURE, outline ); + } + } + + add_pen_lines_bounds( dev, total, points, outline ); + + if (interior) + { + CombineRgn( interior, interior, outline, RGN_DIFF ); + ret = brush_region( dev, interior ); + DeleteObject( interior ); + } + if (outline) + { + if (ret) ret = pen_region( dev, outline ); + DeleteObject( outline ); + } + +done: + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, types ); + return ret; +} + /* Intensities of the 17 glyph levels when drawn with text component of 0xff on a black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ static const BYTE ramp[17] = @@ -1000,6 +1067,16 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) } /*********************************************************************** + * dibdrv_FillPath + */ +BOOL dibdrv_FillPath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, FALSE, TRUE ); +} + +/*********************************************************************** * dibdrv_GetNearestColor */ COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) @@ -1499,3 +1576,23 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) free_clipped_rects( &clipped_rects ); return color; } + +/*********************************************************************** + * dibdrv_StrokeAndFillPath + */ +BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, TRUE, TRUE ); +} + +/*********************************************************************** + * dibdrv_StrokePath + */ +BOOL dibdrv_StrokePath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, TRUE, FALSE ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 08a5d3b..15e50e1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -335,6 +335,7 @@ typedef struct /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; +extern int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0d89cfb..06fac77 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -273,6 +273,32 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; } +/* convert a (flattened) path to a region */ +static HRGN path_to_region( const struct gdi_path *path, int mode ) +{ + int i, pos, polygons, *counts; + HRGN hrgn; + + if (!path->count) return 0; + + if (!(counts = HeapAlloc( GetProcessHeap(), 0, (path->count / 2) * sizeof(*counts) ))) return 0; + + pos = polygons = 0; + assert( path->flags[0] == PT_MOVETO ); + for (i = 1; i < path->count; i++) + { + if (path->flags[i] != PT_MOVETO) continue; + counts[polygons++] = i - pos; + pos = i; + } + if (i > pos + 1) counts[polygons++] = i - pos; + + assert( polygons <= path->count / 2 ); + hrgn = CreatePolyPolygonRgn( path->points, counts, polygons, mode ); + HeapFree( GetProcessHeap(), 0, counts ); + return hrgn; +} + /* PATH_CheckCorners * * Helper function for RoundRect() and Rectangle() @@ -505,6 +531,37 @@ static BOOL PATH_DoArcPart(struct gdi_path *pPath, FLOAT_POINT corners[], return TRUE; } +/* retrieve a flattened path in device coordinates, and optionally its region */ +/* the DC path is deleted; the returned data must be freed by caller */ +/* helper for stroke_and_fill_path in the DIB driver */ +int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) +{ + DC *dc = get_dc_ptr( hdc ); + int ret = -1; + + if (!dc) return -1; + + if (dc->path) + { + struct gdi_path *path = PATH_FlattenPath( dc->path ); + + free_gdi_path( dc->path ); + dc->path = NULL; + if (path) + { + ret = path->count; + *points = path->points; + *flags = path->flags; + if (rgn) *rgn = path_to_region( path, GetPolyFillMode( hdc )); + HeapFree( GetProcessHeap(), 0, path ); + } + } + else SetLastError( ERROR_CAN_NOT_COMPLETE ); + + release_dc_ptr( dc ); + return ret; +} + /*********************************************************************** * BeginPath (GDI32.@)

1 0