September 2015 - Wine-Commits

Józef Kucia : d3d11: Implement d3d11_shader_resource_view_GetDesc().
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 28f98a0d9d1a53c6f204be0f694f72bd0d13aba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f98a0d9d1a53c6f204be0f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:45 2015 +0200 d3d11: Implement d3d11_shader_resource_view_GetDesc(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 3 ++- dlls/d3d11/view.c | 26 +++++++++++++++----------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 420de97..5cf7509 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -197,13 +197,13 @@ struct d3d_shader_resource_view struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; - D3D10_SHADER_RESOURCE_VIEW_DESC desc; + D3D11_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0b90fb8..4266a98 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2115,7 +2115,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) + if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, + (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cac8c25..f3ac62f 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -240,7 +240,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -265,13 +265,13 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D; desc->u.Texture1D.MostDetailedMip = 0; desc->u.Texture1D.MipLevels = texture_desc.MipLevels; } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1DARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MostDetailedMip = 0; desc->u.Texture1DArray.MipLevels = texture_desc.MipLevels; desc->u.Texture1DArray.FirstArraySlice = 0; @@ -300,20 +300,20 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I { if (texture_desc.SampleDesc.Count == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; desc->u.Texture2D.MostDetailedMip = 0; desc->u.Texture2D.MipLevels = texture_desc.MipLevels; } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMS; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS; } } else { if (texture_desc.SampleDesc.Count == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MostDetailedMip = 0; desc->u.Texture2DArray.MipLevels = texture_desc.MipLevels; desc->u.Texture2DArray.FirstArraySlice = 0; @@ -321,7 +321,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } @@ -345,7 +345,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I ID3D10Texture3D_Release(texture); desc->Format = texture_desc.Format; - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE3D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D; desc->u.Texture3D.MostDetailedMip = 0; desc->u.Texture3D.MipLevels = texture_desc.MipLevels; @@ -1298,7 +1298,11 @@ static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11Shade static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D11ShaderResourceViewVtbl d3d11_shader_resource_view_vtbl = @@ -1421,7 +1425,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderRes TRACE("iface %p, desc %p.\n", iface, desc); - *desc = view->desc; + memcpy(desc, &view->desc, sizeof(*desc)); } static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl = @@ -1442,7 +1446,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) + ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; HRESULT hr;

1 0

