September 2015 - Wine-Commits

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

Sept. 9, 2015

Module: wine Branch: master Commit: 9a0d564683855e1a01ffcb926c9cb1653a7ff669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0d564683855e1a01ffcb926… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:45 2015 +0200 d3d11: Implement d3d11_device_CreateRenderTargetView(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 31 +++++++++++++++---------------- dlls/d3d11/view.c | 24 +++++++++++++++++++++++- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e950bcd..cddef4d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -184,8 +184,8 @@ struct d3d_rendertarget_view ID3D10Device1 *device; }; -HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, - ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, + 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 */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5e1f9e0..e866f71 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -135,9 +135,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device *iface, ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_rendertarget_view *object; + HRESULT hr; + + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + if (FAILED(hr = d3d_rendertarget_view_create(device, resource, desc, &object))) + return hr; + + *view = &object->ID3D11RenderTargetView_iface; + + return S_OK; - return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, @@ -2128,28 +2138,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - 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_rendertarget_view_init(object, device, d3d11_resource, - (const D3D11_RENDER_TARGET_VIEW_DESC *)desc))) - { - WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - ID3D11Resource_Release(d3d11_resource); - return hr; - } - + hr = d3d_rendertarget_view_create(device, d3d11_resource, (const D3D11_RENDER_TARGET_VIEW_DESC *)desc, &object); ID3D11Resource_Release(d3d11_resource); + if (FAILED(hr)) + return hr; - TRACE("Created rendertarget view %p.\n", object); *view = &object->ID3D10RenderTargetView_iface; return S_OK; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c30e12d..195cd73 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1095,7 +1095,7 @@ static void wined3d_rendertarget_view_desc_from_d3d11(struct wined3d_rendertarge } } -HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, +static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc) { struct wined3d_rendertarget_view_desc wined3d_desc; @@ -1143,6 +1143,28 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3 return S_OK; } +HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) +{ + struct d3d_rendertarget_view *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) + { + WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rendertarget view %p.\n", object); + *view = object; + + return S_OK; +} + struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Rename d3d10_rendertarget_view to d3d_rendertarget_view.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 44fa6faa9bf1809ef2cf59f4cfc32a3a93f4ec2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fa6faa9bf1809ef2cf59f4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:41 2015 +0200 d3d11: Rename d3d10_rendertarget_view to d3d_rendertarget_view. --- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 10 +++++----- dlls/d3d11/view.c | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c5593d7..ea6e834 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -171,7 +171,7 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ -struct d3d10_rendertarget_view +struct d3d_rendertarget_view { ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; @@ -183,9 +183,9 @@ struct d3d10_rendertarget_view ID3D10Device1 *device; }; -HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device, +HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; +struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; /* ID3D10ShaderResourceView */ struct d3d10_shader_resource_view diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d6065b4..d9beffe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -940,7 +940,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa wined3d_mutex_lock(); for (i = 0; i < render_target_view_count; ++i) { - struct d3d10_rendertarget_view *rtv = unsafe_impl_from_ID3D10RenderTargetView(render_target_views[i]); + struct d3d_rendertarget_view *rtv = unsafe_impl_from_ID3D10RenderTargetView(render_target_views[i]); wined3d_device_set_rendertarget_view(device->wined3d_device, i, rtv ? rtv->wined3d_view : NULL, FALSE); @@ -1210,7 +1210,7 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); + struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr; @@ -1692,7 +1692,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa wined3d_mutex_lock(); if (render_target_views) { - struct d3d10_rendertarget_view *view_impl; + struct d3d_rendertarget_view *view_impl; unsigned int i; for (i = 0; i < view_count; ++i) @@ -2122,7 +2122,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rendertarget_view *object; + struct d3d_rendertarget_view *object; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); @@ -2130,7 +2130,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_rendertarget_view_init(object, device, resource, desc))) + if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) { WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cff0948..4fc77f5 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -766,9 +766,9 @@ struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10Dept return impl_from_ID3D10DepthStencilView(iface); } -static inline struct d3d10_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { - return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, ID3D10RenderTargetView_iface); + return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface); } /* IUnknown methods */ @@ -796,7 +796,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10Re static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -806,7 +806,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTarget static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -829,7 +829,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -840,7 +840,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -851,7 +851,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -862,7 +862,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -874,7 +874,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, ID3D10Resource **resource) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, resource %p\n", iface, resource); @@ -887,7 +887,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView *iface, D3D10_RENDER_TARGET_VIEW_DESC *desc) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -974,7 +974,7 @@ static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendert } } -HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device, +HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { struct wined3d_rendertarget_view_desc wined3d_desc; @@ -1021,7 +1021,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return S_OK; } -struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { if (!iface) return NULL;

1 0

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

Sept. 9, 2015

Module: wine Branch: master Commit: b5b5b381f469870be81a109b6627170d9eafb20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b5b381f469870be81a109b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:42 2015 +0200 d3d11: Add ID3D11RenderTargetView interface stub. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/view.c | 162 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 140 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index ea6e834..58e5912 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -170,9 +170,10 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN; struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; -/* ID3D10RenderTargetView */ +/* ID3D11RenderTargetView, ID3D10RenderTargetView */ struct d3d_rendertarget_view { + ID3D11RenderTargetView ID3D11RenderTargetView_iface; ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 4fc77f5..7f7dcfd 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -766,65 +766,178 @@ struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10Dept return impl_from_ID3D10DepthStencilView(iface); } -static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +/* ID3D11RenderTargetView methods */ + +static inline struct d3d_rendertarget_view *impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) { - return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface); + return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D11RenderTargetView_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_QueryInterface(ID3D11RenderTargetView *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface); - if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView) - || IsEqualGUID(riid, &IID_ID3D10View) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11RenderTargetView) + || IsEqualGUID(riid, &IID_ID3D11View) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11RenderTargetView_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10RenderTargetView_AddRef(&view->ID3D10RenderTargetView_iface); + *object = &view->ID3D10RenderTargetView_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) +static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTargetView *iface) { - struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_Release(ID3D10RenderTargetView *iface) +static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTargetView *iface) { - struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_decref(This->wined3d_view); - ID3D10Resource_Release(This->resource); - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); + wined3d_rendertarget_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_rendertarget_view_GetDevice(ID3D11RenderTargetView *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_GetPrivateData(ID3D11RenderTargetView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_SetPrivateData(ID3D11RenderTargetView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_SetPrivateDataInterface(ID3D11RenderTargetView *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_GetResource(ID3D11RenderTargetView *iface, + ID3D11Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDesc(ID3D11RenderTargetView *iface, + D3D11_RENDER_TARGET_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11RenderTargetViewVtbl d3d11_rendertarget_view_vtbl = +{ + /* IUnknown methods */ + d3d11_rendertarget_view_QueryInterface, + d3d11_rendertarget_view_AddRef, + d3d11_rendertarget_view_Release, + /* ID3D11DeviceChild methods */ + d3d11_rendertarget_view_GetDevice, + d3d11_rendertarget_view_GetPrivateData, + d3d11_rendertarget_view_SetPrivateData, + d3d11_rendertarget_view_SetPrivateDataInterface, + /* ID3D11View methods */ + d3d11_rendertarget_view_GetResource, + /* ID3D11RenderTargetView methods */ + d3d11_rendertarget_view_GetDesc, +}; + +/* ID3D10RenderTargetView methods */ + +static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, + REFIID riid, void **object) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_rendertarget_view_QueryInterface(&view->ID3D11RenderTargetView_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_rendertarget_view_AddRef(&view->ID3D11RenderTargetView_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) +{ + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_rendertarget_view_Release(&view->ID3D11RenderTargetView_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) @@ -981,6 +1094,7 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3 struct wined3d_resource *wined3d_resource; HRESULT hr; + view->ID3D11RenderTargetView_iface.lpVtbl = &d3d11_rendertarget_view_vtbl; view->ID3D10RenderTargetView_iface.lpVtbl = &d3d10_rendertarget_view_vtbl; view->refcount = 1;

1 0

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

Sept. 9, 2015

Module: wine Branch: master Commit: 99bb367d522778abba938933267025c6c8fd384c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bb367d522778abba9389332… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:43 2015 +0200 d3d11: Implement d3d11_rendertarget_view_GetResource(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 13 ++++++++++++- dlls/d3d11/view.c | 38 +++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 58e5912..30c588e 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -180,12 +180,12 @@ struct d3d_rendertarget_view struct wined3d_private_store private_store; struct wined3d_rendertarget_view *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; - ID3D10Resource *resource; + ID3D11Resource *resource; ID3D10Device1 *device; }; HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; + ID3D11Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; /* ID3D10ShaderResourceView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d9beffe..b45342a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2123,6 +2123,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_rendertarget_view *object; + ID3D11Resource *d3d11_resource; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); @@ -2130,13 +2131,23 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) + 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_rendertarget_view_init(object, device, d3d11_resource, desc))) { WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + ID3D11Resource_Release(d3d11_resource); return hr; } + ID3D11Resource_Release(d3d11_resource); + TRACE("Created rendertarget view %p.\n", object); *view = &object->ID3D10RenderTargetView_iface; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7f7dcfd..231eb19 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -121,21 +121,21 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 } } -static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) +static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { - D3D10_RESOURCE_DIMENSION dimension; + D3D11_RESOURCE_DIMENSION dimension; HRESULT hr; - ID3D10Resource_GetType(resource, &dimension); + ID3D11Resource_GetType(resource, &dimension); switch(dimension) { - case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { ID3D10Texture1D *texture; D3D10_TEXTURE1D_DESC texture_desc; - hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture); + hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture); if (FAILED(hr)) { ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D?\n"); @@ -162,12 +162,12 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { ID3D10Texture2D *texture; D3D10_TEXTURE2D_DESC texture_desc; - hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); + hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); if (FAILED(hr)) { ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D?\n"); @@ -210,12 +210,12 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { ID3D10Texture3D *texture; D3D10_TEXTURE3D_DESC texture_desc; - hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture); + hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture); if (FAILED(hr)) { ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D?\n"); @@ -826,7 +826,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D10Resource_Release(view->resource); + ID3D11Resource_Release(view->resource); ID3D10Device1_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -875,7 +875,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetResource(ID3D11RenderTargetView *iface, ID3D11Resource **resource) { - FIXME("iface %p, resource %p stub!\n", iface, resource); + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + *resource = view->resource; + ID3D11Resource_AddRef(*resource); } static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDesc(ID3D11RenderTargetView *iface, @@ -991,8 +996,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa TRACE("iface %p, resource %p\n", iface, resource); - *resource = view->resource; - ID3D10Resource_AddRef(*resource); + ID3D11Resource_QueryInterface(view->resource, &IID_ID3D10Resource, (void **)resource); } /* ID3D10RenderTargetView methods */ @@ -1088,7 +1092,7 @@ static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendert } HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) + ID3D11Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { struct wined3d_rendertarget_view_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -1109,10 +1113,10 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3 } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource))) { wined3d_mutex_unlock(); - ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); + ERR("Failed to get wined3d resource for d3d11 resource %p.\n", resource); return E_FAIL; } @@ -1128,7 +1132,7 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3 wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D10Resource_AddRef(resource); + ID3D11Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(view->device);

1 0

Piotr Caban : msi: Check HKLM/Software/Classes/Installer/ Components path while looking for components.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: e8f4fea5a0a99e82b538b03b3b0299cceab114db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f4fea5a0a99e82b538b03b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 9 09:55:35 2015 +0200 msi: Check HKLM/Software/Classes/Installer/Components path while looking for components. --- dlls/msi/registry.c | 12 +++++++++++- dlls/msi/tests/action.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 2106ab2..e797f1e 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -173,6 +173,10 @@ static const WCHAR szUserComponents[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; +static const WCHAR szInstaller_Components[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', + 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; + static const WCHAR szUserFeatures[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','F','e','a','t','u','r','e','s','\\',0}; @@ -650,6 +654,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINS UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squished_cc[GUID_SIZE], keypath[0x200]; + UINT ret; if (!squash_guid(szComponent, squished_cc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szComponent), debugstr_w(squished_cc)); @@ -658,7 +663,12 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) strcatW(keypath, squished_cc); if (create) return RegCreateKeyW(HKEY_CURRENT_USER, keypath, key); - return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); + ret = RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); + if (ret != ERROR_FILE_NOT_FOUND) return ret; + + strcpyW(keypath, szInstaller_Components); + strcatW(keypath, squished_cc); + return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 435aeeb..2aa5b0b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5854,10 +5854,14 @@ static void test_publish_components(void) { static const char keypath[] = "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; + static const char keypath2[] = + "Software\\Classes\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; UINT r; LONG res; HKEY key; + BYTE *data; + DWORD size; if (is_process_limited()) { @@ -5879,13 +5883,48 @@ static void test_publish_components(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + size = 0; + r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", + "english.txt", INSTALLMODE_DEFAULT, NULL, &size); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); ok(res == ERROR_SUCCESS, "components key not created %d\n", res); - res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); + res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, &size); + ok(res == ERROR_SUCCESS, "value not found %d\n", res); + + data = HeapAlloc(GetProcessHeap(), 0, size); + res = RegQueryValueExA(key, "english.txt", NULL, NULL, data, &size); ok(res == ERROR_SUCCESS, "value not found %d\n", res); RegCloseKey(key); + res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key); + ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); + + res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + RegCloseKey(key); + + size = 0; + r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", + "english.txt", INSTALLMODE_DEFAULT, NULL, &size); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + + res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); + + res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + HeapFree(GetProcessHeap(), 0, data); + RegCloseKey(key); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Bruno Jesus : msacm32: Quit on unsupported destination format in PCM_FormatSuggest.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: c6afba8979500af43cb48fee1c33eae5fb544d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6afba8979500af43cb48fee1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 9 12:10:55 2015 +0800 msacm32: Quit on unsupported destination format in PCM_FormatSuggest. --- dlls/msacm32/pcmconverter.c | 21 +++++++++++++-------- dlls/msacm32/tests/msacm.c | 1 - 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index cf92d93..f56d155 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -839,28 +839,33 @@ static LRESULT PCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) /* some tests ... */ if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) || - adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || - PCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) { + adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || + PCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) { WARN("not possible\n"); return ACMERR_NOTPOSSIBLE; } /* is no suggestion for destination, then copy source value */ if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NCHANNELS)) { - adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels; + adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels; } if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NSAMPLESPERSEC)) { - adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec; + adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec; } if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WBITSPERSAMPLE)) { - adfs->pwfxDst->wBitsPerSample = adfs->pwfxSrc->wBitsPerSample; + adfs->pwfxDst->wBitsPerSample = adfs->pwfxSrc->wBitsPerSample; } if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) { - if (adfs->pwfxSrc->wFormatTag != WAVE_FORMAT_PCM) { - WARN("not possible\n"); + if (adfs->pwfxSrc->wFormatTag != WAVE_FORMAT_PCM) { + WARN("source format 0x%x not supported\n", adfs->pwfxSrc->wFormatTag); + return ACMERR_NOTPOSSIBLE; + } + adfs->pwfxDst->wFormatTag = adfs->pwfxSrc->wFormatTag; + } else { + if (adfs->pwfxDst->wFormatTag != WAVE_FORMAT_PCM) { + WARN("destination format 0x%x not supported\n", adfs->pwfxDst->wFormatTag); return ACMERR_NOTPOSSIBLE; } - adfs->pwfxDst->wFormatTag = adfs->pwfxSrc->wFormatTag; } /* check if result is ok */ if (PCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) { diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index e897fc9..88ad330 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -652,7 +652,6 @@ todo_wine | ACM_FORMATSUGGESTF_WBITSPERSAMPLE | ACM_FORMATSUGGESTF_WFORMATTAG; rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); -todo_wine ok(rc == ACMERR_NOTPOSSIBLE, "failed with error 0x%x\n", rc); memset(&dst, 0, sizeof(dst)); suggest = 0;

1 0

Andrew Eikum : x3daudio1_7: Stub X3DAudioCalculate.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 0f4b16aa340f3a02a103efbf1ea44529b83f5b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4b16aa340f3a02a103efbf1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 8 14:02:13 2015 -0500 x3daudio1_7: Stub X3DAudioCalculate. --- dlls/x3daudio1_7/main.c | 24 +++++++++- dlls/x3daudio1_7/x3daudio1_7.spec | 2 +- include/Makefile.in | 1 + include/x3daudio.h | 97 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 2488e03..eece4fc 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "x3daudio.h" #include "wine/debug.h" @@ -39,8 +40,29 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, void *handle) +HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, + X3DAUDIO_HANDLE handle) { FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); return S_OK; } + +void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, + const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, + UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) +{ + static int once = 0; + if(!once){ + FIXME("%p %p %p 0x%x %p: Stub!\n", handle, listener, emitter, flags, out); + ++once; + } + + out->LPFDirectCoefficient = 0; + out->LPFReverbCoefficient = 0; + out->ReverbLevel = 0; + out->DopplerFactor = 1; + out->EmitterToListenerAngle = 0; + out->EmitterToListenerDistance = 0; + out->EmitterVelocityComponent = 0; + out->ListenerVelocityComponent = 0; +} diff --git a/dlls/x3daudio1_7/x3daudio1_7.spec b/dlls/x3daudio1_7/x3daudio1_7.spec index 2b93838..7432b84 100644 --- a/dlls/x3daudio1_7/x3daudio1_7.spec +++ b/dlls/x3daudio1_7/x3daudio1_7.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) @ cdecl X3DAudioInitialize(long float ptr) diff --git a/include/Makefile.in b/include/Makefile.in index 1dc912b..f4d853e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -663,6 +663,7 @@ SRCDIR_INCLUDES = \ wsipx.h \ wsnwlink.h \ wtsapi32.h \ + x3daudio.h \ xcmc.h \ xinput.h \ xmldom.h \ diff --git a/include/x3daudio.h b/include/x3daudio.h new file mode 100644 index 0000000..a503507 --- /dev/null +++ b/include/x3daudio.h @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _X3DAUDIO_H +#define _X3DAUDIO_H + +typedef struct X3DAUDIO_VECTOR { + float x, y, z; +} X3DAUDIO_VECTOR; + +typedef struct X3DAUDIO_CONE { + float InnerAngle; + float OuterAngle; + float InnerVolume; + float OuterVolume; + float InnerLPF; + float OuterLPF; + float InnerReverb; + float OuterReverb; +} X3DAUDIO_CONE; + +typedef struct X3DAUDIO_DISTANCE_CURVE_POINT { + float Distance; + float DSPSetting; +} X3DAUDIO_DISTANCE_CURVE_POINT; + +typedef struct X3DAUDIO_DISTANCE_CURVE { + X3DAUDIO_DISTANCE_CURVE_POINT *pPoints; + UINT32 PointCount; +} X3DAUDIO_DISTANCE_CURVE; + +typedef struct X3DAUDIO_LISTENER { + X3DAUDIO_VECTOR OrientFront; + X3DAUDIO_VECTOR OrientTop; + X3DAUDIO_VECTOR Position; + X3DAUDIO_VECTOR Velocity; + X3DAUDIO_CONE *pCone; +} X3DAUDIO_LISTENER; + +typedef struct X3DAUDIO_EMITTER { + X3DAUDIO_CONE *pCone; + X3DAUDIO_VECTOR OrientFront; + X3DAUDIO_VECTOR OrientTop; + X3DAUDIO_VECTOR Position; + X3DAUDIO_VECTOR Velocity; + float InnerRadius; + float InnerRadiusAngle; + UINT32 ChannelCount; + float ChannelRadius; + float *pChannelAzimuths; + X3DAUDIO_DISTANCE_CURVE *pVolumeCurve; + X3DAUDIO_DISTANCE_CURVE *pLFECurve; + X3DAUDIO_DISTANCE_CURVE *pLPFDirectCurve; + X3DAUDIO_DISTANCE_CURVE *pLPFReverbCurve; + X3DAUDIO_DISTANCE_CURVE *pReverbCurve; + float CurveDistanceScalar; + float DopplerScalar; +} X3DAUDIO_EMITTER; + +typedef struct X3DAUDIO_DSP_SETTINGS { + float *pMatrixCoefficients; + float *pDelayTimes; + UINT32 SrcChannelCount; + UINT32 DstChannelCount; + float LPFDirectCoefficient; + float LPFReverbCoefficient; + float ReverbLevel; + float DopplerFactor; + float EmitterToListenerAngle; + float EmitterToListenerDistance; + float EmitterVelocityComponent; + float ListenerVelocityComponent; +} X3DAUDIO_DSP_SETTINGS; + +#define X3DAUDIO_HANDLE_BYTESIZE 20 +typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE]; + +HRESULT CDECL X3DAudioInitialize(UINT32, float, X3DAUDIO_HANDLE); +void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE, const X3DAUDIO_LISTENER *, + const X3DAUDIO_EMITTER *, UINT32, X3DAUDIO_DSP_SETTINGS *); + +#endif

1 0

Bruno Jesus : ws2_32/tests: Remove a dead assignment.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 4e01388a3257c6b5bd3f0748a9c2f4d4fd312a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e01388a3257c6b5bd3f0748a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 9 12:13:19 2015 +0800 ws2_32/tests: Remove a dead assignment. --- dlls/ws2_32/tests/sock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 03e1627..fa1236e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4423,7 +4423,6 @@ static void test_gethostbyname_hack(void) return; } - he = NULL; he = gethostbyname(name); ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, h_errno); if(he)

