March 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : user32: Don't leak region on error.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 5fa0422227027fd4be4d2967cbded9d210b10b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa0422227027fd4be4d2967c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 4 17:38:17 2016 +1100 user32: Don't leak region on error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1dea98d..5855314 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1400,8 +1400,8 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) MapWindowPoints( 0, hwnd, &pt, 1 ); OffsetRgn( update_rgn, -pt.x, -pt.y ); ret = ExtSelectClipRgn( hdc, update_rgn, RGN_DIFF ); - DeleteObject( update_rgn ); } + DeleteObject( update_rgn ); return ret; }

1 0

Stefan Dösinger : wined3d: Call wined3d_texture_set_dirty() in wined3d_volume_invalidate_location().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: b23f21a9fb6e09afad6ac3327233130f8be979b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23f21a9fb6e09afad6ac3327… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 4 00:05:25 2016 +0100 wined3d: Call wined3d_texture_set_dirty() in wined3d_volume_invalidate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 2d88af6..457067d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -109,7 +109,11 @@ void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD locat void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) { TRACE("Volume %p, clearing %s.\n", volume, wined3d_debug_location(location)); + + if (location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + wined3d_texture_set_dirty(volume->container); volume->locations &= ~location; + TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); } @@ -552,10 +556,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - { - wined3d_texture_set_dirty(texture); wined3d_volume_invalidate_location(volume, ~volume->resource.map_binding); - } volume->resource.map_count++;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in context_generate_rt_mask_no_fbo().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: cea2ec9ab63c711415ff1406b9e14e62742aa6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea2ec9ab63c711415ff1406b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 4 00:05:23 2016 +0100 wined3d: Get resource info from the texture in context_generate_rt_mask_no_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9c8deeb..d1966b9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2439,7 +2439,7 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, const struct wined3d_surface *rt) { - if (!rt || rt->resource.format->id == WINED3DFMT_NULL) + if (!rt || rt->container->resource.format->id == WINED3DFMT_NULL) return 0; else if (rt->container->swapchain) return context_generate_rt_mask_from_surface(rt);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in context_find_fbo_entry().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 40ef70eb395e34e752defbdc35c890dd7164ce0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ef70eb395e34e752defbdc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 4 00:05:20 2016 +0100 wined3d: Get resource info from the texture in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6f065ba..2de56c2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -480,15 +480,16 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); depth_stencil = NULL; } - else if (depth_stencil->resource.multisample_type - != render_targets[0]->resource.multisample_type - || depth_stencil->resource.multisample_quality - != render_targets[0]->resource.multisample_quality) + else if (depth_stencil->container->resource.multisample_type + != render_targets[0]->container->resource.multisample_type + || depth_stencil->container->resource.multisample_quality + != render_targets[0]->container->resource.multisample_quality) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - render_targets[0]->resource.multisample_type, - render_targets[0]->resource.multisample_quality, - depth_stencil->resource.multisample_type, depth_stencil->resource.multisample_quality); + render_targets[0]->container->resource.multisample_type, + render_targets[0]->container->resource.multisample_quality, + depth_stencil->container->resource.multisample_type, + depth_stencil->container->resource.multisample_quality); depth_stencil = NULL; } else @@ -505,21 +506,22 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, { if (render_targets[i]) { - TRACE("\tColor attachment %u: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - i, render_targets[i], debug_d3dformat(render_targets[i]->resource.format->id), + TRACE(" Color attachment %u: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", + i, render_targets[i], debug_d3dformat(render_targets[i]->container->resource.format->id), context->fbo_key->objects[i + 1].object, context->fbo_key->rb_namespace & (1 << (i + 1)) ? "rb" : "texure", render_targets[i]->pow2Width, render_targets[i]->pow2Height, - render_targets[i]->resource.multisample_type); + render_targets[i]->container->resource.multisample_type); } } if (depth_stencil) { - TRACE("\tDepth attachment: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - depth_stencil, debug_d3dformat(depth_stencil->resource.format->id), + TRACE(" Depth attachment: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", + depth_stencil, debug_d3dformat(depth_stencil->container->resource.format->id), context->fbo_key->objects[0].object, context->fbo_key->rb_namespace & (1 << 0) ? "rb" : "texure", - depth_stencil->pow2Width, depth_stencil->pow2Height, depth_stencil->resource.multisample_type); + depth_stencil->pow2Width, depth_stencil->pow2Height, + depth_stencil->container->resource.multisample_type); } }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in arbfp_blit_surface().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: b334f1d237a06b62c2143110bcb445ab1e573373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b334f1d237a06b62c2143110b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 4 00:05:19 2016 +0100 wined3d: Get resource info from the texture in arbfp_blit_surface(). 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 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4cc7d3f..956986c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7863,6 +7863,8 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ struct wined3d_surface *dst_surface, const RECT *dst_rect_in, const struct wined3d_color_key *color_key) { + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_context *context; RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; @@ -7875,7 +7877,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) == WINED3D_LOCATION_DRAWABLE - && !wined3d_resource_is_offscreen(&src_surface->container->resource)) + && !wined3d_resource_is_offscreen(&src_texture->resource)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can @@ -7888,16 +7890,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - wined3d_texture_load(src_surface->container, context, FALSE); + wined3d_texture_load(src_texture, context, FALSE); context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { - const struct wined3d_format *fmt = src_surface->resource.format; + const struct wined3d_format *fmt = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); color_key = &alpha_test_key; @@ -7912,14 +7914,13 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ arbfp_blit_unset(context->gl_info); if (wined3d_settings.strict_draw_ordering - || (dst_surface->container->swapchain - && (dst_surface->container->swapchain->front_buffer == dst_surface->container))) + || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); - surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); + surface_validate_location(dst_surface, dst_texture->resource.draw_binding); + surface_invalidate_location(dst_surface, ~dst_texture->resource.draw_binding); } static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view,

