wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : wined3d: Implement cpu_blit_blit_surface().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: f2459e5527c9d2b1bf6b11d6fcae915925371ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2459e5527c9d2b1bf6b11d6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:47 2017 +0200 wined3d: Implement cpu_blit_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5031fcb..9d82dcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2712,10 +2712,19 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL || blit_op == WINED3D_BLIT_OP_DEPTH_FILL) - return TRUE; + switch (blit_op) + { + case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: + case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + case WINED3D_BLIT_OP_COLOR_FILL: + case WINED3D_BLIT_OP_DEPTH_FILL: + case WINED3D_BLIT_OP_DEPTH_BLIT: + return TRUE; - return FALSE; + default: + return FALSE; + } } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, @@ -3378,8 +3387,30 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - /* FIXME: Remove error returns from surface_blt_cpu. */ - ERR("Blit method not implemented by cpu_blit.\n"); + struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; + struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; + unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_blt_fx fx; + DWORD flags = 0; + + memset(&fx, 0, sizeof(fx)); + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + flags |= WINED3D_BLT_ALPHA_TEST; + } + else if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + flags |= WINED3D_BLT_SRC_CKEY_OVERRIDE | WINED3D_BLT_FX; + fx.src_color_key = *color_key; + } + + if (FAILED(surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, + src_texture, src_sub_resource_idx, &src_box, flags, &fx, filter))) + ERR("Failed to blit.\n"); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); } const struct wined3d_blitter_ops cpu_blit =

1 0

