February 2021 - Wine-devel - list.winehq.org

[PATCH v6] user32: Send a WM_ACTIVATE message after restoring a minimized top level window.
by Zhiyi Zhang 10 Feb '21

10 Feb '21

The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v6: Use GetAncestor(hwnd, GA_ROOT) == hwnd to check if a window is a top level window because there might be top level windows with WS_CHILD set. dlls/user32/tests/msg.c | 247 +++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 +- 2 files changed, 253 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2ce2b3c6e54..11fb764e6cd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -883,6 +883,145 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ +static const struct message WmShowRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, WA_ACTIVE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to a minimized window */ +static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + /* Following optional messages are on XP/2003 */ + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam|optional, WA_ACTIVE }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message on XP even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4677,7 +4816,7 @@ static void test_scroll_messages(HWND hwnd) static void test_showwindow(void) { - HWND hwnd, hchild; + HWND hwnd, hwnd2, hchild; RECT rc; hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, @@ -4814,6 +4953,68 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized window. + */ + hwnd = CreateWindowA("TestWindowClass", "window1", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + hwnd2 = CreateWindowA("static", "window2", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): minimized overlapped", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); + + /* Test 6: + * 1. Restoring a minimized but active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): active minimized overlapped", TRUE); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15527,6 +15728,42 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15588,7 +15825,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 072b574f3aa..c6f806f7beb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1179,7 +1179,13 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ + if (GetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.27.0

2 1

[PATCH] ntdll: Test ImageContainsCode before calling convert_to_pe64
by David Koolhoven 10 Feb '21

10 Feb '21

6.0 would not call convert_to_pe64 if the image did not have a pointer to ImageContainsCode, and would instead return TRUE. This restores a similar outcome. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50647 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/ntdll/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6b76c6f406e..7195f4f7af6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2324,7 +2324,10 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; #ifdef _WIN64 - if (!status && !convert_to_pe64( module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; + if (!status && + image_info->ImageContainsCode && + !convert_to_pe64( module, image_info )) + status = STATUS_INVALID_IMAGE_FORMAT; #endif if (!status) status = build_module( load_path, nt_name, &module, image_info, id, flags, pwm ); if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); -- 2.19.1

1 0

[PATCH 8/8] wined3d: Construct a separate source box in wined3d_device_copy_resource().
by Henri Verbeet 10 Feb '21

10 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 6 ++---- dlls/wined3d/device.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 21543cd224c4..fddb7bfd218e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28205,10 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k]; else expected = initial_data[k]; - todo_wine_if(supported && (dst_format->block_edge != 1 - || k >= src_format->block_size / (sizeof(colour)))) - ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", - src_format->id, dst_format->id, colour, k, expected); + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); if (colour != expected) break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df0f9721e4ab..a400221ee30c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4544,7 +4544,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, unsigned int src_row_block_count, dst_row_block_count; struct wined3d_texture *dst_texture, *src_texture; unsigned int src_row_count, dst_row_count; - struct wined3d_box box; + struct wined3d_box src_box, dst_box; unsigned int i, j; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -4591,9 +4591,9 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { - wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, - src_resource, 0, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); + wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &src_box, + src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4611,13 +4611,14 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, for (i = 0; i < dst_texture->level_count; ++i) { - wined3d_texture_get_level_box(dst_texture, i, &box); + wined3d_texture_get_level_box(src_texture, i, &src_box); + wined3d_texture_get_level_box(dst_texture, i, &dst_box); for (j = 0; j < dst_texture->layer_count; ++j) { unsigned int idx = j * dst_texture->level_count + i; - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, - src_resource, idx, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &dst_box, + src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } } -- 2.20.1

2 1

[PATCH 7/8] wined3d: Compare resource sizes in blocks in wined3d_device_copy_resource().
by Henri Verbeet 10 Feb '21

10 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/device.c | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43bdec02c0d1..21543cd224c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28205,7 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k]; else expected = initial_data[k]; - todo_wine_if(supported) + todo_wine_if(supported && (dst_format->block_edge != 1 + || k >= src_format->block_size / (sizeof(colour)))) ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", src_format->id, dst_format->id, colour, k, expected); if (colour != expected) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 25ef0d1c0169..df0f9721e4ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4541,7 +4541,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { + unsigned int src_row_block_count, dst_row_block_count; struct wined3d_texture *dst_texture, *src_texture; + unsigned int src_row_count, dst_row_count; struct wined3d_box box; unsigned int i, j; @@ -4561,16 +4563,6 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->width != dst_resource->width - || src_resource->height != dst_resource->height - || src_resource->depth != dst_resource->depth) - { - WARN("Resource dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", - dst_resource->width, dst_resource->height, dst_resource->depth, - src_resource->width, src_resource->height, src_resource->depth); - return; - } - if (!resources_format_compatible(src_resource, dst_resource)) { WARN("Resource formats %s and %s are incompatible.\n", @@ -4579,6 +4571,24 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } + src_row_block_count = (src_resource->width + (src_resource->format->block_width - 1)) + / src_resource->format->block_width; + dst_row_block_count = (dst_resource->width + (dst_resource->format->block_width - 1)) + / dst_resource->format->block_width; + src_row_count = (src_resource->height + (src_resource->format->block_height - 1)) + / src_resource->format->block_height; + dst_row_count = (dst_resource->height + (dst_resource->format->block_height - 1)) + / dst_resource->format->block_height; + + if (src_row_block_count != dst_row_block_count || src_row_count != dst_row_count + || src_resource->depth != dst_resource->depth) + { + WARN("Resource block dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", + dst_row_block_count, dst_row_count, dst_resource->depth, + src_row_block_count, src_row_count, src_resource->depth); + return; + } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); -- 2.20.1

