April 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : mtxdm: Implement GetDispenserManager.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 3abb995842b2ec3cc85ed9197a714e6f46559e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abb995842b2ec3cc85ed9197… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 03:59:45 2017 +0000 mtxdm: Implement GetDispenserManager. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mtxdm/Makefile.in | 5 +++++ dlls/mtxdm/mtxdm.spec | 1 + dlls/mtxdm/mtxdm_main.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/mtxdm.h | 34 ++++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+) diff --git a/configure b/configure index e4b9dd2..b9be11d 100755 --- a/configure +++ b/configure @@ -1332,6 +1332,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_mtxdm enable_ncrypt enable_nddeapi enable_ndis_sys @@ -18213,6 +18214,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll mtxdm enable_mtxdm wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys diff --git a/configure.ac b/configure.ac index a2fc66d..1a5b0de 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(mtxdm) WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) diff --git a/dlls/mtxdm/Makefile.in b/dlls/mtxdm/Makefile.in new file mode 100644 index 0000000..63a99b6 --- /dev/null +++ b/dlls/mtxdm/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mtxdm.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + mtxdm_main.c diff --git a/dlls/mtxdm/mtxdm.spec b/dlls/mtxdm/mtxdm.spec new file mode 100644 index 0000000..4aad62f --- /dev/null +++ b/dlls/mtxdm/mtxdm.spec @@ -0,0 +1 @@ +@ cdecl GetDispenserManager(ptr) diff --git a/dlls/mtxdm/mtxdm_main.c b/dlls/mtxdm/mtxdm_main.c new file mode 100644 index 0000000..9b7e1df --- /dev/null +++ b/dlls/mtxdm/mtxdm_main.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "comsvcs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + + +HRESULT CDECL GetDispenserManager(IDispenserManager **dispenser) +{ + TRACE("%p\n", dispenser); + + return CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)dispenser); +} diff --git a/include/Makefile.in b/include/Makefile.in index 2384c93..f9cb7b4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -513,6 +513,7 @@ HEADER_SRCS = \ msxml2did.h \ msxml6did.h \ msxmldid.h \ + mtxdm.h \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/mtxdm.h b/include/mtxdm.h new file mode 100644 index 0000000..94098ea --- /dev/null +++ b/include/mtxdm.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __MTXDM_H__ +#define __MTXDM_H__ + +#include "comsvcs.h" + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT CDECL GetDispenserManager(IDispenserManager**); + +#ifdef __cplusplus +} +#endif + + +#endif

1 0

Alexandre Julliard : Release 2.6.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 709935314458bd0ce27aab3986ae98cc556cb663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709935314458bd0ce27aab398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 793 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 380 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709935314458bd0ce27aa…

1 0

Tag wine-2.6 : Alexandre Julliard : Release 2.6
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: refs/tags/wine-2.6 Tag: 8dc23c59a0986fa41988c8120a2cfcff761ebaad URL: http://source.winehq.org/git/wine.git/?a=tag;h=8dc23c59a0986fa41988c8120a2c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6

1 0

