February 2017 - Wine-commits

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 87f98ee88bb85bfe9b21fb312dfc7e8e5036ff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f98ee88bb85bfe9b21fb312… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:20 2017 +0100 wined3d: Use wined3d_texture_load_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88a3bc9..b4b1803 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -286,7 +286,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_load_location(depth_stencil, context, location); + wined3d_texture_load_location(depth_stencil->container, + dsv->sub_resource_idx, context, location); } if (!context_apply_clear_state(context, state, rt_count, fb))

1 0

Henri Verbeet : wined3d: Merge common code between texture3d_load_location () and surface_load_location().
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 25188eb71fed2540e2a8c828f642837e3e32e747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25188eb71fed2540e2a8c828f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:21 2017 +0100 wined3d: Merge common code between texture3d_load_location() and surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 ++------------------------------------ dlls/wined3d/texture.c | 79 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 89 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 628c83a..84f1c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2492,28 +2492,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } -static DWORD resource_access_from_location(DWORD location) -{ - switch (location) - { - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_BUFFER: - return WINED3D_RESOURCE_ACCESS_CPU; - - case WINED3D_LOCATION_DRAWABLE: - case WINED3D_LOCATION_TEXTURE_SRGB: - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_RB_MULTISAMPLE: - case WINED3D_LOCATION_RB_RESOLVED: - return WINED3D_RESOURCE_ACCESS_GPU; - - default: - FIXME("Unhandled location %#x.\n", location); - return 0; - } -} - static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2814,46 +2792,15 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; - struct wined3d_texture_sub_resource *sub_resource; HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - sub_resource = &texture->sub_resources[sub_resource_idx]; - if (sub_resource->locations & location) - { - TRACE("Location (%#x) is already up to date.\n", location); - return WINED3D_OK; - } - - if (WARN_ON(d3d)) - { - DWORD required_access = resource_access_from_location(location); - if ((texture->resource.access_flags & required_access) != required_access) - WARN("Operation requires %#x access, but surface only has %#x.\n", - required_access, texture->resource.access_flags); - } - - if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Surface previously discarded, nothing to do.\n"); - wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - goto done; - } - - if (!sub_resource->locations) - { - ERR("Surface %p does not have any up to date location.\n", surface); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - return surface_load_location(surface, context, location); - } - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { + DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations), wined3d_debug_location(location)); + wined3d_debug_location(current), wined3d_debug_location(location)); return WINED3DERR_INVALIDCALL; } @@ -2887,9 +2834,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; } -done: - wined3d_texture_validate_location(texture, sub_resource_idx, location); - return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0d9fadf..50572ab 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -88,11 +88,15 @@ static DWORD wined3d_resource_access_from_location(DWORD location) return 0; case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: return WINED3D_RESOURCE_ACCESS_CPU; case WINED3D_LOCATION_BUFFER: + case WINED3D_LOCATION_DRAWABLE: case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: + case WINED3D_LOCATION_RB_MULTISAMPLE: + case WINED3D_LOCATION_RB_RESOLVED: return WINED3D_RESOURCE_ACCESS_GPU; default: @@ -179,7 +183,50 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); + DWORD current = texture->sub_resources[sub_resource_idx].locations; + BOOL ret; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + TRACE("Current resource location %s.\n", wined3d_debug_location(current)); + + if (current & location) + { + TRACE("Location %s is already up to date.\n", wined3d_debug_location(location)); + return TRUE; + } + + if (WARN_ON(d3d)) + { + DWORD required_access = wined3d_resource_access_from_location(location); + if ((texture->resource.access_flags & required_access) != required_access) + WARN("Operation requires %#x access, but texture only has %#x.\n", + required_access, texture->resource.access_flags); + } + + if (current & WINED3D_LOCATION_DISCARDED) + { + TRACE("Sub-resource previously discarded, nothing to do.\n"); + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_validate_location(texture, sub_resource_idx, location); + wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + return TRUE; + } + + if (!current) + { + ERR("Sub-resource %u of texture %p does not have any up to date location.\n", + sub_resource_idx, texture); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + return wined3d_texture_load_location(texture, sub_resource_idx, context, location); + } + + if ((ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location))) + wined3d_texture_validate_location(texture, sub_resource_idx, location); + + return ret; } /* Context activation is done by the caller. */ @@ -2253,38 +2300,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - DWORD required_access = wined3d_resource_access_from_location(location); unsigned int row_pitch, slice_pitch; - TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", - texture, sub_resource_idx, context, wined3d_debug_location(location)); - - TRACE("Current resource location %s.\n", wined3d_debug_location(sub_resource->locations)); - - if ((sub_resource->locations & location) == location) - { - TRACE("Location(s) already up to date.\n"); - return TRUE; - } - - if ((texture->resource.access_flags & required_access) != required_access) - { - ERR("Operation requires %#x access, but volume only has %#x.\n", - required_access, texture->resource.access_flags); - return FALSE; - } - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; - if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Volume previously discarded, nothing to do.\n"); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - goto done; - } - switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: @@ -2369,9 +2389,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return FALSE; } -done: - wined3d_texture_validate_location(texture, sub_resource_idx, location); - return TRUE; }

