February 2024 - Wine-Commits

Rémi Bernon : winevulkan: Handle creation of surfaces with no HWND directly.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 8ba1b27f23684b4c26e33e60bfdcd47c998a79f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ba1b27f23684b4c26e33e60bfdcd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 15:15:44 2023 +0100 winevulkan: Handle creation of surfaces with no HWND directly. --- dlls/winevulkan/vulkan.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9123e65da4c..5d9d9e452b8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1503,18 +1503,31 @@ VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCre const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { struct wine_instance *instance = wine_instance_from_handle(handle); + VkWin32SurfaceCreateInfoKHR create_info_host = *create_info; struct wine_surface *object; + HWND dummy = NULL; VkResult res; if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); if (!(object = calloc(1, sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; - object->hwnd = create_info->hwnd; - res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, create_info, + /* Windows allows surfaces to be created with no HWND, they return VK_ERROR_SURFACE_LOST_KHR later */ + if (!(object->hwnd = create_info->hwnd)) + { + static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; + UNICODE_STRING static_us = RTL_CONSTANT_STRING(staticW); + dummy = NtUserCreateWindowEx(0, &static_us, &static_us, &static_us, WS_POPUP, + 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, NULL, 0, FALSE); + WARN("Created dummy window %p for null surface window\n", dummy); + create_info_host.hwnd = object->hwnd = dummy; + } + + res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, &create_info_host, NULL /* allocator */, &object->driver_surface); if (res != VK_SUCCESS) { + if (dummy) NtUserDestroyWindow(dummy); free(object); return res; } @@ -1522,6 +1535,9 @@ VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCre object->host_surface = vk_funcs->p_wine_get_host_surface(object->driver_surface); WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->host_surface, object); + *surface = wine_surface_to_handle(object); + if (dummy) NtUserDestroyWindow(dummy); + *surface = wine_surface_to_handle(object); return VK_SUCCESS;

1 0

Rémi Bernon : winegstreamer: Use MFCalculateImageSize to compute output info size.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 9a591bf4fee2a4eec098c0d1b2cb10d3cec8ddcd URL: https://gitlab.winehq.org/wine/wine/-/commit/9a591bf4fee2a4eec098c0d1b2cb10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 20 11:13:45 2024 +0100 winegstreamer: Use MFCalculateImageSize to compute output info size. --- dlls/winegstreamer/h264_decoder.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index fae4ede3b54..bc46936555a 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -397,6 +397,23 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR return create_output_media_type(decoder, decoder->output_types[index], NULL, type); } +static HRESULT update_output_info_size(struct h264_decoder *decoder, UINT32 width, UINT32 height) +{ + HRESULT hr = E_FAIL; + UINT32 i, size; + + decoder->output_info.cbSize = 0; + + for (i = 0; i < decoder->output_type_count; ++i) + { + if (FAILED(hr = MFCalculateImageSize(decoder->output_types[i], width, height, &size))) + return hr; + decoder->output_info.cbSize = max(size, decoder->output_info.cbSize); + } + + return hr; +} + static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); @@ -436,7 +453,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM { if (FAILED(hr = IMFMediaType_SetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, frame_size))) WARN("Failed to update stream type frame size, hr %#lx\n", hr); - decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2; + return update_output_info_size(decoder, frame_size >> 32, frame_size); } return S_OK; @@ -654,7 +671,8 @@ static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const str if (FAILED(hr = IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &frame_size))) return hr; - decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2; + if (FAILED(hr = update_output_info_size(decoder, frame_size >> 32, frame_size))) + return hr; uninit_allocator(decoder); return MF_E_TRANSFORM_STREAM_CHANGE;

1 0

Ivo Ivanov : hidclass.sys: Use HID_DEVICE in the mfg_section to match the recent changes.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: e24cf32f810b73556bbf7c51584de45224721d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/e24cf32f810b73556bbf7c51584de4… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Feb 21 13:09:52 2024 +0200 hidclass.sys: Use HID_DEVICE in the mfg_section to match the recent changes. --- dlls/hidclass.sys/input.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/input.inf b/dlls/hidclass.sys/input.inf index d9222b13672..8be8335edad 100644 --- a/dlls/hidclass.sys/input.inf +++ b/dlls/hidclass.sys/input.inf @@ -7,7 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine HID device=device_section,HID\ +Wine HID device=device_section,HID_DEVICE [device_section.Services] AddService = ,0x2

1 0

Paul Gofman : dwrite: Force debug info in critical sections.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 6fda28d030602e2404d7b1359d838709353b1334 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fda28d030602e2404d7b1359d8387… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:54:33 2024 -0600 dwrite: Force debug info in critical sections. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2028440ca8e..83a293e57fe 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5993,7 +5993,7 @@ void init_local_fontfile_loader(void) local_fontfile_loader.IDWriteLocalFontFileLoader_iface.lpVtbl = &localfontfileloadervtbl; local_fontfile_loader.refcount = 1; list_init(&local_fontfile_loader.streams); - InitializeCriticalSection(&local_fontfile_loader.cs); + InitializeCriticalSectionEx(&local_fontfile_loader.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); local_fontfile_loader.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": localfileloader.lock"); } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6776b1ce974..e8765f0672e 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -2097,7 +2097,7 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP list_init(&factory->file_loaders); list_init(&factory->localfontfaces); - InitializeCriticalSection(&factory->cs); + InitializeCriticalSectionEx(&factory->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); factory->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": dwritefactory.lock"); }

