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

Francois Gouget : winetest: Show more detailed version error information.
by Alexandre Julliard March 15, 2021

March 15, 2021

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

Adam Gashlin : advapi32: Don't revoke ACCESS_DENIED_ACE.
by Alexandre Julliard March 15, 2021

March 15, 2021

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

Rémi Bernon : windows.media.speech: Implement IInstalledVoicesStatic stub.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: f4dbded171228a9c57dd745791ddeb791f3ca79e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4dbded171228a9c57dd7457… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:10 2021 +0100 windows.media.speech: Implement IInstalledVoicesStatic stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 89 +++++++++++++++++++++++++++++++ dlls/windows.media.speech/tests/statics.c | 8 +-- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index a6b4fb2ff0a..0d1da641394 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -29,7 +29,10 @@ #include "initguid.h" #include "activation.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Media_SpeechSynthesis #include "windows.media.speechsynthesis.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); @@ -46,6 +49,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct windows_media_speech { IActivationFactory IActivationFactory_iface; + IInstalledVoicesStatic IInstalledVoicesStatic_iface; LONG ref; }; @@ -54,9 +58,16 @@ static inline struct windows_media_speech *impl_from_IActivationFactory(IActivat return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface); } +static inline struct windows_media_speech *impl_from_IInstalledVoicesStatic(IInstalledVoicesStatic *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_speech, IInstalledVoicesStatic_iface); +} + static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( IActivationFactory *iface, REFIID iid, void **out) { + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || @@ -69,6 +80,13 @@ static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_IInstalledVoicesStatic)) + { + IUnknown_AddRef(iface); + *out = &impl->IInstalledVoicesStatic_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -133,9 +151,80 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = windows_media_speech_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE installed_voices_static_QueryInterface( + IInstalledVoicesStatic *iface, REFIID iid, void **out) +{ + struct windows_media_speech *impl = impl_from_IInstalledVoicesStatic(iface); + return windows_media_speech_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE installed_voices_static_AddRef( + IInstalledVoicesStatic *iface) +{ + struct windows_media_speech *impl = impl_from_IInstalledVoicesStatic(iface); + return windows_media_speech_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE installed_voices_static_Release( + IInstalledVoicesStatic *iface) +{ + struct windows_media_speech *impl = impl_from_IInstalledVoicesStatic(iface); + return windows_media_speech_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE installed_voices_static_GetIids( + IInstalledVoicesStatic *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE installed_voices_static_GetRuntimeClassName( + IInstalledVoicesStatic *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE installed_voices_static_GetTrustLevel( + IInstalledVoicesStatic *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE installed_voices_static_get_AllVoices( + IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE installed_voices_static_get_DefaultVoice( + IInstalledVoicesStatic *iface, IVoiceInformation **value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IInstalledVoicesStaticVtbl installed_voices_static_vtbl = +{ + installed_voices_static_QueryInterface, + installed_voices_static_AddRef, + installed_voices_static_Release, + /* IInspectable methods */ + installed_voices_static_GetIids, + installed_voices_static_GetRuntimeClassName, + installed_voices_static_GetTrustLevel, + /* IInstalledVoicesStatic methods */ + installed_voices_static_get_AllVoices, + installed_voices_static_get_DefaultVoice, +}; + static struct windows_media_speech windows_media_speech = { {&activation_factory_vtbl}, + {&installed_voices_static_vtbl}, 1 }; diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/statics.c index 02bb267dc06..470b6d769c6 100644 --- a/dlls/windows.media.speech/tests/statics.c +++ b/dlls/windows.media.speech/tests/statics.c @@ -75,8 +75,7 @@ static void test_SpeechSynthesizer(void) ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - todo_wine ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); ok(SUCCEEDED(hr), "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); @@ -89,7 +88,8 @@ static void test_SpeechSynthesizer(void) IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + todo_wine ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); @@ -107,10 +107,10 @@ static void test_SpeechSynthesizer(void) rc = IVectorView_VoiceInformation_Release(voices); ok(rc == 0, "IVectorView_VoiceInformation_Release returned unexpected refcount %d\n", rc); +done: rc = IInstalledVoicesStatic_Release(voices_static); ok(rc == 4, "IInstalledVoicesStatic_Release returned unexpected refcount %d\n", rc); -done: rc = IAgileObject_Release(agile_object); ok(rc == 3, "IAgileObject_Release returned unexpected refcount %d\n", rc); rc = IInspectable_Release(inspectable);

