October 2015 - Wine-Commits

Riccardo Bortolato : wined3d: Make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 6671535dc32b3a841d1b14003dc7efbe6a5f3863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6671535dc32b3a841d1b14003… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:18 2015 +0200 wined3d: Make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 406cc7e..ae6bebb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -534,7 +534,7 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, wined3d_mutex_lock(); hr = wined3d_device_set_cursor_properties(device->wined3d_device, - hotspot_x, hotspot_y, bitmap_impl->wined3d_surface); + hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a191b71..7d9f735 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -486,7 +486,7 @@ static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); hr = wined3d_device_set_cursor_properties(device->wined3d_device, - hotspot_x, hotspot_y, bitmap_impl->wined3d_surface); + hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 35a9de4..087dc33 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4190,14 +4190,22 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, - UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) + UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx) { struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; + struct wined3d_resource *sub_resource; + struct wined3d_surface *cursor_image; HRESULT hr; - TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", - device, x_hotspot, y_hotspot, cursor_image); + TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", + device, x_hotspot, y_hotspot, texture, sub_resource_idx); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx)) + || sub_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + + cursor_image = surface_from_resource(sub_resource); if (device->cursor_texture) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4dc8be1..da1cbc4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -111,7 +111,7 @@ @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_cursor_position(ptr long long long) -@ cdecl wined3d_device_set_cursor_properties(ptr long long ptr) +@ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c5cfc4a..cb412e4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2245,7 +2245,7 @@ HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, - UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_surface); + UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs);

1 0

Nikolay Sivov : strmbase: Remove redundant null pointer check.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 9385e9f78af34e36e5e505dfe2197b07ed76eba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9385e9f78af34e36e5e505dfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:51 2015 +0300 strmbase: Remove redundant null pointer check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dispatch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index d0f778e..62bc397 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -37,8 +37,6 @@ HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) if (SUCCEEDED(hr)) { hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &This->pTypeInfo); - - if (pTypeLib) ITypeLib_Release(pTypeLib); } return hr;

1 0

Nikolay Sivov : dwrite: Set bitmap target ppdip factor from context dpi.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 9389bcdb51b4416fdfbe49940d57977b0c7d90b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9389bcdb51b4416fdfbe49940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:04 2015 +0300 dwrite: Set bitmap target ppdip factor from context dpi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e178f33..53c9c51 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -567,7 +567,7 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt } target->m = identity; - target->ppdip = 1.0; + target->ppdip = GetDeviceCaps(target->hdc, LOGPIXELSX) / 96.0f; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; target->factory = factory; IDWriteFactory_AddRef(factory);

1 0

Józef Kucia : d3d11/tests: Check that shader resource views implement ID3D10ShaderResourceView1.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 64e02271c133c67456886c7f1775be8bae4aa724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e02271c133c67456886c7f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:42:01 2015 +0200 d3d11/tests: Check that shader resource views implement ID3D10ShaderResourceView1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5d423a1..4a9d12d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1282,6 +1282,10 @@ static void test_create_shader_resource_view(void) ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D10ShaderResourceView.\n"); if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); @@ -1308,6 +1312,10 @@ static void test_create_shader_resource_view(void) ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D10ShaderResourceView.\n"); if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format);

1 0

