March 2020 - Wine-devel - list.winehq.org

[tools] testbot: Add the exe32 and exe64 mission capabilities.
by Francois Gouget 06 Mar '20

06 Mar '20

This makes it possible to only test the mailing list patches against one bitness of a locale-specific Windows VM duplicate, while still allowing developers to create jobs of either bitness on it, to run test executables for instance. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 810eb4dda4..4f0061c8f8 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -177,7 +177,7 @@ sub GetMissionCaps($$) $Capabilities->{lang}->{$Lang} = 1; } } - elsif ($Capability =~ /^(?:win32|wow32|wow64)$/) + elsif ($Capability =~ /^(?:exe32|exe64|win32|wow32|wow64)$/) { $Capabilities->{build}->{$Capability} = 1; } -- 2.20.1

1 0

[PATCH] dnsapi/tests: Add some DnsQuery tests.
by Dmitry Timoshkov 06 Mar '20

06 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dnsapi/tests/Makefile.in | 5 +- dlls/dnsapi/tests/query.c | 111 ++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 dlls/dnsapi/tests/query.c diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 14c8f30fd1..2c48bcec36 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi +IMPORTS = dnsapi ws2_32 C_SRCS = \ cache.c \ name.c \ - record.c + record.c \ + query.c diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c new file mode 100644 index 0000000000..108cd52755 --- /dev/null +++ b/dlls/dnsapi/tests/query.c @@ -0,0 +1,111 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" +#include "winsock2.h" +#include "ws2ipdef.h" + +#include "wine/test.h" + +#define NS_MAXDNAME 1025 + +static void test_DnsQuery(void) +{ + WCHAR domain[MAX_PATH]; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + DNS_STATUS status; + + wcscpy(domain, L"_ldap._tcp.deadbeef"); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + + wcscpy(domain, L"_ldap._tcp.dc._msdcs."); + size = ARRAY_SIZE(domain) - wcslen(domain); + ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size); + ok(ret, "GetComputerNameEx error %u\n", GetLastError()); + if (!size) + { + skip("computer is not in a domain\n"); + return; + } + + status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + trace("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), status); + if (status != ERROR_SUCCESS) + { + skip("domain %s doesn't have an SRV entry\n", wine_dbgstr_w(domain)); + return; + } + + trace("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + wcsncpy(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + status = DnsQuery_W(name, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + WCHAR buf[IP4_ADDRESS_STRING_LENGTH]; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + + /* IPv6 */ + status = DnsQuery_W(name, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + WCHAR buf[IP6_ADDRESS_STRING_LENGTH]; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } +} + +START_TEST(query) +{ + test_DnsQuery(); +} -- 2.20.1

2 1

[PATCH 5/5] wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode().
by Zhiyi Zhang 06 Mar '20

06 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 7 +------ dlls/dxgi/swapchain.c | 9 ++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 ++++++++--------- dlls/wined3d/swapchain.c | 23 ++++++++++------------- dlls/wined3d/wined3d.spec | 6 +++--- dlls/wined3d/wined3d_main.c | 4 ++-- include/wine/wined3d.h | 11 +++++------ 8 files changed, 32 insertions(+), 47 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index fe8dd7b5c0a..8c94788fbf1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -49,8 +49,6 @@ static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output, struct wined3d_display_mode *mode, IUnknown *device) { - struct dxgi_adapter *adapter; - struct wined3d *wined3d; HRESULT hr; if (!mode->width != !mode->height) @@ -66,10 +64,7 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output } wined3d_mutex_lock(); - adapter = output->adapter; - wined3d = adapter->factory->wined3d; - - hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, mode); + hr = wined3d_output_find_closest_matching_mode(output->wined3d_output, mode); wined3d_mutex_unlock(); return hr; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d929099eb9..b86a79a94cf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -156,15 +156,13 @@ static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_stat const struct wined3d_swapchain_desc *swapchain_desc, IDXGIOutput *output) { struct dxgi_output *dxgi_output; - struct dxgi_adapter *adapter; HRESULT hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); - adapter = dxgi_output->adapter; wined3d_mutex_lock(); hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - adapter->factory->wined3d, dxgi_output->wined3d_output, NULL); + dxgi_output->wined3d_output, NULL); wined3d_mutex_unlock(); return hr; @@ -175,7 +173,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, { struct wined3d_display_mode mode; struct dxgi_output *dxgi_output; - struct dxgi_adapter *adapter; IDXGIOutput *output; HRESULT hr; @@ -188,7 +185,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(swapchain, &output))) return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); - adapter = dxgi_output->adapter; TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -197,8 +193,7 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, - dxgi_output->wined3d_output, &mode); + hr = wined3d_swapchain_state_resize_target(state, dxgi_output->wined3d_output, &mode); IDXGIOutput_Release(output); return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9a1a16a6a7b..370ec5b794b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5154,7 +5154,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return E_FAIL; } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, output, mode))) + swapchain_desc, output, mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6ab9dd23579..9ca3053c89b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1080,18 +1080,18 @@ HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, return WINED3D_OK; } -HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, - unsigned int adapter_idx, struct wined3d_display_mode *mode) +HRESULT CDECL wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode) { unsigned int i, j, mode_count, matching_mode_count, closest; struct wined3d_display_mode **matching_modes; struct wined3d_display_mode *modes; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); + TRACE("output %p, mode %p.\n", output, mode); - if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) + if (!(mode_count = wined3d_output_get_mode_count(output, mode->format_id, + WINED3D_SCANLINE_ORDERING_UNKNOWN))) { WARN("Output has 0 matching modes.\n"); return E_FAIL; @@ -1107,8 +1107,8 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w for (i = 0; i < mode_count; ++i) { - if (FAILED(hr = wined3d_output_get_mode(&wined3d->adapters[adapter_idx]->outputs[0], - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) + if (FAILED(hr = wined3d_output_get_mode(output, mode->format_id, + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) { heap_free(matching_modes); heap_free(modes); @@ -1144,8 +1144,7 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w if (!mode->width || !mode->height) { struct wined3d_display_mode current_mode; - if (FAILED(hr = wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], - &current_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &current_mode, NULL))) { heap_free(matching_modes); heap_free(modes); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 57e5e25003a..c0eb25ffb66 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1440,13 +1440,13 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) + struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) + if (FAILED(hr = wined3d_output_find_closest_matching_mode(output, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } @@ -1462,15 +1462,14 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, struct wined3d_output *output, - const struct wined3d_display_mode *mode) + struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HWND window; HRESULT hr; - TRACE("state %p, wined3d %p, output %p, mode %p.\n", state, wined3d, output, mode); + TRACE("state %p, output %p, mode %p.\n", state, output, mode); wined3d_mutex_lock(); @@ -1490,8 +1489,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, - &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1628,14 +1626,14 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st } HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d *wined3d, - struct wined3d_output *output, const struct wined3d_display_mode *mode) + const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; HRESULT hr; - TRACE("state %p, swapchain_desc %p, wined3d %p, output %p, mode %p.\n", - state, swapchain_desc, wined3d, output, mode); + TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", + state, swapchain_desc, output, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1660,8 +1658,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, - &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) return hr; } else diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 01f261b7662..51745e24183 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -9,7 +9,6 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) -@ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @@ -158,6 +157,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) @@ -282,8 +282,8 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) -@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ea58f4473b8..e681ac1b61b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -570,8 +570,8 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam ERR("Failed to get output from swapchain %p.\n", swapchain); break; } - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, output, NULL); + wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, output, + NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b2b7dac87c2..a3a66fd4219 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2258,8 +2258,6 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad enum wined3d_format_id backbuffer_format_id, BOOL windowed); struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); -HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, - unsigned int adapter_idx, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); @@ -2492,6 +2490,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, @@ -2759,11 +2759,10 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, struct wined3d_output *output, - const struct wined3d_display_mode *mode); -HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, struct wined3d_output *output, const struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, + const struct wined3d_swapchain_desc *desc, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode().
by Zhiyi Zhang 06 Mar '20

06 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 14 ++++++++++++-- dlls/ddraw/ddraw.c | 12 ++++++------ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 25 +++++++++++-------------- dlls/wined3d/swapchain.c | 30 ++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 6 +++--- 11 files changed, 63 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b78b119d22c..d515caffd25 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -184,13 +184,18 @@ static HRESULT WINAPI d3d8_GetAdapterDisplayMode(IDirect3D8 *iface, UINT adapter { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d8->wined3d, adapter, &wined3d_mode, NULL); + hr = wined3d_output_get_display_mode(d3d8->wined3d_outputs[output_idx], &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 83bb3d8217c..d006cf27435 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -208,12 +208,17 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayMode(IDirect3D9Ex *iface, UINT adapt { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode, NULL); + hr = wined3d_output_get_display_mode(d3d9->wined3d_outputs[output_idx], &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -504,16 +509,21 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p, rotation %p.\n", iface, adapter, mode, rotation); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode->Size != sizeof(*mode)) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode, + hr = wined3d_output_get_display_mode(d3d9->wined3d_outputs[output_idx], &wined3d_mode, (enum wined3d_display_rotation *)rotation); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4d4a9d7114f..f947ca8b2b6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -556,7 +556,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, TRACE("ddraw %p.\n", ddraw); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode.\n"); return hr; @@ -1617,7 +1617,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 wined3d_mutex_lock(); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -1710,7 +1710,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return hr; @@ -1772,7 +1772,7 @@ static HRESULT WINAPI ddraw7_GetMonitorFrequency(IDirectDraw7 *iface, DWORD *fre TRACE("iface %p, frequency %p.\n", iface, frequency); wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL); + hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -1907,7 +1907,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c /* Some applications (e.g. 3DMark 2000) assume that the reported amount of * video memory doesn't include the memory used by the default framebuffer. */ - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { WARN("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -4432,7 +4432,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * not like that we'll have to find some workaround, like iterating over * all imaginable formats and collecting all the depth stencil formats we * can get. */ - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 39626157a56..ab3584b8fea 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,10 +1086,10 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL))) { wined3d_mutex_unlock(); - WARN("Cannot get the current adapter format\n"); + WARN("Failed to get output display mode, hr %#x.\n", hr); return hr; } @@ -1214,10 +1214,10 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL))) { wined3d_mutex_unlock(); - WARN("Cannot get the current adapter format\n"); + WARN("Failed to get output display mode, hr %#x.\n", hr); return hr; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 442aeed67b3..a803324c450 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6008,7 +6008,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); heap_free(texture); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 25e994c5fe8..0d929099eb9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2903,7 +2903,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) return hr; if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, - dxgi_adapter->factory->wined3d, dxgi_adapter->ordinal, &swapchain->state))) + dxgi_adapter->factory->wined3d, &swapchain->state))) return hr; if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 21f9af9566d..9a1a16a6a7b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4856,7 +4856,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb43e46ee5e..6ab9dd23579 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -933,7 +933,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, &rotation))) + if (FAILED(hr = wined3d_output_get_display_mode(&adapter->outputs[0], &mode, &rotation))) return hr; memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); @@ -1144,7 +1144,7 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w if (!mode->width || !mode->height) { struct wined3d_display_mode current_mode; - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, + if (FAILED(hr = wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &current_mode, NULL))) { heap_free(matching_modes); @@ -1180,24 +1180,20 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w return WINED3D_OK; } -HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { - const struct wined3d_adapter *adapter; DEVMODEW m; - TRACE("wined3d %p, adapter_idx %u, display_mode %p, rotation %p.\n", - wined3d, adapter_idx, mode, rotation); + TRACE("output %p, display_mode %p, rotation %p.\n", output, mode, rotation); - if (!mode || adapter_idx >= wined3d->adapter_count) + if (!mode) return WINED3DERR_INVALIDCALL; - adapter = wined3d->adapters[adapter_idx]; - memset(&m, 0, sizeof(m)); m.dmSize = sizeof(m); - EnumDisplaySettingsExW(adapter->device_name, ENUM_CURRENT_SETTINGS, &m, 0); + EnumDisplaySettingsExW(output->device_name, ENUM_CURRENT_SETTINGS, &m, 0); mode->width = m.dmPelsWidth; mode->height = m.dmPelsHeight; mode->refresh_rate = DEFAULT_REFRESH_RATE; @@ -1209,12 +1205,12 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out * that GetDisplayMode still returns 24 bpp. This should probably be * handled in winex11 instead. */ - if (adapter->outputs[0].screen_format && adapter->outputs[0].screen_format != mode->format_id) + if (output->screen_format && output->screen_format != mode->format_id) { WARN("Overriding format %s with stored format %s.\n", debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->outputs[0].screen_format)); - mode->format_id = adapter->outputs[0].screen_format; + debug_d3dformat(output->screen_format)); + mode->format_id = output->screen_format; } if (!(m.dmFields & DM_DISPLAYFLAGS)) @@ -1421,7 +1417,8 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, NULL))) + if (FAILED(wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &mode, + NULL))) return WINED3DERR_INVALIDCALL; if (mode.refresh_rate == DEFAULT_REFRESH_RATE) mode.refresh_rate = 60; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 720a82f9b32..57e5e25003a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -321,12 +321,18 @@ struct wined3d_swapchain_state * CDECL wined3d_swapchain_get_state(struct wined3 HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { + struct wined3d_output *output; HRESULT hr; TRACE("swapchain %p, mode %p, rotation %p.\n", swapchain, mode, rotation); - hr = wined3d_get_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, mode, rotation); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + + hr = wined3d_output_get_display_mode(output, mode, rotation); TRACE("Returning w %u, h %u, refresh rate %u, format %s.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id)); @@ -811,8 +817,7 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window, - struct wined3d *wined3d, unsigned int adapter_idx) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) { struct wined3d_output *output; HRESULT hr; @@ -825,7 +830,7 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return E_FAIL; } - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &state->original_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); return hr; @@ -881,7 +886,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, adapter->ordinal))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) return hr; swapchain->swapchain_ops = swapchain_ops; @@ -1495,7 +1500,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -1664,7 +1669,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st if (mode) WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1715,20 +1720,17 @@ void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; - TRACE("desc %p, window %p, wined3d %p, adapter_idx %u, state %p.\n", - desc, window, wined3d, adapter_idx, state); - - TRACE("desc %p, window %p, state %p.\n", desc, window, state); + TRACE("desc %p, window %p, wined3d %p, state %p.\n", desc, window, wined3d, state); if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, adapter_idx))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b83adbaa8f3..01f261b7662 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @@ -159,6 +158,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_set_display_mode(ptr ptr) @@ -280,7 +280,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f62375e539e..b2b7dac87c2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2263,8 +2263,6 @@ HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); -HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, @@ -2494,6 +2492,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, unsigned int mode_idx, struct wined3d_display_mode *mode); @@ -2756,7 +2756,7 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, struct wined3d *wined3d, struct wined3d_output *output, -- 2.20.1

1 0

[PATCH 2/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Zhiyi Zhang 06 Mar '20

06 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 312e8f2d24d..65935a61650 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1430,19 +1430,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1480,7 +1480,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1649,7 +1650,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) return hr; } else -- 2.20.1

1 0

[PATCH 1/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target().
by Zhiyi Zhang 06 Mar '20

06 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 ++++-- dlls/wined3d/swapchain.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 603cf171e27..25e994c5fe8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -189,7 +189,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); adapter = dxgi_output->adapter; - IDXGIOutput_Release(output); TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -198,7 +197,10 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - return wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, adapter->ordinal, &mode); + hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, + dxgi_output->wined3d_output, &mode); + IDXGIOutput_Release(output); + return hr; } static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index be41cc385e7..312e8f2d24d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1452,14 +1452,15 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HWND window; HRESULT hr; - TRACE("state %p, wined3d %p, adapter_idx %u, mode %p.\n", state, wined3d, adapter_idx, mode); + TRACE("state %p, wined3d %p, output %p, mode %p.\n", state, wined3d, output, mode); wined3d_mutex_lock(); @@ -1479,7 +1480,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1488,7 +1489,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5c3efbdc8b6..2dbb394444d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -282,7 +282,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb8f19981aa..b14db420838 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2759,7 +2759,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, struct wined3d_output *output, const struct wined3d_display_mode *mode); -- 2.20.1

1 0

[PATCH 2/4] winevulkan: Replace temp heap_allocs with alloca
by Joshua Ashton 06 Mar '20

06 Mar '20

This allocates these structs and arrays of structures on the stack instead of the heap (which is expensive and takes time!) These structures and arrays of structures are small, and this is all super duper hot path code. We need to forceinline these conversion functions in the compiler as otherwise the alloca would invalidate their inlining. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- dlls/winevulkan/make_vulkan | 142 ++---------------------------------- dlls/winevulkan/vulkan.c | 13 +--- 2 files changed, 8 insertions(+), 147 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..954d484933 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -666,13 +666,6 @@ class VkFunction(object): body += p.copy(Direction.OUTPUT) - # Perform any required cleanups. Most of these are for array functions. - for p in self.params: - if not p.needs_free(): - continue - - body += p.free() - # Finally return the result. if self.type != "void": body += " return result;\n" @@ -1084,9 +1077,6 @@ class VkMember(object): else: conversions.append(ConversionFunction(False, False, direction, struct)) - if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), struct)) - return conversions def is_const(self): @@ -1152,17 +1142,6 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_conversion() - def needs_free(self): - if not self.needs_conversion(): - return False - - if self.is_dynamic_array(): - return True - - # TODO: some non-pointer structs and optional pointer structs may need freeing, - # though none of this type have been encountered yet. - return False - def needs_struct_extensions_conversion(self): if not self.is_struct(): return False @@ -1248,11 +1227,6 @@ class VkParam(object): if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, self.struct) - # Dynamic arrays, but also some normal structs (e.g. VkCommandBufferBeginInfo) need memory - # allocation and thus some cleanup. - if self.is_dynamic_array() or self.struct.needs_free(): - self.free_func = FreeFunction(self.is_dynamic_array(), self.struct) - def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -1380,20 +1354,6 @@ class VkParam(object): def format_string(self): return self.format_str - def free(self): - if self.is_dynamic_array(): - if self.struct.returnedonly: - # For returnedonly, counts is stored in a pointer. - return " free_{0}_array({1}_host, *{2});\n".format(self.type, self.name, self.dyn_array_len) - else: - return " free_{0}_array({1}_host, {2});\n".format(self.type, self.name, self.dyn_array_len) - else: - # We are operating on a single structure. Some structs (very rare) contain dynamic members, - # which would need freeing. - if self.struct.needs_free(): - return " free_{0}(&{1}_host);\n".format(self.type, self.name) - return "" - def get_conversions(self): """ Get a list of conversions required for this parameter if any. Parameters which are structures may require conversion between win32 @@ -1430,8 +1390,6 @@ class VkParam(object): conversions.append(self.input_conv) if self.output_conv is not None: conversions.append(self.output_conv) - if self.free_func is not None: - conversions.append(self.free_func) return conversions @@ -1479,9 +1437,6 @@ class VkParam(object): return False - def needs_free(self): - return self.free_func is not None - def needs_input_conversion(self): return self.input_conv is not None @@ -1694,17 +1649,6 @@ class VkStruct(Sequence): return True return False - def needs_free(self): - """ Check if any struct member needs some memory freeing.""" - - for m in self.members: - if m.needs_free(): - return True - - continue - - return False - def needs_struct_extensions_conversion(self): """ Checks if structure extensions in pNext chain need conversion. """ ret = False @@ -1750,7 +1694,10 @@ class ConversionFunction(object): return_type = "{0}_host".format(self.type) # Generate function prototype. - body = "static inline {0} *{1}(".format(return_type, self.name) + # We *must* forceinline otherwise our alloca will be + # garbage when this function returns. + # Regular inline won't cut it, alloca invalidates regular inlining. + body = "static WINEVULKAN_FORCEINLINE {0} *{1}(".format(return_type, self.name) body += ", ".join(p for p in params) body += ")\n{\n" @@ -1758,7 +1705,7 @@ class ConversionFunction(object): body += " unsigned int i;\n\n" body += " if (!in) return NULL;\n\n" - body += " out = heap_alloc(count * sizeof(*out));\n" + body += " out = WINEVULKAN_ALLOCA(count * sizeof(*out));\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" @@ -1781,7 +1728,7 @@ class ConversionFunction(object): else: params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] - body = "static inline void {0}(".format(self.name) + body = "static WINEVULKAN_FORCEINLINE void {0}(".format(self.name) # Generate parameter list body += ", ".join(p for p in params) @@ -1814,7 +1761,7 @@ class ConversionFunction(object): params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] # Generate function prototype. - body = "static inline void {0}(".format(self.name) + body = "static WINEVULKAN_FORCEINLINE void {0}(".format(self.name) body += ", ".join(p for p in params) body += ")\n{\n" body += " unsigned int i;\n\n" @@ -1856,81 +1803,6 @@ class ConversionFunction(object): else: return self._generate_conversion_func() - -class FreeFunction(object): - def __init__(self, dyn_array, struct): - self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name - - if dyn_array: - self.name = "free_{0}_array".format(self.type) - else: - self.name = "free_{0}".format(self.type) - - def __eq__(self, other): - return self.name == other.name - - def _generate_array_free_func(self): - """ Helper function for cleaning up temporary buffers required for array conversions. """ - - # Generate function prototype. - body = "static inline void {0}({1}_host *in, uint32_t count)\n{{\n".format(self.name, self.type) - - # E.g. VkGraphicsPipelineCreateInfo_host needs freeing for pStages. - if self.struct.needs_free(): - body += " unsigned int i;\n\n" - body += " if (!in) return;\n\n" - body += " for (i = 0; i < count; i++)\n" - body += " {\n" - - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) - else: - body += " free_{0}_array(in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) - elif m.needs_conversion(): - LOGGER.error("Unhandled conversion for {0}".format(m.name)) - body += " }\n" - else: - body += " if (!in) return;\n\n" - - body += " heap_free(in);\n" - - body += "}\n\n" - return body - - def _generate_free_func(self): - # E.g. VkCommandBufferBeginInfo.pInheritanceInfo needs freeing. - if not self.struct.needs_free(): - return "" - - # Generate function prototype. - body = "static inline void {0}({1}_host *in)\n{{\n".format(self.name, self.type) - - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - count = m.dyn_array_len if isinstance(m.dyn_array_len, int) else "in->{0}".format(m.dyn_array_len) - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in->{1}, {2});\n".format(m.type, m.name, count) - else: - body += " free_{0}_array(in->{1}, {2});\n".format(m.type, m.name, count) - - body += "}\n\n" - return body - - def definition(self): - if self.dyn_array: - return self._generate_array_free_func() - else: - # Some structures need freeing too if they contain dynamic arrays. - # E.g. VkCommandBufferBeginInfo - return self._generate_free_func() - - class StructChainConversionFunction(object): def __init__(self, direction, struct): self.direction = direction diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef8..1cc1b4f61f 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -520,23 +520,12 @@ void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, if (!buffers || !count) return; - /* Unfortunately we need a temporary buffer as our command buffers are wrapped. - * This call is called often and if a performance concern, we may want to use - * alloca as we shouldn't need much memory and it needs to be cleaned up after - * the call anyway. - */ - if (!(tmp_buffers = heap_alloc(count * sizeof(*tmp_buffers)))) - { - ERR("Failed to allocate memory for temporary command buffers\n"); - return; - } + tmp_buffers = WINEVULKAN_ALLOCA(count * sizeof(*tmp_buffers)); for (i = 0; i < count; i++) tmp_buffers[i] = buffers[i]->command_buffer; buffer->device->funcs.p_vkCmdExecuteCommands(buffer->command_buffer, count, tmp_buffers); - - heap_free(tmp_buffers); } VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, -- 2.25.1

6 5

[PATCH 4/4] comctl32/imagelist: Support flag ILS_SATURATE for ImageList_DrawIndirect().
by Ziqing Hui 06 Mar '20

06 Mar '20

Note: the grayscale algorithm which I implemented(Gray = R*0.299 + G*0.587 + B*0.114) is identical to the windows behavior. This can be indicated by [PATCH 2/4]. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 24 ++++++++++++++++++------ dlls/comctl32/tests/imagelist.c | 1 - 2 files changed, 18 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4] comctl32/tests/imagelist: Add a 4x4 bitmap for ImageList_DrawIndirect tests.
by Ziqing Hui 06 Mar '20

06 Mar '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 34 ++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] comctl32/tests/imagelist: Add tests for grayscale.
by Ziqing Hui 06 Mar '20

06 Mar '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)

1 0