1 0

Paul Gofman : inetcomm: Force debug info in critical sections.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 39e5926760d36fc0b0c031118c60754b017dcaa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/39e5926760d36fc0b0c031118c6075… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:55:17 2024 -0600 inetcomm: Force debug info in critical sections. --- dlls/inetcomm/mimeintl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 1e5b1a0ce90..9a4c610d996 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -526,7 +526,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; - InitializeCriticalSection(&global_internat->cs); + InitializeCriticalSectionEx(&global_internat->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); global_internat->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": global_internat.cs"); list_init(&global_internat->charsets);

1 0

Paul Gofman : dinput: Force debug info in critical sections.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: a485f6b4a3c9aff3fd5107cdfbbdc89d5f4fc28b URL: https://gitlab.winehq.org/wine/wine/-/commit/a485f6b4a3c9aff3fd5107cdfbbdc8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:50:24 2024 -0600 dinput: Force debug info in critical sections. --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index bb2feb0e8da..9a9b559902a 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2131,7 +2131,7 @@ void dinput_device_init( struct dinput_device *device, const struct dinput_devic device->device_gain = 10000; device->autocenter = DIPROPAUTOCENTER_ON; device->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; - InitializeCriticalSection( &device->crit ); + InitializeCriticalSectionEx( &device->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); dinput_internal_addref( (device->dinput = dinput) ); device->vtbl = vtbl;

1 0

Paul Gofman : dplayx: Force debug info in critical sections.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 8268d4e017f37073a8d210efb58d1b93e6e54238 URL: https://gitlab.winehq.org/wine/wine/-/commit/8268d4e017f37073a8d210efb58d1b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:51:41 2024 -0600 dplayx: Force debug info in critical sections. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplobby.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 9b287001e9e..d2d9c5f6a4a 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5675,7 +5675,7 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->ref4A = 0; obj->ref4 = 1; - InitializeCriticalSection( &obj->lock ); + InitializeCriticalSectionEx( &obj->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); if ( DP_CreateDirectPlay2( obj ) ) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index aa2d44430f6..f7178597a9b 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -2043,7 +2043,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->ref3 = 1; obj->ref3A = 0; - InitializeCriticalSection( &obj->lock ); + InitializeCriticalSectionEx( &obj->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); DPQ_INIT( obj->msgs );

1 0

