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

Tag wine-1.9.12 : Alexandre Julliard : Release 1.9.12
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: refs/tags/wine-1.9.12 Tag: 0797c16e1c8857baaf6ece4d5a7d2a8d8cd0d755 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0797c16e1c8857baaf6ece4d5a7d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:04:02 2016 +0900 Release 1.9.12

1 0

Alexandre Julliard : explorer: Avoid crash on empty Start Menu folders.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 1b025eb0b5543f058025105a623a91659cdbe99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b025eb0b5543f058025105a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 13:47:02 2016 +0900 explorer: Avoid crash on empty Start Menu folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/startmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 15bb7b5..0d79aca 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -464,8 +464,8 @@ void do_startmenu(HWND hwnd) if (!public_startmenu.folder) pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder); - if (!shell_folder_is_empty(user_startmenu.folder) || - !shell_folder_is_empty(public_startmenu.folder)) + if ((user_startmenu.folder && !shell_folder_is_empty(user_startmenu.folder)) || + (public_startmenu.folder && !shell_folder_is_empty(public_startmenu.folder))) { fill_menu(&user_startmenu);

1 0

Alexandre Julliard : explorer: Don' t bother with taskbar buttons when the taskbar is not visible.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 69b41aebdaa9aca5ae2b18dc52dfee05466eb43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b41aebdaa9aca5ae2b18dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 17:39:54 2016 +0900 explorer: Don't bother with taskbar buttons when the taskbar is not visible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 94ba74b..623743f 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -483,6 +483,8 @@ static void sync_taskbar_buttons(void) int right = tray_width - nb_displayed * icon_cx; HWND foreground = GetAncestor( GetForegroundWindow(), GA_ROOTOWNER ); + if (!IsWindowVisible( tray_window )) return; + LIST_FOR_EACH_ENTRY( win, &taskbar_buttons, struct taskbar_button, entry ) { if (!win->hwnd) /* start button */ @@ -597,6 +599,8 @@ static void add_taskbar_button( HWND hwnd ) { struct taskbar_button *win; + if (hide_systray) return; + /* ignore our own windows */ if (hwnd) { @@ -730,9 +734,9 @@ static void do_show_systray(void) tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, size.cy ); start_button_width = size.cx; - sync_taskbar_buttons(); SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); + sync_taskbar_buttons(); } static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Alexandre Julliard : user32: Notify explorer when the active window changes.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 2e4f89edf1e394678b000d8d1c355422192e8267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4f89edf1e394678b000d8d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 14:05:38 2016 +0900 user32: Notify explorer when the active window changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index c47a82d..f1c8831 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -154,6 +154,8 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); + if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) + PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); } /* now change focus if necessary */

1 0

Michael Stefaniuc : comdlg32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: db134bbd5a032f568a925b89f5715bf5e5d11387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db134bbd5a032f568a925b89f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:39:39 2016 +0200 comdlg32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 56 +++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0b55c5c..0fe2d84 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -422,63 +422,56 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L case cmb1: case edt1: ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0), - "control id %03x should have sized horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have sized horizontally and moved vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* sized horizontal and vertical */ case lst2: ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 10), - "control id %03x should have sized horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have sized horizontally and vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* moved horizontal and vertical */ case IDCANCEL: case pshHelp: ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0), - "control id %03x should have moved horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have moved horizontally and vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* moved vertically */ case chx1: case stc2: case stc3: ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0), - "control id %03x should have moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have moved vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* resized horizontal */ case cmb2: /* aka IDC_LOOKIN */ ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)|| TESTRECTS( ctrlrcs[i], rc, 0, 0, 0, 0), /* Vista and higher */ - "control id %03x should have resized horizontally, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have resized horizontally, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* non moving non sizing controls */ case stc4: ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), - "control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x was moved/resized, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* todo_wine: non moving non sizing controls */ case lst1: todo_wine ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), - "control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x was moved/resized, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* don't test: id is not unique */ case IDOK: @@ -487,10 +480,9 @@ todo_wine case -1: break; default: - trace("untested control id %03x before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + trace("untested control id %03x before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); #undef TESTRECTS #undef MAXNRCTRLS }

1 0

Michael Stefaniuc : d3d10core/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 7c0d79770d914f590bc8ec8ba193b88268a948c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0d79770d914f590bc8ec8ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:41:32 2016 +0200 d3d10core/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 771dc39..dd97781 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3143,8 +3143,7 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); @@ -3542,8 +3541,7 @@ float4 main(float4 color : COLOR) : SV_TARGET && tmp_rect[i].top == i * 2 && tmp_rect[i].right == i + 1 && tmp_rect[i].bottom == (i + 1) * 2, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, @@ -3680,12 +3678,12 @@ float4 main(float4 color : COLOR) : SV_TARGET { if (!i) todo_wine ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); else ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(!count, "Got unexpected viewport count %u.\n", count);

