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

Zhiyi Zhang : advapi32: Check NULL return key pointers when creating registry keys.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: d2045611b655dc3763c0366d511fd383b42e0a19 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2045611b655dc3763c0366d511fd3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 4 12:13:46 2024 +0800 advapi32: Check NULL return key pointers when creating registry keys. Fix Warlords Battlecry III (433280) crashes at launch. --- dlls/advapi32/registry.c | 6 ++++++ dlls/kernelbase/registry.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 85e883bdcc9..e3226c38d0a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -70,6 +70,9 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) */ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) { + if (!phkResult) + return ERROR_INVALID_PARAMETER; + return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } @@ -82,6 +85,9 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) */ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) { + if (!phkResult) + return ERROR_INVALID_PARAMETER; + return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index dcdb1cf84eb..ee57a4acdd1 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -592,6 +592,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD { UNICODE_STRING nameW, classW; + if (!retkey) return ERROR_BADKEY; if (reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -633,6 +634,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD ANSI_STRING nameA, classA; NTSTATUS status; + if (!retkey) return ERROR_BADKEY; if (reserved) return ERROR_INVALID_PARAMETER; if (!is_version_nt()) {

1 0

Zhiyi Zhang : advapi32/tests: Test creating registry keys with a NULL return key pointer.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 058bfeed1d607d61b147311bd6f792e91fc18f26 URL: https://gitlab.winehq.org/wine/wine/-/commit/058bfeed1d607d61b147311bd6f792… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 4 12:09:45 2024 +0800 advapi32/tests: Test creating registry keys with a NULL return key pointer. --- dlls/advapi32/tests/registry.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d66b10e8952..27ee3fbbe30 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1279,6 +1279,19 @@ static void test_reg_create_key(void) PACL key_acl; SECURITY_DESCRIPTOR *sd; + /* NULL return key check */ + ret = RegCreateKeyA(hkey_main, "Subkey1", NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret); + + ret = RegCreateKeyW(hkey_main, L"Subkey1", NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret); + + ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL); + ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret); + + ret = RegCreateKeyExW(hkey_main, L"Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL); + ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret); + ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); ok(!ret, "RegCreateKeyExA failed with error %ld\n", ret); /* should succeed: all versions of Windows ignore the access rights

1 0

Tim Clem : winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: c5f9d9188a6dea5b9e9e4a2f8fbf362f11b5e72b URL: https://gitlab.winehq.org/wine/wine/-/commit/c5f9d9188a6dea5b9e9e4a2f8fbf36… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Mar 1 14:39:18 2024 -0800 winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend. An extension of 3985b7c5. Opening the device for the Touch Bar on older MacBooks also triggers a permission prompt, so for now it makes sense to restrict the devices we open. --- dlls/winebus.sys/bus_iohid.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index fdcd820e99e..a44944576e9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -281,17 +281,22 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); - if (usage_page == HID_USAGE_PAGE_GENERIC && (usage == HID_USAGE_GENERIC_MOUSE || usage == HID_USAGE_GENERIC_KEYBOARD)) - { - TRACE("Ignoring mouse / keyboard device\n"); - return; - } - desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (usage_page != HID_USAGE_PAGE_GENERIC || + !(usage == HID_USAGE_GENERIC_JOYSTICK || usage == HID_USAGE_GENERIC_GAMEPAD)) + { + /* winebus isn't currently meant to handle anything but these, and + * opening keyboards, mice, or the Touch Bar on older MacBooks triggers + * a permissions dialog for input monitoring. + */ + ERR("Ignoring HID device %p (vid %04x, pid %04x): not a joystick or gamepad\n", IOHIDDevice, desc.vid, desc.pid); + return; + } + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) { ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, desc.vid, desc.pid);

1 0

Zhiyi Zhang : rtworkq: Avoid closing a thread pool object while its callbacks are running.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: f3bab6c5b793deeed5738081d3e43bfdd679e95f URL: https://gitlab.winehq.org/wine/wine/-/commit/f3bab6c5b793deeed5738081d3e43b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 23 16:47:55 2024 +0800 rtworkq: Avoid closing a thread pool object while its callbacks are running. Consider a thread A running scheduled_item_cancelable_callback() and a thread B running queue_cancel_item(), which is the scenario from canceling a work item right after it gets submitted by RtwqScheduleWorkItem(). When the CloseThreadpoolTimer() call in queue_cancel_item() in thread B runs before the queue_release_pending_item() in scheduled_item_cancelable_callback() in thread A, scheduled_item_cancelable_callback() ends up calling work_item_Release() and CloseThreadpoolTimer() is called again for the same timer object. So the thread pool timer object end up getting released while the scheduled_item_cancelable_callback() is running, triggering the '!object->num_running_callbacks' assertion in tp_object_release(). This is actually a double free but the assertion happens before the second free could happen. The same thing could happen for thread pool wait objects as well. Fix mf and mfmediaengine tests sometimes trigger the '!object->num_running_callbacks' assertion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55724 --- dlls/rtworkq/queue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 15b8da47639..40471ff5234 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -892,9 +892,13 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) IRtwqAsyncResult_SetStatus(item->result, RTWQ_E_OPERATION_CANCELLED); invoke_async_callback(item->result); CloseThreadpoolWait(item->u.wait_object); + item->u.wait_object = NULL; } else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) + { CloseThreadpoolTimer(item->u.timer_object); + item->u.timer_object = NULL; + } else WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item);

1 0

Zhiyi Zhang : rtworkq: Avoid possible scenarios that an async callback could be called twice.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 7865026f53b295eee910b51f93e56e8e1d0bb9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7865026f53b295eee910b51f93e56e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 23 17:12:04 2024 +0800 rtworkq: Avoid possible scenarios that an async callback could be called twice. Consider a thread A running waiting_item_cancelable_callback() and a thread B running queue_cancel_item(), which is the scenario from canceling a work item right after it gets submitted by RtwqPutWaitingWorkItem(). When the invoke_async_callback() call in queue_cancel_item() for item key with WAIT_ITEM_KEY_MASK in thread B runs before the queue_release_pending_item() in waiting_item_cancelable_callback() in thread A, the async callback is called the first time in queue_cancel_item() with RTWQ_E_OPERATION_CANCELLED, then a second time in waiting_item_cancelable_callback(). We should check in queue_release_pending_item() whether an item is already removed by queue_cancel_item() before calling async callbacks. A different scenario could happen for scheduled_item_cancelable_callback() with the function ends up calling its async callback even after it has been canceled by queue_cancel_item(). --- dlls/rtworkq/queue.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 40471ff5234..eebb096ad31 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -730,16 +730,22 @@ static HRESULT invoke_async_callback(IRtwqAsyncResult *result) return hr; } -static void queue_release_pending_item(struct work_item *item) +/* Return TRUE when the item is actually released by this function. The item could have been already + * removed from pending items when it got canceled. */ +static BOOL queue_release_pending_item(struct work_item *item) { + BOOL ret = FALSE; + EnterCriticalSection(&item->queue->cs); if (item->key) { list_remove(&item->entry); + ret = TRUE; item->key = 0; IUnknown_Release(&item->IUnknown_iface); } LeaveCriticalSection(&item->queue->cs); + return ret; } static void CALLBACK waiting_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_WAIT *wait, @@ -761,9 +767,8 @@ static void CALLBACK waiting_item_cancelable_callback(TP_CALLBACK_INSTANCE *inst TRACE("result object %p.\n", item->result); - queue_release_pending_item(item); - - invoke_async_callback(item->result); + if (queue_release_pending_item(item)) + invoke_async_callback(item->result); IUnknown_Release(&item->IUnknown_iface); } @@ -785,9 +790,8 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in TRACE("result object %p.\n", item->result); - queue_release_pending_item(item); - - invoke_async_callback(item->result); + if (queue_release_pending_item(item)) + invoke_async_callback(item->result); IUnknown_Release(&item->IUnknown_iface); }

1 0

Rémi Bernon : mfreadwrite/reader: Adjust min_buffer_size to be 1s of audio data.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: bf800b5e76b808ee0b50be3349a6d5a037c77e36 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf800b5e76b808ee0b50be3349a6d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 18:19:11 2024 +0100 mfreadwrite/reader: Adjust min_buffer_size to be 1s of audio data. --- dlls/mfreadwrite/reader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 58de40c772b..5cd4641a0d4 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1912,9 +1912,14 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL list_init(&entry->entry); entry->category = category; - if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio)) - IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, - &entry->min_buffer_size); + if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio) + && SUCCEEDED(IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &entry->min_buffer_size))) + { + UINT32 bytes_per_second; + + if (SUCCEEDED(IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &bytes_per_second))) + entry->min_buffer_size = max(entry->min_buffer_size, bytes_per_second); + } count = 0; if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, allow_processor ? NULL : &out_type, NULL, &classes, &count)))