Józef Kucia : d3d11: Add ID3D11ShaderResourceView interface stub.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 3882f2d303bf06bae60ba4f3d9e04b2f59f3cee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3882f2d303bf06bae60ba4f3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:43 2015 +0200 d3d11: Add ID3D11ShaderResourceView interface stub. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/view.c | 158 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 138 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0abd374..b5d0b72 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -188,9 +188,10 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; -/* ID3D10ShaderResourceView */ +/* ID3D11ShaderResourceView, ID3D10ShaderResourceView */ struct d3d_shader_resource_view { + ID3D11ShaderResourceView ID3D11ShaderResourceView_iface; ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 968c27e..7410916 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1178,65 +1178,178 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend return impl_from_ID3D10RenderTargetView(iface); } -static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) +/* ID3D11ShaderResourceView methods */ + +struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) { - return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface); + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_QueryInterface(ID3D11ShaderResourceView *iface, REFIID riid, void **object) { + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView) - || IsEqualGUID(riid, &IID_ID3D10View) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11ShaderResourceView) + || IsEqualGUID(riid, &IID_ID3D11View) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11ShaderResourceView_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10ShaderResourceView_AddRef(&view->ID3D10ShaderResourceView_iface); + *object = &view->ID3D10ShaderResourceView_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderResourceView *iface) { - struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + ULONG refcount = InterlockedIncrement(&view->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", view, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderResourceView *iface) { - struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + ULONG refcount = InterlockedDecrement(&view->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) { wined3d_mutex_lock(); - wined3d_shader_resource_view_decref(This->wined3d_view); - ID3D10Resource_Release(This->resource); - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); + wined3d_shader_resource_view_decref(view->wined3d_view); + ID3D10Resource_Release(view->resource); + ID3D10Device1_Release(view->device); + wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, view); } return refcount; } +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateData(ID3D11ShaderResourceView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateDataInterface(ID3D11ShaderResourceView *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&view->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11ShaderResourceView *iface, + ID3D11Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, + D3D11_SHADER_RESOURCE_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11ShaderResourceViewVtbl d3d11_shader_resource_view_vtbl = +{ + /* IUnknown methods */ + d3d11_shader_resource_view_QueryInterface, + d3d11_shader_resource_view_AddRef, + d3d11_shader_resource_view_Release, + /* ID3D11DeviceChild methods */ + d3d11_shader_resource_view_GetDevice, + d3d11_shader_resource_view_GetPrivateData, + d3d11_shader_resource_view_SetPrivateData, + d3d11_shader_resource_view_SetPrivateDataInterface, + /* ID3D11View methods */ + d3d11_shader_resource_view_GetResource, + /* ID3D11ShaderResourceView methods */ + d3d11_shader_resource_view_GetDesc, +}; + +/* ID3D10ShaderResourceView methods */ + +static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, + REFIID riid, void **object) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_shader_resource_view_QueryInterface(&view->ID3D11ShaderResourceView_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_shader_resource_view_AddRef(&view->ID3D11ShaderResourceView_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_shader_resource_view_Release(&view->ID3D11ShaderResourceView_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface, @@ -1330,6 +1443,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str struct wined3d_resource *wined3d_resource; HRESULT hr; + view->ID3D11ShaderResourceView_iface.lpVtbl = &d3d11_shader_resource_view_vtbl; view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; view->refcount = 1;

1 0

Józef Kucia : d3d11: Rename d3d10_shader_resource_view to d3d_shader_resource_view.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 55d30331a5b3712280291720a65b3529420a2cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d30331a5b3712280291720a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:42 2015 +0200 d3d11: Rename d3d10_shader_resource_view to d3d_shader_resource_view. --- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/view.c | 26 +++++++++++++------------- 3 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55d30331a5b3712280291…

1 0

Riccardo Bortolato : wined3d: Remove wined3d_volume_preload.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 02ce14b3ef1c8087cf7d7443f674469a192bce03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ce14b3ef1c8087cf7d7443f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:19 2015 +0200 wined3d: Remove wined3d_volume_preload. --- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 424938a..1bce5c0 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -481,11 +481,6 @@ void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) return volume->resource.parent; } -void CDECL wined3d_volume_preload(struct wined3d_volume *volume) -{ - FIXME("volume %p stub!\n", volume); -} - struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9f714ef..ec3cc45 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -289,5 +289,4 @@ @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) -@ cdecl wined3d_volume_preload(ptr) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7d4e5a0..8f686fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2573,7 +2573,6 @@ struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_vol ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); -void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */

1 0