Henri Verbeet : wined3d: Introduce a multi-threaded command stream implementation.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: e97ed10d09a94cae9bd449f297813a0f0722a378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97ed10d09a94cae9bd449f29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 13 00:11:01 2017 +0200 wined3d: Introduce a multi-threaded command stream implementation. The primary purpose of this patch is to serialise draws from multiple threads, without the overhead of extra flushes that "StrictDrawOrdering" imposes. With additional work, offloading state processing and driver overhead to a separate thread may also allow for improved performance in some applications, but that's not a goal of this patch. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 + dlls/wined3d/cs.c | 410 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/device.c | 6 + dlls/wined3d/query.c | 45 ++++- dlls/wined3d/wined3d_main.c | 4 + dlls/wined3d/wined3d_private.h | 59 +++++- 6 files changed, 472 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e97ed10d09a94cae9bd44…

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_memory() in surface_convert_format().
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 5a9a2b4cce866b64fa9933aa266dc805846add80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9a2b4cce866b64fa9933aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 13 00:11:02 2017 +0200 wined3d: Use wined3d_texture_get_memory() in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 64 +++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 625e4f3..2ba8060 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1252,9 +1252,13 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; + const struct wined3d_gl_info *gl_info = NULL; + unsigned int src_row_pitch, src_slice_pitch; + struct wined3d_context *context = NULL; struct wined3d_texture *dst_texture; + struct wined3d_bo_address src_data; struct wined3d_resource_desc desc; - struct wined3d_map_desc src_map; + DWORD map_binding; if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert @@ -1285,54 +1289,60 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return NULL; } - memset(&src_map, 0, sizeof(src_map)); - if (FAILED(wined3d_resource_map(&src_texture->resource, sub_resource_idx, - &src_map, NULL, WINED3D_MAP_READONLY))) + if (device->d3d_initialized) { - ERR("Failed to map the source texture.\n"); - wined3d_texture_decref(dst_texture); - return NULL; + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; } + + map_binding = src_texture->resource.map_binding; + if (!wined3d_texture_load_location(src_texture, sub_resource_idx, context, map_binding)) + ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_get_pitch(src_texture, texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_memory(src_texture, sub_resource_idx, &src_data, map_binding); + if (conv) { - struct wined3d_map_desc dst_map; + unsigned int dst_row_pitch, dst_slice_pitch; + struct wined3d_bo_address dst_data; + const BYTE *src; + BYTE *dst; - memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(wined3d_resource_map(&dst_texture->resource, 0, &dst_map, NULL, 0))) - { - ERR("Failed to map the destination texture.\n"); - wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); - wined3d_texture_decref(dst_texture); - return NULL; - } + map_binding = dst_texture->resource.map_binding; + if (!wined3d_texture_load_location(dst_texture, 0, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_get_pitch(dst_texture, 0, &dst_row_pitch, &dst_slice_pitch); + wined3d_texture_get_memory(dst_texture, 0, &dst_data, map_binding); + + src = wined3d_texture_map_bo_address(&src_data, src_texture->sub_resources[sub_resource_idx].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); + dst = wined3d_texture_map_bo_address(&dst_data, dst_texture->sub_resources[0].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); - conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, desc.width, desc.height); + conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); - wined3d_resource_unmap(&dst_texture->resource, 0); + wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); + wined3d_texture_unmap_bo_address(&dst_data, gl_info, GL_PIXEL_UNPACK_BUFFER); + wined3d_texture_unmap_bo_address(&src_data, gl_info, GL_PIXEL_UNPACK_BUFFER); } else { - struct wined3d_bo_address data = {0, src_map.data}; RECT src_rect = {0, 0, desc.width, desc.height}; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; POINT dst_point = {0, 0}; TRACE("Using upload conversion.\n"); - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_surface_upload_data(dst_texture->sub_resources[0].u.surface, gl_info, src_format, - &src_rect, src_map.row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&data)); - - context_release(context); + &src_rect, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); } - wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); + + if (context) + context_release(context); return dst_texture; }

1 0

