September 2015 - Wine-Commits

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

Sept. 3, 2015

Module: wine Branch: master Commit: 9abc17dcce2283ab4e59a1aac44b5b6a80bcda10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abc17dcce2283ab4e59a1aac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:53 2015 +0200 d3d11: Add ID3D11Buffer interface stub. --- dlls/d3d11/buffer.c | 149 ++++++++++++++++++++++++++++++++++++++++----- dlls/d3d11/d3d11_private.h | 3 +- 2 files changed, 137 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index cf97712..d0655a2 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -24,36 +24,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static inline struct d3d_buffer *impl_from_ID3D10Buffer(ID3D10Buffer *iface) +/* ID3D11Buffer methods */ + +static inline struct d3d_buffer *impl_from_ID3D11Buffer(ID3D11Buffer *iface) { - return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D10Buffer_iface); + return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D11Buffer_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d11_buffer_QueryInterface(ID3D11Buffer *iface, REFIID riid, void **out) { + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_ID3D10Buffer) - || IsEqualGUID(riid, &IID_ID3D10Resource) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11Buffer) + || IsEqualGUID(riid, &IID_ID3D11Resource) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11Buffer_AddRef(iface); *out = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10Buffer) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10Buffer_AddRef(&buffer->ID3D10Buffer_iface); + *out = &buffer->ID3D10Buffer_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *out = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) +static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) { - struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); ULONG refcount = InterlockedIncrement(&buffer->refcount); TRACE("%p increasing refcount to %u.\n", buffer, refcount); @@ -69,9 +80,9 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) +static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) { - struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); ULONG refcount = InterlockedDecrement(&buffer->refcount); TRACE("%p decreasing refcount to %u.\n", buffer, refcount); @@ -91,6 +102,115 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) return refcount; } +static void STDMETHODCALLTYPE d3d11_buffer_GetDevice(ID3D11Buffer *iface, ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateData(ID3D11Buffer *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateDataInterface(ID3D11Buffer *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d11_buffer_GetType(ID3D11Buffer *iface, + D3D11_RESOURCE_DIMENSION *resource_dimension) +{ + TRACE("iface %p, resource_dimension %p.\n", iface, resource_dimension); + + *resource_dimension = D3D11_RESOURCE_DIMENSION_BUFFER; +} + +static void STDMETHODCALLTYPE d3d11_buffer_SetEvictionPriority(ID3D11Buffer *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %#x stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d11_buffer_GetEvictionPriority(ID3D11Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d3d11_buffer_GetDesc(ID3D11Buffer *iface, D3D11_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11BufferVtbl d3d11_buffer_vtbl = +{ + /* IUnknown methods */ + d3d11_buffer_QueryInterface, + d3d11_buffer_AddRef, + d3d11_buffer_Release, + /* ID3D11DeviceChild methods */ + d3d11_buffer_GetDevice, + d3d11_buffer_GetPrivateData, + d3d11_buffer_SetPrivateData, + d3d11_buffer_SetPrivateDataInterface, + /* ID3D11Resource methods */ + d3d11_buffer_GetType, + d3d11_buffer_SetEvictionPriority, + d3d11_buffer_GetEvictionPriority, + /* ID3D11Buffer methods */ + d3d11_buffer_GetDesc, +}; + +/* ID3D10Buffer methods */ + +static inline struct d3d_buffer *impl_from_ID3D10Buffer(ID3D10Buffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D10Buffer_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **out) +{ + struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + return d3d11_buffer_QueryInterface(&buffer->ID3D11Buffer_iface, riid, out); +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) +{ + struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_buffer_AddRef(&buffer->ID3D11Buffer_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) +{ + struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_buffer_Release(&buffer->ID3D11Buffer_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) @@ -240,6 +360,7 @@ HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, struct wined3d_buffer_desc wined3d_desc; HRESULT hr; + buffer->ID3D11Buffer_iface.lpVtbl = &d3d11_buffer_vtbl; buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; buffer->refcount = 1; wined3d_mutex_lock(); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8d2224b..12e4df2 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -133,9 +133,10 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; -/* ID3D10Buffer */ +/* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer { + ID3D11Buffer ID3D11Buffer_iface; ID3D10Buffer ID3D10Buffer_iface; LONG refcount;

1 0

Józef Kucia : d3d11: Implement private data methods for ID3D11Buffer.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: c05e8d14606c2fd1860618bab5314f67b77f7fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05e8d14606c2fd1860618bab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:54 2015 +0200 d3d11: Implement private data methods for ID3D11Buffer. --- dlls/d3d11/buffer.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index d0655a2..6fec784 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -110,25 +110,31 @@ static void STDMETHODCALLTYPE d3d11_buffer_GetDevice(ID3D11Buffer *iface, ID3D11 static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d_get_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateData(ID3D11Buffer *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d_set_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateDataInterface(ID3D11Buffer *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&buffer->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_buffer_GetType(ID3D11Buffer *iface,

1 0

Stefan Dösinger : wined3d: Return a texture from wined3d_swapchain_get_back_buffer.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: f010e5d88a91f0c6a66ff51d9b26930f1fa0753d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f010e5d88a91f0c6a66ff51d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:52 2015 +0200 wined3d: Return a texture from wined3d_swapchain_get_back_buffer. --- dlls/d3d8/swapchain.c | 15 ++++++++++++--- dlls/d3d9/swapchain.c | 19 ++++++++++++++----- dlls/dxgi/swapchain.c | 12 ++++++------ dlls/wined3d/device.c | 6 +++++- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d.h | 2 +- 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 44fc02a..70b7fb0 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -112,23 +112,32 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; HRESULT hr = D3D_OK; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + if (!backbuffer) + { + WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - if ((wined3d_surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer); } else { + /* Do not set *backbuffer = NULL, see tests/device.c, test_swapchain(). */ hr = D3DERR_INVALIDCALL; } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5cf56d2..b26a482 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -152,23 +152,32 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + if (!backbuffer) + { + WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - if ((wined3d_surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface9_iface; - IDirect3DSurface9_AddRef(*backbuffer); + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*backbuffer); } else { + /* Do not set *backbuffer = NULL, see tests/device.c, test_swapchain(). */ hr = D3DERR_INVALIDCALL; } wined3d_mutex_unlock(); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ce09450..10ae26d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -143,7 +143,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, UINT buffer_idx, REFIID riid, void **surface) { struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); - struct wined3d_surface *backbuffer; + struct wined3d_texture *texture; IUnknown *parent; HRESULT hr; @@ -152,14 +152,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs); - if (!(backbuffer = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, + if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO))) { LeaveCriticalSection(&dxgi_cs); return DXGI_ERROR_INVALID_CALL; } - parent = wined3d_surface_get_parent(backbuffer); + parent = wined3d_texture_get_parent(texture); hr = IUnknown_QueryInterface(parent, riid, surface); LeaveCriticalSection(&dxgi_cs); @@ -220,7 +220,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if { struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); struct wined3d_swapchain_desc wined3d_desc; - struct wined3d_surface *surface; + struct wined3d_texture *texture; IUnknown *parent; unsigned int i; HRESULT hr; @@ -235,9 +235,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); for (i = 0; i < wined3d_desc.backbuffer_count; ++i) { - surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, i, WINED3D_BACKBUFFER_TYPE_MONO); - parent = wined3d_surface_get_parent(surface); + parent = wined3d_texture_get_parent(texture); IUnknown_AddRef(parent); if (IUnknown_Release(parent)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8b9666..dcc5d37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3186,6 +3186,8 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer) { + struct wined3d_texture *texture; + struct wined3d_resource *resource; struct wined3d_swapchain *swapchain; TRACE("device %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -3194,8 +3196,10 @@ HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) return WINED3DERR_INVALIDCALL; - if (!(*backbuffer = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) + if (!(texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) return WINED3DERR_INVALIDCALL; + resource = wined3d_texture_get_sub_resource(texture, 0); + *backbuffer = wined3d_surface_from_resource(resource); return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 70f5d5c..600c9bd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -177,7 +177,7 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } -struct wined3d_surface * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, +struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT back_buffer_idx, enum wined3d_backbuffer_type type) { TRACE("swapchain %p, back_buffer_idx %u, type %#x.\n", @@ -198,7 +198,7 @@ struct wined3d_surface * CDECL wined3d_swapchain_get_back_buffer(const struct wi TRACE("Returning back buffer %p.\n", swapchain->back_buffers[back_buffer_idx]); - return surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[back_buffer_idx], 0)); + return swapchain->back_buffers[back_buffer_idx]; } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8970cd5..41384b5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2513,7 +2513,7 @@ HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *s HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); -struct wined3d_surface * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, +struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain,

1 0

Florian Pelz : po: German translation: Fix mistranslations.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 10fcf17934b253df10533985e05f4837ea38a7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fcf17934b253df10533985e… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:10 2015 +0200 po: German translation: Fix mistranslations. --- po/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 1b2ee6d..da790ce 100644 --- a/po/de.po +++ b/po/de.po @@ -3972,15 +3972,15 @@ msgstr "Keine Prozess-Slots.\n" #: winerror.mc:376 msgid "Too many semaphores.\n" -msgstr "Zu viele Semaphoren.\n" +msgstr "Zu viele Semaphore.\n" #: winerror.mc:381 msgid "Exclusive semaphore already owned.\n" -msgstr "Exklusive Semaphore bereits zugewiesen.\n" +msgstr "Exklusiver Semaphor bereits zugewiesen.\n" #: winerror.mc:386 msgid "Semaphore is set.\n" -msgstr "Semaphore ist gesetzt.\n" +msgstr "Semaphor ist gesetzt.\n" #: winerror.mc:391 msgid "Too many semaphore requests.\n" @@ -4420,7 +4420,7 @@ msgstr "Mutex nicht im Besitz des Aufrufers.\n" #: winerror.mc:946 msgid "Too many posts to semaphore.\n" -msgstr "Zu viele Posts an Semaphore.\n" +msgstr "Zu viele Posts an Semaphor.\n" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" @@ -7862,11 +7862,11 @@ msgstr "Runterscrollen" #: shdoclc.rc:235 msgid "Left Edge" -msgstr "Linke Ecke" +msgstr "Linker Rand" #: shdoclc.rc:236 msgid "Right Edge" -msgstr "Rechte Ecke" +msgstr "Rechter Rand" #: shdoclc.rc:238 msgid "Page Left" @@ -9860,7 +9860,7 @@ msgstr "" "unmittelbar danach), erscheint am Zeilenanfang, wenn cmd auf Eingabe\n" "wartet.\n" "\n" -"Die folgenden Zeichen haben eine besondere Bedeutung:\n" +"Die folgenden Zeichenketten haben eine besondere Bedeutung:\n" "\n" "$$ Dollarzeichen $_ Zeilenvorschub $b Pipe-Zeichen (|)\n" "$d aktuelles Datum $e Escape $g Größerzeichen (>)\n" @@ -10048,7 +10048,7 @@ msgstr "VER zeigt die aktuelle Version von CMD an.\n" #: cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL zeigt die Datenträgernummer an.\n" +msgstr "VOL zeigt die Datenträgerbezeichnung an.\n" #: cmd.rc:263 msgid ""

1 0

Józef Kucia : d3d11: Rename d3d10_{get, set}_private_data functions to d3d_{get, set}_private_data.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 1bc74139468e51f527a941a42c5e352b5f34a090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc74139468e51f527a941a42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:50 2015 +0200 d3d11: Rename d3d10_{get, set}_private_data functions to d3d_{get, set}_private_data. --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/inputlayout.c | 6 +++--- dlls/d3d11/shader.c | 18 +++++++++--------- dlls/d3d11/state.c | 24 ++++++++++++------------ dlls/d3d11/texture.c | 12 ++++++------ dlls/d3d11/utils.c | 8 ++++---- dlls/d3d11/view.c | 18 +++++++++--------- 9 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bc74139468e51f527a94…

1 0

Hugh McMaster : regsvr32: Do not attempt to register '/' or '-'.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 80c3fca05694871972ed609bf845ac459042ae76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3fca05694871972ed609bf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Sep 3 21:29:23 2015 +1000 regsvr32: Do not attempt to register '/' or '-'. --- programs/regsvr32/regsvr32.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index e560d32..a2d83a1 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -241,8 +241,14 @@ int wmain(int argc, WCHAR* argv[]) */ for(i = 1; i < argc; i++) { - if ((argv[i][0] == '/' || argv[i][0] == '-') && (!argv[i][2] || argv[i][2] == ':')) + if (argv[i][0] == '/' || argv[i][0] == '-') { + if (!argv[i][1]) + return INVALID_ARG; + + if (argv[i][2] && argv[i][2] != ':') + continue; + switch (tolowerW(argv[i][1])) { case 'u':

1 0

Stefan Dösinger : wined3d: Remove wined3d_device_get_back_buffer.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: feb35006f514c48fbda6b0609d1ac36e889746a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb35006f514c48fbda6b0609… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:53 2015 +0200 wined3d: Remove wined3d_device_get_back_buffer. --- dlls/d3d8/device.c | 33 +++++++++++++++++++++++---------- dlls/d3d9/device.c | 35 +++++++++++++++++++++++++---------- dlls/wined3d/device.c | 20 -------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 5 files changed, 48 insertions(+), 43 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8200119..336a07c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -724,25 +724,38 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_swapchain *swapchain; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; - HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - hr = wined3d_device_get_back_buffer(device->wined3d_device, 0, backbuffer_idx, - (enum wined3d_backbuffer_type)backbuffer_type, &wined3d_surface); - if (SUCCEEDED(hr) && wined3d_surface && backbuffer) + if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface8_iface; - IDirect3DSurface8_AddRef(*backbuffer); + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; } - wined3d_mutex_unlock(); - return hr; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, + backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + { + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; + } + + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface8_iface; + IDirect3DSurface8_AddRef(*backbuffer); + + wined3d_mutex_unlock(); + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetRasterStatus(IDirect3DDevice8 *iface, D3DRASTER_STATUS *raster_status) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 95d1e02..5640bdd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -746,26 +746,41 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; - HRESULT hr; TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, swapchain, backbuffer_idx, backbuffer_type, backbuffer); + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - hr = wined3d_device_get_back_buffer(device->wined3d_device, swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type, &wined3d_surface); - if (SUCCEEDED(hr) && wined3d_surface && backbuffer) + + if (!(wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, swapchain))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface9_iface; - IDirect3DSurface9_AddRef(*backbuffer); + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; } - wined3d_mutex_unlock(); - return hr; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, + backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + { + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; + } + + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*backbuffer); + + wined3d_mutex_unlock(); + return D3D_OK; } + static HRESULT WINAPI d3d9_device_GetRasterStatus(IDirect3DDevice9Ex *iface, UINT swapchain, D3DRASTER_STATUS *raster_status) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dcc5d37..765af0d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3183,26 +3183,6 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } -HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer) -{ - struct wined3d_texture *texture; - struct wined3d_resource *resource; - struct wined3d_swapchain *swapchain; - - TRACE("device %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", - device, swapchain_idx, backbuffer_idx, backbuffer_type, backbuffer); - - if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) - return WINED3DERR_INVALIDCALL; - - if (!(texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) - return WINED3DERR_INVALIDCALL; - resource = wined3d_texture_get_sub_resource(texture, 0); - *backbuffer = wined3d_surface_from_resource(resource); - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4710f51..9f714ef 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -49,7 +49,6 @@ @ cdecl wined3d_device_end_stateblock(ptr ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) -@ cdecl wined3d_device_get_back_buffer(ptr long long long ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 41384b5..72a41b2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2154,8 +2154,6 @@ HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, struct wined3d_vec4 *plane);

1 0

Stefan Dösinger : d3d8/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 76c43d817746bb9c81b36e0d0bec4bb0b2ffbdbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c43d817746bb9c81b36e0d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:55 2015 +0200 d3d8/tests: Add more GetBackBuffer error handling tests. --- dlls/d3d8/tests/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 660e202..47326b5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -280,6 +280,12 @@ static void test_swapchain(void) goto cleanup; } + backbuffer = (void *)0xdeadbeef; + /* IDirect3DDevice8::GetBackBuffer crashes if a NULL output pointer is passed. */ + hr = IDirect3DDevice8_GetBackBuffer(device, 1, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; @@ -300,6 +306,9 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Failed to create a swapchain (%#08x)\n", hr); if(SUCCEEDED(hr)) { /* Swapchain 3, created with backbuffercount 2 */ + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + backbuffer = (void *) 0xdeadbeef; hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the 1st back buffer (%#08x)\n", hr);

1 0

Thomas Faller : usp10: Fix invalid read.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: f1334dbb8d1d6f3678590d38124f1c265bab385a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1334dbb8d1d6f3678590d381… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Sep 3 11:50:36 2015 +0200 usp10: Fix invalid read. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fa4dc79..f3fb369 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1477,7 +1477,8 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, } } - while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space) && cnt < cInChars) + while ((!levels || (levels && cnt+1 < cInChars && levels[cnt+1] == levels[0])) + && (cnt < cInChars && pwcInChars[cnt] == Numeric_space)) cnt++; if (cnt == cInChars) /* All Spaces */

1 0

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

Sept. 3, 2015

Module: wine Branch: master Commit: ba9d80bacd7d96ef7469a62f53a0072a5c384646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9d80bacd7d96ef7469a62f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:55 2015 +0200 d3d11: Implement d3d11_buffer_GetDevice(). --- dlls/d3d11/buffer.c | 19 +++++++++++-------- dlls/d3d11/d3d11_private.h | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 6fec784..d2e3156 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) if (refcount == 1) { - ID3D10Device1_AddRef(buffer->device); + ID3D11Device_AddRef(buffer->device); wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); @@ -89,14 +89,14 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) if (!refcount) { - ID3D10Device1 *device = buffer->device; + ID3D11Device *device = buffer->device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D10Device1_Release(device); + ID3D11Device_Release(device); } return refcount; @@ -104,7 +104,11 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) static void STDMETHODCALLTYPE d3d11_buffer_GetDevice(ID3D11Buffer *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = buffer->device; } static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface, @@ -225,8 +229,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10 TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)buffer->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, @@ -389,8 +392,8 @@ HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, } wined3d_mutex_unlock(); - buffer->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(buffer->device); + buffer->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(buffer->device); return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 12e4df2..2f56a5a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -142,7 +142,7 @@ struct d3d_buffer struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device,

1 0