Nikolay Sivov : dwrite/tests: Some tests for TranslateColorGlyphRun().
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 37d10af966221ff932d73a418163bd1fba29ff7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d10af966221ff932d73a418… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 17:48:12 2015 +0300 dwrite/tests: Some tests for TranslateColorGlyphRun(). --- dlls/dwrite/tests/font.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++- include/winerror.h | 1 + 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dfe782d..468a5c0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -98,6 +98,7 @@ static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; +static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; static IDWriteFactory *create_factory(void) { @@ -4793,7 +4794,6 @@ struct CPAL_Header_0 static void test_GetPaletteEntries(void) { - static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; IDWriteFactory *factory; @@ -4880,6 +4880,127 @@ static void test_GetPaletteEntries(void) IDWriteFactory_Release(factory); } +static void test_TranslateColorGlyphRun(void) +{ + IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN *colorrun; + IDWriteFontFace *fontface; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + UINT32 codepoints[2]; + IDWriteFont *font; + UINT16 glyphs[2]; + BOOL hasrun; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + IDWriteFactory_Release(factory); + if (hr != S_OK) { + win_skip("TranslateColorGlyphRun() is not supported.\n"); + return; + } + + /* Tahoma, no color support */ + fontface = create_fontface((IDWriteFactory*)factory2); + + codepoints[0] = 'A'; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.fontFace = fontface; + run.fontEmSize = 20.0f; + run.glyphCount = 1; + run.glyphIndices = glyphs; + run.glyphAdvances = NULL; + run.glyphOffsets = NULL; + run.isSideways = FALSE; + run.bidiLevel = 0; + + layers = (void*)0xdeadbeef; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); +todo_wine { + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(layers == NULL, "got %p\n", layers); +} + IDWriteFontFace_Release(fontface); + + /* Segoe UI Emoji, with color support */ + font = get_font((IDWriteFactory*)factory2, emojiW, DWRITE_FONT_STYLE_NORMAL); + if (!font) { + IDWriteFactory2_Release(factory2); + skip("Segoe UI Emoji font not found.\n"); + return; + } + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + codepoints[0] = 0x26c4; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.fontFace = fontface; + + layers = NULL; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(layers != NULL, "got %p\n", layers); + + while (1) { + hasrun = FALSE; + hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (!hasrun) + break; + } + + /* iterated all way through */ + hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); +todo_wine + ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + + IDWriteColorGlyphRunEnumerator_Release(layers); + + /* color font, glyph without color info */ + codepoints[0] = 'A'; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + layers = (void*)0xdeadbeef; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); +todo_wine { + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(layers == NULL, "got %p\n", layers); +} + /* one glyph with, one without */ + codepoints[0] = 'A'; + codepoints[1] = 0x26c4; + + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 2, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.glyphCount = 2; + + layers = NULL; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(layers != NULL, "got %p\n", layers); + IDWriteColorGlyphRunEnumerator_Release(layers); + + IDWriteFontFace_Release(fontface); + IDWriteFactory2_Release(factory2); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4931,6 +5052,7 @@ START_TEST(font) test_CreateAlphaTexture(); test_IsSymbolFont(); test_GetPaletteEntries(); + test_TranslateColorGlyphRun(); IDWriteFactory_Release(factory); } diff --git a/include/winerror.h b/include/winerror.h index 1c9df07..87419d1 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2077,6 +2077,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #undef NOERROR /* arpa/nameser_compat.h defines this */ #define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) +#define E_NOT_VALID_STATE HRESULT_FROM_WIN32(ERROR_INVALID_STATE) #ifdef RC_INVOKED #define _HRESULT_TYPEDEF_(x) (x)

1 0

