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

[PATCH 3/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_multisample_type().
by Zhiyi Zhang 11 Mar '20

11 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/device.c | 4 +++- dlls/d3d8/directx.c | 19 +++++++++++++++++-- dlls/d3d9/directx.c | 19 +++++++++++++++++-- dlls/wined3d/directx.c | 10 +++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 555d998da22..92d0c33faf6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3436,6 +3436,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct wined3d_device_creation_parameters params; + struct wined3d_adapter *wined3d_adapter; struct wined3d *wined3d; HRESULT hr; @@ -3460,7 +3461,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D wined3d_mutex_lock(); wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); - hr = wined3d_check_device_multisample_type(wined3d, params.adapter_idx, params.device_type, + wined3d_adapter = wined3d_get_adapter(wined3d, params.adapter_idx); + hr = wined3d_check_device_multisample_type(wined3d_adapter, params.device_type, wined3dformat_from_dxgi_format(format), TRUE, sample_count, quality_level_count); wined3d_mutex_unlock(); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d60088f2a3c..de35ad55983 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -247,12 +247,18 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); enum wined3d_resource_type wined3d_rtype; + struct wined3d_adapter *wined3d_adapter; unsigned int bind_flags; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 && adapter_format != D3DFMT_X1R5G5B5) { @@ -292,7 +298,9 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) { DWORD levels; - hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; @@ -309,16 +317,23 @@ static HRESULT WINAPI d3d8_CheckDeviceMultiSampleType(IDirect3D8 *iface, UINT ad D3DFORMAT format, BOOL windowed, D3DMULTISAMPLE_TYPE multisample_type) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x.\n", iface, adapter, device_type, format, windowed, multisample_type); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (multisample_type > D3DMULTISAMPLE_16_SAMPLES) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, wined3dformat_from_d3dformat(format), windowed, (enum wined3d_multisample_type)multisample_type, NULL); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 501ae45877b..8d596550a6a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -271,12 +271,18 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); enum wined3d_resource_type wined3d_rtype; + struct wined3d_adapter *wined3d_adapter; unsigned int bind_flags; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 && adapter_format != D3DFMT_X1R5G5B5) { @@ -316,7 +322,9 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) { DWORD levels; - hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type, + + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; @@ -334,16 +342,23 @@ static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT D3DFORMAT format, BOOL windowed, D3DMULTISAMPLE_TYPE multisample_type, DWORD *levels) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x, levels %p.\n", iface, adapter, device_type, format, windowed, multisample_type, levels); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (multisample_type > D3DMULTISAMPLE_16_SAMPLES) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, wined3dformat_from_d3dformat(format), windowed, multisample_type, levels); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE && levels) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 722b12f0a30..fcfeaa73481 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1475,21 +1475,18 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d_adapter *ad return WINED3DERR_NOTAVAILABLE; } -HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, enum wined3d_multisample_type multisample_type, DWORD *quality_levels) { - const struct wined3d_adapter *adapter; const struct wined3d_format *format; HRESULT hr = WINED3D_OK; - TRACE("wined3d %p, adapter_idx %u, device_type %s, surface_format %s, " + TRACE("adapter %p, device_type %s, surface_format %s, " "windowed %#x, multisample_type %#x, quality_levels %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(surface_format_id), + adapter, debug_d3ddevicetype(device_type), debug_d3dformat(surface_format_id), windowed, multisample_type, quality_levels); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; if (surface_format_id == WINED3DFMT_UNKNOWN) return WINED3DERR_INVALIDCALL; if (multisample_type < WINED3D_MULTISAMPLE_NONE) @@ -1500,7 +1497,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return WINED3DERR_NOTAVAILABLE; } - adapter = wined3d->adapters[adapter_idx]; format = wined3d_get_format(adapter, surface_format_id, 0); if (multisample_type && !(format->multisample_types & 1u << (multisample_type - 1))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 076386ac64a..7000259d0b6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -5,7 +5,7 @@ @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr long long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) -@ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) +@ cdecl wined3d_check_device_multisample_type(ptr long long long long ptr) @ cdecl wined3d_check_device_type(ptr ptr long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 752c98261de..30d1da2ce25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2256,7 +2256,7 @@ HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, UINT HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id, enum wined3d_format_id target_format_id); -HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, enum wined3d_multisample_type multisample_type, DWORD *quality_levels); HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, -- 2.20.1

2 2

[PATCH 2/5] wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier().
by Zhiyi Zhang 11 Mar '20

11 Mar '20

wined3d_adapter_get_identifier() uses a struct wined3d_adapter pointer as parameter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/directx.c | 18 ++++++++++++++++-- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 2 +- dlls/dxgi/adapter.c | 8 ++++---- dlls/wined3d/directx.c | 14 +++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 8 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index e56246613fa..d60088f2a3c 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -105,11 +105,17 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_adapter_identifier adapter_id; + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", iface, adapter, flags, identifier); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + adapter_id.driver = identifier->Driver; adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; @@ -117,7 +123,8 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id))) + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index cd52a0e68f5..501ae45877b 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -120,11 +120,17 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_adapter_identifier adapter_id; + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", iface, adapter, flags, identifier); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + adapter_id.driver = identifier->Driver; adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; @@ -132,7 +138,8 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id))) + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; @@ -590,15 +597,22 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_adapter_identifier adapter_id; + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + adapter_id.driver_size = 0; adapter_id.description_size = 0; adapter_id.device_name_size = 0; - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id))) + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0, &adapter_id))) *luid = adapter_id.adapter_luid; return hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3a536e4127..5487855be67 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1928,7 +1928,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c { struct wined3d_adapter_identifier desc = {0}; - hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0, &desc); total_vidmem = min(UINT_MAX, desc.video_memory); *total = framebuffer_size > total_vidmem ? 0 : total_vidmem - framebuffer_size; TRACE("Total video memory %#x.\n", *total); @@ -2609,7 +2609,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description_size = sizeof(DDDI->szDescription); adapter_id.device_name_size = 0; wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index dee93de123e..20c0f3f9537 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -78,7 +78,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC adapter_id.description_size = sizeof(DriverDescription); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_get_adapter_identifier(wined3d, adapter_idx, 0x0, &adapter_id))) + if (FAILED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0x0, &adapter_id))) { WARN("Failed to get adapter identifier, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 8d2879e4129..2bd69954e10 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -163,7 +163,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; - if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, ARRAY_SIZE(description))) @@ -233,7 +233,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda wined3d = adapter->factory->wined3d; hr = wined3d_get_device_caps(wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); if (SUCCEEDED(hr)) - hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); + hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -316,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.description_size = 0; adapter_id.device_name_size = 0; - if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; switch (segment_group) @@ -387,7 +387,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_get_adapter_info(IWineDXGIAdapter TRACE("iface %p, info %p.\n", iface, info); memset(&adapter_id, 0, sizeof(adapter_id)); - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + if (SUCCEEDED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) { info->driver_uuid = adapter_id.driver_uuid; info->device_uuid = adapter_id.device_uuid; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ecfa444e050..722b12f0a30 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1347,21 +1347,13 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, return WINED3D_OK; } -HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, - UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) +HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, + DWORD flags, struct wined3d_adapter_identifier *identifier) { - const struct wined3d_adapter *adapter; - - TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", - wined3d, adapter_idx, flags, identifier); + TRACE("adapter %p, flags %#x, identifier %p.\n", adapter, flags, identifier); wined3d_mutex_lock(); - if (adapter_idx >= wined3d->adapter_count) - goto fail; - - adapter = wined3d->adapters[adapter_idx]; - wined3d_copy_name(identifier->driver, adapter->driver_info.name, identifier->driver_size); wined3d_copy_name(identifier->description, adapter->driver_info.description, identifier->description_size); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d4b0a147262..076386ac64a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,7 +11,6 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @@ -19,6 +18,7 @@ @ cdecl wined3d_register_window(ptr ptr ptr long) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_identifier(ptr long ptr) @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5ff935dd8ea..752c98261de 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2268,8 +2268,6 @@ ULONG __cdecl wined3d_decref(struct wined3d *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_identifier(const struct wined3d *wined3d, UINT adapter_idx, - DWORD flags, struct wined3d_adapter_identifier *identifier); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2280,6 +2278,8 @@ BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, struct wined3d_device *device, unsigned int flags); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +HRESULT __cdecl wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, + DWORD flags, struct wined3d_adapter_identifier *identifier); struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); -- 2.20.1