Henri Verbeet : wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5e40695310739ea7d34703c7a961fb313f043ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e40695310739ea7d34703c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:46 2017 +0200 wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 237b604..5031fcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3405,6 +3405,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_swapchain *src_swapchain, *dst_swapchain; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; + DWORD dst_location; static const DWORD simple_blit = WINED3D_BLT_ASYNC | WINED3D_BLT_SRC_CKEY @@ -3511,17 +3512,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format))) { + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, WINED3D_BLIT_OP_DEPTH_BLIT, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - NULL, filter); + dst_surface, dst_location, dst_rect, NULL, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; } @@ -3620,17 +3623,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { struct wined3d_context *context; + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, blit_op, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - colour_key, filter); + dst_surface, dst_location, dst_rect, colour_key, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Merge wined3d_blitter_ops.color_fill() and wined3d_blitter_ops.depth_fill().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 03e85bf9916c6c88d68b35c94288ed2d36f3285c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e85bf9916c6c88d68b35c94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:45 2017 +0200 wined3d: Merge wined3d_blitter_ops.color_fill() and wined3d_blitter_ops.depth_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 17 ++------ dlls/wined3d/device.c | 5 +-- dlls/wined3d/surface.c | 82 ++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 6 +-- 4 files changed, 37 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 95aba0a..8d187ac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7868,18 +7868,10 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } -static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, const struct wined3d_color *color) +static void arbfp_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - FIXME("Color filling not implemented by arbfp_blit\n"); - return WINED3DERR_INVALIDCALL; -} - -static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD clear_flags, float depth, DWORD stencil) -{ - FIXME("Depth/stencil filling not implemented by arbfp_blit.\n"); - return WINED3DERR_INVALIDCALL; + ERR("This blitter does not implement clears.\n"); } const struct wined3d_blitter_ops arbfp_blit = @@ -7887,7 +7879,6 @@ const struct wined3d_blitter_ops arbfp_blit = arbfp_blit_alloc, arbfp_blit_free, arbfp_blit_supported, - arbfp_blit_color_fill, - arbfp_blit_depth_fill, + arbfp_blit_clear, arbfp_blit_surface, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 618e289..fe2c4ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4196,10 +4196,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) - blitter->color_fill(device, view, rect, color); - else - blitter->depth_fill(device, view, rect, flags, depth, stencil); + blitter->blitter_clear(device, view, rect, flags, color, depth, stencil); return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 56e822a..237b604 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2450,18 +2450,10 @@ static void fbo_blitter_free(struct wined3d_device *device) { } -static HRESULT fbo_blitter_colour_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, const struct wined3d_color *colour) +static void fbo_blitter_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - ERR("This blitter does not implement colour fills.\n"); - return E_NOTIMPL; -} - -static HRESULT fbo_blitter_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD clear_flags, float depth, DWORD stencil) -{ - ERR("This blitter does not implement depth/stencil fills.\n"); - return E_NOTIMPL; + ERR("This blitter does not implement clears.\n"); } static void fbo_blitter_blit(struct wined3d_device *device, enum wined3d_blit_op op, @@ -2492,8 +2484,7 @@ const struct wined3d_blitter_ops fbo_blitter_ops = fbo_blitter_alloc, fbo_blitter_free, fbo_blitter_supported, - fbo_blitter_colour_fill, - fbo_blitter_depth_fill, + fbo_blitter_clear, fbo_blitter_blit, }; @@ -2574,27 +2565,21 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, const struct wined3d_color *color) +static void ffp_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { const RECT draw_rect = {0, 0, view->width, view->height}; struct wined3d_fb_state fb = {&view, NULL}; - device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); - - return WINED3D_OK; -} - -static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, - float depth, DWORD stencil) -{ - const RECT draw_rect = {0, 0, view->width, view->height}; - struct wined3d_fb_state fb = {NULL, view}; + if (flags != WINED3DCLEAR_TARGET) + { + struct wined3d_fb_state fb = {NULL, view}; - device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, clear_flags, NULL, depth, stencil); + device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, flags, NULL, depth, stencil); + return; + } - return WINED3D_OK; + device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, flags, colour, 0.0f, 0); } static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, @@ -2708,8 +2693,7 @@ const struct wined3d_blitter_ops ffp_blit = ffp_blit_alloc, ffp_blit_free, ffp_blit_supported, - ffp_blit_color_fill, - ffp_blit_depth_fill, + ffp_blit_clear, ffp_blit_blit_surface, }; @@ -3296,7 +3280,7 @@ release: return hr; } -static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, +static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, const struct wined3d_box *box, const struct wined3d_color *colour) { unsigned int x, y, w, h, bpp; @@ -3309,7 +3293,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie if (view->format_flags & WINED3DFMT_FLAG_BLOCKS) { FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id)); - return E_NOTIMPL; + return; } c = wined3d_format_convert_from_float(view->format, colour); @@ -3356,7 +3340,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie default: FIXME("Not implemented for bpp %u.\n", bpp); wined3d_resource_unmap(view->resource, view->sub_resource_idx); - return WINED3DERR_NOTAVAILABLE; + return; } row = map.data; @@ -3366,32 +3350,27 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *vie memcpy(row, map.data, w * bpp); } wined3d_resource_unmap(view->resource, view->sub_resource_idx); - - return WINED3D_OK; } -static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, const struct wined3d_color *color) +static void cpu_blit_clear(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; + struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; - return surface_cpu_blt_colour_fill(view, &box, color); -} - -static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, - float depth, DWORD stencil) -{ - const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; + if (flags == WINED3DCLEAR_TARGET) + { + surface_cpu_blt_colour_fill(view, &box, colour); + return; + } - if (clear_flags != WINED3DCLEAR_ZBUFFER) + if (flags == WINED3DCLEAR_ZBUFFER) { - FIXME("clear_flags %#x not implemented.\n", clear_flags); - return WINED3DERR_INVALIDCALL; + surface_cpu_blt_colour_fill(view, &box, &c); + return; } - return surface_cpu_blt_colour_fill(view, &box, &color); + FIXME("flags %#x not implemented.\n", flags); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, @@ -3408,8 +3387,7 @@ const struct wined3d_blitter_ops cpu_blit = cpu_blit_alloc, cpu_blit_free, cpu_blit_supported, - cpu_blit_color_fill, - cpu_blit_depth_fill, + cpu_blit_clear, cpu_blit_blit_surface, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 575c817..9a388ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1875,10 +1875,8 @@ struct wined3d_blitter_ops const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); - HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, const struct wined3d_color *color); - HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD clear_flags, float depth, DWORD stencil); + void (*blitter_clear)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect,

