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

Huw Davies : shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: aef764d37cc94a531174817d54db1bf50636ebd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef764d37cc94a531174817d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 10:47:59 2017 +0000 shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 759cce6..07309ab 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3800,10 +3800,10 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - pILFree(pidl_testdir); + pILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); + if (FAILED(hr)) return; hr = IShellFolder_EnumObjects(psf, NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &peidl); ok(hr == S_OK, "Got %08x\n", hr);

1 0

Henri Verbeet : wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod().
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: d9d5dcee2b166e28eacc417970747e24fe97b9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d5dcee2b166e28eacc41797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:15 2017 +0100 wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod(). It's not safe to call device_invalidate_state() outside the CS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a1aba36..ddc128c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1140,13 +1140,16 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) if (texture->lod != lod) { + struct wined3d_device *device = texture->resource.device; + wined3d_resource_wait_idle(&texture->resource); texture->lod = lod; texture->texture_rgb.base_level = ~0u; texture->texture_srgb.base_level = ~0u; if (texture->resource.bind_count) - device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); + wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, + device->state.sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } return old;

1 0

Henri Verbeet : wined3d: Only copy source/ destination rectangles when needed in arbfp_blit_surface().
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: d5527c2d1cc08b1877a824004da22fc4326ac223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5527c2d1cc08b1877a824004… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:18 2017 +0100 wined3d: Only copy source/destination rectangles when needed 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 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 60bfbe3..3f0388a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7790,16 +7790,15 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - RECT src_rect = *src_rect_in; - RECT dst_rect = *dst_rect_in; struct wined3d_color_key alpha_test_key; + RECT s, d; /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -7815,8 +7814,10 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; - src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; + s = *src_rect; + s.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.top; + s.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.bottom; + src_rect = &s; } else wined3d_texture_load(src_texture, context, FALSE); @@ -7824,7 +7825,11 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ context_apply_blit_state(context, device); if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + { + d = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &d); + dst_rect = &d; + } if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { @@ -7837,7 +7842,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ arbfp_blit_set(device->blit_priv, context, src_surface, color_key); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info);

1 0

Francois Gouget : ddraw: Make ddraw_destroy_swapchain() static.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: d2aa533b9c00b205c657ce5853ab932a0179a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2aa533b9c00b205c657ce585… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 16 15:38:31 2017 +0100 ddraw: Make ddraw_destroy_swapchain() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b72ec6e..5f90a75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -361,7 +361,7 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) return ddraw1_AddRef(&This->IDirectDraw_iface); } -void ddraw_destroy_swapchain(struct ddraw *ddraw) +static void ddraw_destroy_swapchain(struct ddraw *ddraw) { TRACE("Destroying the swapchain.\n"); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 48b6c70..7d640f7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -127,7 +127,6 @@ struct ddraw HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) DECLSPEC_HIDDEN; -void ddraw_destroy_swapchain(struct ddraw *ddraw) DECLSPEC_HIDDEN; HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) DECLSPEC_HIDDEN; void ddraw_update_lost_surfaces(struct ddraw *ddraw) DECLSPEC_HIDDEN;

1 0

Huw Davies : krnl386.exe16: Fix mask values.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: eec602fecb98952f5d5db4ddfec6ca60c9a897d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec602fecb98952f5d5db4ddf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 09:44:43 2017 +0000 krnl386.exe16: Fix mask values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dma.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index 9a255ce..0eab98f 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -201,22 +201,22 @@ void DMA_ioport_out( WORD port, BYTE val ) break; /* Low Page Base Address */ - case 0x87: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x83: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x81: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x82: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x8B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x89: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 16))|((val & 0xFF) << 16); break; + case 0x87: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x83: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x81: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x82: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x8B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x89: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & 0xFF00FFFF)|((val & 0xFF) << 16); break; /* Low Page Base Address (only 4 lower bits are significant) */ - case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & 0x00FFFFFF)|((val & 0x0F) << 24); break; case 0x08: case 0xD0:

1 0

Paul Gofman : d3dx9/tests: Extend test effect and add checks to test_effect_preshader().
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 96e0b2777ada7fc617c73a7637e0db3a8fef2930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e0b2777ada7fc617c73a763… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 14 15:46:58 2017 +0300 d3dx9/tests: Extend test effect and add checks to test_effect_preshader(). 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/tests/effect.c | 562 ++++++++++++++++++++++++++----------------- 1 file changed, 336 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96e0b2777ada7fc617c73…

1 0