1 0

Michael Stefaniuc : d3dx9/tests: Avoid using an empty rect for a test.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 46b6f60de14afcd9b610b73c47483091c66e66b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b6f60de14afcd9b610b73c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 15:23:19 2016 +0100 d3dx9/tests: Avoid using an empty rect for a test. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 55e3d88..dc95740 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -808,7 +808,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - SetRect(&destrect, 0, 0, 0, 0); /* left = right, top = bottom */ + SetRect(&destrect, 1, 2, 1, 2); /* left = right, top = bottom */ hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); /* fails when debug version of d3d9 is used */ ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Paul Gofman : d3dx9: Implement CommitChanges in effect.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: afcb6dc891cb44049e0295207b9bdd64994a1fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcb6dc891cb44049e0295207… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 3 15:22:15 2016 +0300 d3dx9: Implement CommitChanges in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ca5c46b..4be6e4b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3556,19 +3556,19 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - if (!This->active_pass) + if (!effect->active_pass) { WARN("Called without an active pass.\n"); return D3D_OK; } - - return E_NOTIMPL; + /* TODO: apply only changed states */ + return d3dx9_apply_pass_states(effect, effect->active_pass); } static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface)

1 0

Hugh McMaster : reg: Fail if REG_DWORD_BIG_ENDIAN is passed with no data argument.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 3762c294d9e1733e215ca6835e9edb1144a0cb91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3762c294d9e1733e215ca6835… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 4 12:59:28 2016 +1100 reg: Fail if REG_DWORD_BIG_ENDIAN is passed with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 80bac24..164981d 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -404,7 +404,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, output_message(STRING_UNSUPPORTED_TYPE, type); return 1; } - if (reg_type == REG_DWORD && !data) + if ((reg_type == REG_DWORD || reg_type == REG_DWORD_BIG_ENDIAN) && !data) { RegCloseKey(subkey); output_message(STRING_INVALID_CMDLINE); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2e2dd9b..4089367 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -351,12 +351,10 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), - "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), - "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r);

1 0

Hugh McMaster : reg: Correctly handle /ve commands with no data.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 9bfddcf76f7ec633a564799aea933093ea047cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfddcf76f7ec633a564799ae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 4 12:59:27 2016 +1100 reg: Correctly handle /ve commands with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6f3db63..80bac24 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -378,7 +378,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (value_name || data) + if (value_name || value_empty || data) { DWORD reg_type; DWORD reg_count = 0; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index af28a43..2e2dd9b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -151,7 +151,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE|TODO_REG_TYPE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); @@ -187,11 +187,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); @@ -216,7 +216,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); @@ -260,7 +260,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_BINARY, buffer, 0, TODO_REG_DATA|TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); @@ -331,8 +331,7 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), - "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); @@ -438,7 +437,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE|TODO_REG_DATA|TODO_REG_TYPE); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE); RegCloseKey(hkey);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in context_create().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 6b2567e42c91af0327db9446430eadf1b506a355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2567e42c91af0327db94464… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 4 00:05:22 2016 +0100 wined3d: Get resource info from the texture in context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f810706..9c8deeb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1659,7 +1659,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - color_format = target->resource.format; + color_format = target->container->resource.format; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */

1 0