1 0

Bruno Jesus : msacm32/tests: Add tests for acmFormatSuggest().
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: af8760e6e5a4c0dc8e93ce76d19f9121dfa9afb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8760e6e5a4c0dc8e93ce76d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 9 12:10:39 2015 +0800 msacm32/tests: Add tests for acmFormatSuggest(). --- dlls/msacm32/tests/msacm.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ include/mmreg.h | 1 + 2 files changed, 109 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 747c5fe..e897fc9 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -594,8 +594,116 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); } +static void test_acmFormatSuggest(void) +{ + WAVEFORMATEX src, dst; + DWORD suggest; + MMRESULT rc; + + /* Test a valid PCM format */ + src.wFormatTag = WAVE_FORMAT_PCM; + src.nChannels = 1; + src.nSamplesPerSec = 8000; + src.nAvgBytesPerSec = 16000; + src.nBlockAlign = 2; + src.wBitsPerSample = 16; + src.cbSize = 0; + suggest = 0; + memset(&dst, 0, sizeof(dst)); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); +todo_wine + ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); + ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); +todo_wine + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); +todo_wine + ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); +todo_wine + ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); + + /* All parameters from destination are valid */ + suggest = ACM_FORMATSUGGESTF_NCHANNELS + | ACM_FORMATSUGGESTF_NSAMPLESPERSEC + | ACM_FORMATSUGGESTF_WBITSPERSAMPLE + | ACM_FORMATSUGGESTF_WFORMATTAG; + dst = src; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); + ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); + ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); + + /* Test for WAVE_FORMAT_MSRT24 used in Monster Truck Madness 2 */ + src.wFormatTag = WAVE_FORMAT_MSRT24; + src.nChannels = 1; + src.nSamplesPerSec = 8000; + src.nAvgBytesPerSec = 16000; + src.nBlockAlign = 2; + src.wBitsPerSample = 16; + src.cbSize = 0; + dst = src; + suggest = ACM_FORMATSUGGESTF_NCHANNELS + | ACM_FORMATSUGGESTF_NSAMPLESPERSEC + | ACM_FORMATSUGGESTF_WBITSPERSAMPLE + | ACM_FORMATSUGGESTF_WFORMATTAG; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); +todo_wine + ok(rc == ACMERR_NOTPOSSIBLE, "failed with error 0x%x\n", rc); + memset(&dst, 0, sizeof(dst)); + suggest = 0; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + + /* Invalid struct size */ + src.wFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatSuggest(NULL, &src, &dst, 0, suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) / 2, suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + /* cbSize is the last parameter and not required for PCM */ + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize) - 1, suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + /* cbSize is required for others */ + src.wFormatTag = WAVE_FORMAT_ADPCM; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); +todo_wine + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + + /* Invalid suggest flags */ + src.wFormatTag = WAVE_FORMAT_PCM; + suggest = 0xFFFFFFFF; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); + ok(rc == MMSYSERR_INVALFLAG, "failed with error 0x%x\n", rc); + + /* Invalid source and destination */ + suggest = 0; + rc = acmFormatSuggest(NULL, NULL, &dst, sizeof(dst), suggest); + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, &src, NULL, sizeof(dst), suggest); + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + rc = acmFormatSuggest(NULL, NULL, NULL, sizeof(dst), suggest); + ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); +} + START_TEST(msacm) { driver_tests(); test_prepareheader(); + test_acmFormatSuggest(); } diff --git a/include/mmreg.h b/include/mmreg.h index 55bfd35..e0b1dd0 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -107,6 +107,7 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_G721_ADPCM 0x0040 /* Antex Electronics Corporation */ #define WAVE_FORMAT_MPEG 0x0050 /* Microsoft Corporation */ #define WAVE_FORMAT_MPEGLAYER3 0x0055 +#define WAVE_FORMAT_MSRT24 0x0082 /* Microsoft Corporation */ #define WAVE_FORMAT_CREATIVE_ADPCM 0x0200 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH8 0x0202 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH10 0x0203 /* Creative Labs, Inc */

1 0

Thomas Faller : ntdll: Fix invalid use of uninitialized memory.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: d90f25156c09c374554cd799b0076e1bc938c002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f25156c09c374554cd799b… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Sep 8 16:32:12 2015 +0200 ntdll: Fix invalid use of uninitialized memory. --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 8b7cbaa..feaac9e 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -869,7 +869,7 @@ BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3( const UNICODE_STRING *unicode, if (oem->Length > 12) return FALSE; /* a starting . is invalid, except for . and .. */ - if (oem->Buffer[0] == '.') + if (oem->Length > 0 && oem->Buffer[0] == '.') { if (oem->Length != 1 && (oem->Length != 2 || oem->Buffer[1] != '.')) return FALSE; if (spaces) *spaces = FALSE;

1 0