July 2016 - Wine-commits - list.winehq.org

Alex Henrie : shell32/tests: Free winetest BSTR after use.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: de37f020a2b193316d6252a5727eb81db434c9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de37f020a2b193316d6252a57… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 19 22:43:06 2016 -0600 shell32/tests: Free winetest BSTR after use. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 1f50277..80ca8ad 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -338,6 +338,7 @@ static void test_items(void) r = IShellDispatch_NameSpace(sd, var, &folder); ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); ok(!!folder, "folder is null\n"); + SysFreeString(V_BSTR(&var)); IShellDispatch_Release(sd); SetCurrentDirectoryW(winetestW);

1 0

Alex Henrie : shell32/tests: Change to temp dir to be able to remove winetest dir.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: a615647435bd017af1993454902982d7a37b3cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a615647435bd017af19934549… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 19 22:43:07 2016 -0600 shell32/tests: Change to temp dir to be able to remove winetest dir. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 80ca8ad..70b6c36 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -428,6 +428,8 @@ todo_wine ok(!verbs, "verbs is not null\n"); } + GetTempPathW(MAX_PATH, wstr); + SetCurrentDirectoryW(wstr); RemoveDirectoryW(winetestW); SetCurrentDirectoryW(orig_dir);

1 0

Nikolay Sivov : dwrite: Implement GetOverhangMetrics() for trimming sign.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 0973f4655a67b51e0dbc7c18c0e528da0ba90bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0973f4655a67b51e0dbc7c18c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:02:59 2016 +0300 dwrite: Implement GetOverhangMetrics() for trimming sign. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a9c0572..22c3f31 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4693,8 +4693,8 @@ static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, static HRESULT WINAPI dwritetrimmingsign_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - FIXME("(%p)->(%p): stub\n", This, overhangs); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, overhangs); + return IDWriteTextLayout_GetOverhangMetrics(This->layout, overhangs); } static HRESULT WINAPI dwritetrimmingsign_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before,

1 0

Nikolay Sivov : dwrite/tests: A couple of tests for matching with invalid font properties.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 02773e1f15d34663bccb2a280f421753d19b12ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=02773e1f15d34663bccb2a280… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:03:00 2016 +0300 dwrite/tests: A couple of tests for matching with invalid font properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0459285..3b402b8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2970,6 +2970,20 @@ static void test_GetFirstMatchingFont(void) IDWriteFont_Release(font); IDWriteFont_Release(font2); + /* out-of-range font props are allowed */ + hr = IDWriteFontFamily_GetFirstMatchingFont(family, 1000, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, 10, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + 10, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_ITALIC); @@ -2998,6 +3012,22 @@ static void test_GetMatchingFonts(void) hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); ok(hr == S_OK, "got 0x%08x\n", hr); + /* out-of-range font props are allowed */ + hr = IDWriteFontFamily_GetMatchingFonts(family, 1000, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, 10, + DWRITE_FONT_STYLE_NORMAL, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + 10, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &fontlist); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Filter invalid weight in SetFontWeight().
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 4f01bee4c81f9cbee4b854f47dcccbcda6ca396d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f01bee4c81f9cbee4b854f47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:03:01 2016 +0300 dwrite: Filter invalid weight in SetFontWeight(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 22c3f31..6f10ce4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2889,6 +2889,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout3 *iface, TRACE("(%p)->(%d %s)\n", This, weight, debugstr_range(&range)); + if ((UINT32)weight > DWRITE_FONT_WEIGHT_ULTRA_BLACK) + return E_INVALIDARG; + value.range = range; value.u.weight = weight; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_WEIGHT, &value); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9f3b8c3..4134a97 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1249,6 +1249,11 @@ static void test_fontweight(void) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); ok(range.length == 6, "got %d\n", range.length); + range.startPosition = 0; + range.length = 6; + hr = IDWriteTextLayout_SetFontWeight(layout, 1000, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + size = IDWriteTextLayout_GetMaxWidth(layout); ok(size == 100.0, "got %.2f\n", size);

1 0

Alexandre Julliard : configure: Set the libwine soname on Android.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 1409662393784723032d0037babfe335ff88133b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1409662393784723032d0037b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:54:50 2016 +0900 configure: Set the libwine soname on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ce49aed..06e13d2 100755 --- a/configure +++ b/configure @@ -8380,7 +8380,7 @@ fi LIBWINE_INSTALL_LIB="libwine.so" - LIBWINE_LDFLAGS="-shared" + LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" ;; diff --git a/configure.ac b/configure.ac index 019d549..0a42855 100644 --- a/configure.ac +++ b/configure.ac @@ -860,7 +860,7 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") - AC_SUBST(LIBWINE_LDFLAGS,"-shared") + AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) ;; *)

1 0