1 0

Michael Stefaniuc : d3d9/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: bcd38dec15eab510b482e9213cab6fc8ecda9b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd38dec15eab510b482e9213… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:44:30 2016 +0200 d3d9/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 27 ++++------ dlls/d3d9/tests/device.c | 126 +++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd38dec15eab510b482e…

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating render target views.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: e9ac14596b6d9ec6dd40bcc9a9977362d19f4717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ac14596b6d9ec6dd40bcc9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:00 2016 +0200 d3d10core/tests: Add more tests for creating render target views. 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/d3d10core/tests/device.c | 266 ++++++++++++++++++++++++++++++++---------- 1 file changed, 203 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9ac14596b6d9ec6dd40b…

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating depth stencil views.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: cd0a3c23a12031e81e6e8b0de1f3d009ce6fcd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0a3c23a12031e81e6e8b0de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:01 2016 +0200 d3d10core/tests: Add more tests for creating depth stencil views. 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/d3d10core/tests/device.c | 165 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 135 insertions(+), 30 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8c47f42..b2a75cd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -267,6 +267,71 @@ static void check_rtv_desc_(unsigned int line, const D3D10_RENDER_TARGET_VIEW_DE } } +struct dsv_desc +{ + DXGI_FORMAT format; + D3D10_DSV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; +}; + +static void get_dsv_desc(D3D10_DEPTH_STENCIL_VIEW_DESC *d3d10_desc, const struct dsv_desc *desc) +{ + d3d10_desc->Format = desc->format; + d3d10_desc->ViewDimension = desc->dimension; + if (desc->dimension == D3D10_DSV_DIMENSION_TEXTURE2D) + { + U(*d3d10_desc).Texture2D.MipSlice = desc->miplevel_idx; + } + else if (desc->dimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY) + { + U(*d3d10_desc).Texture2DArray.MipSlice = desc->miplevel_idx; + U(*d3d10_desc).Texture2DArray.FirstArraySlice = desc->layer_idx; + U(*d3d10_desc).Texture2DArray.ArraySize = desc->layer_count; + } + else + { + trace("Unhandled view dimension %#x.\n", desc->dimension); + } +} + +#define check_dsv_desc(a, b) check_dsv_desc_(__LINE__, a, b) +static void check_dsv_desc_(unsigned int line, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, + const struct dsv_desc *expected_desc) +{ + ok_(__FILE__, line)(desc->Format == expected_desc->format, + "Got format %#x, expected %#x.\n", desc->Format, expected_desc->format); + ok_(__FILE__, line)(desc->ViewDimension == expected_desc->dimension, + "Got view dimension %#x, expected %#x.\n", desc->ViewDimension, expected_desc->dimension); + + if (desc->ViewDimension != expected_desc->dimension) + return; + + if (desc->ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D) + { + ok_(__FILE__, line)(U(*desc).Texture2D.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2D.MipSlice, expected_desc->miplevel_idx); + } + else if (desc->ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY) + { + ok_(__FILE__, line)(U(*desc).Texture2DArray.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2DArray.MipSlice, expected_desc->miplevel_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.FirstArraySlice == expected_desc->layer_idx, + "Got FirstArraySlice %u, expected %u.\n", + U(*desc).Texture2DArray.FirstArraySlice, expected_desc->layer_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.ArraySize == expected_desc->layer_count, + "Got ArraySize %u, expected %u.\n", + U(*desc).Texture2DArray.ArraySize, expected_desc->layer_count); + } + else + { + trace("Unhandled view dimension %#x.\n", desc->ViewDimension); + } +} + #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) static ID3D10Buffer *create_buffer_(unsigned int line, ID3D10Device *device, unsigned int bind_flags, unsigned int size, const void *data) @@ -1416,8 +1481,48 @@ static void test_create_depthstencil_view(void) ID3D10DepthStencilView *dsview; ID3D10Device *device, *tmp; ID3D10Texture2D *texture; + IUnknown *iface; + unsigned int i; HRESULT hr; + static const struct + { + struct + { + unsigned int miplevel_count; + unsigned int array_size; + DXGI_FORMAT format; + } texture; + struct dsv_desc dsv_desc; + struct dsv_desc expected_dsv_desc; + } + tests[] = + { +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN +#define D24_S8 DXGI_FORMAT_D24_UNORM_S8_UINT +#define TEX_2D D3D10_DSV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D10_DSV_DIMENSION_TEXTURE2DARRAY + {{ 1, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 1}, {D24_S8, TEX_2D, 1}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 9}, {D24_S8, TEX_2D, 9}}, + {{ 1, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 1, 0, -1}, {D24_S8, TEX_2D_ARRAY, 1, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 3, 0, -1}, {D24_S8, TEX_2D_ARRAY, 3, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 5, 0, -1}, {D24_S8, TEX_2D_ARRAY, 5, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 9, 0, -1}, {D24_S8, TEX_2D_ARRAY, 9, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, -1}, {D24_S8, TEX_2D_ARRAY, 0, 1, 3}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 2, -1}, {D24_S8, TEX_2D_ARRAY, 0, 2, 2}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 3, -1}, {D24_S8, TEX_2D_ARRAY, 0, 3, 1}}, +#undef FMT_UNKNOWN +#undef D24_S8 +#undef TEX_2D +#undef TEX_2D_ARRAY + }; + if (!(device = create_device())) { skip("Failed to create device, skipping tests.\n"); @@ -1460,44 +1565,44 @@ static void test_create_depthstencil_view(void) ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); - dsv_desc.Format = DXGI_FORMAT_UNKNOWN; - - hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); - ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + D3D10_DEPTH_STENCIL_VIEW_DESC *current_desc; - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + texture_desc.MipLevels = tests[i].texture.miplevel_count; + texture_desc.ArraySize = tests[i].texture.array_size; + texture_desc.Format = tests[i].texture.format; - ID3D10DepthStencilView_Release(dsview); - ID3D10Texture2D_Release(texture); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - texture_desc.ArraySize = 4; + if (tests[i].dsv_desc.dimension == D3D10_DSV_DIMENSION_UNKNOWN) + { + current_desc = NULL; + } + else + { + current_desc = &dsv_desc; + get_dsv_desc(current_desc, &tests[i].dsv_desc); + } - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, current_desc, &dsview); + ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); - hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); - ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Test %u: Depth stencil view should implement ID3D11DepthStencilView.\n", i); + if (SUCCEEDED(hr)) IUnknown_Release(iface); - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", - U(dsv_desc).Texture2DArray.MipSlice); - ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", - U(dsv_desc).Texture2DArray.FirstArraySlice); - ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, - "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + check_dsv_desc(&dsv_desc, &tests[i].expected_dsv_desc); - ID3D10DepthStencilView_Release(dsview); - ID3D10Texture2D_Release(texture); + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); + } refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11/tests: Add test for texturing with custom shader resource views.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 932964d9cea92a4e5ac83251d8dac44dc174032b URL: http://source.winehq.org/git/wine.git/?a=commit;h=932964d9cea92a4e5ac83251d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:02 2016 +0200 d3d11/tests: Add test for texturing with custom shader resource views. 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/d3d11/tests/d3d11.c | 151 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 88bf8a8..5928c67 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4204,11 +4204,13 @@ static void test_texture(void) D3D11_SUBRESOURCE_DATA data[3]; }; + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; struct d3d11_test_context test_context; const struct texture *current_texture; D3D11_TEXTURE2D_DESC texture_desc; D3D11_SAMPLER_DESC sampler_desc; const struct shader *current_ps; + D3D_FEATURE_LEVEL feature_level; ID3D11ShaderResourceView *srv; ID3D11DeviceContext *context; ID3D11SamplerState *sampler; @@ -4541,6 +4543,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture srgb_typeless = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_TYPELESS, + {{srgb_data, 4 * sizeof(*srgb_data)}}}; static const struct texture a8_texture = {4, 4, 1, 1, DXGI_FORMAT_A8_UNORM, {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; @@ -4551,6 +4555,9 @@ static void test_texture(void) static const struct texture bc1_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; + static const struct texture bc1_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC1_TYPELESS, {{bc1_data, 2 * 8}}}; + static const struct texture bc2_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC2_TYPELESS, {{bc2_data, 2 * 16}}}; + static const struct texture bc3_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC3_TYPELESS, {{bc3_data, 2 * 16}}}; static const struct texture sint8_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_SINT, {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; static const struct texture uint8_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UINT, @@ -4644,7 +4651,7 @@ static void test_texture(void) static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - static const struct test + static const struct texture_test { const struct shader *ps; const struct texture *texture; @@ -4655,7 +4662,7 @@ static void test_texture(void) float ps_constant; const DWORD *expected_colors; } - tests[] = + texture_tests[] = { #define POINT D3D11_FILTER_MIN_MAG_MIP_POINT #define POINT_LINEAR D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR @@ -4759,12 +4766,58 @@ static void test_texture(void) #undef POINT_LINEAR #undef MIP_MAX }; + static const struct srv_test + { + const struct shader *ps; + const struct texture *texture; + struct srv_desc srv_desc; + float ps_constant; + const DWORD *expected_colors; + } + srv_tests[] = + { +#define TEX_2D D3D11_SRV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_SRV_DIMENSION_TEXTURE2DARRAY +#define BC1_UNORM DXGI_FORMAT_BC1_UNORM +#define BC1_UNORM_SRGB DXGI_FORMAT_BC1_UNORM_SRGB +#define BC2_UNORM DXGI_FORMAT_BC2_UNORM +#define BC2_UNORM_SRGB DXGI_FORMAT_BC2_UNORM_SRGB +#define BC3_UNORM DXGI_FORMAT_BC3_UNORM +#define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB +#define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN + {&ps_sample, &bc1_typeless, {BC1_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc1_typeless, {BC1_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc2_typeless, {BC2_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc2_typeless, {BC2_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc3_typeless, {BC3_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc3_typeless, {BC3_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, + {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, + {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 2, 1}, 0.0f, blue_colors}, +#undef TEX_2D +#undef TEX_2D_ARRAY +#undef BC1_UNORM +#undef BC1_UNORM_SRGB +#undef BC2_UNORM +#undef BC2_UNORM_SRGB +#undef BC3_UNORM +#undef BC3_UNORM_SRGB +#undef R8G8B8A8_UNORM_SRGB +#undef R8G8B8A8_UNORM +#undef FMT_UNKNOWN + }; if (!init_test_context(&test_context, NULL)) return; device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(ps_constant), NULL); @@ -4797,9 +4850,9 @@ static void test_texture(void) texture = NULL; current_ps = NULL; current_texture = NULL; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < sizeof(texture_tests) / sizeof(*texture_tests); ++i) { - const struct test *test = &tests[i]; + const struct texture_test *test = &texture_tests[i]; if (current_ps != test->ps) { @@ -4891,6 +4944,96 @@ static void test_texture(void) ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1) + { + win_skip("SRV tests are broken on WARP.\n"); + ID3D11Buffer_Release(cb); + release_test_context(&test_context); + return; + } + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D11_FLOAT32_MAX; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + + ps = NULL; + srv = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < sizeof(srv_tests) / sizeof(*srv_tests); ++i) + { + const struct srv_test *test = &srv_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D11PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D11Device_CreatePixelShader(device, current_ps->code, current_ps->size, NULL, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D11Texture2D_Release(texture); + + current_texture = test->texture; + + texture_desc.Width = current_texture->width; + texture_desc.Height = current_texture->height; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + } + + if (srv) + ID3D11ShaderResourceView_Release(srv); + + get_srv_desc(&srv_desc, &test->srv_desc); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + + ps_constant.x = test->ps_constant; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); + ok(compare_color(color, test->expected_colors[y * 4 + x], 1), + "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + } + } + release_texture_readback(&rb); + } + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11ShaderResourceView_Release(srv); + ID3D11SamplerState_Release(sampler); + ID3D11Buffer_Release(cb); release_test_context(&test_context); }

1 0