2 1

[PATCH 4/8] d3d10core/tests: Add format compatibility tests for compressed formats.
by Henri Verbeet 10 Feb '21

10 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 205 +++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5edd2fc1fbb8..f21431b22434 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16129,6 +16129,210 @@ static void test_format_compatibility(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_compressed_format_compatibility(void) +{ + const struct format_info *src_format, *dst_format; + unsigned int row_block_count, row_count, i, j, k; + ID3D10Texture2D *src_texture, *dst_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + unsigned int block_idx, y; + DWORD colour, expected; + ID3D10Device *device; + const BYTE *row; + ULONG refcount; + D3D10_BOX box; + HRESULT hr; + + static const struct format_info + { + DXGI_FORMAT id; + size_t block_size; + size_t block_edge; + } + formats[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_UINT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_SINT, 16, 1}, + + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UINT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SINT, 8, 1}, + + {DXGI_FORMAT_R32G32_TYPELESS, 8, 1}, + {DXGI_FORMAT_R32G32_FLOAT, 8, 1}, + {DXGI_FORMAT_R32G32_UINT, 8, 1}, + {DXGI_FORMAT_R32G32_SINT, 8, 1}, + + {DXGI_FORMAT_R32_TYPELESS, 4, 1}, + {DXGI_FORMAT_R32_FLOAT, 4, 1}, + {DXGI_FORMAT_R32_UINT, 4, 1}, + {DXGI_FORMAT_R32_SINT, 4, 1}, + + {DXGI_FORMAT_R32G8X24_TYPELESS, 8, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, 4, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 4, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, 2, 1}, + {DXGI_FORMAT_R16_TYPELESS, 2, 1}, + {DXGI_FORMAT_R8_TYPELESS, 1, 1}, + + {DXGI_FORMAT_BC1_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC1_UNORM, 8, 4}, + {DXGI_FORMAT_BC1_UNORM_SRGB, 8, 4}, + + {DXGI_FORMAT_BC2_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC2_UNORM, 16, 4}, + {DXGI_FORMAT_BC2_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC3_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC3_UNORM, 16, 4}, + {DXGI_FORMAT_BC3_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC4_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC4_UNORM, 8, 4}, + {DXGI_FORMAT_BC4_SNORM, 8, 4}, + + {DXGI_FORMAT_BC5_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC5_UNORM, 16, 4}, + {DXGI_FORMAT_BC5_SNORM, 16, 4}, + }; + + static const DWORD initial_data[64] = {0}; + static const DWORD texture_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + row_block_count = 4; + + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.SysMemSlicePitch = 0; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + src_format = &formats[i]; + row_count = sizeof(texture_data) / (row_block_count * src_format->block_size); + texture_desc.Width = row_block_count * src_format->block_edge; + texture_desc.Height = row_count * src_format->block_edge; + texture_desc.Format = src_format->id; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = row_block_count * src_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(hr == S_OK, "Source format %#x: Got unexpected hr %#x.\n", src_format->id, hr); + + for (j = 0; j < ARRAY_SIZE(formats); ++j) + { + dst_format = &formats[j]; + + if ((src_format->block_edge == 1 && dst_format->block_edge == 1) + || (src_format->block_edge != 1 && dst_format->block_edge != 1)) + continue; + + row_count = sizeof(initial_data) / (row_block_count * dst_format->block_size); + texture_desc.Width = row_block_count * dst_format->block_edge; + texture_desc.Height = row_count * dst_format->block_edge; + texture_desc.Format = dst_format->id; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = row_block_count * dst_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(hr == S_OK, "%#x -> %#x: Got unexpected hr %#x.\n", src_format->id, dst_format->id, hr); + + set_box(&box, 0, 0, 0, src_format->block_edge, src_format->block_edge, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + dst_format->block_edge, dst_format->block_edge, 0, (ID3D10Resource *)src_texture, 0, &box); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + } + + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void check_clip_distance(struct d3d10core_test_context *test_context, ID3D10Buffer *vb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -18633,6 +18837,7 @@ START_TEST(d3d10core) queue_test(test_stream_output_resume); queue_test(test_depth_bias); queue_test(test_format_compatibility); + queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); queue_test(test_generate_mips); -- 2.20.1

