September 2015 - Wine-commits

Stefan Dösinger : wined3d: Return a texture from wined3d_swapchain_get_back_buffer.
by Alexandre Julliard 03 Sep '15

03 Sep '15

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

Stefan Dösinger : wined3d: Remove wined3d_device_get_back_buffer.
by Alexandre Julliard 03 Sep '15

03 Sep '15

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 : d3d9/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: fc987aaaf6ceac1f66c5e41255d7fd425413a705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc987aaaf6ceac1f66c5e4125… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:54 2015 +0200 d3d9/tests: Add more GetBackBuffer error handling tests. --- dlls/d3d9/tests/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d1a8d37..c41a5e6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1085,6 +1085,18 @@ static void test_swapchain(void) ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* IDirect3DDevice9::GetBackBuffer crashes if a NULL output pointer is passed. */ + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 1, 0, 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); + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 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); + /* Check if there is a back buffer */ hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr);

1 0

Stefan Dösinger : d3d8/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard 03 Sep '15

03 Sep '15

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

Nikolay Sivov : dwrite: Add simulated bold faces for each family when appropriate.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: e38d9bc68e5ab7a436ca52dc8154af84b4b56147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38d9bc68e5ab7a436ca52dc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:35:35 2015 +0300 dwrite: Add simulated bold faces for each family when appropriate. --- dlls/dwrite/font.c | 231 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 183 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38d9bc68e5ab7a436ca5…

1 0

Nikolay Sivov : dwrite: Add simulated oblique faces.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: a10d75e597df5484c8d62e5832190ab6d02c187c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10d75e597df5484c8d62e583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:01 2015 +0300 dwrite: Add simulated oblique faces. --- dlls/dwrite/font.c | 116 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a10d75e597df5484c8d62…

1 0

Nikolay Sivov : dwrite: Remove GetFaceNames() hack for simulated case.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 7581b11d2b01fd01c4f56778218e98bafa74358f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7581b11d2b01fd01c4f567782… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:25 2015 +0300 dwrite: Remove GetFaceNames() hack for simulated case. --- dlls/dwrite/font.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3daab79..0970f3a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1240,47 +1240,9 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocalizedStrings **names) { - static const WCHAR boldobliqueW[] = {'B','o','l','d',' ','O','b','l','i','q','u','e',0}; - struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteLocalizedStrings *strings; - const WCHAR *name; - HRESULT hr; - TRACE("(%p)->(%p)\n", This, names); - - *names = NULL; - - if (This->data->simulations == DWRITE_FONT_SIMULATIONS_NONE) - return clone_localizedstring(This->data->names, names); - - switch (This->data->simulations) { - case DWRITE_FONT_SIMULATIONS_BOLD|DWRITE_FONT_SIMULATIONS_OBLIQUE: - name = boldobliqueW; - break; - case DWRITE_FONT_SIMULATIONS_BOLD: - name = boldW; - break; - case DWRITE_FONT_SIMULATIONS_OBLIQUE: - name = obliqueW; - break; - default: - ERR("unknown simulations %d\n", This->data->simulations); - return E_FAIL; - } - - hr = create_localizedstrings(&strings); - if (FAILED(hr)) return hr; - - hr = add_localizedstring(strings, enusW, name); - if (FAILED(hr)) { - IDWriteLocalizedStrings_Release(strings); - return hr; - } - - *names = strings; - - return S_OK; + return clone_localizedstring(This->data->names, names); } static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface,

1 0

Nikolay Sivov : dwrite: Increase a number of allocated family slots for system collection.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 30108c730e9d38c1af7d253bad764136615db2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=30108c730e9d38c1af7d253ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:55 2015 +0300 dwrite: Increase a number of allocated family slots for system collection. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0970f3a..baa5ace 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1866,10 +1866,10 @@ static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BO collection->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; collection->ref = 1; collection->family_count = 0; - collection->family_alloc = 2; + collection->family_alloc = is_system ? 30 : 5; collection->is_system = is_system; - collection->family_data = heap_alloc(sizeof(*collection->family_data)*2); + collection->family_data = heap_alloc(sizeof(*collection->family_data) * collection->family_alloc); if (!collection->family_data) return E_OUTOFMEMORY;

1 0

Florian Pelz : po: German translation: Fix grammar errors.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 9a52351f9b3acebd9f188b54c492fc14a3a97dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a52351f9b3acebd9f188b54c… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:11 2015 +0200 po: German translation: Fix grammar errors. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 806eff2..091c77f 100644 --- a/po/de.po +++ b/po/de.po @@ -9494,7 +9494,7 @@ msgstr "Kann nicht zum LDAP-Server verbinden" #: wldap32.rc:122 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "Operation durch diese Version des LDAP-Protokoll nicht unterstützt" +msgstr "Operation durch diese Version des LDAP-Protokolls nicht unterstützt" #: wldap32.rc:123 msgid "Specified control was not found in message" @@ -11200,7 +11200,7 @@ msgstr "Wine-Registrierungs-Editor ausführen" #: oleview.rc:110 msgid "Quit the application. Prompts to save changes" -msgstr "Anwendung beenden. Frag ob Änderungen zu speichern sind" +msgstr "Anwendung beenden. Fragt ob Änderungen zu speichern sind" #: oleview.rc:111 msgid "Create an instance of the selected object" @@ -12266,7 +12266,7 @@ msgstr "&Neuer Task..." #: taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "P&rozesse aller Benutzern anzeigen" +msgstr "P&rozesse aller Benutzer anzeigen" #: taskmgr.rc:372 msgid "CPU usage" @@ -12719,7 +12719,7 @@ msgstr "Wechselt den Fokus zu dem Prozess des ausgewählten Tasks" #: taskmgr.rc:229 msgid "Restores the Task Manager from its hidden state" -msgstr "Stellt den Task-Manager von seiner versteckten Status wieder her" +msgstr "Stellt den Task-Manager aus seinem versteckten Status wieder her" #: taskmgr.rc:230 msgid "Removes the process from the system" @@ -13779,7 +13779,7 @@ msgstr "Dies ist ein Test" #: wineconsole.rc:44 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: Ereignis-ID konnte nicht geparsed werden\n" +msgstr "wineconsole: Ereignis-ID konnte nicht geparset werden\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n"