1 0

Shaun Ren : sapi: Implement ISpeechVoice::{get/put}_Volume.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 7c384f361aaa38b31fa7b9ff72085eee728c52ea URL: https://gitlab.winehq.org/wine/wine/-/commit/7c384f361aaa38b31fa7b9ff72085e… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Mar 1 20:20:13 2024 -0500 sapi: Implement ISpeechVoice::{get/put}_Volume. --- dlls/sapi/tests/tts.c | 9 ++++++++- dlls/sapi/tts.c | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 4d565b35294..a5c950aa80b 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -434,7 +434,7 @@ static void test_spvoice(void) DWORD start, duration; ISpeechVoice *speech_voice; ISpeechObjectTokens *speech_tokens; - LONG count; + LONG count, volume_long; BSTR req = NULL, opt = NULL; UINT info_count; ITypeInfo *typeinfo; @@ -717,6 +717,13 @@ static void test_spvoice(void) ok(count == 1, "got %ld.\n", count); ISpeechObjectTokens_Release(speech_tokens); + volume_long = 0xdeadbeef; + hr = ISpeechVoice_put_Volume(speech_voice, 80); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechVoice_get_Volume(speech_voice, &volume_long); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(volume_long == 80, "got %ld.\n", volume_long); + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index d22ffd7a0da..325edaf04fb 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -291,16 +291,25 @@ static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate) static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume) { - FIXME("(%p, %p): stub.\n", iface, volume); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + USHORT res = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, volume); + + if (!volume) return E_POINTER; + hr = ISpVoice_GetVolume(&This->ISpVoice_iface, &res); + *volume = res; + return hr; } static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume) { - FIXME("(%p, %ld): stub.\n", iface, volume); + struct speech_voice *This = impl_from_ISpeechVoice(iface); - return E_NOTIMPL; + TRACE("(%p, %ld).\n", iface, volume); + + return ISpVoice_SetVolume(&This->ISpVoice_iface, (USHORT)volume); } static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,

