February 2021 - Wine-commits

Piotr Caban : msvcp90: Add _Wcsxfrm implementation.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3657c8b8293a1a026c81aa9cf4c04b1884c133cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3657c8b8293a1a026c81aa9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:57:06 2021 +0100 msvcp90: Add _Wcsxfrm implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 ++++++++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index dd5ccfaf7e0..a05d20dea4e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2969,7 +2969,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6a386237ed7..10c2216aebb 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3877,7 +3877,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index fd42183beae..6f3e7b65f92 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b7662613b94..c35dcb2d427 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) msvcp120._Wcsxfrm # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 94dd37ad4b3..dcd062aa4fc 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3747,7 +3747,7 @@ @ stub _WStoldx @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) @ cdecl _Xtime_diff_to_millis(ptr) _Xtime_diff_to_millis @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 422902375cd..0b371131613 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5153,7 +5153,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig # extern _Zero @ stub __Wcrtomb_lk diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index fa4d6eaf405..6505f893b50 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5779,7 +5779,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Stodx @ stub __Stofx diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f968ce068ef..338ded0082d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12704,6 +12704,43 @@ size_t __cdecl _Strxfrm(char *dest, char *dest_end, return len; } +size_t __cdecl _Wcsxfrm(wchar_t *dest, wchar_t *dest_end, + const wchar_t *src, const wchar_t *src_end, _Collvec *coll) +{ + size_t dest_len = dest_end - dest; + size_t src_len = src_end - src; + _Collvec cv; + LCID lcid; + int i, len; + + TRACE("(%p %p %p %p %p)\n", dest, dest_end, src, src_end, coll); + + if (coll) cv = *coll; + else getcoll(&cv); + +#if _MSVCP_VER < 110 + lcid = cv.handle; +#else + lcid = LocaleNameToLCID(cv.lc_name, 0); +#endif + + if (!lcid) + { + if (src_len > dest_len) return src_len; + memcpy(dest, src, src_len * sizeof(wchar_t)); + return src_len; + } + + len = LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, NULL, 0); + if (!len) return INT_MAX; + if (len > dest_len) return len; + + LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, dest, dest_len); + for (i = len - 1; i >= 0; i--) + dest[i] = ((BYTE*)dest)[i]; + return len; +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c38dd041af2..1fbabe3114c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6554,7 +6554,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d700b6d933c..9d6fe2b9bcc 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -106,6 +106,8 @@ static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); static size_t (__cdecl *p__Strxfrm)(char*, char*, const char*, const char*, const MSVCP__Collvec*); +static size_t (__cdecl *p__Wcsxfrm)(wchar_t*, wchar_t*, const wchar_t*, + const wchar_t*, const MSVCP__Collvec*); #undef __thiscall #ifdef __i386__ @@ -250,6 +252,7 @@ static BOOL init(void) SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); SET(p__Strxfrm, "_Strxfrm"); + SET(p__Wcsxfrm, "_Wcsxfrm"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); @@ -1110,6 +1113,26 @@ static void test__Strxfrm(void) ok(!strcmp(in, out), "out = %s\n", out); } +static void test__Wcsxfrm(void) +{ + const wchar_t in[] = L"abc"; + + MSVCP__Collvec coll; + wchar_t out[64]; + size_t ret; + + memset(&coll, 0, sizeof(coll)); + + out[0] = 'z'; + ret = p__Wcsxfrm(out, out + 1, in, in + 2, &coll); + ok(ret == 2, "ret = %d\n", (int)ret); + ok(out[0] == 'z', "out[0] = %x\n", out[0]); + + ret = p__Wcsxfrm(out, out + ARRAY_SIZE(out), in, in + 4, &coll); + ok(ret == 4, "ret = %d\n", (int)ret); + ok(!wcscmp(in, out), "out = %s\n", wine_dbgstr_w(out)); +} + START_TEST(misc) { if(!init()) @@ -1131,6 +1154,7 @@ START_TEST(misc) test_locale__Locimp__Locimp_Addfac(); test_raise_handler(); test__Strxfrm(); + test__Wcsxfrm(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Roman Pišl : conhost: Improve notification when resizing window.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 2ca86d3b597c6a16988468ee83ff9f2abf0c2571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca86d3b597c6a16988468ee… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 1 18:29:16 2021 +0100 conhost: Improve notification when resizing window. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 21 +++++++++++++-------- programs/conhost/conhost.h | 2 ++ programs/conhost/window.c | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0ac1c5f507b..dd22636be6a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1735,6 +1735,18 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou return STATUS_SUCCESS; } +void notify_screen_buffer_size( struct screen_buffer *screen_buffer ) +{ + if (is_active( screen_buffer ) && screen_buffer->console->mode & ENABLE_WINDOW_INPUT) + { + INPUT_RECORD ir; + ir.EventType = WINDOW_BUFFER_SIZE_EVENT; + ir.Event.WindowBufferSizeEvent.dwSize.X = screen_buffer->width; + ir.Event.WindowBufferSizeEvent.dwSize.Y = screen_buffer->height; + write_console_input( screen_buffer->console, &ir, 1, TRUE ); + } +} + NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ) { int i, old_width, old_height, copy_width, copy_height; @@ -1839,14 +1851,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (screen_buffer->cursor_x >= info->width) screen_buffer->cursor_x = info->width - 1; if (screen_buffer->cursor_y >= info->height) screen_buffer->cursor_y = info->height - 1; - if (is_active( screen_buffer ) && screen_buffer->console->mode & ENABLE_WINDOW_INPUT) - { - INPUT_RECORD ir; - ir.EventType = WINDOW_BUFFER_SIZE_EVENT; - ir.Event.WindowBufferSizeEvent.dwSize.X = info->width; - ir.Event.WindowBufferSizeEvent.dwSize.Y = info->height; - write_console_input( screen_buffer->console, &ir, 1, TRUE ); - } + notify_screen_buffer_size( screen_buffer ); } if (params->mask & SET_CONSOLE_OUTPUT_INFO_ATTR) { diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 3094fd6e5f0..6f3985352e2 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -136,6 +136,8 @@ void update_window_config( struct console *console ); NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); + +void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5e94a1d454e..01917ee8b67 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1901,6 +1901,8 @@ static void apply_config( struct console *console, const struct console_config * } update_window( console ); + + notify_screen_buffer_size( console->active ); } static void current_config( struct console *console, struct console_config *config )