Riccardo Bortolato : wined3d: Make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 53f795af0ac138846d70aba3bb3802ed98ddf1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f795af0ac138846d70aba3b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:17 2015 +0200 wined3d: Make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/swapchain.c | 12 +++++++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 271c4ec..406cc7e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1158,7 +1158,8 @@ static HRESULT WINAPI d3d8_device_GetFrontBuffer(IDirect3DDevice8 *iface, IDirec } wined3d_mutex_lock(); - hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchain->wined3d_swapchain, dst_impl->wined3d_surface); + hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchain->wined3d_swapchain, + dst_impl->wined3d_texture, dst_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 507b3dd..a191b71 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1288,7 +1288,7 @@ static HRESULT WINAPI d3d9_device_GetFrontBufferData(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (swapchain < device->implicit_swapchain_count) hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchains[swapchain]->wined3d_swapchain, - dst_impl->wined3d_surface); + dst_impl->wined3d_texture, dst_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index c995afb..91a22a3 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -142,7 +142,7 @@ static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *i TRACE("iface %p, surface %p.\n", iface, surface); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_front_buffer_data(swapchain->wined3d_swapchain, dst->wined3d_surface); + hr = wined3d_swapchain_get_front_buffer_data(swapchain->wined3d_swapchain, dst->wined3d_texture, dst->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 27bcf70..e965bda 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -156,13 +156,19 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, } HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, - struct wined3d_surface *dst_surface) + struct wined3d_texture *dst_texture, unsigned int sub_resource_idx) { - struct wined3d_surface *src_surface; + struct wined3d_surface *src_surface, *dst_surface; + struct wined3d_resource *sub_resource; RECT src_rect, dst_rect; - TRACE("swapchain %p, dst_surface %p.\n", swapchain, dst_surface); + TRACE("swapchain %p, dst_texture %p, sub_resource_idx %u.\n", swapchain, dst_texture, sub_resource_idx); + if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || + sub_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + + dst_surface = surface_from_resource(sub_resource); src_surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); dst_rect = src_rect; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b39e9d..4dc8be1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -244,7 +244,7 @@ @ cdecl wined3d_swapchain_get_back_buffer(ptr long long) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) -@ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr) +@ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr) @ cdecl wined3d_swapchain_get_desc(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7d407bb..c5cfc4a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2505,7 +2505,7 @@ struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3 HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, - struct wined3d_surface *dst_surface); + struct wined3d_texture *dst_texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain);

1 0

Riccardo Bortolato : d3d9: Call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d9_device_GetFrontBuffer.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 9875ad2cc301c28d88b42bf85ac4c6df93bbb4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9875ad2cc301c28d88b42bf85… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:16 2015 +0200 d3d9: Call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d9_device_GetFrontBuffer. Removed the now unused wined3d_device_get_front_buffer_data from wined3d. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 ++++-- dlls/wined3d/device.c | 13 ------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9ff32a7..507b3dd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1281,12 +1281,14 @@ static HRESULT WINAPI d3d9_device_GetFrontBufferData(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); - HRESULT hr; + HRESULT hr = D3DERR_INVALIDCALL; TRACE("iface %p, swapchain %u, dst_surface %p.\n", iface, swapchain, dst_surface); wined3d_mutex_lock(); - hr = wined3d_device_get_front_buffer_data(device->wined3d_device, swapchain, dst_impl->wined3d_surface); + if (swapchain < device->implicit_swapchain_count) + hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchains[swapchain]->wined3d_swapchain, + dst_impl->wined3d_surface); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3a55e04..35a9de4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3632,19 +3632,6 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_front_buffer_data(const struct wined3d_device *device, - UINT swapchain_idx, struct wined3d_surface *dst_surface) -{ - struct wined3d_swapchain *swapchain; - - TRACE("device %p, swapchain_idx %u, dst_surface %p.\n", device, swapchain_idx, dst_surface); - - if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) - return WINED3DERR_INVALIDCALL; - - return wined3d_swapchain_get_front_buffer_data(swapchain, dst_surface); -} - HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) { const struct wined3d_state *state = &device->state; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 541f549..1b39e9d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -56,7 +56,6 @@ @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) -@ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 19a4e4f..7d407bb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2159,8 +2159,6 @@ struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); -HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, - UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Riccardo Bortolato : d3d8: Call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d8_device_GetFrontBuffer.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: cdc24238b70e27d0c1daf80176b9cb44b34d8cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc24238b70e27d0c1daf8017… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:15 2015 +0200 d3d8: Call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d8_device_GetFrontBuffer. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9dd78b0..271c4ec 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1158,7 +1158,7 @@ static HRESULT WINAPI d3d8_device_GetFrontBuffer(IDirect3DDevice8 *iface, IDirec } wined3d_mutex_lock(); - hr = wined3d_device_get_front_buffer_data(device->wined3d_device, 0, dst_impl->wined3d_surface); + hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchain->wined3d_swapchain, dst_impl->wined3d_surface); wined3d_mutex_unlock(); return hr;

1 0

