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

Nikolay Sivov : msscript: Added IConnectionPointContainer stub.
by Alexandre Julliard 16 Jun '16

16 Jun '16

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

Hadrien Boizard : usp10: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 37840f84ff1cf53998a6f06e7b93190f653ffc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37840f84ff1cf53998a6f06e7… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Tue Jun 14 19:01:56 2016 +0200 usp10: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 613fb05..d7afbe1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1300,14 +1300,14 @@ static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt if (val_fmt1) { GPOS_get_value_record_offsets( pos_table, &val_rec1, val_fmt1, ppem, adjust, advance ); - TRACE( "Glyph 1 resulting cumulative offset is %i,%i design units\n", adjust[0].x, adjust[0].y ); - TRACE( "Glyph 1 resulting cumulative advance is %i,%i design units\n", advance[0].x, advance[0].y ); + TRACE( "Glyph 1 resulting cumulative offset is %s design units\n", wine_dbgstr_point(&adjust[0]) ); + TRACE( "Glyph 1 resulting cumulative advance is %s design units\n", wine_dbgstr_point(&advance[0]) ); } if (val_fmt2) { GPOS_get_value_record_offsets( pos_table, &val_rec2, val_fmt2, ppem, adjust + 1, advance + 1 ); - TRACE( "Glyph 2 resulting cumulative offset is %i,%i design units\n", adjust[1].x, adjust[1].y ); - TRACE( "Glyph 2 resulting cumulative advance is %i,%i design units\n", advance[1].x, advance[1].y ); + TRACE( "Glyph 2 resulting cumulative offset is %s design units\n", wine_dbgstr_point(&adjust[1]) ); + TRACE( "Glyph 2 resulting cumulative advance is %s design units\n", wine_dbgstr_point(&advance[1]) ); } } @@ -1424,7 +1424,7 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &exit_pt, ppem); offset = GET_BE_WORD(cpf1->EntryExitRecord[index_entry].EntryAnchor); GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &entry_pt, ppem); - TRACE("Found linkage %x[%i,%i] %x[%i,%i]\n",glyphs[glyph_index], exit_pt.x,exit_pt.y, glyphs[glyph_index+write_dir], entry_pt.x, entry_pt.y); + TRACE("Found linkage %x[%s] %x[%s]\n",glyphs[glyph_index], wine_dbgstr_point(&exit_pt), glyphs[glyph_index+write_dir], wine_dbgstr_point(&entry_pt)); pt->x = entry_pt.x - exit_pt.x; pt->y = entry_pt.y - exit_pt.y; return; @@ -1505,11 +1505,11 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c GPOS_get_anchor_values((const BYTE*)ba + offset, &base_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on base is %i,%i design units\n",base_pt.x,base_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on base is %s design units\n",wine_dbgstr_point(&base_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += base_pt.x - mark_pt.x; pt->y += base_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); rc = base_glyph; } } @@ -1597,11 +1597,11 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A GPOS_get_anchor_values((const BYTE*)lt + offset, &ligature_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on ligature is %i,%i design units\n",ligature_pt.x,ligature_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on ligature is %s design units\n",wine_dbgstr_point(&ligature_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += ligature_pt.x - mark_pt.x; pt->y += ligature_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); } } } @@ -1662,11 +1662,11 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY GPOS_get_anchor_values((const BYTE*)m2a + offset, &mark2_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on mark2 is %i,%i design units\n",mark2_pt.x,mark2_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on mark2 is %s design units\n",wine_dbgstr_point(&mark2_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += mark2_pt.x - mark_pt.x; pt->y += mark2_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); rc = TRUE; } }

1 0

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

16 Jun '16

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

Józef Kucia : wined3d: Forbid creating SRVs with level or layer count equal to 0.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 5f4fc0a93722c8bee5b3dfeee2c598b63442ecc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4fc0a93722c8bee5b3dfeee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:32 2016 +0200 wined3d: Forbid creating SRVs with level or layer count equal to 0. 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, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 68b134f..5973668 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -298,8 +298,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ struct wined3d_texture *texture = texture_from_resource(resource); unsigned int i; - if (desc->u.texture.level_idx >= texture->level_count + if (!desc->u.texture.level_count + || desc->u.texture.level_idx >= texture->level_count || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !desc->u.texture.layer_count || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG;

1 0

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC.
by Alexandre Julliard 16 Jun '16

16 Jun '16

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 : d3d11/tests: Add test for invalid SRV descriptions.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 87717cf42c0506ba050951e5bba7c3ffb0071951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87717cf42c0506ba050951e5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:34 2016 +0200 d3d11/tests: Add test for invalid SRV descriptions. 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/tests/d3d11.c | 301 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 253 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87717cf42c0506ba05095…

1 0

Józef Kucia : wined3d: Forbid creating RTVs with layer count equal 0.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 838ecc1cb86f18702f2d59304c164cd0a64f605d URL: http://source.winehq.org/git/wine.git/?a=commit;h=838ecc1cb86f18702f2d59304… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:35 2016 +0200 wined3d: Forbid creating RTVs with layer count equal 0. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5973668..6a9800c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -118,6 +118,7 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * if (desc->u.texture.level_idx >= texture->level_count || 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;

1 0

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

16 Jun '16

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 : wined3d: Forbid creating typeless render target views.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: b511775b1b8712d3f8f6200b7b73b472c9602608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b511775b1b8712d3f8f6200b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:37 2016 +0200 wined3d: Forbid creating typeless render target 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 | 9 ++++++++- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ae58b62..52e3f1e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -98,6 +98,13 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * view->format = wined3d_get_format(gl_info, desc->format_id); view->format_flags = view->format->flags[resource->gl_type]; + + if (wined3d_format_is_typeless(view->format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; @@ -277,7 +284,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_format *view_format; view_format = wined3d_get_format(gl_info, desc->format_id); - if (view_format->id == view_format->typeless_id) + if (wined3d_format_is_typeless(view_format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e46e47..0ef2414 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3574,6 +3574,11 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) +{ + return format->id == format->typeless_id && format->id != WINED3DFMT_UNKNOWN; +} + static inline void *wined3d_calloc(SIZE_T count, SIZE_T size) { if (count > ~(SIZE_T)0 / size)

1 0

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
by Alexandre Julliard 16 Jun '16

16 Jun '16

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