2 1

[PATCH 3/8] d3d11/tests: Add format compatibility tests for compressed formats.
by Henri Verbeet 10 Feb '21

10 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 271 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff734ba453c8..d1b09baa641f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27958,6 +27958,275 @@ static void test_format_compatibility(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature_level) +{ + const struct format_info *src_format, *dst_format; + unsigned int row_block_count, row_count, i, j, k; + ID3D11Texture2D *src_texture, *dst_texture; + BOOL supported, broken_dst_offset = FALSE; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + unsigned int block_idx, x, y; + struct resource_readback rb; + DWORD colour, expected; + ID3D11Device *device; + UINT format_support; + const BYTE *row; + ULONG refcount; + D3D11_BOX box; + HRESULT hr; + const struct device_desc device_desc = + { + .feature_level = &feature_level, + }; + + static const struct format_info + { + DXGI_FORMAT id; + size_t block_size; + size_t block_edge; + BOOL supported; + BOOL skip_if_broken; + } + formats[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_UINT, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_SINT, 16, 1, TRUE}, + + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_UINT, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_SNORM, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_SINT, 8, 1, TRUE}, + + {DXGI_FORMAT_R32G32_TYPELESS, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_UINT, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_SINT, 8, 1, TRUE}, + + {DXGI_FORMAT_R32_TYPELESS, 4, 1, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 4, 1, TRUE}, + {DXGI_FORMAT_R32_UINT, 4, 1, TRUE}, + {DXGI_FORMAT_R32_SINT, 4, 1, TRUE}, + + {DXGI_FORMAT_R32G8X24_TYPELESS, 8, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, 4, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 4, 1}, + {DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, 2, 1}, + {DXGI_FORMAT_R16_TYPELESS, 2, 1}, + {DXGI_FORMAT_R8_TYPELESS, 1, 1}, + + {DXGI_FORMAT_BC1_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC1_UNORM, 8, 4}, + {DXGI_FORMAT_BC1_UNORM_SRGB, 8, 4}, + + {DXGI_FORMAT_BC2_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC2_UNORM, 16, 4}, + {DXGI_FORMAT_BC2_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC3_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC3_UNORM, 16, 4}, + {DXGI_FORMAT_BC3_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC4_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC4_UNORM, 8, 4}, + {DXGI_FORMAT_BC4_SNORM, 8, 4}, + + {DXGI_FORMAT_BC5_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC5_UNORM, 16, 4}, + {DXGI_FORMAT_BC5_SNORM, 16, 4}, + + {DXGI_FORMAT_BC6H_TYPELESS, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC6H_UF16, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC6H_SF16, 16, 4, FALSE, TRUE}, + + {DXGI_FORMAT_BC7_TYPELESS, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC7_UNORM, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC7_UNORM_SRGB, 16, 4, FALSE, TRUE}, + }; + + static const DWORD initial_data[64] = {0}; + static const DWORD texture_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + }; + + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + return; + } + ID3D11Device_GetImmediateContext(device, &context); + + row_block_count = 4; + + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.SysMemSlicePitch = 0; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + src_format = &formats[i]; + row_count = sizeof(texture_data) / (row_block_count * src_format->block_size); + texture_desc.Width = row_block_count * src_format->block_edge; + texture_desc.Height = row_count * src_format->block_edge; + texture_desc.Format = src_format->id; + texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = row_block_count * src_format->block_size; + + hr = ID3D11Device_CheckFormatSupport(device, src_format->id, &format_support); + if (hr == E_FAIL || !(format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) + continue; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(hr == S_OK, "Source format %#x: Got unexpected hr %#x.\n", src_format->id, hr); + + for (j = 0; j < ARRAY_SIZE(formats); ++j) + { + dst_format = &formats[j]; + + if ((src_format->block_edge == 1 && dst_format->block_edge == 1) + || (src_format->block_edge != 1 && dst_format->block_edge != 1)) + continue; + + hr = ID3D11Device_CheckFormatSupport(device, dst_format->id, &format_support); + if (hr == E_FAIL || !(format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) + continue; + + supported = ((src_format->block_edge != 1 && dst_format->supported) + || (src_format->supported && dst_format->block_edge != 1)) + && src_format->block_size == dst_format->block_size + && feature_level >= D3D_FEATURE_LEVEL_10_1; + + /* These cause the device to be removed on some versions of Windows. */ + if (supported && broken_dst_offset && (src_format->skip_if_broken || dst_format->skip_if_broken)) + { + win_skip("Skipping %#x -> %#x tests because of broken destination offset.\n", + src_format->id, dst_format->id); + continue; + } + + row_count = sizeof(initial_data) / (row_block_count * dst_format->block_size); + texture_desc.Width = row_block_count * dst_format->block_edge; + texture_desc.Height = row_count * dst_format->block_edge; + texture_desc.Format = dst_format->id; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = row_block_count * dst_format->block_size; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(hr == S_OK, "%#x -> %#x: Got unexpected hr %#x.\n", src_format->id, dst_format->id, hr); + + if (supported && broken_dst_offset) + { + win_skip("Skipping %#x -> %#x CopySubresourceRegion() test because of broken destination offset.\n", + src_format->id, dst_format->id); + } + else + { + set_box(&box, 0, 0, 0, src_format->block_edge, src_format->block_edge, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + dst_format->block_edge, dst_format->block_edge, 0, (ID3D11Resource *)src_texture, 0, &box); + get_texture_readback(dst_texture, 0, &rb); + colour = get_readback_color(&rb, 0, 0, 0); + if (supported && colour == texture_data[0]) + { + win_skip("Detected broken destination offset for %#x -> %#x copy.\n", + src_format->id, dst_format->id); + broken_dst_offset = TRUE; + } + for (k = 0; k < ARRAY_SIZE(texture_data) && (!supported || !broken_dst_offset); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + x = block_idx % row_block_count; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + if (supported && x == 1 && y == 1) + expected = texture_data[k - ((row_block_count + 1) * dst_format->block_size) / sizeof(colour)]; + else + expected = initial_data[k]; + todo_wine_if(supported && x == 1 && y == 1) + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + } + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_texture, (ID3D11Resource *)src_texture); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + if (supported) + expected = texture_data[k]; + else + expected = initial_data[k]; + todo_wine_if(supported) + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D11Texture2D_Release(dst_texture); + } + + ID3D11Texture2D_Release(src_texture); + } + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void check_clip_distance(struct d3d11_test_context *test_context, ID3D11Buffer *vb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -31918,6 +32187,8 @@ START_TEST(d3d11) queue_test(test_early_depth_stencil); queue_test(test_conservative_depth_output); queue_test(test_format_compatibility); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); queue_test(test_generate_mips); -- 2.20.1

2 1

[tools] testbot/LogUtils: Add support for winedbg's unhandled exception lines.
by Francois Gouget 10 Feb '21

10 Feb '21

They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite tests: WTBS Simple test crash (serialui:confdlg). WTBS Crash in a child process (kernel32:toolhelp). testbot/lib/WineTestBot/LogUtils.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 69299da66..9164b47ff 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -631,6 +631,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif ($Line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) -- 2.20.1

1 0

[tools] testbot/reporttest: Add a test for winedbg's unhandled exception lines.
by Francois Gouget 10 Feb '21

10 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- We get these when running the tests in Wine. testbot/src/reporttest/report.template | 9 +++++++-- testbot/src/reporttest/report.testwtbs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 14d2cf6b7..8ff6e1466 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -314,7 +314,7 @@ advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - ----- WTBS Simple test crash ------ A test unit with a crash +----- 1/2: A test unit with a wine/test.h "unhandled exception" line ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s @@ -515,7 +515,12 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -stub comctl32:tab +comctl32:tab start dlls/comctl32/tests/tab.c - +----- WTBS Simple test crash +----- 2/2: A test unit with a winedbg "unhandled exception" line +----- Expected assessement: Crash +Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). +comctl32:tab:07b0 done (-1073741819) in 0s stub comctl32:taskdialog diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 49ef2c0f5..b444b6931 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 40 +p tests.TestFailures 41 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -41,6 +41,7 @@ n 0 1234:rebar: unhandled exception c0000005 at 0040167C n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! -- 2.20.1