1 0

Henri Verbeet : wined3d: Allow all formats with "glInternal" set in CheckSurfaceCapability().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 8c98be4791f18f31b04a4a0f08d18979aa0d06df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c98be4791f18f31b04a4a0f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:44 2017 +0200 wined3d: Allow all formats with "glInternal" set in CheckSurfaceCapability(). Rendertarget, depth/stencil and texturing restrictions are applied later in wined3d_check_device_format(), so to the extent this make a difference it mostly affects off-screen plain surfaces. Note that if the blitter check were to be implemented properly it would practically always return TRUE as well, because of the CPU based blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 419eb4d..82abcfa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5126,13 +5126,11 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, - const struct wined3d_format *check_format, BOOL no3d) +static BOOL wined3d_check_surface_capability(const struct wined3d_format *format, BOOL no3d) { if (no3d) { - switch (check_format->id) + switch (format->id) { case WINED3DFMT_B8G8R8_UNORM: TRACE("[FAILED] - Not enumerated on Windows.\n"); @@ -5162,21 +5160,7 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, } } - /* All formats that are supported for textures are supported for surfaces - * as well. */ - if (check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - return TRUE; - /* All depth stencil formats are supported on surfaces */ - if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_TEX_2D)) - return TRUE; - if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_RB)) - return TRUE; - - /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, - WINED3D_BLIT_OP_COLOR_BLIT, - NULL, WINED3D_POOL_DEFAULT, 0, check_format, - NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) + if (format->glInternal) { TRACE("[OK]\n"); return TRUE; @@ -5227,7 +5211,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; if (!(usage & WINED3DUSAGE_TEXTURE)) { - if (!CheckSurfaceCapability(adapter, adapter_format, format, wined3d->flags & WINED3D_NO3D)) + if (!wined3d_check_surface_capability(format, wined3d->flags & WINED3D_NO3D)) { TRACE("[FAILED] - Not supported for plain surfaces.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Ignore the blitter's depth/ colour fill return value in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 49f2a1ab2f0edfc76062ca4f418132dde1a4e65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f2a1ab2f0edfc76062ca4f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:43 2017 +0200 wined3d: Ignore the blitter's depth/colour fill return value in wined3d_device_clear_rendertarget_view(). Direct3D 10 and later don't have a return value, earlier versions seem to claim success even if the fill/clear is unsupported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 13 +++++-------- dlls/wined3d/device.c | 6 ++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 59a2e7d..5f96cc3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1310,8 +1310,7 @@ static void color_fill_test(void) enum { CHECK_FILL_VALUE = 0x1, - TODO_FILL_RETURN = 0x2, - BLOCKS = 0x4, + BLOCKS = 0x2, } flags; DWORD fill_value; } @@ -1337,7 +1336,7 @@ static void color_fill_test(void) * result on Wine. * {D3DFMT_YUY2, "D3DFMT_YUY2", BLOCKS, 0}, * {D3DFMT_UYVY, "D3DFMT_UYVY", BLOCKS, 0}, */ - {D3DFMT_DXT1, "D3DFMT_DXT1", BLOCKS | TODO_FILL_RETURN, 0}, + {D3DFMT_DXT1, "D3DFMT_DXT1", BLOCKS, 0x00000000}, /* Vendor-specific formats like ATI2N are a non-issue here since they're not * supported as offscreen plain surfaces and do not support D3DUSAGE_RENDERTARGET * when created as texture. */ @@ -1447,18 +1446,16 @@ static void color_fill_test(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, 0xdeadbeef); - todo_wine_if (formats[i].flags & TODO_FILL_RETURN) - ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, &rect, 0xdeadbeef); - todo_wine_if (formats[i].flags & TODO_FILL_RETURN) - ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); if (SUCCEEDED(hr)) { hr = IDirect3DDevice9_ColorFill(device, surface, &rect2, 0xdeadbeef); if (formats[i].flags & BLOCKS) - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, fmt=%s.\n", hr, formats[i].name); else ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b50e48..618e289 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4197,9 +4197,11 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi } if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) - return blitter->color_fill(device, view, rect, color); + blitter->color_fill(device, view, rect, color); else - return blitter->depth_fill(device, view, rect, flags, depth, stencil); + blitter->depth_fill(device, view, rect, flags, depth, stencil); + + return WINED3D_OK; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device,

1 0

Nikolay Sivov : dwrite: Added missing max bitmap size initialization.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: cc25929d3a152ee70f0f779091d82da88010f2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc25929d3a152ee70f0f77909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 3 08:14:08 2017 +0300 dwrite: Added missing max bitmap size initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e89d0a8..4e35cea 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5203,6 +5203,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->flags = 0; analysis->bitmap = NULL; + analysis->max_glyph_bitmap_size = 0; analysis->ppdip = desc->ppdip; analysis->origin.x = desc->origin_x * desc->ppdip; analysis->origin.y = desc->origin_y * desc->ppdip;

1 0

Viktor Semykin : windowscodecs/tests: Test with SHCreateMemStream.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2fcfe35e88fe051ed02e837b274f9c00969032be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcfe35e88fe051ed02e837b2… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:14 2017 -0300 windowscodecs/tests: Test with SHCreateMemStream. SHCreateMemStream takes less code to inialize and is preferred over CreateStreamOnHGlobal according to documentation. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/pngformat.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index e11d184..e006e3d 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windowscodecs.dll -IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 +IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 shlwapi C_SRCS = \ bitmap.c \ diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 02e0b1c..1aeb9bc 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -25,6 +25,7 @@ #include "windef.h" #include "wincodec.h" #include "wine/test.h" +#include "shlwapi.h" /* 1x1 pixel PNG image */ static const char png_no_color_profile[] = { @@ -277,8 +278,6 @@ static IWICImagingFactory *factory; static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) { - HGLOBAL hmem; - BYTE *data; HRESULT hr; IWICBitmapDecoder *decoder = NULL; IStream *stream; @@ -287,13 +286,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ULARGE_INTEGER pos; LARGE_INTEGER zero; - hmem = GlobalAlloc(0, image_size); - data = GlobalLock(hmem); - memcpy(data, image_data, image_size); - GlobalUnlock(hmem); - - hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + stream = SHCreateMemStream (image_data, image_size); + ok(stream != NULL, "SHCreateMemStream error\n"); hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0

Viktor Semykin : windowscodecs: Fixed loading png from streams.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2d5c861f750eea985a45c726f31576d941e824e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c861f750eea985a45c726f… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:13 2017 -0300 windowscodecs: Fixed loading png from streams. Png decoder was making one extra seek after it met IEND chunk. This led to crashes of some software. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 7 +++---- dlls/windowscodecs/tests/pngformat.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 990dcf6..c98a6a7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -774,11 +774,12 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* Find the metadata chunks in the file. */ seek.QuadPart = 8; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; do { + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + hr = read_png_chunk(pIStream, chunk_type, NULL, &chunk_size); if (FAILED(hr)) goto end; @@ -816,8 +817,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; } while (memcmp(chunk_type, "IEND", 4)); This->stream = pIStream; diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index e9a0c18..02e0b1c 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -306,7 +306,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size zero.QuadPart = 0; IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); refcount = IStream_Release(stream);