1 0

Rémi Bernon : include: Add KSHARED_USER_DATA QpcData details and flags.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 3b874440acb7858953a4a0b59cfc39196cfed7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b874440acb7858953a4a0b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 10 12:22:34 2021 +0100 include: Add KSHARED_USER_DATA QpcData details and flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c0b97e243aa..3b9af7d52b2 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1292,12 +1292,26 @@ typedef struct _KUSER_SHARED_DATA { volatile ULONGLONG QpcBias; /* 0x3b8 */ ULONG ActiveProcessorCount; /* 0x3c0 */ volatile UCHAR ActiveGroupCount; /* 0x3c4 */ - USHORT QpcData; /* 0x3c6 */ + union { + USHORT QpcData; /* 0x3c6 */ + struct { + UCHAR volatile QpcBypassEnabled; + UCHAR QpcShift; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME3; LARGE_INTEGER TimeZoneBiasEffectiveStart; /* 0x3c8 */ LARGE_INTEGER TimeZoneBiasEffectiveEnd; /* 0x3d0 */ XSTATE_CONFIGURATION XState; /* 0x3d8 */ } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED 0x01 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE 0x02 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_DISABLE_32BIT 0x04 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_MFENCE 0x10 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_LFENCE 0x20 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_A73_ERRATA 0x40 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP 0x80 + typedef enum _MEMORY_CACHING_TYPE { MmNonCached = 0, MmCached = 1,

1 0

Torge Matthies : winepulse.drv: Make timer thread time-critical.
by Alexandre Julliard March 15, 2021

March 15, 2021

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

Rémi Bernon : windows.media.speech: Fake empty IInstalledVoicesStatic::AllVoices vector.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 0c216c5d5735c7808478171b380254aad6fe2603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c216c5d5735c7808478171b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:12 2021 +0100 windows.media.speech: Fake empty IInstalledVoicesStatic::AllVoices vector. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 11 +++++++---- dlls/windows.media.speech/tests/statics.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index 28b1c45c4fd..92215fe717d 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -119,28 +119,31 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt( IVectorView_VoiceInformation *iface, ULONG index, IVoiceInformation **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( IVectorView_VoiceInformation *iface, ULONG *value) { FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + *value = 0; + return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( IVectorView_VoiceInformation *iface, IVoiceInformation *element, ULONG *index, BOOLEAN *value) { FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); - return E_NOTIMPL; + *value = FALSE; + return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany( IVectorView_VoiceInformation *iface, ULONG start_index, IVoiceInformation **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); - return E_NOTIMPL; + *value = 0; + return S_OK; } static const struct IVectorView_VoiceInformationVtbl vector_view_voice_information_vtbl = diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/statics.c index 30994b3ac1d..8454729f9c3 100644 --- a/dlls/windows.media.speech/tests/statics.c +++ b/dlls/windows.media.speech/tests/statics.c @@ -100,7 +100,7 @@ static void test_SpeechSynthesizer(void) size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - todo_wine ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); rc = IVectorView_VoiceInformation_Release(voices);

1 0

Henri Verbeet : d3d11: Validate the feature level count in d3d11_device_CreateDeviceContextState().
by Alexandre Julliard March 15, 2021

March 15, 2021

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: Move feature level selection to wined3d_state_create().
by Alexandre Julliard March 15, 2021

March 15, 2021

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

Jacek Caban : mshtml: Use single navigator instance per inner window.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 000321b234291fee3a00e14a4c5d0a045b85d838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000321b234291fee3a00e14a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:45 2021 +0100 mshtml: Use single navigator instance per inner window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 14 ++++++++++++-- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/omnavigator.c | 9 +++++---- dlls/mshtml/tests/dom.c | 4 +++- dlls/mshtml/tests/dom.js | 10 ++++++++++ 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a373bbe1916..5d9a603e686 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -294,6 +294,8 @@ static void release_inner_window(HTMLInnerWindow *This) IOmHistory_Release(&This->history->IOmHistory_iface); } + if(This->navigator) + IOmNavigator_Release(This->navigator); if(This->session_storage) IHTMLStorage_Release(This->session_storage); if(This->local_storage) @@ -918,11 +920,19 @@ static HRESULT WINAPI HTMLWindow2_get_opener(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigator **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); - *p = OmNavigator_Create(); - return *p ? S_OK : E_OUTOFMEMORY; + if(!window->navigator) { + HRESULT hres; + hres = create_navigator(dispex_compat_mode(&window->event_target.dispex), &window->navigator); + if(FAILED(hres)) + return hres; + } + + IOmNavigator_AddRef(*p = window->navigator); + return S_OK; } static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 784432b30b2..f870c05f2cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -535,6 +535,7 @@ struct HTMLInnerWindow { HTMLXMLHttpRequestFactory *xhr_factory; IHTMLScreen *screen; OmHistory *history; + IOmNavigator *navigator; IHTMLStorage *session_storage; IHTMLStorage *local_storage; @@ -910,7 +911,7 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactor HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; -IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; +HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index f3a3ec54924..624e66b4c95 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1453,20 +1453,21 @@ static dispex_static_data_t OmNavigator_dispex = { OmNavigator_iface_tids }; -IOmNavigator *OmNavigator_Create(void) +HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator) { OmNavigator *ret; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) - return NULL; + return E_OUTOFMEMORY; ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl; ret->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)&ret->IOmNavigator_iface, &OmNavigator_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IOmNavigator_iface, &OmNavigator_dispex, compat_mode); - return &ret->IOmNavigator_iface; + *navigator = &ret->IOmNavigator_iface; + return S_OK; } typedef struct { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ebed27b48e8..3c9deec7d0b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6296,12 +6296,13 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + todo_wine ok(navigator != navigator2, "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); hres = IHTMLWindow2_get_clientInformation(window, &navigator2); ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres); - todo_wine ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); + ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); IHTMLWindow2_Release(window); @@ -6416,6 +6417,7 @@ static void test_navigator(IHTMLDocument2 *doc) test_mime_types_col(navigator); ref = IOmNavigator_Release(navigator); + todo_wine ok(!ref, "navigator should be destroyed here\n"); } diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 7fc6b87882c..e1c60d6ea53 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -415,3 +415,13 @@ async_test("animation", function() { document.body.appendChild(div); div.className = "testAnimation"; }); + +sync_test("navigator", function() { + ok(typeof(window.navigator) === "object", + "typeof(window.navigator) = " + typeof(window.navigator)); + + var v = window.navigator; + ok(v === window.navigator, "v != window.navigator"); + v.testProp = true; + ok(window.navigator.testProp, "window.navigator.testProp = " + window.navigator.testProp); +});

1 0

Jacek Caban : mshtml: Initialize HTMLPerformanceNavigation and HTMLPerformanceTiming objects with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 974a215d486df91f23e113c5a2c4da8e6286c54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=974a215d486df91f23e113c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:58 2021 +0100 mshtml: Initialize HTMLPerformanceNavigation and HTMLPerformanceTiming objects with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index ed65f18caaf..e43328bf5b2 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2099,8 +2099,8 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, navigation->IHTMLPerformanceNavigation_iface.lpVtbl = &HTMLPerformanceNavigationVtbl; navigation->ref = 1; - init_dispex(&navigation->dispex, (IUnknown*)&navigation->IHTMLPerformanceNavigation_iface, - &HTMLPerformanceNavigation_dispex); + init_dispex_with_compat_mode(&navigation->dispex, (IUnknown*)&navigation->IHTMLPerformanceNavigation_iface, + &HTMLPerformanceNavigation_dispex, dispex_compat_mode(&This->dispex)); This->navigation = &navigation->IHTMLPerformanceNavigation_iface; } @@ -2124,8 +2124,8 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP timing->IHTMLPerformanceTiming_iface.lpVtbl = &HTMLPerformanceTimingVtbl; timing->ref = 1; - init_dispex(&timing->dispex, (IUnknown*)&timing->IHTMLPerformanceTiming_iface, - &HTMLPerformanceTiming_dispex); + init_dispex_with_compat_mode(&timing->dispex, (IUnknown*)&timing->IHTMLPerformanceTiming_iface, + &HTMLPerformanceTiming_dispex, dispex_compat_mode(&This->dispex)); This->timing = &timing->IHTMLPerformanceTiming_iface; }

1 0