Paul Gofman : d3dx9/tests: Factor out op results test helper function from test_effect_preshader().
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: eca2f87a2ed164c3e8e3e847c546953a22147adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca2f87a2ed164c3e8e3e847c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 15 23:40:07 2017 +0100 d3dx9/tests: Factor out op results test helper function from test_effect_preshader(). 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/tests/effect.c | 137 ++++++++++++++++++++++++++----------------- 1 file changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 27328e4..24817dc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3938,6 +3938,88 @@ static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDe IDirect3DVertexShader9_Release(vshader); } +static const struct +{ + const char *comment; + BOOL todo[4]; + unsigned int result[4]; + unsigned int ulps; +} +test_effect_preshader_op_expected[] = +{ + {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, + {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, + {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, + {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, + {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, + {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, + {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + + {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, + {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, + {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, +#if __x86_64__ + {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, + {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, +#else + {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, + {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, +#endif + {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, + {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, + {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, + + {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, + {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, +}; + +enum expected_state_update +{ + EXPECTED_STATE_ZERO, + EXPECTED_STATE_UPDATED, + EXPECTED_STATE_ANYTHING +}; + +#define test_effect_preshader_op_results(a, b, c) test_effect_preshader_op_results_(__LINE__, a, b, c) +static void test_effect_preshader_op_results_(unsigned int line, IDirect3DDevice9 *device, + const enum expected_state_update *expected_state, const char *updated_param) +{ + static const D3DCOLORVALUE black = {0.0f}; + unsigned int i, j; + D3DLIGHT9 light; + const float *v; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_op_expected); ++i) + { + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + v = i < 8 ? &light.Diffuse.r : (i < 16 ? &light.Ambient.r : &light.Specular.r); + if (!expected_state || expected_state[i] == EXPECTED_STATE_UPDATED) + { + for (j = 0; j < 4; ++j) + { + todo_wine_if(test_effect_preshader_op_expected[i].todo[j]) + ok_(__FILE__, line)(compare_float(v[j], + ((const float *)test_effect_preshader_op_expected[i].result)[j], + test_effect_preshader_op_expected[i].ulps), + "Operation %s, component %u, expected %#x, got %#x (%g).\n", + test_effect_preshader_op_expected[i].comment, j, + test_effect_preshader_op_expected[i].result[j], + ((const unsigned int *)v)[j], v[j]); + } + } + else if (expected_state[i] == EXPECTED_STATE_ZERO) + { + ok_(__FILE__, line)(!memcmp(v, &black, sizeof(black)), + "Parameter %s, test %d, operation %s, state updated unexpectedly.\n", + updated_param, i, test_effect_preshader_op_expected[i].comment); + } + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = @@ -4002,46 +4084,12 @@ static void test_effect_preshader(IDirect3DDevice9 *device) { {4, 3, 2, 1} }; - static const struct - { - const char *comment; - BOOL todo[4]; - unsigned int result[4]; - unsigned int ulps; - } - test_effect_preshader_op_results[] = - { - {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, - {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, - {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, - {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, - {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, - {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, - {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, - {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, - {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, -#if __x86_64__ - {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, - {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, -#else - {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, - {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, -#endif - {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, - {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, - {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, - {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, - {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, - }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) #define TEST_EFFECT_PRES_NFLOATP ARRAY_SIZE(test_effect_preshader_fconstsp) #define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) #define TEST_EFFECT_PRES_NBOOL ARRAY_SIZE(test_effect_preshader_bconsts) #define TEST_EFFECT_PRES_NINT ARRAY_SIZE(test_effect_preshader_iconsts) -#define TEST_EFFECT_PRES_NOPTESTS ARRAY_SIZE(test_effect_preshader_op_results) static const D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; static const D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; @@ -4053,12 +4101,11 @@ static void test_effect_preshader(IDirect3DDevice9 *device) unsigned int npasses; DWORD value; BOOL bval; - D3DLIGHT9 light; D3DXVECTOR4 fdata[TEST_EFFECT_PRES_NFLOATMAX]; int idata[TEST_EFFECT_PRES_NINT][4]; BOOL bdata[TEST_EFFECT_PRES_NBOOL]; IDirect3DVertexShader9 *vshader; - unsigned int i, j; + unsigned int i; D3DCAPS9 caps; hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -4160,23 +4207,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK && !bval, "Got result %#x, boolean register value %u.\n", hr, bval); } - for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) - { - float *v; - - hr = IDirect3DDevice9_GetLight(device, i % 8, &light); - v = i < 8 ? &light.Diffuse.r : (i < 16 ? &light.Ambient.r : &light.Specular.r); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - for (j = 0; j < 4; ++j) - { - todo_wine_if(test_effect_preshader_op_results[i].todo[j]) - ok(compare_float(v[j], ((float *)test_effect_preshader_op_results[i].result)[j], - test_effect_preshader_op_results[i].ulps), - "Operation %s, component %u, expected %#x, got %#x (%g).\n", - test_effect_preshader_op_results[i].comment, j, - test_effect_preshader_op_results[i].result[j], ((unsigned int *)v)[j], v[j]); - } - } + test_effect_preshader_op_results(device, NULL, NULL); hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MINFILTER, &value); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

André Hentschel : opencl: Fix some spec file entries.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: b0a35bbcd20a6c741fb45843dbcc51eb55d76eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a35bbcd20a6c741fb45843d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 15 23:24:52 2017 +0100 opencl: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/opencl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index f2a4a70..ba8ce6e 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -5,8 +5,8 @@ @ stdcall clGetDeviceIDs( long long long ptr ptr ) wine_clGetDeviceIDs @ stdcall clGetDeviceInfo( long long long ptr ptr ) wine_clGetDeviceInfo -@ stdcall clCreateContext( ptr long ptr long ptr ptr ) wine_clCreateContext -@ stdcall clCreateContextFromType( ptr long long ptr ptr ) wine_clCreateContextFromType +@ stdcall clCreateContext(ptr long ptr ptr ptr ptr) wine_clCreateContext +@ stdcall clCreateContextFromType(ptr long ptr ptr ptr) wine_clCreateContextFromType @ stdcall clRetainContext( long ) wine_clRetainContext @ stdcall clReleaseContext( long ) wine_clReleaseContext @ stdcall clGetContextInfo( long long long ptr ptr ) wine_clGetContextInfo @@ -71,7 +71,7 @@ @ stdcall clEnqueueUnmapMemObject( long long ptr long ptr ptr ) wine_clEnqueueUnmapMemObject @ stdcall clEnqueueNDRangeKernel( long long long ptr ptr ptr long ptr ptr ) wine_clEnqueueNDRangeKernel @ stdcall clEnqueueTask( long long long ptr ptr ) wine_clEnqueueTask -@ stdcall clEnqueueNativeKernel( long long ptr long long ptr ptr long ptr ptr ) wine_clEnqueueNativeKernel +@ stdcall clEnqueueNativeKernel(long ptr ptr long long ptr ptr long ptr ptr) wine_clEnqueueNativeKernel @ stdcall clEnqueueMarker( long ptr ) wine_clEnqueueMarker @ stdcall clEnqueueWaitForEvents( long long ptr ) wine_clEnqueueWaitForEvents @ stdcall clEnqueueBarrier( long ) wine_clEnqueueBarrier

1 0

Huw Davies : wined3d: Zero-initialize count.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 7b32c8ab3ea4df7d57222b9f9923d2cb7142ea38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b32c8ab3ea4df7d57222b9f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 15 16:50:19 2017 +0000 wined3d: Zero-initialize count. This prevents the loop below accessing beyond multisample_types if the GL_NUM_SAMPLE_COUNTS call fails. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3f9c012..dd78583 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2803,6 +2803,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, { if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) { + count = 0; GL_EXTCALL(glGetInternalformativ(GL_RENDERBUFFER, format->glInternal, GL_NUM_SAMPLE_COUNTS, 1, &count)); checkGLcall("glGetInternalformativ(GL_NUM_SAMPLE_COUNTS)");

1 0

Nikolay Sivov : msxml3/tests: A bit more tests for IPersist* interfaces.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 2656f73817d8eb72f57d8b4f2db170f49fa299f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2656f73817d8eb72f57d8b4f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 16 14:12:29 2017 +0300 msxml3/tests: A bit more tests for IPersist* interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f6e33d3..611d48e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1839,12 +1839,15 @@ if (0) free_bstrs(); } -static void test_persiststreaminit(void) +static void test_persiststream(void) { - IXMLDOMDocument *doc; IPersistStreamInit *streaminit; + IPersistStream *stream; + IXMLDOMDocument *doc; ULARGE_INTEGER size; + IPersist *persist; HRESULT hr; + CLSID clsid; doc = create_document(&IID_IXMLDOMDocument); @@ -1857,6 +1860,26 @@ static void test_persiststreaminit(void) hr = IPersistStreamInit_GetSizeMax(streaminit, &size); ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((IUnknown *)stream == (IUnknown *)streaminit, "got %p, %p\n", stream, streaminit); + + hr = IPersistStream_QueryInterface(stream, &IID_IPersist, (void **)&persist); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersist, (void **)&persist); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IPersistStreamInit_GetClassID(streaminit, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + memset(&clsid, 0, sizeof(clsid)); + hr = IPersistStreamInit_GetClassID(streaminit, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_DOMDocument2), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + IPersistStream_Release(stream); + IPersistStreamInit_Release(streaminit); IXMLDOMDocument_Release(doc); } @@ -12189,7 +12212,7 @@ START_TEST(domdoc) } test_domdoc(); - test_persiststreaminit(); + test_persiststream(); test_domnode(); test_refs(); test_create();

1 0