1 0

Rémi Bernon : widl: Generate WinRT runtimeclass name constants.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 98fcca256ae09ba7e7c3861b2003b5c62e18a712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fcca256ae09ba7e7c3861b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 09:22:33 2021 +0100 widl: Generate WinRT runtimeclass name constants. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index 63389440c94..e6394991317 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1702,6 +1702,7 @@ static void write_runtimeclass(FILE *header, type_t *runtimeclass) { expr_t *contract = get_attrp(runtimeclass->attrs, ATTR_CONTRACT); char *name, *c_name; + size_t i, len; name = format_namespace(runtimeclass->namespace, "", ".", runtimeclass->name, NULL); c_name = format_namespace(runtimeclass->namespace, "", "_", runtimeclass->name, NULL); fprintf(header, "/*\n"); @@ -1710,6 +1711,14 @@ static void write_runtimeclass(FILE *header, type_t *runtimeclass) if (contract) write_apicontract_guard_start(header, contract); fprintf(header, "#ifndef RUNTIMECLASS_%s_DEFINED\n", c_name); fprintf(header, "#define RUNTIMECLASS_%s_DEFINED\n", c_name); + fprintf(header, "#if defined(_MSC_VER) || defined(__MINGW32__)\n"); + /* FIXME: MIDL generates extern const here but GCC warns if extern is initialized */ + fprintf(header, "const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = L\"%s\";\n", c_name, name); + fprintf(header, "#else\n"); + fprintf(header, "static const WCHAR RuntimeClass_%s[] = {", c_name); + for (i = 0, len = strlen(name); i < len; ++i) fprintf(header, "'%c',", name[i]); + fprintf(header, "0};\n"); + fprintf(header, "#endif\n"); fprintf(header, "#endif /* RUNTIMECLASS_%s_DEFINED */\n", c_name); free(c_name); free(name);

1 0

Rémi Bernon : d3d11/tests: Add more tests for ID3D11DeviceContext1_SwapDeviceContextState.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: ccffc06c6df30aa8b4ea487b868c419b9c7f5a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccffc06c6df30aa8b4ea487b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:00 2021 +0100 d3d11/tests: Add more tests for ID3D11DeviceContext1_SwapDeviceContextState. Better checking multiple context swap side effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c5c2e16e716..7935dab1332 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7057,14 +7057,21 @@ static void test_device_context_state(void) ID3D11Device1_GetImmediateContext1(device2, &context2); ok(!!context2, "Failed to get immediate context.\n"); + /* but they track a distinct state on each context */ ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); ok(!!tmp_context_state, "Failed to get context state.\n"); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); else refcount = 0; todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); refcount = ID3DDeviceContextState_Release(tmp_context_state); ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); @@ -7072,14 +7079,46 @@ static void test_device_context_state(void) todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + /* clearing the vertex shader on context doesn't have side effect on context2 */ ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); refcount = ID3D11VertexShader_Release(vs2); ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state);