Bruno Jesus : msvfw32: Simplify error handling in ICSeqCompressFrameStart.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 982fb2fd699333545cfa624448b51416eaf4e80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=982fb2fd699333545cfa62444… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 19 17:47:56 2015 +0800 msvfw32: Simplify error handling in ICSeqCompressFrameStart. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index db56fdf..5aff706 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1433,28 +1433,18 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) *pc->lpbiIn = *lpbiIn; pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - return FALSE; - } + goto error; pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); if (!pc->lpState) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - return FALSE; - } + goto error; + pc->cbState = sizeof(ICCOMPRESS); pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); if (!pc->lpBitsOut) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpState); - return FALSE; - } + goto error; + TRACE("Compvars:\n" "\tpc:\n" "\tsize: %i\n" @@ -1483,6 +1473,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; return TRUE; } +error: HeapFree(GetProcessHeap(), 0, pc->lpbiIn); HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); HeapFree(GetProcessHeap(), 0, pc->lpState);

1 0

Nikolay Sivov : strmbase: Remove some redundant return value initializers.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 7dd00af7478de1c0d1e8c98445c30a5bf4f815f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd00af7478de1c0d1e8c9844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:50 2015 +0300 strmbase: Remove some redundant return value initializers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/audio.c | 2 +- dlls/strmbase/dispatch.c | 2 +- dlls/strmbase/filter.c | 3 +-- dlls/strmbase/outputqueue.c | 3 +-- dlls/strmbase/pin.c | 13 +++++-------- dlls/strmbase/renderer.c | 8 ++++---- dlls/strmbase/transform.c | 2 +- dlls/strmbase/video.c | 2 +- dlls/strmbase/window.c | 2 +- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index e167a79..1b79ec5 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -70,8 +70,8 @@ HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPO HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BasicAudio *This = impl_from_IBasicAudio(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 8f7aa05..d0f778e 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -29,8 +29,8 @@ HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { - HRESULT hr = E_FAIL; ITypeLib *pTypeLib; + HRESULT hr; This->pTypeInfo = NULL; hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &pTypeLib); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 697b243..f1b2d49 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -158,7 +158,6 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { - HRESULT hr = S_OK; BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -173,7 +172,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph } LeaveCriticalSection(&This->csFilter); - return hr; + return S_OK; } HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 36960e3..842a9f0 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -68,7 +68,6 @@ HRESULT WINAPI OutputQueue_Construct( OutputQueue **ppOutputQueue ) { - HRESULT hr = S_OK; BOOL threaded = FALSE; DWORD tid; @@ -116,7 +115,7 @@ HRESULT WINAPI OutputQueue_Construct( } LeaveCriticalSection(&This->csQueue); - return hr; + return S_OK; } HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a9c1928..d61469c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -575,9 +575,9 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa /* replaces OutputPin_SendSample */ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSample) { - HRESULT hr = S_OK; IMemInputPin * pMemConnected = NULL; PIN_INFO pinInfo; + HRESULT hr; EnterCriticalSection(This->pin.pCritSec); { @@ -615,7 +615,7 @@ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSa /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -635,7 +635,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) /* replaces OutputPin_DecommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -875,12 +875,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { BaseInputPin_Destroy(This); - return 0; - } - else - return refCount; + + return refCount; } HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 99c9278..fa2545b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -60,7 +60,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *renderer = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", This, renderer, pReceivePin, pmt); @@ -99,7 +99,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - HRESULT hr = S_OK; + HRESULT hr; BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); @@ -126,7 +126,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); @@ -151,7 +151,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, pFilter); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4d872be..59c89be 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -93,7 +93,7 @@ static HRESULT WINAPI TransformFilter_Input_CheckMediaType(BasePin *iface, const static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSample *pInSample) { - HRESULT hr = S_FALSE; + HRESULT hr; TransformFilter * pTransform; TRACE("%p\n", This); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 1c4f360..9714d7e 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -77,8 +77,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID rii HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index cb448e3..b4b5aab 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -250,8 +250,8 @@ HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID r HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlWindow* This = impl_from_IVideoWindow(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr))

1 0

Nikolay Sivov : dwrite: Scale glyph run analysis advances and offsets with ppdip factor.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 2fdee67dd2c5799a9edd0715711a3dff0dbeabb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdee67dd2c5799a9edd07157… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:02 2015 +0300 dwrite: Scale glyph run analysis advances and offsets with ppdip factor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++++++++------- dlls/dwrite/tests/font.c | 31 ++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bb01ccf..a2026ca 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4381,6 +4381,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; + UINT32 i; *ret = NULL; @@ -4425,12 +4426,17 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA memcpy(analysis->glyphs, run->glyphIndices, run->glyphCount*sizeof(*run->glyphIndices)); - if (run->glyphAdvances) - memcpy(analysis->advances, run->glyphAdvances, run->glyphCount*sizeof(*run->glyphAdvances)); + if (run->glyphAdvances) { + if (ppdip == 1.0f) + memcpy(analysis->advances, run->glyphAdvances, run->glyphCount*sizeof(*run->glyphAdvances)); + else { + for (i = 0; i < run->glyphCount; i++) + analysis->advances[i] = run->glyphAdvances[i] * ppdip; + } + } else { DWRITE_FONT_METRICS metrics; IDWriteFontFace1 *fontface1; - UINT32 i; IDWriteFontFace_GetMetrics(run->fontFace, &metrics); IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); @@ -4445,7 +4451,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; - analysis->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics); + analysis->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip; break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: @@ -4454,7 +4460,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (FAILED(hr)) analysis->advances[i] = 0.0; else - analysis->advances[i] = floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f) / ppdip; + analysis->advances[i] = floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f); break; default: ; @@ -4464,8 +4470,16 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA IDWriteFontFace1_Release(fontface1); } - if (run->glyphOffsets) - memcpy(analysis->offsets, run->glyphOffsets, run->glyphCount*sizeof(*run->glyphOffsets)); + if (run->glyphOffsets) { + if (ppdip == 1.0f) + memcpy(analysis->offsets, run->glyphOffsets, run->glyphCount*sizeof(*run->glyphOffsets)); + else { + for (i = 0; i < run->glyphCount; i++) { + analysis->offsets[i].advanceOffset = run->glyphOffsets[i].advanceOffset * ppdip; + analysis->offsets[i].ascenderOffset = run->glyphOffsets[i].ascenderOffset * ppdip; + } + } + } *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a2af967..56572f9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3497,11 +3497,11 @@ static void test_CreateGlyphRunAnalysis(void) DWRITE_GLYPH_RUN run; IDWriteFontFace *face; UINT16 glyph, glyphs[10]; - FLOAT advance; + FLOAT advances[2]; HRESULT hr; UINT32 ch; RECT rect, rect2; - DWRITE_GLYPH_OFFSET offset; + DWRITE_GLYPH_OFFSET offsets[2]; DWRITE_GLYPH_METRICS metrics; DWRITE_FONT_METRICS fm; int i; @@ -3517,17 +3517,17 @@ static void test_CreateGlyphRunAnalysis(void) hr = IDWriteFontFace_GetDesignGlyphMetrics(face, &glyph, 1, &metrics, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - advance = metrics.advanceWidth; + advances[0] = metrics.advanceWidth; - offset.advanceOffset = 0.0; - offset.ascenderOffset = 0.0; + offsets[0].advanceOffset = 0.0; + offsets[0].ascenderOffset = 0.0; run.fontFace = face; run.fontEmSize = 24.0; run.glyphCount = 1; run.glyphIndices = &glyph; - run.glyphAdvances = &advance; - run.glyphOffsets = &offset; + run.glyphAdvances = advances; + run.glyphOffsets = offsets; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3680,7 +3680,7 @@ static void test_CreateGlyphRunAnalysis(void) run.fontEmSize = 24.0; run.glyphCount = 1; run.glyphIndices = &glyph; - run.glyphAdvances = &advance; + run.glyphAdvances = advances; run.glyphOffsets = NULL; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3719,12 +3719,14 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteGlyphRunAnalysis_Release(analysis); + /* test that advances are scaled according to ppdip too */ glyphs[0] = glyphs[1] = glyph; + advances[0] = advances[1] = 100.0f; run.fontFace = face; run.fontEmSize = 24.0; run.glyphCount = 2; run.glyphIndices = glyphs; - run.glyphAdvances = NULL; + run.glyphAdvances = advances; run.glyphOffsets = NULL; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3739,7 +3741,18 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect2), "got empty bounds\n"); ok(!EqualRect(&rect, &rect2), "got wrong rect2\n"); + ok((rect2.right - rect.left) > advances[0], "got rect width %d for advance %f\n", rect.right - rect.left, advances[0]); + IDWriteGlyphRunAnalysis_Release(analysis); + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 2.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + SetRectEmpty(&rect); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((rect.right - rect.left) > 2 * advances[0], "got rect width %d for advance %f\n", rect.right - rect.left, advances[0]); IDWriteGlyphRunAnalysis_Release(analysis); IDWriteFontFace_Release(face);

1 0