- Wine-Commits - list.winehq.org

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

Alexandre Julliard : ntdll: Add a helper macro to dump a register context.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 61564202b5ae86b1af01727bdcac5f6539dd9188 URL: https://gitlab.winehq.org/wine/wine/-/commit/61564202b5ae86b1af01727bdcac5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 20:27:25 2024 +0100 ntdll: Add a helper macro to dump a register context. --- dlls/ntdll/ntdll_misc.h | 38 +++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm.c | 30 +++++++++------------------- dlls/ntdll/signal_arm64.c | 49 +++++++++------------------------------------- dlls/ntdll/signal_i386.c | 24 +++++++---------------- dlls/ntdll/signal_x86_64.c | 33 +++++++++---------------------- 5 files changed, 72 insertions(+), 102 deletions(-)

1 0

Rémi Bernon : win32u: Only consider active monitors for virtual screen rect.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: f7788fc7e75fa894fa4286928ddcd7d4b15e208b URL: https://gitlab.winehq.org/wine/wine/-/commit/f7788fc7e75fa894fa4286928ddcd7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors for virtual screen rect. --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index edf68859aa8..824e3b57bb7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2370,6 +2370,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); }

1 0

Rémi Bernon : win32u: Only consider active monitors in monitor_from_rect.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 76326ed3693d4484721d8a5777a043298b5591b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/76326ed3693d4484721d8a5777a043… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors in monitor_from_rect. --- dlls/win32u/sysparams.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 824e3b57bb7..87c37cd2e72 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3564,10 +3564,11 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - RECT intersect; - RECT monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - system_dpi ); + RECT intersect, monitor_rect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + + monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r )) { /* check for larger intersecting area */

1 0

Ivo Ivanov : hidclass.sys: Use the correct string for container_id.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 2497a534844b4ad527abbe7bf33fb584aea60dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/2497a534844b4ad527abbe7bf33fb5… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Feb 17 18:47:05 2024 +0200 hidclass.sys: Use the correct string for container_id. --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 39714abc6b1..e2bdd82f567 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -441,7 +441,7 @@ static WCHAR *query_container_id(DEVICE_OBJECT *device) WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, size))) - memcpy(dst, ext->instance_id, size); + memcpy(dst, ext->container_id, size); return dst; }

1 0

Alexandre Julliard : ntdll: Share exception dispatch implementation across platforms.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 8bd411da0a678e57dbeef9302f64fe7fed84db61 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bd411da0a678e57dbeef9302f64fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 20:27:46 2024 +0100 ntdll: Share exception dispatch implementation across platforms. --- dlls/ntdll/exception.c | 76 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/signal_arm.c | 65 ++------------------------------------- dlls/ntdll/signal_arm64.c | 66 ++-------------------------------------- dlls/ntdll/signal_i386.c | 65 ++------------------------------------- dlls/ntdll/signal_x86_64.c | 66 ++-------------------------------------- 6 files changed, 88 insertions(+), 254 deletions(-)

1 0