2 2

[PATCH 1/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create().
by Zhiyi Zhang 11 Mar '20

11 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 9 ++++++++- dlls/d3d9/device.c | 9 ++++++++- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/directx.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d6253a4a2bf..02b010c22a4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3658,8 +3658,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_adapter *wined3d_adapter; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3670,6 +3672,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; @@ -3684,7 +3690,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ffe04c94d7..84c119d3e0d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4590,8 +4590,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; + struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; unsigned i, count = 1; HRESULT hr; @@ -4606,6 +4608,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode) FIXME("Ignoring display mode.\n"); @@ -4616,7 +4622,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17a02bbc05d..d3a536e4127 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5030,7 +5030,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->flags |= DDRAW_NO3D; } - if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, ddraw->wined3d_adapter, device_type, NULL, 0, DDRAW_STRIDE_ALIGNMENT, feature_levels, ARRAY_SIZE(feature_levels), &ddraw->device_parent, &ddraw->wined3d_device))) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 4b23155754d..5edd431199a 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -519,7 +519,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IWineDXGIDeviceParent_Release(dxgi_device_parent); if (FAILED(hr = wined3d_device_create(dxgi_factory->wined3d, - dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, + dxgi_adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, (const enum wined3d_feature_level *)feature_levels, level_count, wined3d_device_parent, &device->wined3d_device))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 208e00b839f..ecfa444e050 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2319,24 +2319,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - const struct wined3d_adapter *adapter; struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " + TRACE("wined3d %p, adapter %p, device_type %#x, focus_window %p, flags %#x, " "surface_alignment %u, feature_levels %p, feature_level_count %u, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, + wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, device); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; if (FAILED(hr = adapter->adapter_ops->adapter_create_device(wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, &object))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3530a11f8d3..d4b0a147262 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,7 +42,7 @@ @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) -@ cdecl wined3d_device_create(ptr long long ptr long long ptr long ptr ptr) +@ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fbcc6bb332e..5ff935dd8ea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2310,7 +2310,7 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); -HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); -- 2.20.1

3 3

[PATCH v4 2/2] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 11 Mar '20

11 Mar '20

In v4, retire VirtualAlloc/VirtualFree and use HeapAlloc + offset method, again. On Mon, 02 Mar 2020 20:37:26 +0100, Alexandre Julliard wrote: > Note that VirtualAlloc allocates in 64K chunks. Is the typical buffer > size large enough to justify this? It turns out that VirtualAlloc's 64K chunk isn't suitable for dsound buffer. I examined some applications and they use 88,200, 176,400, 192,000 or 352,800 as a buffer size. In most cases, it's multiple of a sample size, i.e. 44,100 or 48,000. Though, it's often greater than 64K, it isn't large enough. I give up this way. In this patch, I employ a pointer size alignment. Andrew, do we need to allocate in larger chunk, e.g. 4K? Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-)

3 2

[PATCH v4 1/2] dsound/tests: Add a test whether the buffer is a valid global memory.
by Akihiro Sagawa 11 Mar '20

11 Mar '20

In v2, separate conformance test patch. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/tests/dsound.c | 7 +++++++ 1 file changed, 7 insertions(+)

2 1

[tools] testbot/Janitor: Fix reporting the version of deleted pending patchsets.
by Francois Gouget 11 Mar '20

11 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 9481d51adc..8fa1782940 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -162,7 +162,7 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - my $Version = $Version eq "" ? "" : " v$Version"; + my $Version = $Set->Version ? " v". $Set->Version : ""; Trace "Deleting pending series$Version for ", $Set->EMail, " (got ", join(" ", sort @Parts), " / ", $Set->TotalParts, ")\n"; next if ($DryRun); -- 2.20.1

1 0

[tools] testbot/PatchUtils: Detect when make_errors needs to be run.
by Francois Gouget 11 Mar '20

11 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 13f969920a..cc61e31d7a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeErrors}) + { + InfoMsg "\nRunning make_errors\n"; + system("cd '$DataDir/$Dir/' && set -x && ./dlls/ntdll/make_errors"); + if ($? != 0) + { + LogMsg "make_errors failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 49bf10126b..f55dc4bdfe 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + { + $Impacts->{MakeErrors} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; -- 2.20.1

1 0

[tools] testbot/UpdateTaskLogs: Fix the detection of Wine test reports.
by Francois Gouget 11 Mar '20

11 Mar '20

We know a report come from a Wine test if the job was created for a patch. But the step that references the patch is not necessarily the task's parent step: it could also be the build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 94adf422db..e50e449c0e 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -286,9 +286,9 @@ sub MoveRefReport($$;$) return 0; } -sub ProcessTaskLogs($$$) +sub ProcessTaskLogs($$$$) { - my ($Step, $Task, $CollectOnly) = @_; + my ($Step, $Task, $IsWineTest, $CollectOnly) = @_; my $Rc = 0; my $ReportNames; @@ -418,12 +418,11 @@ sub ProcessTaskLogs($$$) { # And (re)build the .errors files, even if Status != 'completed' for # task.log and testbot.log. - my ($IsWineTest, $TaskTimedOut); + my $TaskTimedOut; if ($Task->Started and $Task->Ended) { my $Duration = $Task->Ended - $Task->Started; $TaskTimedOut = $Duration > $Task->Timeout; - $IsWineTest = ($Step->Type eq "patch" or $Step->Type eq "suite"); } foreach my $LogName (@{GetLogFileNames($TaskDir, "+old")}) { @@ -564,11 +563,14 @@ my $Jobs = CreateJobs(); foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) { my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; - my $Step = $Jobs->GetItem($JobId)->Steps->GetItem($StepNo); + my $Steps = $Jobs->GetItem($JobId)->Steps; + my $Step = $Steps->GetItem($StepNo); + my $IsWineTest = $Step->FileType eq "patch" || + $Steps->GetItem(1)->FileType eq "patch"; my $CollectOnly = ((defined $OptJobId and $OptJobId ne $JobId) or (defined $OptStepNo and $OptStepNo ne $StepNo) or (defined $OptTaskNo and $OptTaskNo ne $TaskNo)); - $Rc += ProcessTaskLogs($Step, $Task, $CollectOnly); + $Rc += ProcessTaskLogs($Step, $Task, $IsWineTest, $CollectOnly); } exit $Rc ? 1 : 0; -- 2.20.1

1 0

[tools] testbot/LogUtils: Highlight the 'last test seen before the exception' lines.
by Francois Gouget 11 Mar '20

11 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4cc8aaa413..bf933a007d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -332,7 +332,8 @@ sub GetReportLineCategory($) { return "error"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + $Line =~ /: this is the last test seen before the exception/) { return "info"; } -- 2.20.1

1 0

[tools] testbot/PatchUtils: Escape dots in regular expressions.
by Francois Gouget 11 Mar '20

11 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 07e61225e0..49bf10126b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -259,7 +259,7 @@ sub _HandleFile($$$) if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { $Impacts->{PatchedRoot} = 1; - if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") + if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") { # This adds / removes a directory $Impacts->{MakeMakefiles} = 1; @@ -267,7 +267,7 @@ sub _HandleFile($$$) } # Else patches to this file don't impact the Wine build. } - elsif ($FilePath =~ m~/Makefile.in$~ and $Change eq "new") + elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. -- 2.20.1

1 0