March 2021 - Wine-commits - list.winehq.org

Jiangyi Chen : ws2_32: Add a missing break.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 37b7d573b2832c5415220acb2ab33f2c8ab26fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b7d573b2832c5415220acb… Author: Jiangyi Chen <chenjiangyi(a)uniontech.com> Date: Mon Mar 15 11:24:02 2021 +0800 ws2_32: Add a missing break. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6e783f87ee7..28b14e71c9c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7484,6 +7484,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!af) af = supported_protocols[i].iAddressFamily; if (!type) type = supported_protocols[i].iSocketType; if (!protocol) protocol = supported_protocols[i].iProtocol; + break; } }

1 0

Francois Gouget : winetest: Simplify the 'dll is native' error message.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 21e9d51b366148d8bcc4e701dd1fa445315178da URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e9d51b366148d8bcc4e701… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:40 2021 +0100 winetest: Simplify the 'dll is native' error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 408e1b3c706..b0b6ceff88b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -957,7 +957,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } else if (is_native_dll(dll)) { - xprintf (" %s=load error Configured as native\n", dllname); + xprintf (" %s=dll is native\n", dllname); nr_native_dlls++; run = FALSE; }

1 0

Francois Gouget : winetest: Show more detailed version error information.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 18c12c6dbb9946bb7eebf9dda2541c0acce53cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c12c6dbb9946bb7eebf9dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:48 2021 +0100 winetest: Show more detailed version error information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b0b6ceff88b..e203b781dc8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -129,14 +129,14 @@ static char * get_file_version(char * file_name) pFixedVersionInfo->dwFileVersionLS >> 16, pFixedVersionInfo->dwFileVersionLS & 0xffff); } else - sprintf(version, "version not available"); + sprintf(version, "version not found"); } else - sprintf(version, "unknown"); + sprintf(version, "version error %u", GetLastError()); heap_free(data); } else - sprintf(version, "failed"); + sprintf(version, "version error %u", ERROR_OUTOFMEMORY); } else - sprintf(version, "version not available"); + sprintf(version, "version not present"); return version; }

1 0

Torge Matthies : winepulse.drv: Make timer thread time-critical.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: b07c33cac4538b06a276d4cf6cc85487d31041e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07c33cac4538b06a276d4cf… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Mar 6 02:27:13 2021 +0100 winepulse.drv: Make timer thread time-critical. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 417067f0bf8..4609b2851ed 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2045,8 +2045,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) This->started = TRUE; This->just_started = TRUE; - if(!This->timer) + if(!This->timer) { This->timer = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); + SetThreadPriority(This->timer, THREAD_PRIORITY_TIME_CRITICAL); + } } pthread_mutex_unlock(&pulse_lock); return hr;

1 0

Torge Matthies : winepulse.drv: Make timer delay more accurate.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6dd96842fed8ef3b1627a41f58eaec4f897a3ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd96842fed8ef3b1627a41f… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Mar 6 02:27:14 2021 +0100 winepulse.drv: Make timer delay more accurate. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4609b2851ed..10b01868a9d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" @@ -1021,14 +1022,14 @@ static void pulse_read(ACImpl *This) static DWORD WINAPI pulse_timer_cb(void *user) { - DWORD delay; + LARGE_INTEGER delay; UINT32 adv_bytes; ACImpl *This = user; int success; pa_operation *o; pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; pa_stream_get_time(This->stream, &This->last_time); pthread_mutex_unlock(&pulse_lock); @@ -1036,11 +1037,11 @@ static DWORD WINAPI pulse_timer_cb(void *user) pa_usec_t now, adv_usec = 0; int err; - Sleep(delay); + NtDelayExecution(FALSE, &delay); pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; o = pa_stream_update_timing_info(This->stream, pulse_op_cb, &success); if (o) @@ -1076,7 +1077,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) else if(adjust < -((INT32)(This->mmdev_period_usec / 2))) adjust = -1 * This->mmdev_period_usec / 2; - delay = (This->mmdev_period_usec + adjust) / 1000; + delay.QuadPart = -(This->mmdev_period_usec + adjust) * 10; This->last_time += This->mmdev_period_usec; } @@ -1094,16 +1095,16 @@ static DWORD WINAPI pulse_timer_cb(void *user) } }else{ This->last_time = now; - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; } } if (This->event) SetEvent(This->event); - TRACE("%p after update, adv usec: %d, held: %u, delay: %u\n", + TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", This, (int)adv_usec, - (int)(This->held_bytes/ pa_frame_size(&This->ss)), delay); + (int)(This->held_bytes/ pa_frame_size(&This->ss)), (unsigned int)(-delay.QuadPart / 10)); pthread_mutex_unlock(&pulse_lock); }

1 0