1 0

Rémi Bernon : d3d11/tests: Add missing ID3D11DeviceContext1_CSSetUnorderedAccessViews.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: aa2827e8a747472eb7fac0d144bcfb5808c2a9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2827e8a747472eb7fac0d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:01 2021 +0100 d3d11/tests: Add missing ID3D11DeviceContext1_CSSetUnorderedAccessViews. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7935dab1332..fbf88891e83 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7373,6 +7373,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext1_CSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext1_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb);

1 0

Rémi Bernon : d3d11/tests: Add tests for ID3DDeviceContextState_SetPrivateData.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: bbda37edbde7ae6cc5e6a48f6e796663ea03e59c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbda37edbde7ae6cc5e6a48f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:02 2021 +0100 d3d11/tests: Add tests for ID3DDeviceContextState_SetPrivateData. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fbf88891e83..2a94621e1e3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6597,6 +6597,8 @@ static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) static void test_device_context_state(void) { + static const GUID test_guid = + {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; #if 0 float4 main(float4 pos : POSITION) : POSITION { @@ -6781,7 +6783,9 @@ static void test_device_context_state(void) ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *uavb, *tmp_cb; + DWORD data_size; ULONG refcount; + char data[64]; HRESULT hr; if (!(d3d11_device = create_device(NULL))) @@ -6936,6 +6940,19 @@ static void test_device_context_state(void) refcount = get_refcount(vs); todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + hr = ID3DDeviceContextState_SetPrivateData(context_state, &test_guid, sizeof(constant), &constant); + ok(hr == S_OK, "Failed to set private data, hr %#x.\n", hr); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); + data_size = sizeof(data); + memset(data, 0xa5, sizeof(data)); + hr = ID3DDeviceContextState_GetPrivateData(context_state, &test_guid, &data_size, data); + todo_wine ok(hr == S_OK, "Failed to get private data, hr %#x.\n", hr); + todo_wine ok(data_size == sizeof(constant), "Got private data size %x, expected %x.\n", data_size, sizeof(constant)); + todo_wine ok(!memcmp(data, &constant, sizeof(constant)), "Got unexpected private data.\n"); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, NULL); + context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type);

1 0

Rémi Bernon : d3d11/tests: Add tests for input assembler stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3d077ce705fac9d6b709cfc5b6440120aa1897f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d077ce705fac9d6b709cfc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:03 2021 +0100 d3d11/tests: Add tests for input assembler stage state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d077ce705fac9d6b709…

1 0

Rémi Bernon : d3d11/tests: Add tests for output merger stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 1bbf750847463278ba9fc4f7013c0583d48e4141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bbf750847463278ba9fc4f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:04 2021 +0100 d3d11/tests: Add tests for output merger stage state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 214 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 204 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bbf750847463278ba9f…

1 0

Rémi Bernon : d3d11/tests: Add tests for rasterizer stage state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 62ea34c569c34efcb0992141737e272f08c8e0e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea34c569c34efcb0992141… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:05 2021 +0100 d3d11/tests: Add tests for rasterizer stage state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 29f8f124686..63a98f5099a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -280,6 +280,13 @@ static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } +static char const *debugstr_viewport(D3D11_VIEWPORT *vp) +{ + if (!vp) return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}", + vp->TopLeftX, vp->TopLeftY, vp->Width, vp->Height, vp->MinDepth, vp->MaxDepth); +} + struct srv_desc { DXGI_FORMAT format; @@ -6770,7 +6777,7 @@ static void test_device_context_state(void) }; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; - UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref; + UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *tmp_cb, *tmp_ib, *tmp_vb; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; @@ -6784,6 +6791,7 @@ static void test_device_context_state(void) ID3D11RenderTargetView *tmp_rtv, *rtv; ID3D11DepthStencilView *tmp_dsv, *dsv; ID3D11VertexShader *tmp_vs, *vs, *vs2; + ID3D11RasterizerState *tmp_rs, *rs; D3D11_TEXTURE2D_DESC texture_desc; ID3D11GeometryShader *tmp_gs, *gs; enum D3D_PRIMITIVE_TOPOLOGY topo; @@ -6795,8 +6803,11 @@ static void test_device_context_state(void) ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; ID3D11PixelShader *tmp_ps, *ps; + D3D11_RASTERIZER_DESC rs_desc; ID3D11BlendState *tmp_bs, *bs; ID3D11HullShader *tmp_hs, *hs; + D3D11_VIEWPORT tmp_vp[2], vp; + D3D11_RECT tmp_rect[2], rect; D3D11_BLEND_DESC blend_desc; ID3D11Texture2D *texture; enum DXGI_FORMAT format; @@ -6986,6 +6997,27 @@ static void test_device_context_state(void) hr = ID3D11Device1_CreateDepthStencilState(device, &ds_desc, &dss); ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = TRUE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device1_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + SetRect(&rect, 0, 0, 1, 2); + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 3; + vp.Height = 4; + vp.MinDepth = 0.f; + vp.MaxDepth = 0.01f; + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); @@ -7028,6 +7060,10 @@ static void test_device_context_state(void) ID3D11DeviceContext1_OMSetDepthStencilState(context, dss, 3); ID3D11DeviceContext1_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, dsv, 1, 1, &ps_uav, NULL); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); @@ -7199,6 +7235,19 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7457,6 +7506,23 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7674,6 +7740,23 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7844,9 +7927,27 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs); ID3D11DepthStencilState_Release(dss); ID3D11DepthStencilView_Release(dsv);

1 0

Rémi Bernon : d3d11/tests: Add tests for stream output state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 5b89dfa2806b0c7566b36dbffaedf4af3774053d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b89dfa2806b0c7566b36dbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:06 2021 +0100 d3d11/tests: Add tests for stream output state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63a98f5099a..5212776cc59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6777,8 +6777,8 @@ static void test_device_context_state(void) }; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; - UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref, count; - ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *tmp_cb, *tmp_ib, *tmp_vb; + UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; + ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *sob, *tmp_cb, *tmp_ib, *tmp_vb, *tmp_sob; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; ID3D11SamplerState *sampler, *tmp_sampler; @@ -6882,6 +6882,7 @@ static void test_device_context_state(void) uavb = create_buffer((ID3D11Device *)device, D3D11_BIND_UNORDERED_ACCESS, 1024, NULL); ib = create_buffer((ID3D11Device *)device, D3D11_BIND_INDEX_BUFFER, 1024, NULL); vb = create_buffer((ID3D11Device *)device, D3D11_BIND_VERTEX_BUFFER, 1024, NULL); + sob = create_buffer((ID3D11Device *)device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -6942,6 +6943,7 @@ static void test_device_context_state(void) ib_offset = 16; vb_offset = 16; vb_stride = 16; + so_offset = 16; texture_desc.Width = 512; texture_desc.Height = 512; @@ -7064,6 +7066,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); ID3D11DeviceContext1_RSSetState(context, rs); + ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); @@ -7248,6 +7252,11 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); + if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7523,6 +7532,11 @@ static void test_device_context_state(void) ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); + ID3D11Buffer_Release(tmp_sob); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7744,6 +7758,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); ID3D11DeviceContext1_RSSetState(context, rs); + ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; ID3D11DeviceContext1_RSGetState(context, &tmp_rs); todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); @@ -7757,6 +7773,11 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); + if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7944,9 +7965,15 @@ static void test_device_context_state(void) ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + tmp_sob = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); + ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); + ID3D11Buffer_Release(tmp_sob); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Buffer_Release(sob); ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs); ID3D11DepthStencilState_Release(dss);

1 0