wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Alexandre Julliard : uiautomationcore: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: c7070513d4fb14268c55a5b520e8b1f4fe2e4538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7070513d4fb14268c55a5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:58:56 2021 +0100 uiautomationcore: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 2 +- dlls/uiautomationcore/uia_main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index b6edec5f6a9..5c4acb232a4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,7 +1,7 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ uia_main.c diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 77460aa174c..42014af6035 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -22,21 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv) -{ - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); - - switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */

1 0

Torge Matthies : server: Fix page size calculation in write access check.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 102a0b189bafec7f736be376d121801aa473fe48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=102a0b189bafec7f736be376… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Wed Feb 24 20:53:33 2021 +0100 server: Fix page size calculation in write access check. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 49347791d8c..88c176d2d0c 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -410,10 +410,10 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t } /* make sure we can write to the whole address range */ -/* len is the total size (in ints) */ +/* len is the total size (in longs) */ static int check_process_write_access( struct thread *thread, long *addr, data_size_t len ) { - int page = get_page_size() / sizeof(int); + int page = get_page_size() / sizeof(long); for (;;) {

1 0

Hugh McMaster : regedit/tests: Remove elevated user checks from the Windows 3.1 test sequences.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: d1fbb6b99937c226031b7094ce3d60b920d003fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1fbb6b99937c226031b7094… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 18:26:15 2021 +1100 regedit/tests: Remove elevated user checks from the Windows 3.1 test sequences. The tests only run if regedit.exe is started with elevated privileges. This is determined when the test suite is invoked. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 8c6e71907c0..0f58b6d85b8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1119,17 +1119,9 @@ static void test_basic_import_31(void) { HKEY hkey; DWORD dispos; - LONG lr; - /* Check if regedit.exe is running with elevated privileges */ - lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); - if (lr == ERROR_ACCESS_DENIED) - { - win_skip("regedit.exe is not running with elevated privileges; " - "skipping Windows 3.1 import tests\n"); - return; - } + RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (dispos == REG_OPENED_EXISTING_KEY) delete_value(hkey, NULL); @@ -2226,17 +2218,13 @@ static void test_invalid_import_unicode(void) static void test_invalid_import_31(void) { HKEY hkey; - LONG lr; + DWORD dispos; - /* Check if regedit.exe is running with elevated privileges */ - lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ, NULL, &hkey, NULL); - if (lr == ERROR_ACCESS_DENIED) - { - win_skip("regedit.exe is not running with elevated privileges; " - "skipping Windows 3.1 invalid import tests\n"); - return; - } + RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); + + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); /* Test character validity at the start of the line */ exec_import_str("REGEDIT\r\n"

1 0

Hugh McMaster : regedit/tests: Comprehensively check for elevated privileges before starting tests.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: bedd54c968d3bb3e17c014c93ef38e8b0a7eb042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedd54c968d3bb3e17c014c9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 18:26:14 2021 +1100 regedit/tests: Comprehensively check for elevated privileges before starting tests. Calls to regedit.exe on user accounts with standard privileges trigger a UAC prompt. Not responding to the prompt eventually causes a test timeout, so use registry API calls to determine if the tests are running with elevated privileges. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f9c12afb880..8c6e71907c0 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3741,16 +3741,27 @@ static void test_export(void) START_TEST(regedit) { - if(!exec_import_str("REGEDIT4\r\n\r\n")){ - win_skip("regedit not available, skipping regedit tests\n"); - return; - } + HKEY hkey; + LONG err; - if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED) + /* Check if regedit.exe is running with elevated privileges */ + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + if (err == ERROR_ACCESS_DENIED) { win_skip("User is a non-elevated admin; skipping regedit tests.\n"); return; } + if (err == ERROR_FILE_NOT_FOUND) + { + if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL)) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + } test_basic_import(); test_basic_import_unicode();

1 0