Adam Gashlin : advapi32: Don't revoke ACCESS_DENIED_ACE.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 23ffd0a7986421958c23cffce138afa389209920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ffd0a7986421958c23cffc… Author: Adam Gashlin <agashlin(a)gmail.com> Date: Mon Mar 1 21:18:01 2021 -0800 advapi32: Don't revoke ACCESS_DENIED_ACE. REVOKE_ACCESS is only documented to remove ACCESS_ALLOWED_ACE and SYSTEM_AUDIT_ACE. Signed-off-by: Adam Gashlin <agashlin(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 3 +-- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9f80a846966..6246cd21a62 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2314,8 +2314,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, add = FALSE; break; case ACCESS_DENIED_ACE_TYPE: - if (EqualSid(ppsid[j], &((ACCESS_DENIED_ACE *)old_ace_header)->SidStart)) - add = FALSE; + /* REVOKE_ACCESS does not affect ACCESS_DENIED_ACE. */ break; case SYSTEM_AUDIT_ACE_TYPE: if (EqualSid(ppsid[j], &((SYSTEM_AUDIT_ACE *)old_ace_header)->SidStart)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a8c1a80e419..ce9c26d238e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7437,6 +7437,32 @@ static void test_GetExplicitEntriesFromAclW(void) ok(access2 == NULL, "access2 was not NULL\n"); LocalFree(new_acl); + /* Make the ACL both Allow and Deny Everyone. */ + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, everyone_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce(old_acl, ACL_REVISION, KEY_WRITE, everyone_sid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + /* Revoke Everyone. */ + access.Trustee.ptstrName = everyone_sid; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.grfAccessPermissions = 0; + new_acl = NULL; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + /* Deny Everyone should remain (along with Grant Users from earlier). */ + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ , "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + ok(access2[1].grfAccessMode == DENY_ACCESS, "Expected DENY_ACCESS, got %d\n", access2[1].grfAccessMode); + ok(access2[1].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[1].grfAccessPermissions); + ok(EqualSid(access2[1].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + FreeSid(users_sid); FreeSid(everyone_sid); HeapFree(GetProcessHeap(), 0, old_acl);

1 0

Henri Verbeet : d3d11: Validate the feature level count in d3d11_device_CreateDeviceContextState().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 0ab3adf65a807262c19b67224569bea918dc0aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab3adf65a807262c19b6722… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:34 2021 +0100 d3d11: Validate the feature level count in d3d11_device_CreateDeviceContextState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++----- dlls/d3d11/tests/d3d11.c | 12 +++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4ae146b11a6..ff628eeaae1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4061,15 +4061,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Devic } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, UINT sdk_version, REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state) { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + HRESULT hr = E_INVALIDARG; FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", iface, flags, feature_levels, - feature_levels_count, sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", + iface, flags, feature_levels, feature_level_count, sdk_version, + debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (!feature_level_count) + goto fail; if (chosen_feature_level) FIXME("Device context state feature level not implemented yet.\n"); @@ -4078,8 +4083,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) { - *state = NULL; - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } d3d_device_context_state_init(state_impl, device, emulated_interface); @@ -4089,6 +4094,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev device->d3d11_only = FALSE; if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); return state ? S_OK : S_FALSE; + +fail: + if (chosen_feature_level) + *chosen_feature_level = 0; + if (state) + *state = NULL; + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1b35e8f4983..acbd1856b08 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6876,19 +6876,17 @@ static void test_device_context_state(void) context_state = (void *)0xc0de0001; hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, &context_state); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); - todo_wine ok(!context_state, "Got unexpected context state %p.\n", context_state); - if (SUCCEEDED(hr)) - ID3DDeviceContextState_Release(context_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); + ok(!context_state, "Got unexpected context state %p.\n", context_state); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device1_CreateDeviceContextState(device, 0, NULL, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, &context_state);

1 0