Nikolay Sivov : gdi32: Fix widths returned by GetCharWidthI().
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: bba13f04c48869956a0171db0e2b4db0f61aab3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba13f04c48869956a0171db0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 13 00:47:39 2017 +0300 gdi32: Fix widths returned by GetCharWidthI(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ddd0051..3b3f0b5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3809,7 +3809,7 @@ BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT } for (i = 0; i < count; i++) - buffer[i] = abc->abcA + abc->abcB + abc->abcC; + buffer[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; HeapFree(GetProcessHeap(), 0, abc); return TRUE; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0b8cfd5..299fadba 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6637,6 +6637,48 @@ static void test_bitmap_font_glyph_index(void) DeleteDC(hdc); } +static void test_GetCharWidthI(void) +{ + static const char *teststr = "wine "; + HFONT hfont, prev_hfont; + WORD glyphs[5]; + INT widths[5]; + LOGFONTA lf; + ABC abc[5]; + int len, i; + DWORD nb; + BOOL ret; + HDC hdc; + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -20; + + hdc = GetDC(0); + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + len = strlen(teststr); + nb = GetGlyphIndicesA(hdc, teststr, len, glyphs, 0); + ok(nb == len, "\n"); + + memset(abc, 0xcc, sizeof(abc)); + ret = GetCharABCWidthsI(hdc, 0, len, glyphs, abc); + ok(ret, "GetCharABCWidthsI failed\n"); + + memset(widths, 0xcc, sizeof(widths)); + ret = GetCharWidthI(hdc, 0, len, glyphs, widths); + ok(ret, "GetCharWidthI failed\n"); + + for (i = 0; i < len; i++) + ok(widths[i] == abc[i].abcA + abc[i].abcB + abc[i].abcC, "%u, glyph %u, got width %d\n", + i, glyphs[i], widths[i]); + + DeleteObject(SelectObject(hdc, prev_hfont)); + ReleaseDC(0, hdc); +} + START_TEST(font) { init(); @@ -6699,6 +6741,7 @@ START_TEST(font) test_GetCharWidth32(); test_fake_bold_font(); test_bitmap_font_glyph_index(); + test_GetCharWidthI(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Stefan Dösinger : d3d9/tests: Relax the partially initialized varyings test.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: b96da0d8be6836cb0a9e5a3d3ed4ecb04ad065d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96da0d8be6836cb0a9e5a3d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 14:03:43 2017 +0200 d3d9/tests: Relax the partially initialized varyings test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 65bc8fc..13a7233 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20471,37 +20471,42 @@ static void test_uninitialized_varyings(void) const DWORD *ps; D3DCOLOR expected; BOOL allow_zero_alpha; + BOOL partial; BOOL allow_zero; BOOL broken_warp; } /* On AMD specular color is generally initialized to 0x00000000 and texcoords to 0xff000000 - * while on Nvidia it's the opposite. Just allow both. */ + * while on Nvidia it's the opposite. Just allow both. + * + * Partially initialized varyings reliably handle the component that has been initialized. + * The uninitialized components generally follow the rule above, with some exceptions on + * radeon cards. r500 and r600 GPUs have been found to set uninitialized components to 0.0, + * 0.5 and 1.0 without a sensible pattern. */ tests[] = { {D3DVS_VERSION(1, 1), vs1_code, 0, NULL, 0xffffffff}, { 0, NULL, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, { 0, NULL, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xffffffff}, - {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_diffuse_code, 0xffffffff}, - {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, TRUE}, + {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x00000000, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0x00000000, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff7f0000, TRUE}, - {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_diffuse_code, 0xff7fffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff7f0000, TRUE}, - {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff7f0000, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff7f0000, TRUE, TRUE}, + {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_diffuse_code, 0xff7fffff, FALSE, TRUE}, + {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff7f0000, TRUE, TRUE}, + {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff7f0000, TRUE, TRUE}, /* Fails on Radeon HD 2600 with 0x008000ff aka nonsensical color. */ - /* {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xff7fffff, TRUE}, */ - /* Randomly fails on Radeon HD 2600. */ - /* {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x007f0000}, */ - {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff7f0000, TRUE}, + /* {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xff7fffff, TRUE, TRUE}, */ + {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x007f0000, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff7f0000, TRUE, TRUE}, }; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -20607,7 +20612,8 @@ static void test_uninitialized_varyings(void) color = get_readback_color(&rb, 320, 240); ok(color_match(color, tests[i].expected, 1) || (tests[i].allow_zero_alpha && color_match(color, tests[i].expected & 0x00ffffff, 1)) - || (tests[i].allow_zero && !color) || (broken(warp && tests[i].broken_warp)), + || (tests[i].allow_zero && !color) || (broken(warp && tests[i].broken_warp)) + || broken(tests[i].partial && color_match(color & 0x00ff0000, tests[i].expected & 0x00ff0000, 1)), "Got unexpected color 0x%08x, case %u.\n", color, i); release_surface_readback(&rb);

1 0

Stefan Dösinger : d3d8/tests: Relax the partially initialized varyings test.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: ba708a2568a8d3188ac54066118d2c379586c120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba708a2568a8d3188ac540661… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 14:03:44 2017 +0200 d3d8/tests: Relax the partially initialized varyings test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 88667b4..4f0c397 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8233,21 +8233,27 @@ static void test_uninitialized_varyings(void) const DWORD *ps; D3DCOLOR expected; BOOL allow_zero_alpha; + BOOL partial; BOOL broken_warp; } /* On AMD specular color is generally initialized to 0x00000000 and texcoords to 0xff000000 - * while on Nvidia it's the opposite. Just allow both. */ + * while on Nvidia it's the opposite. Just allow both. + * + * Partially initialized varyings reliably handle the component that has been initialized. + * The uninitialized components generally follow the rule above, with some exceptions on + * radeon cards. r500 and r600 GPUs have been found to set uninitialized components to 0.0, + * 0.5 and 1.0 without a sensible pattern. */ tests[] = { {D3DVS_VERSION(1, 1), vs1_code, 0, NULL, 0xffffffff}, { 0, NULL, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xffffffff}, - {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE}, - {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff7f0000, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff7f0000, TRUE, TRUE}, }; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -8351,7 +8357,8 @@ static void test_uninitialized_varyings(void) color = get_readback_color(&rb, 320, 240); ok(color_match(color, tests[i].expected, 1) || (tests[i].allow_zero_alpha && color_match(color, tests[i].expected & 0x00ffffff, 1)) - || (broken(warp && tests[i].broken_warp)), + || (broken(warp && tests[i].broken_warp)) + || broken(tests[i].partial && color_match(color & 0x00ff0000, tests[i].expected & 0x00ff0000, 1)), "Got unexpected color 0x%08x, case %u.\n", color, i); release_surface_readback(&rb);

1 0

