October 2015 - Wine-commits

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 19 Oct '15

19 Oct '15

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

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 19 Oct '15

19 Oct '15

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 : wined3d: Make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx.
by Alexandre Julliard 19 Oct '15

19 Oct '15

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 : wined3d: Make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index.
by Alexandre Julliard 19 Oct '15

19 Oct '15

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

Riccardo Bortolato : wined3d: Introduce a new wined3d_texture_blt function.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 6241ce5637d53d8355d5d3b06b014066be599c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6241ce5637d53d8355d5d3b06… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:19 2015 +0200 wined3d: Introduce a new wined3d_texture_blt function. 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/d3d8_private.h | 3 +-- dlls/d3d8/device.c | 14 +++++++------- dlls/d3d8/surface.c | 3 +-- dlls/wined3d/texture.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9a5de92..958b3c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -233,7 +233,6 @@ struct d3d8_surface struct d3d8_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_surface *wined3d_surface; struct list rtv_entry; struct wined3d_rendertarget_view *wined3d_rtv; IDirect3DDevice8 *parent_device; @@ -243,7 +242,7 @@ struct d3d8_surface struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; struct d3d8_vertexbuffer diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ae6bebb..6c94243 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1085,8 +1085,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, if (!rect_count && !src_rects && !dst_points) { RECT rect = {0, 0, src_w, src_h}; - wined3d_surface_blt(dst->wined3d_surface, &rect, - src->wined3d_surface, &rect, 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &rect, + src->wined3d_texture, src->sub_resource_idx, &rect, 0, NULL, WINED3D_TEXF_POINT); } else { @@ -1101,8 +1101,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, RECT dst_rect = {dst_points[i].x, dst_points[i].y, dst_points[i].x + w, dst_points[i].y + h}; - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); } } else @@ -1113,8 +1113,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, UINT h = src_rects[i].bottom - src_rects[i].top; RECT dst_rect = {0, 0, w, h}; - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); } } } @@ -3003,7 +3003,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, wined3d_texture, sub_resource_idx, surface, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 077502d..8153340 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -301,14 +301,13 @@ static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = }; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) + const struct wined3d_parent_ops **parent_ops) { IDirect3DBaseTexture8 *texture; surface->IDirect3DSurface8_iface.lpVtbl = &d3d8_surface_vtbl; d3d8_resource_init(&surface->resource); surface->resource.refcount = 0; - surface->wined3d_surface = wined3d_surface; list_init(&surface->rtv_entry); surface->container = wined3d_texture_get_parent(wined3d_texture); surface->wined3d_texture = wined3d_texture; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f00553a..7aa723e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1434,6 +1434,30 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct return WINED3D_OK; } +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect_in, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) +{ + struct wined3d_resource *dst_resource, *src_resource = NULL; + + TRACE("dst_texture %p, dst_sub_resource_idx %u, src_texture %p, src_sub_resource_idx %u.\n", + dst_texture, dst_sub_resource_idx, src_texture, src_sub_resource_idx); + + if (!(dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx)) + || dst_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + + if (src_texture) + { + if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) + || src_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, + src_resource ? surface_from_resource(src_resource) : NULL, src_rect_in, flags, fx, filter); +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index da1cbc4..9a266c9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -257,6 +257,7 @@ @ cdecl wined3d_swapchain_set_window(ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) +@ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb412e4..6f98c34 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2527,6 +2527,9 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); +HRESULT __cdecl wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_idx, const RECT *dst_rect_in, + struct wined3d_texture *src_texture, unsigned int src_idx, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture);

1 0

Józef Kucia : d3d11: Implement ID3D10ShaderResourceView1 interface.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 6c96e0ac77ee6804909b254984c3278a437917cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c96e0ac77ee6804909b25498… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:41:58 2015 +0200 d3d11: Implement ID3D10ShaderResourceView1 interface. 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/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/view.c | 49 +++++++++++++++++++++++++++++----------------- 3 files changed, 37 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c96e0ac77ee6804909b2…

1 0

Józef Kucia : d3d10core/tests: Check that shader resource views implement ID3D10ShaderResourceView1.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 0ce1d59a80c68685d8df74a83f87f0317cda0480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce1d59a80c68685d8df74a83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:42:00 2015 +0200 d3d10core/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/d3d10core/tests/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e899206..dadf113 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -926,6 +926,10 @@ static void test_create_shader_resource_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10ShaderResourceView_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); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D11ShaderResourceView.\n"); @@ -960,6 +964,10 @@ static void test_create_shader_resource_view(void) U(srv_desc).Texture2D.MostDetailedMip); ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + hr = ID3D10ShaderResourceView_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); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D11ShaderResourceView.\n");

1 0

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

19 Oct '15

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

Józef Kucia : dxgi: Make dxgi_swapchain_SetFullscreenState() hotpatchable.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: e79bf35933439800bd13b55c0cf7cc7505c05564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79bf35933439800bd13b55c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:58:59 2015 +0200 dxgi: Make dxgi_swapchain_SetFullscreenState() hotpatchable. 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/dxgi/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f1495cb..a12e1e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -178,10 +178,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %u, target %p stub!\n", iface, fullscreen, target); + FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; }

1 0

Dmitry Timoshkov : user32: Always call BeginPaint/ EndPaint when handling a WM_PAINT message for the button.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 0fe60f83d227bf70f6cb4a2d7983d6fd654edba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe60f83d227bf70f6cb4a2d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 20:16:50 2015 +0800 user32: Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. Python 3.5 installer creates windows with class "Button" that have 0x000e button style, that causes infinite painting loops and inability to draw the installer UI. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9a10b86..eeb3035 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -282,16 +282,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_PRINTCLIENT: case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); if (btnPaintFunc[btn_type]) { - PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); int nOldMode = SetBkMode( hdc, OPAQUE ); (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ - if( !wParam ) EndPaint( hWnd, &ps ); } + if ( !wParam ) EndPaint( hWnd, &ps ); break; + } case WM_KEYDOWN: if (wParam == VK_SPACE)

1 0