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

[PATCH 1/4] d3d10: Add impl_from_ID3D10EffectShaderVariable.
by Connor McAdams March 25, 2020

March 25, 2020

Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/effect.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2360e5a025..e2c18ce049 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -124,6 +124,11 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1 return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + struct d3d10_effect_state_property_info { UINT id; @@ -6639,7 +6644,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6661,7 +6666,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6683,7 +6688,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6706,7 +6711,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6720,13 +6725,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->input_signature.signature) { WARN("No shader signature\n"); @@ -6762,7 +6767,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6776,13 +6781,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->output_signature.signature) { WARN("No shader signature\n"); -- 2.20.1

3 7

[PATCH] d3dx9: Validate state operation in d3dx_parse_state().
by Paul Gofman March 25, 2020

March 25, 2020

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5a2ac13358..94a1e05163 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5905,6 +5905,12 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s state->type = ST_CONSTANT; read_dword(ptr, &state->operation); + if (state->operation >= ARRAY_SIZE(state_table)) + { + WARN("Unknown state operation %u.\n", state->operation); + return D3DERR_INVALIDCALL; + } + TRACE("Operation: %#x (%s)\n", state->operation, state_table[state->operation].name); read_dword(ptr, &state->index); -- 2.25.1

2 1

[PATCH] oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo.
by Jacek Caban March 25, 2020

March 25, 2020

Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.idl | 23 +++++++++++++ dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 59 +++++++++++++++++++------------- 3 files changed, 114 insertions(+), 26 deletions(-)

2 1

[PATCH] wined3d: Add GTX 1660 SUPER as a card.
by FLGX March 25, 2020

March 25, 2020

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e269bf8138..33ba2c01ca 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1363,6 +1363,7 @@ cards_nvidia_binary[] = {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ + {"GTX 1660 SUPER", CARD_NVIDIA_GEFORCE_GTX1660SUPER}, /* GeForce 1600 - highend */ {"GTX 1650 SUPER", CARD_NVIDIA_GEFORCE_GTX1650SUPER}, /* GeForce 1600 - midend high */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42cc5c8f92..4c8d91e4de 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -430,6 +430,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1650SUPER,"NVIDIA GeForce GTX 1650 SUPER", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660SUPER,"NVIDIA GeForce GTX 1660 SUPER", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a300a0ea..4c684688df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2592,6 +2592,7 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, CARD_NVIDIA_GEFORCE_GTX1650SUPER= 0x2187, + CARD_NVIDIA_GEFORCE_GTX1660SUPER= 0x2181, CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, -- 2.26.0

2 1

[PATCH] ucrtbase: Add test for _strnicmp() count parameter.
by Paul Gofman March 25, 2020

March 25, 2020

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ucrtbase/tests/string.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index dde139755c..74f0f56be0 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -430,6 +430,29 @@ static void test_wcstok(void) ok(!token, "expected NULL, got %p\n", token); } +static void test__strnicmp(void) +{ + static const char str1[] = "TEST"; + static const char str2[] = "test"; + int ret; + + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = _strnicmp(str1, str2, -1); + todo_wine CHECK_CALLED(invalid_parameter_handler); + todo_wine ok(ret == _NLSCMPERROR, "got %d.\n", ret); + todo_wine ok(errno == EINVAL, "Unexpected errno %d.\n", errno); + + ret = _strnicmp(str1, str2, 0x7fffffff); + ok(!ret, "got %d.\n", ret); + + ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { test_strtod(); @@ -439,4 +462,5 @@ START_TEST(string) test_C_locale(); test_mbsspn(); test_wcstok(); + test__strnicmp(); } -- 2.25.1

2 1

[PATCH 2/2] wined3d: Remove device_name and device_name_size from struct wined3d_adapter_identifier.
by Zhiyi Zhang March 25, 2020

March 25, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 2 -- dlls/d3d9/directx.c | 15 ++++++++++++--- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/main.c | 12 ++++++------ dlls/dxgi/adapter.c | 3 --- dlls/wined3d/directx.c | 15 --------------- include/wine/wined3d.h | 2 -- 7 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 509a76239d..874f9ea047 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -120,8 +120,6 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); - adapter_id.device_name = NULL; /* d3d9 only */ - adapter_id.device_name_size = 0; /* d3d9 only */ wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 070387dde3..6c67be31b4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -121,6 +121,7 @@ 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; + struct wined3d_output_desc output_desc; unsigned int output_idx; HRESULT hr; @@ -131,12 +132,20 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte if (output_idx >= d3d9->wined3d_output_count) return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_output_get_desc(d3d9->wined3d_outputs[output_idx], &output_desc))) + { + wined3d_mutex_unlock(); + WARN("Failed to get output description, hr %#x.\n", hr); + return hr; + } + WideCharToMultiByte(CP_ACP, 0, output_desc.device_name, -1, identifier->DeviceName, + sizeof(identifier->DeviceName), NULL, NULL); + adapter_id.driver = identifier->Driver; adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); - adapter_id.device_name = identifier->DeviceName; - adapter_id.device_name_size = sizeof(identifier->DeviceName); wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) @@ -149,6 +158,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); identifier->WHQLLevel = adapter_id.whql_level; } + wined3d_mutex_unlock(); return hr; } @@ -636,7 +646,6 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0, &adapter_id))) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 050f625f71..db7fc2c948 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2607,7 +2607,6 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.driver_size = sizeof(DDDI->szDriver); adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); - adapter_id.device_name_size = 0; wined3d_mutex_lock(); hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b9fe6b1e4b..4b00c016ed 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -68,15 +68,13 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC while (cont_enum && (wined3d_adapter = wined3d_get_adapter(wined3d, adapter_idx))) { - char DriverName[512] = "", DriverDescription[512] = ""; + char device_name[512] = "", description[512] = ""; /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the * Driver Name, so obtain the DeviceName and GUID from D3D. */ memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - adapter_id.description = DriverDescription; - adapter_id.description_size = sizeof(DriverDescription); + adapter_id.description = description; + adapter_id.description_size = sizeof(description); wined3d_mutex_lock(); if (FAILED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0x0, &adapter_id))) @@ -101,8 +99,10 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC TRACE("Interface %u: %s\n", interface_count++, wine_dbgstr_guid(&adapter_id.device_identifier)); + WideCharToMultiByte(CP_ACP, 0, output_desc.device_name, -1, device_name, + sizeof(device_name), NULL, NULL); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, - adapter_id.device_name, context, output_desc.monitor); + device_name, context, output_desc.monitor); } if (FAILED(hr)) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d48d4755d0..ad4e4b1305 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -161,7 +161,6 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); - adapter_id.device_name_size = 0; if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; @@ -226,7 +225,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; wined3d_mutex_lock(); hr = wined3d_get_device_caps(adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &caps); @@ -312,7 +310,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a50f594854..3dc3043bce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1357,17 +1357,6 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt wined3d_copy_name(identifier->driver, adapter->driver_info.name, identifier->driver_size); wined3d_copy_name(identifier->description, adapter->driver_info.description, identifier->description_size); - /* Note that d3d8 doesn't supply a device name. */ - if (identifier->device_name_size) - { - if (!WideCharToMultiByte(CP_ACP, 0, adapter->device_name, -1, identifier->device_name, - identifier->device_name_size, NULL, NULL)) - { - ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - goto fail; - } - } - identifier->driver_version.u.HighPart = adapter->driver_info.version_high; identifier->driver_version.u.LowPart = adapter->driver_info.version_low; identifier->vendor_id = adapter->driver_info.vendor; @@ -1385,10 +1374,6 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt wined3d_mutex_unlock(); return WINED3D_OK; - -fail: - wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; } HRESULT CDECL wined3d_output_get_raster_status(const struct wined3d_output *output, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 30b6f9a7e8..0b3b41896e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1742,8 +1742,6 @@ struct wined3d_adapter_identifier unsigned int driver_size; char *description; unsigned int description_size; - char *device_name; - unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id; -- 2.20.1

2 1

[PATCH 1/2] wined3d: Support non-primary outputs in wined3d_output_get_desc().
by Zhiyi Zhang March 25, 2020

March 25, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 43 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42cc5c8f92..a50f594854 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -916,35 +916,36 @@ HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *in return WINED3D_OK; } +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam) +{ + struct wined3d_output_desc *desc = (struct wined3d_output_desc *)lparam; + MONITORINFOEXW monitor_info; + + monitor_info.cbSize = sizeof(monitor_info); + if (GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info) && + !lstrcmpiW(desc->device_name, monitor_info.szDevice)) + { + desc->monitor = monitor; + desc->desktop_rect = monitor_info.rcMonitor; + desc->attached_to_desktop = TRUE; + return FALSE; + } + + return TRUE; +} + HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, struct wined3d_output_desc *desc) { - enum wined3d_display_rotation rotation; - const struct wined3d_adapter *adapter; struct wined3d_display_mode mode; - HMONITOR monitor; - HRESULT hr; TRACE("output %p, desc %p.\n", output, desc); - adapter = output->adapter; - if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) - return WINED3DERR_INVALIDCALL; - - if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, &rotation))) - return hr; - + memset(desc, 0, sizeof(*desc)); desc->ordinal = output->ordinal; - memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); - SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height); - OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y); - /* FIXME: We should get this from EnumDisplayDevices() when the adapters - * are created. */ - desc->attached_to_desktop = TRUE; - desc->rotation = rotation; - desc->monitor = monitor; - - return WINED3D_OK; + lstrcpyW(desc->device_name, output->device_name); + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)desc); + return wined3d_output_get_display_mode(output, &mode, &desc->rotation); } /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a300a0ea..bb0551e2af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2914,7 +2914,6 @@ struct wined3d_output struct wined3d_adapter { unsigned int ordinal; - POINT monitor_position; struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; -- 2.20.1

2 1

[PATCH 1/5] wined3d: Store the framebuffer inline in struct wined3d_state.
by Matteo Bruni March 25, 2020

March 25, 2020

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 4 +-- dlls/wined3d/context.c | 10 +++---- dlls/wined3d/cs.c | 34 ++++++++++----------- dlls/wined3d/device.c | 50 +++++++++++++++++-------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 ++-- dlls/wined3d/state.c | 30 +++++++++---------- dlls/wined3d/stateblock.c | 4 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d_private.h | 11 +++---- 11 files changed, 79 insertions(+), 78 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c39694f441e..36c920dc6e0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -700,7 +700,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, str { const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; - UINT rt_height = state->fb->render_targets[0]->height; + UINT rt_height = state->fb.render_targets[0]->height; /* Load DirectX 9 float constants for pixel shader */ priv->highest_dirty_ps_const = shader_arb_load_constants_f(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, @@ -4607,7 +4607,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } else { - UINT rt_height = state->fb->render_targets[0]->height; + UINT rt_height = state->fb.render_targets[0]->height; shader_arb_ps_local_constants(compiled, context_gl, state, rt_height); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1c15c25859b..fed4f75ec0e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3319,7 +3319,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, uint32_t rt_mask = 0, *cur_mask; unsigned int i; - if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != state->fb + if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != &state->fb || rt_count != gl_info->limits.buffers) { if (!have_framebuffer_attachment(rt_count, rts, dsv)) @@ -3431,7 +3431,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; + struct wined3d_rendertarget_view * const *rts = state->fb.render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int rt_mask, mask; @@ -3463,7 +3463,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; DWORD color_location = 0; DWORD *cur_mask; @@ -4230,7 +4230,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_state_entry *state_table = context->state_table; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; unsigned int i, base; WORD map; @@ -5121,7 +5121,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_draw_parameters *parameters) { BOOL emulation = FALSE, rasterizer_discard = FALSE; - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_rendertarget_view *dsv, *rtv; struct wined3d_stream_info si_emulated; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dbdf5f2ec28..3fd32631ff5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->fb; + op->fb = &cs->state.fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -624,12 +624,12 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { - if ((view = state->fb->render_targets[i])) + if ((view = state->fb.render_targets[i])) wined3d_resource_acquire(view->resource); } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - view = state->fb->depth_stencil; + view = state->fb.depth_stencil; wined3d_resource_acquire(view->resource); } @@ -915,11 +915,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_release(state->fb->render_targets[i]->resource); + if (state->fb.render_targets[i]) + wined3d_resource_release(state->fb.render_targets[i]->resource); } - if (state->fb->depth_stencil) - wined3d_resource_release(state->fb->depth_stencil->resource); + if (state->fb.depth_stencil) + wined3d_resource_release(state->fb.depth_stencil->resource); release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); @@ -949,11 +949,11 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_acquire(state->fb->render_targets[i]->resource); + if (state->fb.render_targets[i]) + wined3d_resource_acquire(state->fb.render_targets[i]->resource); } - if (state->fb->depth_stencil) - wined3d_resource_acquire(state->fb->depth_stencil->resource); + if (state->fb.depth_stencil) + wined3d_resource_acquire(state->fb.depth_stencil->resource); acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); @@ -1103,8 +1103,8 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v BOOL prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; - prev = cs->state.fb->render_targets[op->view_idx]; - cs->fb.render_targets[op->view_idx] = op->view; + prev = cs->state.fb.render_targets[op->view_idx]; + cs->state.fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; @@ -1132,7 +1132,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; - if ((prev = cs->state.fb->depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) + if ((prev = cs->state.fb.depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture *prev_texture = texture_from_resource(prev->resource); @@ -1142,7 +1142,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); } - cs->fb.depth_stencil = op->view; + cs->state.fb.depth_stencil = op->view; if (!prev != !op->view) { @@ -1965,7 +1965,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2844,7 +2844,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0a0c4c526c8..0f52b0dea2e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1070,7 +1070,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; - memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -1145,8 +1145,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); - memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); @@ -1163,11 +1161,11 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = device->fb.depth_stencil)) + if ((view = device->state.fb.depth_stencil)) { TRACE("Releasing depth/stencil view %p.\n", view); - device->fb.depth_stencil = NULL; + device->state.fb.depth_stencil = NULL; wined3d_rendertarget_view_decref(view); } @@ -1186,6 +1184,9 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; + + memset(&device->state, 0, sizeof(device->state)); + state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -1654,7 +1655,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) dst_resource = &dst_texture->resource; if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) return; - if (!(src_view = state->fb->depth_stencil)) + if (!(src_view = state->fb.depth_stencil)) return; wined3d_device_resolve_sub_resource(device, dst_resource, 0, @@ -3858,7 +3859,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - struct wined3d_rendertarget_view *ds = device->fb.depth_stencil; + struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; if (!ds) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); @@ -3867,8 +3868,8 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } else if (flags & WINED3DCLEAR_TARGET) { - if (ds->width < device->fb.render_targets[0]->width - || ds->height < device->fb.render_targets[0]->height) + if (ds->width < device->state.fb.render_targets[0]->width + || ds->height < device->state.fb.render_targets[0]->height) { WARN("Silently ignoring depth and target clear with mismatching sizes\n"); return WINED3D_OK; @@ -4218,8 +4219,8 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_STENCILENABLE]) { - struct wined3d_rendertarget_view *rt = device->fb.render_targets[0]; - struct wined3d_rendertarget_view *ds = device->fb.depth_stencil; + struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; + struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; if (ds && rt && (ds->width < rt->width || ds->height < rt->height)) { @@ -4724,14 +4725,14 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(co return NULL; } - return device->fb.render_targets[view_idx]; + return device->state.fb.render_targets[view_idx]; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->fb.depth_stencil; + return device->state.fb.depth_stencil; } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, @@ -4796,13 +4797,13 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } - prev = device->fb.render_targets[view_idx]; + prev = device->state.fb.render_targets[view_idx]; if (view == prev) return WINED3D_OK; if (view) wined3d_rendertarget_view_incref(view); - device->fb.render_targets[view_idx] = view; + device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ @@ -4828,14 +4829,14 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - prev = device->fb.depth_stencil; + prev = device->state.fb.depth_stencil; if (prev == view) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); return WINED3D_OK; } - if ((device->fb.depth_stencil = view)) + if ((device->state.fb.depth_stencil = view)) wined3d_rendertarget_view_incref(view); wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) @@ -5100,6 +5101,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; + struct wined3d_fb_state old_fb; struct wined3d_output *output; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5344,8 +5346,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) device->adapter->adapter_ops->adapter_uninit_3d(device); + old_fb = device->state.fb; + memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + + device->state.fb = old_fb; device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5447,13 +5453,13 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) { - if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) + if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); } - if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) + if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); } @@ -5595,7 +5601,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined return hr; } - state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->max_frame_latency = 3; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 26dde1087a0..df8ee3c030d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1734,7 +1734,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_vec4 correction_params = { /* Position is relative to the framebuffer, not the viewport. */ - context->render_offscreen ? 0.0f : (float)state->fb->render_targets[0]->height, + context->render_offscreen ? 0.0f : (float)state->fb.render_targets[0]->height, context->render_offscreen ? 1.0f : -1.0f, 0.0f, 0.0f, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 95db994ff30..41c48c0468b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3904,7 +3904,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb)) { static unsigned int warned = 0; @@ -4161,9 +4161,9 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; - for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { - struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; + struct wined3d_rendertarget_view *rtv = state->fb.render_targets[i]; if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b5d54db5b3b..d375122781b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -236,7 +236,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* No z test without depth stencil buffers */ - if (!state->fb->depth_stencil) + if (!state->fb.depth_stencil) { TRACE("No Z buffer - disabling depth test\n"); zenable = WINED3D_ZB_FALSE; @@ -556,7 +556,7 @@ static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined { const struct wined3d_blend_state *b = state->blend_state; - if (!state->fb->render_targets[index]) + if (!state->fb.render_targets[index]) return FALSE; if (!b->desc.rt[index].enable) @@ -566,7 +566,7 @@ static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined * With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ if (context->render_offscreen - && !(state->fb->render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + && !(state->fb.render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) return FALSE; return TRUE; @@ -610,7 +610,7 @@ static void blend(struct wined3d_context *context, const struct wined3d_state *s gl_info->gl_ops.gl.p_glEnable(GL_BLEND); checkGLcall("glEnable GL_BLEND"); - rt_format = state->fb->render_targets[0]->format; + rt_format = state->fb.render_targets[0]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); @@ -683,7 +683,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat return; } - rt_format = state->fb->render_targets[0]->format; + rt_format = state->fb.render_targets[0]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); @@ -766,7 +766,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat GL_EXTCALL(glEnablei(GL_BLEND, i)); checkGLcall("glEnablei GL_BLEND"); - rt_format = state->fb->render_targets[i]->format; + rt_format = state->fb.render_targets[i]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[i].src, b->desc.rt[i].dst, rt_format); gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[i].src_alpha, b->desc.rt[i].dst_alpha, rt_format); @@ -1061,7 +1061,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ GLint depthFail_back; /* No stencil test without a stencil buffer. */ - if (!state->fb->depth_stencil) + if (!state->fb.depth_stencil) { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); @@ -1075,7 +1075,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); @@ -1157,7 +1157,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ static void state_stencilwrite2s_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; + DWORD mask = state->fb.depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); @@ -1171,7 +1171,7 @@ static void state_stencilwrite2s_ext(struct wined3d_context *context, const stru static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; + DWORD mask = state->fb.depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; gl_info->gl_ops.gl.p_glStencilMask(mask); @@ -1859,7 +1859,7 @@ static void depthbias(struct wined3d_context *context, const struct wined3d_stat if (scale_bias || const_bias.f) { - const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; + const struct wined3d_rendertarget_view *depth = state->fb.depth_stencil; float factor, units, scale, clamp; clamp = r ? r->desc.depth_bias_clamp : 0.0f; @@ -4092,8 +4092,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void get_viewports(struct wined3d_context *context, const struct wined3d_state *state, unsigned int viewport_count, struct wined3d_viewport *viewports) { - const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *depth_stencil = state->fb.depth_stencil; + const struct wined3d_rendertarget_view *target = state->fb.render_targets[0]; unsigned int width, height, i; for (i = 0; i < viewport_count; ++i) @@ -4342,7 +4342,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st if (!context->render_offscreen) { - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *target = state->fb.render_targets[0]; unsigned int width; wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); @@ -4474,7 +4474,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (needs_srgb_write(context->d3d_info, state, state->fb)) + if (needs_srgb_write(context->d3d_info, state, &state->fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b6c3169c4c6..48d133485b8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1851,13 +1851,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->streams[i].frequency = 1; } -void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; state->flags = flags; - state->fb = fb; for (i = 0; i < LIGHTMAP_SIZE; i++) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c5fd2879c05..e4cb5a27469 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -506,7 +506,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; - const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; + const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; struct wined3d_texture *logo_texture, *cursor_texture; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f3ed3b3cec5..7b08851fbf9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5493,7 +5493,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = flip ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; - enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? + enum wined3d_depth_buffer_type zenable = state->fb.depth_stencil ? state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? clip_control ? 1.0f : 2.0f : 0.0f; float z_offset = zenable ? clip_control ? 0.0f : -1.0f : 0.0f; @@ -6236,7 +6236,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e976fb0aaa..8740c532a59 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3186,7 +3186,7 @@ struct wined3d_light_state struct wined3d_state { DWORD flags; - const struct wined3d_fb_state *fb; + struct wined3d_fb_state fb; struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; @@ -3303,7 +3303,6 @@ struct wined3d_device struct wine_rb_tree samplers, rasterizer_states, blend_states; /* Render Target Support */ - struct wined3d_fb_state fb; struct wined3d_rendertarget_view *auto_depth_stencil_view; /* Cursor management */ @@ -3991,8 +3990,7 @@ HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD l const struct wined3d_light *params, struct wined3d_light_info **light_info) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id @@ -4035,7 +4033,6 @@ struct wined3d_cs { const struct wined3d_cs_ops *ops; struct wined3d_device *device; - struct wined3d_fb_state fb; struct wined3d_state state; HMODULE wined3d_module; HANDLE thread; @@ -5306,12 +5303,12 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (dsv = state->fb->depth_stencil) && dsv->resource == resource + && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; -- 2.24.1

4 10

TestBot: A dive into the Windows timers
by Francois Gouget March 25, 2020

March 25, 2020

TL;DR; * Windows is bad at hitting precise timing targets. * The 15.6 ms Windows timer granularity can have an impact on the tests reliability. * But some unknown factor is causing large delays which are the source of most timing related failures. * The same delays probably also cause the wait timed out failures. * Avoiding these failures in the timer tests is tricky. -> Find the source of these delays and figure out how to avoid them. My test subject for this dive was test_tp_timer() in ntdll:threadpool, and more specifically the loop which we expect to run in 500 to 750 ms: https://source.winehq.org/git/wine.git/blob/HEAD:/dlls/ntdll/tests/threadpo… * Recurring timers are nice because one knows exactly how often they should generate an event which makes it easy to see how badly and how often they miss. This is unlike most WaitForSingleObject() calls where one does not know how much time will elapse and all one gets is the unpredictable one-off timeout. * Wine on Linux is waaay better than Windows at ensuring the timer events arrive precisely on time. Even in a QEmu VM on an otherwise busy machine, every event arrives within 1 ms of the expected time (so in this case, in Wine we go through the loop once every 200 ms and rarely 199 or 201 ms). * On Windows the default timer resolution is 15.625 ms. So asking for a 200 ms timer interval as in this test is asking for trouble: Windows will round that to 13 * 15.625 ms = 203 ms and then occasionally make the interval shorter so the average stays around 200 ms. So we typically get a pattern of 203 203 203 203 188 ms and again 203... * Even on real hardware (Windows 8.1 on cw-rx460), Windows can sometimes get into a rut, alternating between 172 ms and 219 ms for instance. So if I tweak the test to go through more loops I'd sometimes get only 4 out of 14 events arriving within 190-210 ms of the previous one! Whether this happens is heavily influenced by the other processes running on the machine, such as playing a video in IE. * This means that based on just a few events one cannot expect the interval between most events to fall within a narrow range. So here for instance if the acceptable interval is 190-210 ms and the first interval is instead 237 ms, then the next one will necessarily be out of range too, and likely the one after that too. So expecting 2 out of 3 intervals to be within the range is no more reliable than checking just one interval. * The timer resolution can be changed with NtSetTimerResolution() and increased to 0.5 ms. But that does not change the results: one still gets 203, 203, 203, 203, 188 ms. My understanding is that increasing the timer resolution really only impacts timers that request a higher resolution. But that means testing a different API. * At least increasing the timer resolution seems to prevent Windows from getting stuck alternating between 172 and 219 ms. * Interestingly if one starts a Disk Cleanup and then runs "Clean up system files", the analysis of the system files drops the timer interval to 0.5 ms! So trying to see the impact of disk activity can modify the results in unexpected ways. * One can check the current timer resolution with ClockRes command line tool: https://docs.microsoft.com/en-us/sysinternals/downloads/clockres * When the delay is greater than the timer interval, e.g. 437 ms, the timer does not try to compensate for the lost events. But it does try to compensate for the fractional interval remainder. So one sees: Expected Actual Loop Time Time Interval Lateness 1 200 437 437 200+37 2 400 609 172 200+9 3 600 812 203 200+12 4 800 1000 188 200 * In QEmu, when the timer misses it often misses big: 437 ms, 687 ms, even 1469 ms. So most of the time expecting three events to take about 3 intervals does not help with reliability because the timer does not try to compensate the missed events. So at the end it will still be off by one interval (200 ms) or more. * I could not reproduce these big misses on the Windows 8.1 on cw-rx460 machine (i.e. real hardware). * Conclusion: - Because Windows constantly adjusts the timer interval so that they are only accurate *on average*, testing the total time for N events will be more reliable than testing the events individually. - But the occasional big delays mean any timing tolerances below ~1700 ms will be somewhat unreliable :-( - For timers one could check if a big delay happened in one of the loops and either account for it or reset the timer and retry in the hope no delay will occur then. But that's overly complex. - The same big delays are probably also the cause of the WaitForSingleObject() failures when the timeout is < 2000 ms. - The timing in Wine in Debian VMs is very reliable. Yet it is likely that QEmu is somehow responsible for the timing issues in the Windows VMs. - The best lead at this point is to check whether some VM clock setting is causing this. But some are also need to prevent reverts from taking forever[1]. (w8) <clock offset='localtime'> <timer name='rtc' tickpolicy='delay'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> </clock> vs. (w1064) <hyperv> <relaxed state='on'/> <vapic state='on'/> <spinlocks state='on' retries='8191'/> </hyperv> <clock offset='localtime'> <timer name='rtc' tickpolicy='catchup' track='guest'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> <timer name='hypervclock' present='yes'/> </clock> vs. (fgtbdebian10) <clock offset='utc'/> - Otherwise try CPU pinning. But Linux seems to do really well without it... [1] https://bugs.launchpad.net/qemu/+bug/1505041 https://bugs.launchpad.net/qemu/+bug/1174654 -- Francois Gouget <fgouget(a)codeweavers.com>

3 3

[PATCH 6/6] dbghelp: Move reading debug base address from PEB to check_live_target.
by Jacek Caban March 25, 2020

March 25, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 22 ++++++++++-- dlls/dbghelp/dbghelp_private.h | 4 +-- dlls/dbghelp/elf_module.c | 55 ++++++---------------------- dlls/dbghelp/macho_module.c | 66 +++++++++------------------------- 4 files changed, 47 insertions(+), 100 deletions(-)

1 0