Stefan Dösinger : d3d9/tests: Allow 1.0 alpha in SM3 uninitialized varyings tests.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 71d3a4a202cd40c63bbc520c0408b203b4557fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d3a4a202cd40c63bbc520c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 14:03:45 2017 +0200 d3d9/tests: Allow 1.0 alpha in SM3 uninitialized varyings tests. My Radeon X1600 shows this behavior. This makes the tests less of an exception compared to the other ones, which also expect alpha 0.0 or 1.0. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13a7233..5def528 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20494,8 +20494,8 @@ static void test_uninitialized_varyings(void) {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0x00000000, FALSE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE, TRUE},

1 0

Stefan Dösinger : d3d9/tests: Disable the SM3 uninitialized diffuse test.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 463880ea1f7690a2e9fc4e9976fe92196dad5fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463880ea1f7690a2e9fc4e997… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 14:03:46 2017 +0200 d3d9/tests: Disable the SM3 uninitialized diffuse test. With the AMD r500 Windows result we have so many combinations that I don't see the point of testing this case. As an added bonus, we can remove the allow_zero flag now. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5def528..a211959 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20442,6 +20442,8 @@ static void test_uninitialized_varyings(void) 0x02000001, 0x800f0800, 0xb0e40000, /* mov oC0, t0 */ 0x0000ffff }; +#if 0 + /* This has been left here for documentation purposes. It is referenced in disabled tests in the table below. */ static const DWORD ps3_diffuse_code[] = { 0xffff0300, /* ps_3_0 */ @@ -20449,6 +20451,7 @@ static void test_uninitialized_varyings(void) 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ 0x0000ffff }; +#endif static const DWORD ps3_specular_code[] = { 0xffff0300, /* ps_3_0 */ @@ -20472,7 +20475,6 @@ static void test_uninitialized_varyings(void) D3DCOLOR expected; BOOL allow_zero_alpha; BOOL partial; - BOOL allow_zero; BOOL broken_warp; } /* On AMD specular color is generally initialized to 0x00000000 and texcoords to 0xff000000 @@ -20488,14 +20490,22 @@ static void test_uninitialized_varyings(void) { 0, NULL, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, { 0, NULL, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xffffffff}, - {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_diffuse_code, 0xffffffff}, - {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, + {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff000000, TRUE, FALSE, TRUE}, {D3DVS_VERSION(2, 0), vs2_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff000000, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, - {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff000000, TRUE, FALSE, FALSE, TRUE}, + /* This test shows a lot of combinations of alpha and color that involve 1.0 and 0.0. Disable it. + * + * AMD r500 sets alpha = 1.0, color = 0.0. Nvidia sets alpha = 1.0, color = 1.0. r600 Sets Alpha = 0.0, + * color = 0.0. So far no combination with Alpha = 0.0, color = 1.0 has been found though. + * {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xffffffff, FALSE, FALSE}, + * + * The same issues apply to the partially initialized COLOR0 varying, in addition to unreliable results + * with partially initialized varyings in general. + * {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xff7fffff, TRUE, TRUE}, */ + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0xff000000, TRUE, FALSE, TRUE}, + {D3DVS_VERSION(3, 0), vs3_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff000000, TRUE, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE, TRUE}, @@ -20503,8 +20513,6 @@ static void test_uninitialized_varyings(void) {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_diffuse_code, 0xff7fffff, FALSE, TRUE}, {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_specular_code, 0xff7f0000, TRUE, TRUE}, {D3DVS_VERSION(2, 0), vs2_partial_code, D3DPS_VERSION(2, 0), ps2_texcoord_code, 0xff7f0000, TRUE, TRUE}, - /* Fails on Radeon HD 2600 with 0x008000ff aka nonsensical color. */ - /* {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_diffuse_code, 0xff7fffff, TRUE, TRUE}, */ {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_specular_code, 0x007f0000, FALSE, TRUE}, {D3DVS_VERSION(3, 0), vs3_partial_code, D3DPS_VERSION(3, 0), ps3_texcoord_code, 0xff7f0000, TRUE, TRUE}, }; @@ -20612,7 +20620,7 @@ static void test_uninitialized_varyings(void) color = get_readback_color(&rb, 320, 240); ok(color_match(color, tests[i].expected, 1) || (tests[i].allow_zero_alpha && color_match(color, tests[i].expected & 0x00ffffff, 1)) - || (tests[i].allow_zero && !color) || (broken(warp && tests[i].broken_warp)) + || (broken(warp && tests[i].broken_warp)) || broken(tests[i].partial && color_match(color & 0x00ff0000, tests[i].expected & 0x00ff0000, 1)), "Got unexpected color 0x%08x, case %u.\n", color, i); release_surface_readback(&rb);

1 0