January 2016 - Wine-Commits

Nikolay Sivov : quartz: Explicitly compare to HRESULT values.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: ed65fc7cedb4e5d7b147ff6c0643e60d94a60556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed65fc7cedb4e5d7b147ff6c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 2 14:04:13 2016 +0300 quartz: Explicitly compare to HRESULT values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/enumfilters.c | 2 +- dlls/quartz/filtergraph.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index ea2af2a..331991b 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -185,7 +185,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) This->uIndex = 0; hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); - if (!hr) + if (hr == S_OK) This->Version = currentVersion; return S_OK; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9f072a8..5b4b080 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1618,7 +1618,7 @@ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) /* Try to find a match without reading the file first */ hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (!hr) + if (hr == S_OK) return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); /* Now create a AyncReader instance, to check for signature bytes in the file */ @@ -1660,7 +1660,7 @@ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); IAsyncReader_Release(pReader); - if (!hr) + if (hr == S_OK) { /* Release the AsyncReader filter and create the matching one */ IBaseFilter_Release(*filter);

1 0

Alexandre Julliard : Update copyright info for 2016.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: f6998ea4ced8b2051df64dd81242416d903a90d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6998ea4ced8b2051df64dd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 3 20:08:27 2016 +0100 Update copyright info for 2016. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6dbf8c0..c35515e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 6fd4ff9..8dbb85b 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index cae5408..fcf1385 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alex Henrie : maintainers: Add Wine Staging maintainers.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 18698993330d9a2755d3db635ea3b5d312ddca10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18698993330d9a2755d3db635… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 31 17:59:15 2015 +0100 maintainers: Add Wine Staging maintainers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f622df0..3e7d48d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -266,3 +266,9 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> W: http://wiki.winehq.org/StableRules + +Staging Branch +M: Sebastian Lackner <sebastian(a)fds-team.de> +M: Michael Müller <michael(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> +W: https://wine-staging.com/

1 0

Nikolay Sivov : comdlg32: Explicitly compare to HRESULT values.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: c8e407da3badb4d5bc7b6deba0e8a093f8245179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e407da3badb4d5bc7b6deba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 2 14:03:53 2016 +0300 comdlg32: Explicitly compare to HRESULT values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/printdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index acdb46c..a389e53 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -4126,7 +4126,7 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) hr = E_FAIL; lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm); - if (!hr && lppd->hDevMode) { + if (hr == S_OK && lppd->hDevMode) { if (lppd->Flags & PD_RETURNDC) { lppd->hDC = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); if (!lppd->hDC) @@ -4274,7 +4274,7 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) hr = E_FAIL; lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm); - if (!hr && lppd->hDevMode) { + if (hr == S_OK && lppd->hDevMode) { if (lppd->Flags & PD_RETURNDC) { lppd->hDC = CreateDCW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); if (!lppd->hDC)

1 0

Stefan Dösinger : ddraw/tests: Use a slop for test_shademode.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: dbd93084cedc7e9c19fb3751669b5b68597e2edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd93084cedc7e9c19fb37516… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jan 1 18:24:51 2016 +0000 ddraw/tests: Use a slop for test_shademode. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 33d60b0..9dcf1f6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7951,9 +7951,9 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(compare_color(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(compare_color(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f92067b..47da233 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9054,9 +9054,9 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(compare_color(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(compare_color(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 78e2aa0..1f05cec 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10223,9 +10223,9 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(compare_color(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(compare_color(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 632dc7d..f7a71b8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10506,9 +10506,9 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(compare_color(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(compare_color(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); }

1 0

Nikolay Sivov : msxml3/tests: Fix some leaks while testing attribute values (Valgrind).
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 81fbbb30a53591344939d705d73b80202bf16daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fbbb30a53591344939d705d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:54 2015 +0300 msxml3/tests: Fix some leaks while testing attribute values (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0958c03..88b2404 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -298,7 +298,10 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].uriW); SysFreeString(call_seq->sequence[i].attributes[j].localW); SysFreeString(call_seq->sequence[i].attributes[j].qnameW); + SysFreeString(call_seq->sequence[i].attributes[j].valueW); } + HeapFree(GetProcessHeap(), 0, call_seq->sequence[i].attributes); + call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); SysFreeString(call_seq->sequence[i].arg2W);

1 0

Nikolay Sivov : msxml3/tests: Fix a stream leak (Valgrind).
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 08be561fbf959a127d2deb44c32397a473a41e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08be561fbf959a127d2deb44c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:56 2015 +0300 msxml3/tests: Fix a stream leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 68de61e..ab72d3a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1684,6 +1684,7 @@ static void test_XMLHTTP(void) hr = GetHGlobalFromStream((IStream*)V_UNKNOWN(&varbody), &g); EXPECT_HR(hr, S_OK); ok(g != NULL, "got %p\n", g); + VariantClear(&varbody); IDispatch_Release(event);

1 0

Matteo Bruni : wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: d2d8d8f13e0302c32f63714fdb52d97195f2b335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d8d8f13e0302c32f63714fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 14 23:37:53 2015 +0100 wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/wined3d_private.h | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6fa9521..973b4a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8068,6 +8068,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; unsigned int i; @@ -8093,7 +8094,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* Because of settings->texcoords, we have to regenerate the vertex * shader on a vdecl change if there aren't enough varyings to just * always output all the texture coordinates. */ - if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info)) + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) @@ -8112,6 +8114,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } context->last_was_vshader = use_vs(state); + context->last_was_normal = normal; } static void glsl_vertex_pipe_vs(struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 53ef63e..70857c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1175,6 +1175,7 @@ struct wined3d_context DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; + DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; DWORD numberedArraysLoaded : 1; DWORD last_was_blit : 1; @@ -1185,17 +1186,17 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; - DWORD use_immediate_mode_draw : 1; DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ + DWORD use_immediate_mode_draw : 1; DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; - DWORD padding : 15; + DWORD padding : 14; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Józef Kucia : wined3d: Recognize SM4 imin opcode.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 1ef7eddfcbf3b3d021898ea3535ca18d165dbbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef7eddfcbf3b3d021898ea35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 1 18:08:04 2016 +0100 wined3d: Recognize SM4 imin opcode. 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/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 62caa2a..3dfc8c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5258,6 +5258,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IMAX */ NULL, + /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9d2cc16..ed87e79 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7858,6 +7858,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMAX */ NULL, + /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 417d20e..bf420ee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IMAX */ "imax", + /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b813f2e..a915b0d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -99,6 +99,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMAX = 0x24, + WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, @@ -269,6 +270,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, + {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb16aac..23fe595 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -501,6 +501,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_IMAX, + WINED3DSIH_IMIN, WINED3DSIH_IMUL, WINED3DSIH_ISHL, WINED3DSIH_ITOF,

1 0

Stefan Dösinger : d3d8/tests: Use a slop for test_shademode.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 43903e12cbf147db1a56ceb2af3f46f323736bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=43903e12cbf147db1a56ceb2a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jan 1 18:24:50 2016 +0000 d3d8/tests: Use a slop for test_shademode. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 0663e18..322c0dd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8478,9 +8478,9 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); IDirect3DDevice8_SetVertexShader(device, 0);

1 0