1 0

Shaun Ren : sapi: Implement ISpeechVoice::{get/putref}_Voice.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 43220a6063328bc445a346e5f6849731aafcaf88 URL: https://gitlab.winehq.org/wine/wine/-/commit/43220a6063328bc445a346e5f68497… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Mar 1 20:44:43 2024 -0500 sapi: Implement ISpeechVoice::{get/putref}_Voice. --- dlls/sapi/tests/tts.c | 22 +++++++++++++++++++++- dlls/sapi/tts.c | 26 ++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index a5c950aa80b..38c69e6144a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -424,7 +424,7 @@ static void test_spvoice(void) IUnknown *dummy; ISpMMSysAudio *audio_out; ISpObjectTokenCategory *token_cat; - ISpObjectToken *token; + ISpObjectToken *token, *token2; WCHAR *token_id = NULL, *default_token_id = NULL; ISpDataKey *attrs_key; LONG rate; @@ -435,6 +435,7 @@ static void test_spvoice(void) ISpeechVoice *speech_voice; ISpeechObjectTokens *speech_tokens; LONG count, volume_long; + ISpeechObjectToken *speech_token; BSTR req = NULL, opt = NULL; UINT info_count; ITypeInfo *typeinfo; @@ -724,6 +725,25 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(volume_long == 80, "got %ld.\n", volume_long); + hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)&speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechVoice_putref_Voice(speech_voice, speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + ISpeechObjectToken_Release(speech_token); + + speech_token = (ISpeechObjectToken *)0xdeadbeef; + hr = ISpeechVoice_get_Voice(speech_voice, &speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(speech_token && speech_token != (ISpeechObjectToken *)0xdeadbeef, "got %p.\n", speech_token); + hr = ISpeechObjectToken_QueryInterface(speech_token, &IID_ISpObjectToken, (void **)&token2); + ok(hr == S_OK, "got %#lx.\n", hr); + token_id = NULL; + hr = ISpObjectToken_GetId(token2, &token_id); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!wcscmp(token_id, test_token_id), "got %s.\n", wine_dbgstr_w(token_id)); + CoTaskMemFree(token_id); + ISpObjectToken_Release(token2); + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 325edaf04fb..c474a118981 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -235,16 +235,34 @@ static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceS static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice) { - FIXME("(%p, %p): stub.\n", iface, voice); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ISpObjectToken *token; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, voice); + + if (!voice) return E_POINTER; + if (FAILED(hr = ISpVoice_GetVoice(&This->ISpVoice_iface, &token))) + return hr; + hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)voice); + ISpObjectToken_Release(token); + return hr; } static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice) { - FIXME("(%p, %p): stub.\n", iface, voice); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ISpObjectToken *token; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, voice); + + if (!voice) return E_INVALIDARG; + if (FAILED(hr = ISpeechObjectToken_QueryInterface(voice, &IID_ISpObjectToken, (void **)&token))) + return hr; + hr = ISpVoice_SetVoice(&This->ISpVoice_iface, token); + ISpObjectToken_Release(token); + return hr; } static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)