Zebediah Figura : quartz/vmr9: Don't release the default presenter object if it could not be created.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: bfdb2e11e7d1a49f71ac8894944192135694ad39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdb2e11e7d1a49f71ac8894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 24 16:17:54 2021 -0600 quartz/vmr9: Don't release the default presenter object if it could not be created. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 57b219a6d26..c748e674081 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1383,19 +1383,23 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface case VMR9Mode_Windowless: This->cookie = ~0; - hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); - if (SUCCEEDED(hr)) - hr = IVMRImagePresenter9_QueryInterface(This->presenter, - &IID_IVMRSurfaceAllocator9, (void **)&This->allocator); - if (FAILED(hr)) + if (FAILED(hr = VMR9DefaultAllocatorPresenterImpl_create(This, (void **)&This->presenter))) + { + ERR("Failed to create default presenter, hr %#x.\n", hr); + break; + } + + if (FAILED(hr = IVMRImagePresenter9_QueryInterface(This->presenter, + &IID_IVMRSurfaceAllocator9, (void **)&This->allocator))) { - ERR("Unable to find Presenter interface\n"); + ERR("Failed to query for IVMRSurfaceAllocator9, hr %#x.\n", hr); IVMRImagePresenter9_Release(This->presenter); This->allocator = NULL; This->presenter = NULL; + break; } - else - hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + + hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break;

1 0

Zebediah Figura : server: Always set the async result when the APC object is destroyed.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 44fc44880f2074cbc3c586ffc8dea009608b63dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44fc44880f2074cbc3c586ff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 24 16:11:35 2021 -0600 server: Always set the async result when the APC object is destroyed. This can happen if the async is terminated while there is no thread to queue the APC to (as in the relevant test), or if the client dies before getting the APC, or before transferring the APC results back to the server. This also fixes a leak of async objects present since 61abc500f5. If a process dies while accept asyncs are pending, the asyncs will be terminated but will not find a valid thread to queue the APC to, and thus async_set_result() and the completion callback are never called. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 +++--- server/thread.c | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f1feb6c53f0..0ac356c8483 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4168,9 +4168,9 @@ static void test_exit_process_async(void) size = 0xdeadbeef; ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped, 1000); ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %u\n", GetLastError()); - todo_wine ok(!size, "got size %u\n", size); - todo_wine ok(key == 123, "got key %Iu\n", key); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + ok(key == 123, "got key %Iu\n", key); CloseHandle(port); CloseHandle(server); diff --git a/server/thread.c b/server/thread.c index 3cee717e169..d544970f3c1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -490,8 +490,16 @@ static int thread_apc_signaled( struct object *obj, struct wait_queue_entry *ent static void thread_apc_destroy( struct object *obj ) { struct thread_apc *apc = (struct thread_apc *)obj; + if (apc->caller) release_object( apc->caller ); - if (apc->owner) release_object( apc->owner ); + if (apc->owner) + { + if (apc->result.type == APC_ASYNC_IO) + async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total ); + else if (apc->call.type == APC_ASYNC_IO) + async_set_result( apc->owner, apc->call.async_io.status, 0 ); + release_object( apc->owner ); + } } /* queue an async procedure call */ @@ -1649,11 +1657,6 @@ DECL_HANDLER(select) apc->result.create_thread.handle = handle; clear_error(); /* ignore errors from the above calls */ } - else if (apc->result.type == APC_ASYNC_IO) - { - if (apc->owner) - async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total ); - } wake_up( &apc->obj, 0 ); close_handle( current->process, req->prev_apc ); release_object( apc );

1 0