Alexandre Julliard : winegcc: Set the soname of all dlls on Android.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: f5929a9cf95449221329b365fd1392f011ac74d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5929a9cf95449221329b365f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:55:11 2016 +0900 winegcc: Set the soname of all dlls on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 119e12b..514a574 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1130,7 +1130,8 @@ static void build(struct options* opts) } break; case PLATFORM_ANDROID: - /* not supported on Android */ + /* the Android loader requires a soname for all libraries */ + strarray_add( link_args, strmake( "-Wl,-soname,%s.so", output_name )); break; default: if (opts->image_base)

1 0

Matteo Bruni : wined3d: Update vertex shader when the swizzle map changes.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 8d6ea0ea02e8e1cee6cd873486997b646ca75323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6ea0ea02e8e1cee6cd87348… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:25 2016 +0200 wined3d: Update vertex shader when the swizzle map changes. 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/state.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff0fd2b..c239a47 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8972,9 +8972,12 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* If the vertex declaration contains a transformed position attribute, * the draw uses the fixed function vertex pipeline regardless of any * vertex shader set by the application. */ - if (transformed != wasrhw) + if (transformed != wasrhw + || context->stream_info.swizzle_map != context->last_swizzle_map) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + context->last_swizzle_map = context->stream_info.swizzle_map; + if (!use_vs(state)) { if (context->last_was_vshader) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 98e78da..30ea1c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4451,6 +4451,11 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine context->last_was_rhw = transformed; + if (context->stream_info.swizzle_map != context->last_swizzle_map) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + + context->last_swizzle_map = context->stream_info.swizzle_map; + /* Don't have to apply the matrices when vertex shaders are used. When * vshaders are turned off this function will be called again anyway to * make sure they're properly set. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b400994..3c6c869 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1462,6 +1462,7 @@ struct wined3d_context DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD padding : 14; + DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Matteo Bruni : wined3d: Check BLENDWEIGHT and BLENDINDICES FFP attributes for fixups.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: dcaf944e35cfb995b1262c325595c2dc35514da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaf944e35cfb995b1262c325… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:26 2016 +0200 wined3d: Check BLENDWEIGHT and BLENDINDICES FFP attributes for fixups. 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/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 79d1246..039b3a1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -381,6 +381,10 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s fixup_flags, &stride_this_run) || ret; fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_BLENDWEIGHT, + fixup_flags, &stride_this_run) || ret; + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_BLENDINDICES, + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, state, WINED3D_FFP_NORMAL, fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, state, WINED3D_FFP_DIFFUSE,

1 0

Matteo Bruni : d3d8: Use a union in tss_lookup. (Coverity).
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 3a597237b7cde9b2e2f8c69e28de66aeafe1c1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a597237b7cde9b2e2f8c69e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:27 2016 +0200 d3d8: Use a union in tss_lookup. (Coverity). 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/d3d8/device.c | 72 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f0efad..bf333c1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1810,39 +1810,43 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag static const struct tss_lookup { BOOL sampler_state; - enum wined3d_texture_stage_state state; + union + { + enum wined3d_texture_stage_state texture_state; + enum wined3d_sampler_state sampler_state; + } u; } tss_lookup[] = { - {FALSE, WINED3D_TSS_INVALID}, /* 0, unused */ - {FALSE, WINED3D_TSS_COLOR_OP}, /* 1, D3DTSS_COLOROP */ - {FALSE, WINED3D_TSS_COLOR_ARG1}, /* 2, D3DTSS_COLORARG1 */ - {FALSE, WINED3D_TSS_COLOR_ARG2}, /* 3, D3DTSS_COLORARG2 */ - {FALSE, WINED3D_TSS_ALPHA_OP}, /* 4, D3DTSS_ALPHAOP */ - {FALSE, WINED3D_TSS_ALPHA_ARG1}, /* 5, D3DTSS_ALPHAARG1 */ - {FALSE, WINED3D_TSS_ALPHA_ARG2}, /* 6, D3DTSS_ALPHAARG2 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT00}, /* 7, D3DTSS_BUMPENVMAT00 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT01}, /* 8, D3DTSS_BUMPENVMAT01 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT10}, /* 9, D3DTSS_BUMPENVMAT10 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT11}, /* 10, D3DTSS_BUMPENVMAT11 */ - {FALSE, WINED3D_TSS_TEXCOORD_INDEX}, /* 11, D3DTSS_TEXCOORDINDEX */ - {FALSE, WINED3D_TSS_INVALID}, /* 12, unused */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 13, D3DTSS_ADDRESSU */ - {TRUE, WINED3D_SAMP_ADDRESS_V}, /* 14, D3DTSS_ADDRESSV */ - {TRUE, WINED3D_SAMP_BORDER_COLOR}, /* 15, D3DTSS_BORDERCOLOR */ - {TRUE, WINED3D_SAMP_MAG_FILTER}, /* 16, D3DTSS_MAGFILTER */ - {TRUE, WINED3D_SAMP_MIN_FILTER}, /* 17, D3DTSS_MINFILTER */ - {TRUE, WINED3D_SAMP_MIP_FILTER}, /* 18, D3DTSS_MIPFILTER */ - {TRUE, WINED3D_SAMP_MIPMAP_LOD_BIAS}, /* 19, D3DTSS_MIPMAPLODBIAS */ - {TRUE, WINED3D_SAMP_MAX_MIP_LEVEL}, /* 20, D3DTSS_MAXMIPLEVEL */ - {TRUE, WINED3D_SAMP_MAX_ANISOTROPY}, /* 21, D3DTSS_MAXANISOTROPY */ - {FALSE, WINED3D_TSS_BUMPENV_LSCALE}, /* 22, D3DTSS_BUMPENVLSCALE */ - {FALSE, WINED3D_TSS_BUMPENV_LOFFSET}, /* 23, D3DTSS_BUMPENVLOFFSET */ - {FALSE, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ - {TRUE, WINED3D_SAMP_ADDRESS_W}, /* 25, D3DTSS_ADDRESSW */ - {FALSE, WINED3D_TSS_COLOR_ARG0}, /* 26, D3DTSS_COLORARG0 */ - {FALSE, WINED3D_TSS_ALPHA_ARG0}, /* 27, D3DTSS_ALPHAARG0 */ - {FALSE, WINED3D_TSS_RESULT_ARG}, /* 28, D3DTSS_RESULTARG */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 0, unused */ + {FALSE, {WINED3D_TSS_COLOR_OP}}, /* 1, D3DTSS_COLOROP */ + {FALSE, {WINED3D_TSS_COLOR_ARG1}}, /* 2, D3DTSS_COLORARG1 */ + {FALSE, {WINED3D_TSS_COLOR_ARG2}}, /* 3, D3DTSS_COLORARG2 */ + {FALSE, {WINED3D_TSS_ALPHA_OP}}, /* 4, D3DTSS_ALPHAOP */ + {FALSE, {WINED3D_TSS_ALPHA_ARG1}}, /* 5, D3DTSS_ALPHAARG1 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG2}}, /* 6, D3DTSS_ALPHAARG2 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT00}}, /* 7, D3DTSS_BUMPENVMAT00 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT01}}, /* 8, D3DTSS_BUMPENVMAT01 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT10}}, /* 9, D3DTSS_BUMPENVMAT10 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT11}}, /* 10, D3DTSS_BUMPENVMAT11 */ + {FALSE, {WINED3D_TSS_TEXCOORD_INDEX}}, /* 11, D3DTSS_TEXCOORDINDEX */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 12, unused */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 13, D3DTSS_ADDRESSU */ + {TRUE, {WINED3D_SAMP_ADDRESS_V}}, /* 14, D3DTSS_ADDRESSV */ + {TRUE, {WINED3D_SAMP_BORDER_COLOR}}, /* 15, D3DTSS_BORDERCOLOR */ + {TRUE, {WINED3D_SAMP_MAG_FILTER}}, /* 16, D3DTSS_MAGFILTER */ + {TRUE, {WINED3D_SAMP_MIN_FILTER}}, /* 17, D3DTSS_MINFILTER */ + {TRUE, {WINED3D_SAMP_MIP_FILTER}}, /* 18, D3DTSS_MIPFILTER */ + {TRUE, {WINED3D_SAMP_MIPMAP_LOD_BIAS}}, /* 19, D3DTSS_MIPMAPLODBIAS */ + {TRUE, {WINED3D_SAMP_MAX_MIP_LEVEL}}, /* 20, D3DTSS_MAXMIPLEVEL */ + {TRUE, {WINED3D_SAMP_MAX_ANISOTROPY}}, /* 21, D3DTSS_MAXANISOTROPY */ + {FALSE, {WINED3D_TSS_BUMPENV_LSCALE}}, /* 22, D3DTSS_BUMPENVLSCALE */ + {FALSE, {WINED3D_TSS_BUMPENV_LOFFSET}}, /* 23, D3DTSS_BUMPENVLOFFSET */ + {FALSE, {WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ + {TRUE, {WINED3D_SAMP_ADDRESS_W}}, /* 25, D3DTSS_ADDRESSW */ + {FALSE, {WINED3D_TSS_COLOR_ARG0}}, /* 26, D3DTSS_COLORARG0 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG0}}, /* 27, D3DTSS_ALPHAARG0 */ + {FALSE, {WINED3D_TSS_RESULT_ARG}}, /* 28, D3DTSS_RESULTARG */ }; static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, @@ -1863,9 +1867,9 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); else - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); wined3d_mutex_unlock(); return D3D_OK; @@ -1889,9 +1893,9 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); else - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0