Marcus Meissner : ws2_32/tests: Fixed argument to GetComputerNameExW.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 5af9acadb6b5b162b137476482308e4e548b32db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af9acadb6b5b162b13747648… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Sep 9 21:47:14 2015 +0200 ws2_32/tests: Fixed argument to GetComputerNameExW. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fa1236e..2bcc92e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6313,7 +6313,7 @@ static void test_GetAddrInfoW(void) int i, ret; ADDRINFOW *result, *result2, *p, hint; WCHAR name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(WCHAR); if (!pGetAddrInfoW || !pFreeAddrInfoW) {

1 0

Bruno Jesus : msvfw32: Trace only what matters in MCIWNDM_GETDEVICE.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 19d73d284745b3f24844ed5967f18ee2a9993f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d73d284745b3f24844ed596… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 10 00:48:05 2015 +0800 msvfw32: Trace only what matters in MCIWNDM_GETDEVICE. --- dlls/msvfw32/mciwnd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index e561b14..fc49973 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -1070,27 +1070,33 @@ end_of_mci_open: case MCIWNDM_GETDEVICEA: { + int len = 0; + char *str = (char *)lParam; MCI_SYSINFO_PARMSA mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandA(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an((LPSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an(str, len)); return 0; } case MCIWNDM_GETDEVICEW: { + int len = 0; + WCHAR *str = (WCHAR *)lParam; MCI_SYSINFO_PARMSW mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPWSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn((LPWSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn(str, len)); return 0; }

1 0

Józef Kucia : d3d11: Implement d3d11_shader_resource_view_GetResource().
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 487cf3d5c41693723ebdb899807cd3df921d8a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=487cf3d5c41693723ebdb8998… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:46 2015 +0200 d3d11: Implement d3d11_shader_resource_view_GetResource(). --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 13 ++++++++- dlls/d3d11/view.c | 68 ++++++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5cf7509..93b82f9 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -198,12 +198,12 @@ struct d3d_shader_resource_view struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; D3D11_SHADER_RESOURCE_VIEW_DESC desc; - ID3D10Resource *resource; + ID3D11Resource *resource; ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4266a98..ef12a33 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2108,6 +2108,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *object; + ID3D11Resource *d3d11_resource; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); @@ -2115,14 +2116,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource))) + { + ERR("Resource does not implement ID3D11Resource.\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + + if (FAILED(hr = d3d_shader_resource_view_init(object, device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + ID3D11Resource_Release(d3d11_resource); return hr; } + ID3D11Resource_Release(d3d11_resource); + TRACE("Created shader resource view %p.\n", object); *view = &object->ID3D10ShaderResourceView_iface; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f3ac62f..99b1be7 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -240,27 +240,27 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { - D3D10_RESOURCE_DIMENSION dimension; + D3D11_RESOURCE_DIMENSION dimension; - ID3D10Resource_GetType(resource, &dimension); + ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { - D3D10_TEXTURE1D_DESC texture_desc; - ID3D10Texture1D *texture; + D3D11_TEXTURE1D_DESC texture_desc; + ID3D11Texture1D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); return E_INVALIDARG; } - ID3D10Texture1D_GetDesc(texture, &texture_desc); - ID3D10Texture1D_Release(texture); + ID3D11Texture1D_GetDesc(texture, &texture_desc); + ID3D11Texture1D_Release(texture); desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) @@ -281,19 +281,19 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D10_TEXTURE2D_DESC texture_desc; - ID3D10Texture2D *texture; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); return E_INVALIDARG; } - ID3D10Texture2D_GetDesc(texture, &texture_desc); - ID3D10Texture2D_Release(texture); + ID3D11Texture2D_GetDesc(texture, &texture_desc); + ID3D11Texture2D_Release(texture); desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) @@ -330,19 +330,19 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D10_TEXTURE3D_DESC texture_desc; - ID3D10Texture3D *texture; + D3D11_TEXTURE3D_DESC texture_desc; + ID3D11Texture3D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture3D, (void **)&texture))) { - ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); + ERR("Resource of type TEXTURE3D doesn't implement ID3D11Texture3D.\n"); return E_INVALIDARG; } - ID3D10Texture3D_GetDesc(texture, &texture_desc); - ID3D10Texture3D_Release(texture); + ID3D11Texture3D_GetDesc(texture, &texture_desc); + ID3D11Texture3D_Release(texture); desc->Format = texture_desc.Format; desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D; @@ -354,7 +354,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I default: FIXME("Unhandled resource dimension %#x.\n", dimension); - case D3D10_RESOURCE_DIMENSION_BUFFER: + case D3D11_RESOURCE_DIMENSION_BUFFER: return E_INVALIDARG; } } @@ -1238,7 +1238,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe { wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D10Resource_Release(view->resource); + ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1292,7 +1292,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateDataInterf static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11ShaderResourceView *iface, ID3D11Resource **resource) { - FIXME("iface %p, resource %p stub!\n", iface, resource); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + *resource = view->resource; + ID3D11Resource_AddRef(*resource); } static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, @@ -1412,8 +1417,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade TRACE("iface %p, resource %p.\n", iface, resource); - *resource = view->resource; - ID3D10Resource_AddRef(*resource); + ID3D11Resource_QueryInterface(view->resource, &IID_ID3D10Resource, (void **)resource); } /* ID3D10ShaderResourceView methods */ @@ -1446,7 +1450,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) + ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; HRESULT hr; @@ -1466,7 +1470,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource))) { ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL; @@ -1482,7 +1486,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D10Resource_AddRef(resource); + ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device);

1 0

Riccardo Bortolato : wined3d: Remove wined3d_volume_get_parent.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 5cba355a8392c41b9b7b418eb910fb5c454b5528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cba355a8392c41b9b7b418eb… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:20 2015 +0200 wined3d: Remove wined3d_volume_get_parent. --- dlls/wined3d/volume.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 1bce5c0..6d62c5e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -474,13 +474,6 @@ ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) return wined3d_texture_decref(volume->container); } -void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) -{ - TRACE("volume %p.\n", volume); - - return volume->resource.parent; -} - struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ec3cc45..f2447da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -285,7 +285,6 @@ @ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) -@ cdecl wined3d_volume_get_parent(ptr) @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8f686fb..e2b9e1f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2568,7 +2568,6 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); -void * __cdecl wined3d_volume_get_parent(const struct wined3d_volume *volume); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume,