Zebediah Figura : kernel32/tests: Add a test for async cancellation due to process exit.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 4eddeff18a75445a8dc46829784019add34704eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eddeff18a75445a8dc46829… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 24 16:11:34 2021 -0600 kernel32/tests: Add a test for async cancellation due to process exit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 91f6df34f81..f1feb6c53f0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4116,6 +4116,66 @@ static void test_GetOverlappedResultEx(void) CloseHandle(server); } +static void child_process_exit_process_async(DWORD parent_pid, HANDLE parent_pipe) +{ + OVERLAPPED overlapped = {0}; + static char buffer[1]; + HANDLE parent, pipe; + BOOL ret; + + parent = OpenProcess(PROCESS_DUP_HANDLE, FALSE, parent_pid); + ok(!!parent, "got parent %p\n", parent); + + ret = DuplicateHandle(parent, parent_pipe, GetCurrentProcess(), &pipe, 0, + FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(ret, "got error %u\n", GetLastError()); + + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + ret = ReadFile(pipe, buffer, sizeof(buffer), NULL, &overlapped); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + + /* exit without closing the pipe handle */ +} + +static void test_exit_process_async(void) +{ + HANDLE client, server, port; + OVERLAPPED *overlapped; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + char cmdline[300]; + ULONG_PTR key; + char **argv; + DWORD size; + BOOL ret; + + winetest_get_mainargs(&argv); + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + port = CreateIoCompletionPort(client, NULL, 123, 0); + + sprintf(cmdline, "%s pipe exit_process_async %x %p", argv[0], GetCurrentProcessId(), client); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "got error %u\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + key = 0xdeadbeef; + size = 0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped, 1000); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %u\n", GetLastError()); + todo_wine ok(!size, "got size %u\n", size); + todo_wine ok(key == 123, "got key %Iu\n", key); + + CloseHandle(port); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4158,6 +4218,15 @@ START_TEST(pipe) child_process_check_session_id(id); return; } + if (!strcmp(argv[2], "exit_process_async")) + { + HANDLE handle; + DWORD pid; + sscanf(argv[3], "%x", &pid); + sscanf(argv[4], "%p", &handle); + child_process_exit_process_async(pid, handle); + return; + } } if (test_DisconnectNamedPipe()) @@ -4186,4 +4255,5 @@ START_TEST(pipe) test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); test_GetOverlappedResultEx(); + test_exit_process_async(); }

1 0

Henri Verbeet : wined3d: Load/invalidate entire views in ffp_blitter_clear_rendertargets().
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: f870cf9282333e397dcaa0d5b26218635a886478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f870cf9282333e397dcaa0d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:05 2021 +0100 wined3d: Load/invalidate entire views in ffp_blitter_clear_rendertargets(). In particular, clearing a multi-layer view affects all layers, not just the first. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/texture.c | 21 ++++++++------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a5b2620d98a..b2a2e2028f2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11250,12 +11250,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 3, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 4, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); ID3D10RenderTargetView_Release(rtv[2]); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a331baf48a0..c40593d31d8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15580,12 +15580,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 3, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 4, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); ID3D11RenderTargetView_Release(rtv[2]); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b53cd02d75c..d6408fb1c7a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5366,12 +5366,10 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (rtv && rtv->format->id != WINED3DFMT_NULL) { - struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rtv, draw_rect, rect_count ? clear_rect : NULL)) - wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); else - wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding); } } @@ -5392,18 +5390,17 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (depth_stencil) { DWORD ds_location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !is_full_clear(dsv, draw_rect, rect_count ? clear_rect : NULL)) - wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); + wined3d_rendertarget_view_load_location(dsv, context, ds_location); else - wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location); + wined3d_rendertarget_view_prepare_location(dsv, context, ds_location); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - wined3d_texture_validate_location(ds, dsv->sub_resource_idx, ds_location); - wined3d_texture_invalidate_location(ds, dsv->sub_resource_idx, ~ds_location); + wined3d_rendertarget_view_validate_location(dsv, ds_location); + wined3d_rendertarget_view_invalidate_location(dsv, ~ds_location); } } @@ -5443,7 +5440,6 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig for (i = 0; i < rt_count; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_texture *texture; if (!rtv) continue; @@ -5454,9 +5450,8 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig continue; } - texture = texture_from_resource(rtv->resource); - wined3d_texture_validate_location(texture, rtv->sub_resource_idx, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + wined3d_rendertarget_view_validate_location(rtv, rtv->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); } if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context->d3d_info, state, fb))