1 0

Henri Verbeet : d2d1: Properly invert join directions when needed.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: a525b6978146b24a4e75655578959e6107dd7345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a525b6978146b24a4e7565557… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:22 2017 +0100 d2d1: Properly invert join directions when needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 ++++++++++- dlls/d2d1/render_target.c | 42 ++++++++++++++++++------------------------ dlls/d2d1/tests/d2d1.c | 3 ++- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index b268b7d..5ef62cb 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1743,6 +1743,7 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; + float ccw; if (!d2d_array_reserve((void **)&geometry->outline.vertices, &geometry->outline.vertices_size, geometry->outline.vertex_count + 4, sizeof(*geometry->outline.vertices))) @@ -1767,7 +1768,8 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, d2d_point_normalise(&q_prev); d2d_point_normalise(&q_next); - if (d2d_point_dot(&q_prev, &q_next) == -1.0f) + ccw = d2d_point_ccw(p0, prev, next); + if (ccw == 0.0f) { d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); @@ -1776,6 +1778,13 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); } + else if (ccw < 0.0f) + { + d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + } else { d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0f37264..c60d06e 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1917,12 +1917,10 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, float2 q_prev, q_next, v_p, q_i; float l; - q_prev.x = dot(prev, transform_geometry._11_21); - q_prev.y = dot(prev, transform_geometry._12_22); + q_prev = float2(dot(prev, transform_geometry._11_21), dot(prev, transform_geometry._12_22)); q_prev = normalize(q_prev); - q_next.x = dot(next, transform_geometry._11_21); - q_next.y = dot(next, transform_geometry._12_22); + q_next = float2(dot(next, transform_geometry._11_21), dot(next, transform_geometry._12_22)); q_next = normalize(q_next); /* tan(½θ) = sin(θ) / (1 + cos(θ)) @@ -1930,21 +1928,19 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, v_p = float2(-q_prev.y, q_prev.x); l = -dot(v_p, q_next) / (1.0f + dot(q_prev, q_next)); q_i = l * q_prev + v_p; - if (l < 0.0f) - q_i *= -1.0f; position = mul(float3(position, 1.0f), transform_geometry) + stroke_width * 0.5f * q_i; return float4(mul(float2x3(transform_rtx.xyz * transform_rtx.w, transform_rty.xyz * transform_rty.w), float3(position.xy, 1.0f)) + float2(-1.0f, 1.0f), 0.0f, 1.0f); } #endif - 0x43425844, 0xb58748c9, 0x99343e01, 0x92198e38, 0x667ab784, 0x00000001, 0x000004c0, 0x00000003, + 0x43425844, 0xe88f7af5, 0x480b101b, 0xfd80f66b, 0xd878e0b8, 0x00000001, 0x0000047c, 0x00000003, 0x0000002c, 0x00000098, 0x000000cc, 0x4e475349, 0x00000064, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x00000059, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x0000005e, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x49534f50, 0x4e4f4954, 0x45525000, 0x454e0056, 0xab005458, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, - 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000003ec, 0x00010040, 0x000000fb, 0x04000059, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000003a8, 0x00010040, 0x000000ea, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005f, 0x00101032, 0x00000000, 0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x00101032, 0x00000002, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000003, 0x0800000f, 0x00100012, 0x00000000, 0x00101046, 0x00000002, 0x00208046, @@ -1960,22 +1956,20 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000000, 0x00100a26, 0x00000001, 0x00100046, 0x00000000, 0x0700000f, 0x00100012, 0x00000000, 0x00100046, 0x00000001, 0x00100046, 0x00000000, 0x07000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0800000e, 0x00100012, 0x00000000, 0x8010002a, 0x00000041, - 0x00000000, 0x0010000a, 0x00000000, 0x09000032, 0x00100062, 0x00000000, 0x00100006, 0x00000000, - 0x00100106, 0x00000001, 0x00100cf6, 0x00000001, 0x07000031, 0x00100012, 0x00000000, 0x0010000a, - 0x00000000, 0x00004001, 0x00000000, 0x0a000037, 0x00100032, 0x00000000, 0x00100006, 0x00000000, - 0x80100596, 0x00000041, 0x00000000, 0x00100596, 0x00000000, 0x08000038, 0x00100042, 0x00000000, - 0x0020803a, 0x00000000, 0x00000001, 0x00004001, 0x3f000000, 0x05000036, 0x00100032, 0x00000001, - 0x00101046, 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, - 0x00100012, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x08000010, - 0x00100022, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000001, 0x09000032, - 0x00100032, 0x00000000, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, 0x00000002, - 0x09000038, 0x00100072, 0x00000001, 0x00208ff6, 0x00000000, 0x00000002, 0x00208246, 0x00000000, - 0x00000002, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x07000010, 0x00100012, - 0x00000001, 0x00100246, 0x00000001, 0x00100246, 0x00000000, 0x09000038, 0x00100072, 0x00000002, - 0x00208ff6, 0x00000000, 0x00000003, 0x00208246, 0x00000000, 0x00000003, 0x07000010, 0x00100022, - 0x00000001, 0x00100246, 0x00000002, 0x00100246, 0x00000000, 0x0a000000, 0x00102032, 0x00000000, - 0x00100046, 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, - 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x00000000, 0x0010000a, 0x00000000, 0x09000032, 0x00100032, 0x00000000, 0x00100006, 0x00000000, + 0x00100046, 0x00000001, 0x00100f36, 0x00000001, 0x08000038, 0x00100042, 0x00000000, 0x0020803a, + 0x00000000, 0x00000001, 0x00004001, 0x3f000000, 0x05000036, 0x00100032, 0x00000001, 0x00101046, + 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, 0x00100012, + 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x08000010, 0x00100022, + 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000001, 0x09000032, 0x00100032, + 0x00000000, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, 0x00000002, 0x09000038, + 0x00100072, 0x00000001, 0x00208ff6, 0x00000000, 0x00000002, 0x00208246, 0x00000000, 0x00000002, + 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x07000010, 0x00100012, 0x00000001, + 0x00100246, 0x00000001, 0x00100246, 0x00000000, 0x09000038, 0x00100072, 0x00000002, 0x00208ff6, + 0x00000000, 0x00000003, 0x00208246, 0x00000000, 0x00000003, 0x07000010, 0x00100022, 0x00000001, + 0x00100246, 0x00000002, 0x00100246, 0x00000000, 0x0a000000, 0x00102032, 0x00000000, 0x00100046, + 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; static const DWORD vs_code_triangle[] = { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7dccbd7..ec2c2d1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3680,6 +3680,7 @@ static void test_draw_geometry(void) ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE); hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); ID2D1RenderTarget_BeginDraw(rt); @@ -3738,7 +3739,7 @@ static void test_draw_geometry(void) "CgIKiwEUjAEUjQESjgESjwEQkAEQkQEOkgEOkwEMlAEMlQEKlgEKlwEImAEImQEGmgEGmwEEnAEE" "nQECngECrycA"); ok(match, "Figure does not match.\n"); - match = compare_figure(surface, 320, 320, 160, 160, 0xff652e89, 2, + match = compare_figure(surface, 320, 320, 160, 160, 0xff652e89, 0, "rycCngECnQEEnAEEmwEGmgEGmQEImAEIlwEKlgEKlQEMlAEMkwEOkgEOkQEQkAEQjwESjgESjQEU" "jAEUiwEKAgqKAQoCCokBCgQKiAEKBAqHAQoGCoYBCgYKhQEKCAqEAQoICoMBCgoKggEKCgqBAQoM" "CoABCgwKfwoOCn4KDgp9ChAKfAoQCnsKEgp6ChIKeQoUCngKFAp3ChYKdgoWCnUKGAp0ChgKcwoa"

1 0

Nikolay Sivov : hlink: Properly return interface pointers.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: f6b1e1235caa04a1e78cef9cb9f0951d41f5b71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b1e1235caa04a1e78cef9cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:03 2017 +0300 hlink: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 2 +- dlls/hlink/link.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e54a392..b0a20b1 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -528,7 +528,7 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { - *ppvObj = This; + *ppvObj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 6f4ac12..f5da0b4 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -129,7 +129,7 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) - *ppvObj = This; + *ppvObj = &This->IHlink_iface; else if (IsEqualIID(riid, &IID_IPersistStream)) *ppvObj = &This->IPersistStream_iface; else if (IsEqualIID(riid, &IID_IDataObject))

1 0

Nikolay Sivov : itss: Properly return interface pointers.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 4fdcc03cf8496ebdaf38f07e22692684e7ca78db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdcc03cf8496ebdaf38f07e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:05 2017 +0300 itss: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/itss.c | 2 +- dlls/itss/storage.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index fe28ba9..f47a0e9 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -84,7 +84,7 @@ ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 60e452d..f20c5bc 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -106,7 +106,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_QueryInterface( || IsEqualGUID(riid, &IID_IEnumSTATSTG)) { IEnumSTATSTG_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IEnumSTATSTG_iface; return S_OK; } @@ -283,7 +283,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_QueryInterface( || IsEqualGUID(riid, &IID_IStorage)) { IStorage_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStorage_iface; return S_OK; } @@ -666,7 +666,7 @@ static HRESULT WINAPI ITSS_IStream_QueryInterface( || IsEqualGUID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStream_iface; return S_OK; }

1 0

Nikolay Sivov : mapi32: Properly return interface pointer.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: d618c0fa0049697ec6075c3ab71143bb09f82b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d618c0fa0049697ec6075c3ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:06 2017 +0300 mapi32: Properly return interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 530c41e..ce8ed80 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1513,7 +1513,7 @@ static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, IsEqualIID(riid, &IID_IMAPIProp) || IsEqualIID(riid, &IID_IMAPIPropData)) { - *ppvObj = This; + *ppvObj = &This->IPropData_iface; IPropData_AddRef(iface); TRACE("returning %p\n", *ppvObj); return S_OK;

1 0

Nikolay Sivov : infosoft: Properly return interface pointers.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: d71672eb4c1dc4b115576de0a2b1c6ef42579411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71672eb4c1dc4b115576de0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:04 2017 +0300 infosoft: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 032316b..9524291 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -81,7 +81,7 @@ static HRESULT WINAPI infosoftcf_fnQueryInterface ( LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { - *ppvObj = This; + *ppvObj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 1789766..ceb9e18 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -57,7 +57,7 @@ static HRESULT WINAPI wb_QueryInterface( IWordBreaker *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IWordBreaker)) { - *ppvObj = This; + *ppvObj = &This->IWordBreaker_iface; return S_OK; }

1 0

Nikolay Sivov : wordpad: Clean up IRichEditOleCallback implementation.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: e492a0d68b297481f9958f451050522d20339c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e492a0d68b297481f9958f451… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:07 2017 +0300 wordpad: Clean up IRichEditOleCallback implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/olecallback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c index 8b279ad..dcfef58 100644 --- a/programs/wordpad/olecallback.c +++ b/programs/wordpad/olecallback.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wordpad); struct IRichEditOleCallbackImpl { - const IRichEditOleCallbackVtbl *vtbl; + IRichEditOleCallback IRichEditOleCallback_iface; IStorage *stg; int item_num; }; @@ -196,7 +196,7 @@ struct IRichEditOleCallbackVtbl olecallbackVtbl = { }; struct IRichEditOleCallbackImpl olecallback = { - &olecallbackVtbl, NULL, 0 + { &olecallbackVtbl }, NULL, 0 }; HRESULT setup_richedit_olecallback(HWND hEditorWnd) @@ -205,6 +205,6 @@ HRESULT setup_richedit_olecallback(HWND hEditorWnd) STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &olecallback.stg); - SendMessageW(hEditorWnd, EM_SETOLECALLBACK, 0, (LPARAM)&olecallback); + SendMessageW(hEditorWnd, EM_SETOLECALLBACK, 0, (LPARAM)&olecallback.IRichEditOleCallback_iface); return hr; }

1 0

Nikolay Sivov : d2d1: Create gdi-compatible texture for WIC target when asked for it.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 122676540389240e73b3a0f1e0b778483677eb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122676540389240e73b3a0f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 22:14:57 2017 +0300 d2d1: Create gdi-compatible texture for WIC target when asked for it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/wic_render_target.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 07a19ee..57f5d61 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -841,7 +841,8 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.Usage = D3D10_USAGE_DEFAULT; texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = 0; + texture_desc.MiscFlags = desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE ? + D3D10_RESOURCE_MISC_GDI_COMPATIBLE : 0; if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture))) { @@ -860,6 +861,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.Usage = D3D10_USAGE_STAGING; texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture))) {

1 0

Józef Kucia : d3d10core/tests: Port test_resinfo_instruction() from d3d11.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 2d3e23c60ffdf8d9e1dd5b8461e0e997a778a7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3e23c60ffdf8d9e1dd5b846… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:32 2017 +0100 d3d10core/tests: Port test_resinfo_instruction() from d3d11. 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 | 315 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3e23c60ffdf8d9e1dd5…

1 0