1 0

Florian Pelz : po: German translation: Fix capitalization.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 1cc73b990fb39cd26be54ada7b574e4144693f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc73b990fb39cd26be54ada7… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:09 2015 +0200 po: German translation: Fix capitalization. --- po/de.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index 091c77f..2be3703 100644 --- a/po/de.po +++ b/po/de.po @@ -187,7 +187,7 @@ msgstr "Software" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "Erlaubt es ihnen, neue Software hinzuzufügen oder zu entfernen." +msgstr "Erlaubt es Ihnen, neue Software hinzuzufügen oder zu entfernen." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" @@ -806,7 +806,7 @@ msgstr "Datei nicht gefunden" #: comdlg32.rc:33 msgid "Please verify that the correct file name was given" -msgstr "Bitte überprüfen sie, ob der korrekte Dateiname angegeben wurde" +msgstr "Bitte überprüfen Sie, ob der korrekte Dateiname angegeben wurde" #: comdlg32.rc:34 msgid "" @@ -958,7 +958,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "Dieser Wert liegt nicht auf der Seite.\n" -"Bitte geben sie einen Wert zwischen %1!d! und %2!d! an." +"Bitte geben Sie einen Wert zwischen %1!d! und %2!d! an." #: comdlg32.rc:60 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -2184,10 +2184,10 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Dieser Assistent hilft Ihnen Zertifikate, Zertifikatssperrlisten und " "Zertifikatsvertrauenslisten aus einer Datei zu importieren.\n" "\n" -"Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " +"Ein Zertifikat dient zur Identifikation von Ihnen oder Ihrem Computer. Es " "kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " "und Zertifikatsvertrauenslisten.\n" @@ -2319,10 +2319,10 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Dieser Assistent hilft Ihnen Zertifikate, Zertifikatssperrlisten und " "Zertifikatsvertrauenslisten in eine Datei zu exportieren.\n" "\n" -"Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " +"Ein Zertifikat dient zur Identifikation von Ihnen oder Ihrem Computer. Es " "kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " "und Zertifikatsvertrauenslisten.\n" @@ -2913,7 +2913,7 @@ msgstr "Passwort eingeben" #: cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "Der private Schlüssel sollte Passwortgeschützt sein." +msgstr "Der private Schlüssel sollte passwortgeschützt sein." #: cryptui.rc:174 msgid "The passwords do not match." @@ -8350,7 +8350,7 @@ msgstr "" "\n" "Wenn Dateien im Zielordner die gleichen Namen haben,\n" "werden diese durch Inhalte des Quellordners ersetzt.\n" -"Möchten sie trotzdem fortfahren?" +"Möchten Sie trotzdem fortfahren?" #: shell32.rc:238 msgid "New Folder" @@ -8499,7 +8499,7 @@ msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Eine installierte ActiveX-Komponente hat Vollzugriff auf ihren Computer. " +"Eine installierte ActiveX-Komponente hat Vollzugriff auf Ihren Computer. " "Klicken Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " "vertrauen." @@ -8769,7 +8769,7 @@ msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"Das aktuelle MIDI-Setup ist beschädigt. Kopieren sie die ursprüngliche Datei " +"Das aktuelle MIDI-Setup ist beschädigt. Kopieren Sie die ursprüngliche Datei " "MIDIMAP.CFG in das Windows-Systemverzeichnis und versuchen Sie es erneut." #: winmm.rc:60 @@ -9646,7 +9646,7 @@ msgstr "COPY <Dateiname> kopiert eine Datei.\n" #: cmd.rc:56 msgid "CTTY changes the input/output device.\n" -msgstr "CTTY Ändert das Eingabe/Ausgabe - Gerät.\n" +msgstr "CTTY ändert das Eingabe/Ausgabe - Gerät.\n" #: cmd.rc:59 msgid "DATE shows or changes the system date.\n" @@ -10008,7 +10008,7 @@ msgstr "" #: cmd.rc:237 msgid "TIME sets or shows the current system time.\n" -msgstr "TIME Setzt oder zeigt die aktuelle Systemzeit an.\n" +msgstr "TIME setzt oder zeigt die aktuelle Systemzeit an.\n" #: cmd.rc:240 msgid "TITLE <string> sets the window title for the cmd window.\n" @@ -10238,7 +10238,7 @@ msgstr "" #: cmd.rc:353 msgid "Are you sure?" -msgstr "Sind sie sicher?" +msgstr "Sind Sie sicher?" #: cmd.rc:354 xcopy.rc:43 msgctxt "Yes key" @@ -12098,11 +12098,11 @@ msgstr "" #: taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Prozess mit der PID %1!u! wurde zum beenden gezwungen.\n" +msgstr "Prozess mit der PID %1!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum beenden gezwungen.\n" +msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" @@ -12110,7 +12110,7 @@ msgstr "Fehler: Konnte Prozess \"%1\" nicht finden.\n" #: taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" +msgstr "Fehler: Konnte die Prozessliste nicht enumerieren.\n" #: taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n"

1 0