1 0

[PATCH 1/8] d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Henri Verbeet 10 Feb '21

10 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a1a215858a2c..ff734ba453c8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27846,6 +27846,13 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, @@ -27879,6 +27886,7 @@ static void test_format_compatibility(void) for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int x, y, texel_dwords; + BOOL broken = FALSE; D3D11_BOX box; texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); @@ -27906,15 +27914,23 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + colour = get_readback_color(&rb, 0, 0, 0); + if (test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && colour == bitmap_data[0]) + { + win_skip("Broken destination offset for %#x -> %#x copy.\n", + test_data[i].src_format, test_data[i].dst_format); + broken = TRUE; + } + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !broken; ++j) { x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -27927,8 +27943,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); -- 2.20.1

2 1

[PATCH 6/8] wined3d: Use the format block dimensions to construct the destination box for sub-resource region copies.
by Henri Verbeet 09 Feb '21

09 Feb '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 5 ++--- dlls/wined3d/device.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b690f94af926..43bdec02c0d1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28182,9 +28182,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k - ((row_block_count + 1) * dst_format->block_size) / sizeof(colour)]; else expected = initial_data[k]; - todo_wine_if(supported && x == 1 && y == 1) - ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", - src_format->id, dst_format->id, colour, k, expected); + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); if (colour != expected) break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac8d5d78b61d..25ef0d1c0169 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4694,6 +4694,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev struct wined3d_texture *dst_texture = texture_from_resource(dst_resource); struct wined3d_texture *src_texture = texture_from_resource(src_resource); unsigned int src_level = src_sub_resource_idx % src_texture->level_count; + unsigned int src_row_block_count, src_row_count; if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) { @@ -4741,8 +4742,23 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), - dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + if (src_resource->format->block_width == dst_resource->format->block_width + && src_resource->format->block_height == dst_resource->format->block_height) + { + wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), + dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + } + else + { + src_row_block_count = (src_box->right - src_box->left + src_resource->format->block_width - 1) + / src_resource->format->block_width; + src_row_count = (src_box->bottom - src_box->top + src_resource->format->block_height - 1) + / src_resource->format->block_height; + wined3d_box_set(&dst_box, dst_x, dst_y, + dst_x + (src_row_block_count * dst_resource->format->block_width), + dst_y + (src_row_count * dst_resource->format->block_height), + dst_z, dst_z + (src_box->back - src_box->front)); + } if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) { -- 2.20.1

1 0