1 0

Viktor Semykin : windowscodecs/tests: Test for png codec seeking too far.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5ada4e947ebeee3bf30e1b211dc045e5f5d9eeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ada4e947ebeee3bf30e1b211… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:12 2017 -0300 windowscodecs/tests: Test for png codec seeking too far. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 34cb533..e9a0c18 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -284,6 +284,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size IStream *stream; GUID format; LONG refcount; + ULARGE_INTEGER pos; + LARGE_INTEGER zero; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -302,6 +304,11 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), "wrong container format %s\n", wine_dbgstr_guid(&format)); + zero.QuadPart = 0; + IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); + todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", + (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); + refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n");

1 0

Nikolay Sivov : xmllite/writer: Preserve original encoding name spelling in writer output.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: a68e51ce63753edd56b82867d291143ede5ad53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68e51ce63753edd56b82867d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 21:35:17 2017 +0300 xmllite/writer: Preserve original encoding name spelling in writer output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 29 +++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 74546e0..62ab871 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -324,9 +324,12 @@ todo_wine static void test_writestartdocument(void) { static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char *prologversion2 = "<?xml version=\"1.0\" encoding=\"uS-asCii\"?>"; static const char prologversion[] = "<?xml version=\"1.0\"?>"; static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR usasciiW[] = {'u','S','-','a','s','C','i','i',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriterOutput *output; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -386,6 +389,32 @@ static void test_writestartdocument(void) IStream_Release(stream); IXmlWriter_Release(writer); + + /* create with us-ascii */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + output = NULL; + hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, prologversion2); + + IStream_Release(stream); + IXmlWriter_Release(writer); + IUnknown_Release(output); } static void test_flush(void) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 3a0bd29..a841614 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -73,6 +73,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + WCHAR *encoding_name; /* exactly as specified on output creation */ struct output_buffer buffer; } xmlwriteroutput; @@ -373,6 +374,14 @@ static HRESULT write_encoding_bom(xmlwriter *writer) return S_OK; } +static const WCHAR *get_output_encoding_name(xmlwriteroutput *output) +{ + if (output->encoding_name) + return output->encoding_name; + + return get_encoding_name(output->encoding); +} + static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) { static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"'}; @@ -387,7 +396,7 @@ static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) /* encoding */ write_output_buffer(writer->output, encodingW, ARRAY_SIZE(encodingW)); - write_output_buffer_quoted(writer->output, get_encoding_name(writer->output->encoding), -1); + write_output_buffer_quoted(writer->output, get_output_encoding_name(writer->output), -1); /* standalone */ if (standalone == XmlStandalone_Omit) @@ -1366,6 +1375,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); free_output_buffer(This); + writeroutput_free(This, This->encoding_name); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -1420,8 +1430,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) return S_OK; } -static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, - IXmlWriterOutput **output) +static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + const WCHAR *encoding_name, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; HRESULT hr; @@ -1432,12 +1442,14 @@ static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding en writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else writeroutput = heap_alloc(sizeof(*writeroutput)); - if(!writeroutput) return E_OUTOFMEMORY; + if (!writeroutput) + return E_OUTOFMEMORY; writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; writeroutput->ref = 1; writeroutput->imalloc = imalloc; - if (imalloc) IMalloc_AddRef(imalloc); + if (imalloc) + IMalloc_AddRef(imalloc); writeroutput->encoding = encoding; writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); @@ -1446,6 +1458,14 @@ static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding en return hr; } + if (encoding_name) { + unsigned int size = (strlenW(encoding_name) + 1) * sizeof(WCHAR); + writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); + memcpy(writeroutput->encoding_name, encoding_name, size); + } + else + writeroutput->encoding_name = NULL; + IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); *output = &writeroutput->IXmlWriterOutput_iface; @@ -1468,7 +1488,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (!stream || !output) return E_INVALIDARG; xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); - return create_writer(stream, imalloc, xml_enc, output); + return create_writer_output(stream, imalloc, xml_enc, encoding, output); } HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, @@ -1483,5 +1503,5 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, if (!stream || !output) return E_INVALIDARG; xml_enc = get_encoding_from_codepage(codepage); - return create_writer(stream, imalloc, xml_enc, output); + return create_writer_output(stream, imalloc, xml_enc, NULL, output); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017