1 0

Henri Verbeet : wined3d: Allow layered clears.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 25e07835a22aef93415ceb0e921deac25630f987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e07835a22aef93415ceb0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:04 2021 +0100 wined3d: Allow layered clears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/device.c | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e8915aea8e7..a5b2620d98a 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -11235,12 +11235,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index efbad45b35d..a331baf48a0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15565,12 +15565,12 @@ static void test_clear_render_target_view_2d(void) get_texture_readback(texture, 0, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 1, &rb); colour = get_readback_color(&rb, 8, 8, 0); - todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); release_resource_readback(&rb); get_texture_readback(texture, 2, &rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7405a38e13b..aaf91a03947 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,12 +5093,6 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3DERR_INVALIDCALL; } - if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx)) - { - FIXME("Layered clears not implemented.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!rect) { SetRect(&r, 0, 0, view->width, view->height);

1 0

Henri Verbeet : d3d11/tests: Add a test for layered clears.
by Alexandre Julliard 25 Feb '21

25 Feb '21

Module: wine Branch: master Commit: 8c91486e75821f9bf8609b9caeb1d6a12d2fb7dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c91486e75821f9bf8609b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 24 22:57:03 2021 +0100 d3d11/tests: Add a test for layered clears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 90 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 32a9dc2e530..efbad45b35d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15434,18 +15434,20 @@ static void test_clear_render_target_view_1d(void) static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; - static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float clear_colour[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 0.5f}; + ID3D11RenderTargetView *rtv[3], *srgb_rtv; ID3D11Texture2D *texture, *srgb_texture; struct d3d11_test_context test_context; - ID3D11RenderTargetView *rtv, *srgb_rtv; D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; struct resource_readback rb; ID3D11Device *device; unsigned int i, j; + DWORD colour; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -15472,27 +15474,27 @@ static void test_clear_render_target_view_2d(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)srgb_texture, NULL, &srgb_rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, clear_colour); check_texture_color(test_context.backbuffer, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); if (!enable_debug_layer) ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); check_texture_color(srgb_texture, expected_srgb_color, 1); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(srgb_texture); ID3D11Texture2D_Release(texture); @@ -15509,30 +15511,88 @@ static void test_clear_render_target_view_2d(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0; - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], clear_colour); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, clear_colour); get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); - DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); - ok(compare_color(color, expected_srgb_color, 1) - || broken(compare_color(color, expected_color, 1) && broken_device), - "Got unexpected color 0x%08x.\n", color); + colour = get_readback_color(&rb, 80 + i * 160, 60 + j * 120, 0); + ok(compare_color(colour, expected_srgb_color, 1) + || broken(compare_color(colour, expected_color, 1) && broken_device), + "Got unexpected colour 0x%08x.\n", colour); } } release_resource_readback(&rb); ID3D11RenderTargetView_Release(srgb_rtv); - ID3D11RenderTargetView_Release(rtv); + ID3D11RenderTargetView_Release(rtv[0]); ID3D11Texture2D_Release(texture); + + texture_desc.Width = 16; + texture_desc.Height = 16; + texture_desc.ArraySize = 5; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = 5; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 1; + U(rtv_desc).Texture2DArray.ArraySize = 3; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[1]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + U(rtv_desc).Texture2DArray.FirstArraySlice = 2; + U(rtv_desc).Texture2DArray.ArraySize = 1; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv[2]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[0], blue); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[1], green); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[2], clear_colour); + + get_texture_readback(texture, 0, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 1, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 2, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + ok(compare_color(colour, 0xbf4c7f19, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 3, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + get_texture_readback(texture, 4, &rb); + colour = get_readback_color(&rb, 8, 8, 0); + todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + ID3D11RenderTargetView_Release(rtv[2]); + ID3D11RenderTargetView_Release(rtv[1]); + ID3D11RenderTargetView_Release(rtv[0]); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021