1 0

Dmitry Timoshkov : oleaut32/tests: Add another test for calling a varargs method.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 232f54aea2ff873305b437197f947da336b40038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232f54aea2ff873305b437197… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:16:32 2015 +0800 oleaut32/tests: Add another test for calling a varargs method. This time with passing SAFEARRAY as a reference. --- dlls/oleaut32/tests/tmarshal.c | 55 +++++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 3 ++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f18aecc..6b89774 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -874,6 +874,41 @@ static HRESULT WINAPI Widget_VarArg_Run( return S_OK; } +static HRESULT WINAPI Widget_VarArg_Ref_Run( + IWidget *iface, BSTR name, SAFEARRAY **params, VARIANT *result) +{ + static const WCHAR catW[] = { 'C','a','t',0 }; + static const WCHAR supermanW[] = { 'S','u','p','e','r','m','a','n',0 }; + LONG bound; + VARIANT *var; + BSTR bstr; + HRESULT hr; + + trace("VarArg_Ref_Run(%p,%p,%p)\n", name, params, result); + + ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + + hr = SafeArrayGetLBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayGetUBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayAccessData(*params, (void **)&var); + ok(hr == S_OK, "SafeArrayAccessData error %#x\n", hr); + + ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n", V_VT(&var[0])); + bstr = V_BSTR(&var[0]); + ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr)); + + hr = SafeArrayUnaccessData(*params); + ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -912,7 +947,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_put_prop_req_arg, Widget_pos_restrict, Widget_neg_restrict, - Widget_VarArg_Run + Widget_VarArg_Run, + Widget_VarArg_Ref_Run }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1554,6 +1590,23 @@ static void test_typelibmarshal(void) SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); + /* call VarArg_Ref_Run */ + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szCat); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 2; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); +todo_wine + ok_ole_success(hr, IDispatch_Invoke); + SysFreeString(V_BSTR(&vararg[1])); + SysFreeString(V_BSTR(&vararg[0])); + /* call Error */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index ff9cac3..680f4b4 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -182,6 +182,9 @@ library TestTypelib [id(DISPID_TM_VARARG_RUN), vararg] HRESULT VarArg_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) params, [out, retval] VARIANT *result); + + [id(DISPID_TM_VARARG_REF_RUN), vararg] + HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index d603a56..dfca216 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -45,6 +45,7 @@ #define DISPID_TM_NEG_RESTRICTED -26 #define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_TM_VARARG_RUN 28 +#define DISPID_TM_VARARG_REF_RUN 29 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0