Paul Gofman : dsound: Force debug info in critical sections.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: c63a99009144e5d6b1254f41d158a5f47cc2f2ec URL: https://gitlab.winehq.org/wine/wine/-/commit/c63a99009144e5d6b1254f41d158a5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:52:59 2024 -0600 dsound: Force debug info in critical sections. --- dlls/dsound/capture.c | 2 +- dlls/dsound/dsound.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 5956da792af..e9012600cfa 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -832,7 +832,7 @@ static HRESULT DirectSoundCaptureDevice_Create( device->ref = 1; device->state = STATE_STOPPED; - InitializeCriticalSection( &(device->lock) ); + InitializeCriticalSectionEx( &(device->lock), 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); device->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundCaptureDevice.lock"); *ppDevice = device; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 356f211d7bb..57fd6c1a651 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -177,7 +177,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->primary_pwfx->nAvgBytesPerSec = device->primary_pwfx->nSamplesPerSec * device->primary_pwfx->nBlockAlign; device->primary_pwfx->cbSize = 0; - InitializeCriticalSection(&(device->mixlock)); + InitializeCriticalSectionEx(&(device->mixlock), 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); InitializeSRWLock(&device->buffer_list_lock);

1 0

Rémi Bernon : win32u: Don't assume that the primary adapter is always first.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: a3686eeb5e36416eee8a532dd358666fc46c7a39 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3686eeb5e36416eee8a532dd35866… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 10 13:26:22 2024 +0100 win32u: Don't assume that the primary adapter is always first. --- dlls/win32u/sysparams.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 87c37cd2e72..5dcf42ff7f5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2744,6 +2744,19 @@ static struct display_device *find_adapter_device_by_id( UINT index ) return NULL; } +/* display_lock mutex must be held */ +static struct display_device *find_primary_adapter_device(void) +{ + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (adapter->dev.state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) + return &adapter->dev; + + WARN( "Failed to find primary adapter.\n" ); + return NULL; +} + /* display_lock mutex must be held */ static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name ) { @@ -2769,7 +2782,7 @@ static struct adapter *find_adapter( UNICODE_STRING *name ) if (!lock_display_devices()) return NULL; if (name && name->Length) device = find_adapter_device_by_name( name ); - else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + else device = find_primary_adapter_device(); if (!device) adapter = NULL; else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); @@ -3226,7 +3239,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod place_all_displays( displays ); - if (!(primary = find_adapter_device_by_id( 0 ))) primary_name[0] = 0; + if (!(primary = find_primary_adapter_device())) primary_name[0] = 0; else wcscpy( primary_name, primary->device_name ); /* use the default implementation in virtual desktop mode */ @@ -3396,7 +3409,7 @@ INT get_display_depth( UNICODE_STRING *name ) if (name && name->Length) device = find_adapter_device_by_name( name ); else - device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + device = find_primary_adapter_device(); if (!device) {

1 0

Paul Gofman : winhttp: Mind read size when skipping async read in WinHttpReadData().
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 9c1bc32fe9515071f1a7501d2fed31b514f704ed URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1bc32fe9515071f1a7501d2fed31… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 16:03:44 2024 -0600 winhttp: Mind read size when skipping async read in WinHttpReadData(). --- dlls/winhttp/request.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4a64095797a..9fe8e1c4782 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3062,9 +3062,11 @@ static DWORD query_data_ready( struct request *request ) return count; } -static BOOL skip_async_queue( struct request *request, BOOL *wont_block ) +static BOOL skip_async_queue( struct request *request, BOOL *wont_block, DWORD to_read ) { - *wont_block = end_of_read_data( request ) || query_data_ready( request ); + if (!request->read_chunked) + to_read = min( to_read, request->content_length - request->content_read ); + *wont_block = end_of_read_data( request ) || query_data_ready( request ) >= to_read; return request->hdr.recursion_count < 3 && *wont_block; } @@ -3133,7 +3135,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block )) + if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block, 1 )) { ret = query_data_available( request, available, async ); } @@ -3229,7 +3231,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW return FALSE; } - if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block )) + if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block, to_read )) { ret = read_data( request, buffer, to_read, read, async ); }

1 0