1 0

Hans Leidekker : netprofm/tests: Mark a test result as broken on Windows 11.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 90f31fbd0ae392eaa4177b943bcaaabefc1829e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f31fbd0ae392eaa4177b943bcaaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 4 13:28:42 2024 +0100 netprofm/tests: Mark a test result as broken on Windows 11. --- dlls/netprofm/tests/list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index bb3d0f59be8..4c0c87cab8b 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -414,10 +414,10 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08lx\n", hr ); while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { - connected = -1; + connected = 1; hr = INetwork_get_IsConnected( network, &connected ); ok( hr == S_OK, "got %08lx\n", hr ); - ok( connected == 0, "got %d\n", connected ); + ok( connected == 0 || broken(connected == -1) /* win11 */, "got %d\n", connected ); INetwork_Release( network ); } IEnumNetworks_Release( network_iter );

1 0

Philip Rebohle : winevulkan: Update to VK spec version 1.3.279.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: ec6879b78ec58bfad9f3039fdab9498173a44f56 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec6879b78ec58bfad9f3039fdab949… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Sat Mar 2 17:12:15 2024 +0100 winevulkan: Update to VK spec version 1.3.279. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 72 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 12 ++++++- 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index bf7e0f6408d..6b4debf20ff 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.278" +VK_XML_VERSION = "1.3.279" WINE_VK_VERSION = (1, 3) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ad1a1e3cbf1..93e52b46a9d 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1549,6 +1549,15 @@ typedef struct VkPipelineShaderStageCreateInfo32 PTR32 pSpecializationInfo; } VkPipelineShaderStageCreateInfo32; +typedef struct VkComputePipelineIndirectBufferInfoNV32 +{ + VkStructureType sType; + PTR32 pNext; + VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress; + VkDeviceSize DECLSPEC_ALIGN(8) size; + VkDeviceAddress DECLSPEC_ALIGN(8) pipelineDeviceAddressCaptureReplay; +} VkComputePipelineIndirectBufferInfoNV32; + typedef struct VkPipelineCreateFlags2CreateInfoKHR32 { VkStructureType sType; @@ -3313,6 +3322,13 @@ typedef struct VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32 VkBool32 memoryUnmapReserve; } VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32; +typedef struct VkPhysicalDeviceRawAccessChainsFeaturesNV32 +{ + VkStructureType sType; + PTR32 pNext; + VkBool32 shaderRawAccessChains; +} VkPhysicalDeviceRawAccessChainsFeaturesNV32; + typedef struct VkDeviceCreateInfo32 { VkStructureType sType; @@ -10862,6 +10878,19 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv { switch (in_header->sType) { + case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV: + { + VkComputePipelineIndirectBufferInfoNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); + const VkComputePipelineIndirectBufferInfoNV32 *in_ext = (const VkComputePipelineIndirectBufferInfoNV32 *)in_header; + out_ext->sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV; + out_ext->pNext = NULL; + out_ext->deviceAddress = in_ext->deviceAddress; + out_ext->size = in_ext->size; + out_ext->pipelineDeviceAddressCaptureReplay = in_ext->pipelineDeviceAddressCaptureReplay; + out_header->pNext = (void *)out_ext; + out_header = (void *)out_ext; + break; + } case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR: { VkPipelineCreateFlags2CreateInfoKHR *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); @@ -13662,6 +13691,17 @@ static inline void convert_VkDeviceCreateInfo_win64_to_host(struct conversion_co out_header = (void *)out_ext; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV: + { + VkPhysicalDeviceRawAccessChainsFeaturesNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); + const VkPhysicalDeviceRawAccessChainsFeaturesNV *in_ext = (const VkPhysicalDeviceRawAccessChainsFeaturesNV *)in_header; + out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV; + out_ext->pNext = NULL; + out_ext->shaderRawAccessChains = in_ext->shaderRawAccessChains; + out_header->pNext = (void *)out_ext; + out_header = (void *)out_ext; + break; + } default: FIXME("Unhandled sType %u.\n", in_header->sType); break; @@ -15945,6 +15985,17 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co out_header = (void *)out_ext; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV: + { + VkPhysicalDeviceRawAccessChainsFeaturesNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); + const VkPhysicalDeviceRawAccessChainsFeaturesNV32 *in_ext = (const VkPhysicalDeviceRawAccessChainsFeaturesNV32 *)in_header; + out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV; + out_ext->pNext = NULL; + out_ext->shaderRawAccessChains = in_ext->shaderRawAccessChains; + out_header->pNext = (void *)out_ext; + out_header = (void *)out_ext; + break; + } default: FIXME("Unhandled sType %u.\n", in_header->sType); break; @@ -23354,6 +23405,17 @@ static inline void convert_VkPhysicalDeviceFeatures2_win32_to_host(struct conver out_header = (void *)out_ext; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV: + { + VkPhysicalDeviceRawAccessChainsFeaturesNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); + const VkPhysicalDeviceRawAccessChainsFeaturesNV32 *in_ext = (const VkPhysicalDeviceRawAccessChainsFeaturesNV32 *)in_header; + out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV; + out_ext->pNext = NULL; + out_ext->shaderRawAccessChains = in_ext->shaderRawAccessChains; + out_header->pNext = (void *)out_ext; + out_header = (void *)out_ext; + break; + } default: FIXME("Unhandled sType %u.\n", in_header->sType); break; @@ -25195,6 +25257,15 @@ static inline void convert_VkPhysicalDeviceFeatures2_host_to_win32(const VkPhysi out_header = (void *)out_ext; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV: + { + VkPhysicalDeviceRawAccessChainsFeaturesNV32 *out_ext = find_next_struct32(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV); + const VkPhysicalDeviceRawAccessChainsFeaturesNV *in_ext = (const VkPhysicalDeviceRawAccessChainsFeaturesNV *)in_header; + out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV; + out_ext->shaderRawAccessChains = in_ext->shaderRawAccessChains; + out_header = (void *)out_ext; + break; + } default: break; } @@ -46627,6 +46698,7 @@ static const char * const vk_device_extensions[] = "VK_NV_optical_flow", "VK_NV_per_stage_descriptor_set", "VK_NV_present_barrier", + "VK_NV_raw_access_chains", "VK_NV_ray_tracing", "VK_NV_ray_tracing_invocation_reorder", "VK_NV_ray_tracing_motion_blur", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 3da205fa21d..2eb759daa57 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.3.278" + "api_version": "1.3.279" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 568bc36e405..8876b8aa794 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -671,6 +671,8 @@ #define VK_KHR_MAINTENANCE_6_EXTENSION_NAME "VK_KHR_maintenance6" #define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_SPEC_VERSION 1 #define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME "VK_NV_descriptor_pool_overallocation" +#define VK_NV_RAW_ACCESS_CHAINS_SPEC_VERSION 1 +#define VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME "VK_NV_raw_access_chains" #define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION 1 #define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME "VK_NV_shader_atomic_float16_vector" #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 @@ -699,7 +701,7 @@ #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) #define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0) #define VKSC_API_VERSION_1_0 VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, 0) -#define VK_HEADER_VERSION 278 +#define VK_HEADER_VERSION 279 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -4768,6 +4770,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT = 1000545007, VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT = 1000545008, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV = 1000546000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV = 1000555000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV = 1000563000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, @@ -9278,6 +9281,13 @@ typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT } VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT; typedef VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM; +typedef struct VkPhysicalDeviceRawAccessChainsFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderRawAccessChains; +} VkPhysicalDeviceRawAccessChainsFeaturesNV; + typedef struct VkPhysicalDeviceRayQueryFeaturesKHR { VkStructureType sType;

1 0