Henri Verbeet : wined3d: Introduce wined3d_state_reset().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 7dadbc586ec991eb7eab738e4c92a740596e32d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dadbc586ec991eb7eab738e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:35 2021 +0100 wined3d: Introduce wined3d_state_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 +---- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/wined3d_private.h | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6bb628b5d13..0d28cb7e0b1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2079,11 +2079,8 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { - struct wined3d_adapter *adapter = cs->c.device->adapter; - state_cleanup(&cs->state); - memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 289c5d941d6..4fb6063741a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1251,8 +1251,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -5754,8 +5753,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->adapter->adapter_ops->adapter_uninit_3d(device); - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86d8061d005..06c7d74d199 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3710,6 +3710,18 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, uint32_t flags) DECLSPEC_HIDDEN; +void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; + +static inline void wined3d_state_reset(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + uint32_t flags = state->flags; + + memset(state, 0, sizeof(*state)); + state_init(state, d3d_info, flags); +} + static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) { if (!state->depth_stencil_state) @@ -4639,10 +4651,6 @@ struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_li HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, 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, 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 { WINED3D_CS_QUEUE_DEFAULT = 0,

1 0

Henri Verbeet : wined3d: Store the feature level in the wined3d_state structure.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 53fdee61082b10b850fcb14ccd02187eb684b007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fdee61082b10b850fcb14c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:36 2021 +0100 wined3d: Store the feature level in the wined3d_state structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/wined3d/cs.c | 34 +++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 17 ++++++----------- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/stateblock.c | 13 +++++++++++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 15 +++++++++------ include/wine/wined3d.h | 2 +- 8 files changed, 63 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53fdee61082b10b850fc…

1 0

Henri Verbeet : wined3d: Move feature level selection to wined3d_state_create().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 4cfac484db49b6d219cb3b5b14ca19011ed81397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cfac484db49b6d219cb3b5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:37 2021 +0100 wined3d: Move feature level selection to wined3d_state_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 29 +---------------------------- dlls/wined3d/stateblock.c | 35 ++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 3 ++- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 414560be72a..16a1027beb9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -295,7 +295,8 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d if ((entry = d3d_device_context_state_get_entry(state, device))) return entry->wined3d_state; - if (FAILED(wined3d_state_create(device->wined3d_device, &wined3d_state))) + if (FAILED(wined3d_state_create(device->wined3d_device, + (enum wined3d_feature_level *)&device->feature_level, 1, &wined3d_state))) return NULL; if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 69f6a437e97..886a76284ff 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3008,7 +3008,8 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) FreeLibraryAndExitThread(wined3d_module, 0); } -struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, enum wined3d_feature_level feature_level) +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; @@ -3016,12 +3017,11 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, enum wined3d if (!(cs = heap_alloc_zero(sizeof(*cs)))) return NULL; - if (!(cs->c.state = heap_alloc_zero(sizeof(*cs->c.state)))) + if (FAILED(wined3d_state_create(device, levels, level_count, &cs->c.state))) { heap_free(cs); return NULL; } - state_init(cs->c.state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, feature_level); cs->c.ops = &wined3d_cs_st_ops; cs->c.device = device; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d97b2eb85..ca179c753ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5976,27 +5976,6 @@ static int wined3d_depth_stencil_state_compare(const void *key, const struct win return memcmp(&state->desc, key, sizeof(state->desc)); } -static BOOL wined3d_select_feature_level(const struct wined3d_adapter *adapter, - const enum wined3d_feature_level *levels, unsigned int level_count, - enum wined3d_feature_level *selected_level) -{ - const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; - unsigned int i; - - for (i = 0; i < level_count; ++i) - { - if (levels[i] && d3d_info->feature_level >= levels[i]) - { - *selected_level = levels[i]; - return TRUE; - } - } - - FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " - "with the current shader backend.\n"); - return FALSE; -} - HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, @@ -6005,15 +5984,9 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; - enum wined3d_feature_level feature_level; unsigned int i; HRESULT hr; - if (!wined3d_select_feature_level(adapter, levels, level_count, &feature_level)) - return E_FAIL; - - TRACE("Device feature level %s.\n", wined3d_debug_feature_level(feature_level)); - device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); @@ -6058,7 +6031,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined device->max_frame_latency = 3; - if (!(device->cs = wined3d_cs_create(device, feature_level))) + if (!(device->cs = wined3d_cs_create(device, levels, level_count))) { WARN("Failed to create command stream.\n"); hr = E_FAIL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2cef5a6498a..1f1ba262336 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -27,6 +27,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static const DWORD pixel_states_render[] = { @@ -1887,15 +1888,43 @@ void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_ state_init_default(state, d3d_info); } -HRESULT CDECL wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state) +static bool wined3d_select_feature_level(const struct wined3d_adapter *adapter, + const enum wined3d_feature_level *levels, unsigned int level_count, + enum wined3d_feature_level *selected_level) { + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + unsigned int i; + + for (i = 0; i < level_count; ++i) + { + if (levels[i] && d3d_info->feature_level >= levels[i]) + { + *selected_level = levels[i]; + return true; + } + } + + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " + "with the current shader backend.\n"); + return false; +} + +HRESULT CDECL wined3d_state_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_state **state) +{ + enum wined3d_feature_level feature_level; struct wined3d_state *object; - TRACE("device %p, state %p.\n", device, state); + TRACE("device %p, levels %p, level_count %u, state %p.\n", device, levels, level_count, state); + + if (!wined3d_select_feature_level(device->adapter, levels, level_count, &feature_level)) + return E_FAIL; + + TRACE("Selected feature level %s.\n", wined3d_debug_feature_level(feature_level)); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - state_init(object, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, device->cs->c.state->feature_level); + state_init(object, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, feature_level); *state = object; return S_OK; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c91f488a7b4..3fe3e0cfd89 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -245,7 +245,7 @@ @ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) -@ cdecl wined3d_state_create(ptr ptr) +@ cdecl wined3d_state_create(ptr ptr long ptr) @ cdecl wined3d_state_destroy(ptr) @ cdecl wined3d_state_get_feature_level(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e934d0f4b87..a8947f444cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,7 +4717,7 @@ struct wined3d_cs }; struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, - enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; + const enum wined3d_feature_level *levels, unsigned int level_count) DECLSPEC_HIDDEN; void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 77c6c223b7b..3c091263742 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2745,7 +2745,8 @@ void __cdecl wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); -HRESULT __cdecl wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state); +HRESULT __cdecl wined3d_state_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_state **state); void __cdecl wined3d_state_destroy(struct wined3d_state *state); enum wined3d_feature_level __cdecl wined3d_state_get_feature_level(const struct wined3d_state *state);

1 0