wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: c73290154297e037d2f9181eba01759e1e13965f URL: https://gitlab.winehq.org/wine/wine/-/commit/c73290154297e037d2f9181eba0175… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:10 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534 Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- dlls/comctl32/listview.c | 16 ++++++++++++---- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bf22a90e987..e48b1fa2847 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3610,6 +3610,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) */ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { + INT nFirst = -1, nLast = -1; RANGES selection; DWORD old_mask; LVITEMW item; @@ -3661,21 +3662,28 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) iterator_destroy(&i); } - /* disable per item notifications on LVS_OWNERDATA style - FIXME: single LVN_ODSTATECHANGED should be used */ + /* Disable per item notifications on LVS_OWNERDATA style */ old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); - iterator_rangesitems(&i, selection); while(iterator_next(&i)) - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + { + /* Find the range for LVN_ODSTATECHANGED */ + if (nFirst == -1) + nFirst = i.nItem; + nLast = i.nItem; + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } /* this will also destroy the selection */ iterator_destroy(&i); + if (infoPtr->dwStyle & LVS_OWNERDATA) + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ed5222a5ee8..fec1a83de4d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3577,7 +3577,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); @@ -3594,7 +3594,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res);

1 0

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 6c814f81aa3ab1ffdc27837c6b0d7a2c9b445316 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c814f81aa3ab1ffdc27837c6b0d7a… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:09 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53123 Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- dlls/comctl32/listview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a12b19b8083..bf22a90e987 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3587,7 +3587,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) for (i = nFirst; i <= nLast; i++) LISTVIEW_SetItemState(infoPtr,i,&item); - LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); + if (infoPtr->dwStyle & LVS_OWNERDATA) + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); if (!IsWindow(hwndSelf)) return FALSE;

1 0

Angelo Haller : comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 425fd8f80e23e34667697f7032d002da8d10a352 URL: https://gitlab.winehq.org/wine/wine/-/commit/425fd8f80e23e34667697f7032d002… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:08 2022 -0500 comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function. Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- dlls/comctl32/listview.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3761a61286e..a12b19b8083 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -438,6 +438,7 @@ static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); +static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *, INT, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); @@ -3565,7 +3566,6 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nFirst = min(infoPtr->nSelectionMark, nItem); INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; - NMLVODSTATECHANGE nmlv; DWORD old_mask; LVITEMW item; INT i; @@ -3587,13 +3587,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) for (i = nFirst; i <= nLast; i++) LISTVIEW_SetItemState(infoPtr,i,&item); - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iFrom = nFirst; - nmlv.iTo = nLast; - nmlv.uOldState = 0; - nmlv.uNewState = item.state; + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); - notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; infoPtr->notify_mask |= old_mask; @@ -9023,6 +9018,22 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE); } +/* Make sure to also disable per item notifications via the notification mask. */ +static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast, const LVITEMW *item) +{ + NMLVODSTATECHANGE nmlv; + + if (!item) return; + + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iFrom = nFirst; + nmlv.iTo = nLast; + nmlv.uOldState = 0; + nmlv.uNewState = item->state; + + notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); +} + /*** * DESCRIPTION: * Sets the state of one or many items.

1 0

Angelo Haller : comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 8b392553b32677d25fd3e0fe14f70a5693f3b42c URL: https://gitlab.winehq.org/wine/wine/-/commit/8b392553b32677d25fd3e0fe14f70a… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:07 2022 -0500 comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews. Send one deselect all items notification on selection change for LVS_OWNERDATA listviews instead of notifying about each individual item change. Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- dlls/comctl32/listview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab328b3e798..3761a61286e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3406,7 +3406,14 @@ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) lvItem.state = 0; lvItem.stateMask = LVIS_SELECTED; - + + /* Only send one deselect all (-1) notification for LVS_OWNERDATA style */ + if (infoPtr->dwStyle & LVS_OWNERDATA) + { + LISTVIEW_SetItemState(infoPtr, -1, &lvItem); + return TRUE; + } + /* need to clone the DPA because callbacks can change it */ if (!(clone = ranges_clone(infoPtr->selectionRanges))) return FALSE; iterator_rangesitems(&i, ranges_diff(clone, toSkip));

1 0

Brendan Shanks : wow64cpu: Use -norelay for BTCpuSimulate.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 38cf242e7d33e4d13f3c703af8db8e9faabeb096 URL: https://gitlab.winehq.org/wine/wine/-/commit/38cf242e7d33e4d13f3c703af8db8e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Aug 5 15:07:40 2022 -0700 wow64cpu: Use -norelay for BTCpuSimulate. Fixes exception handling stack unwinding under Wow64. --- dlls/wow64cpu/wow64cpu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index 0a9e5b16dc8..6346cc54733 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -3,7 +3,7 @@ @ stdcall BTCpuProcessInit() @ stdcall BTCpuResetToConsistentState(ptr) @ stdcall BTCpuSetContext(long long ptr ptr) -@ stdcall BTCpuSimulate() +@ stdcall -norelay BTCpuSimulate() @ stdcall BTCpuTurboThunkControl(long) #@ stub TurboDispatchJumpAddressEnd #@ stub TurboDispatchJumpAddressStart

1 0

Nikolay Sivov : dwrite/fallback: Make sure all consecutively mapped characters belong to the same mapping.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 1bff5e58590d54cf0ef40be26c9e6310ca07c910 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bff5e58590d54cf0ef40be26c9e63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 23:14:59 2022 +0300 dwrite/fallback: Make sure all consecutively mapped characters belong to the same mapping. Picked fallback font often has wider character support than the ranges it's configured for. Desired behavior is to stop at the first character that doesn't belong to current mapping. For example, in texts like "abc<some CJK sequence>abc" we'd want the same for both "abc" sequences, as opposed to using fallback CJK font for trailing Latin range. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3f23c72dab4..f93d06a84d9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -465,11 +465,24 @@ static void release_fallback_data(struct fallback_data *data) fallback_locale_list_destroy(&data->locales); } +static BOOL fallback_mapping_contains_character(const struct fallback_mapping *mapping, UINT32 ch) +{ + size_t i; + + for (i = 0; i < mapping->ranges_count; ++i) + { + const DWRITE_UNICODE_RANGE *range = &mapping->ranges[i]; + if (range->first <= ch && range->last >= ch) return TRUE; + } + + return FALSE; +} + static const struct fallback_mapping * find_fallback_mapping(const struct fallback_data *fallback, const struct fallback_locale *locale, UINT32 ch) { const struct fallback_mapping *mapping; - size_t i, j, r; + size_t i, j; for (i = 0; i < locale->ranges.count; i += 2) { @@ -477,11 +490,7 @@ static const struct fallback_mapping * find_fallback_mapping(const struct fallba for (j = start; j <= end; ++j) { mapping = &fallback->mappings[j]; - for (r = 0; r < mapping->ranges_count; ++r) - { - const DWRITE_UNICODE_RANGE *range = &mapping->ranges[r]; - if (range->first <= ch && range->last >= ch) return mapping; - } + if (fallback_mapping_contains_character(mapping, ch)) return mapping; } } @@ -2255,8 +2264,8 @@ static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface) return IDWriteFactory7_Release(fallback->factory); } -static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, IDWriteTextAnalysisSource *source, UINT32 position, - UINT32 length) +static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, const struct fallback_mapping *mapping, + IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length) { struct text_source_context context; UINT32 mapped = 0; @@ -2264,6 +2273,7 @@ static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, IDWriteText text_source_context_init(&context, source, position, length); while (!text_source_get_next_u32_char(&context)) { + if (mapping && !fallback_mapping_contains_character(mapping, context.ch)) break; if (!IDWriteFont3_HasCharacter(font, context.ch)) break; mapped += context.ch > 0xffff ? 2 : 1; } @@ -2321,7 +2331,7 @@ static HRESULT fallback_map_characters(const struct dwrite_fontfallback *fallbac if (SUCCEEDED(create_matching_font(mapping->collection ? mapping->collection : fallback->systemcollection, mapping->families[i], weight, style, stretch, &IID_IDWriteFont3, (void **)&font))) { - if (!(mapped = fallback_font_get_supported_length(font, source, position, length))) + if (!(mapped = fallback_font_get_supported_length(font, mapping, source, position, length))) { IDWriteFont3_Release(font); continue; @@ -2405,7 +2415,7 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback1 *iface, ID if (SUCCEEDED(create_matching_font(basecollection, basefamily, weight, style, stretch, &IID_IDWriteFont, (void **)&font))) { - if ((*mapped_length = fallback_font_get_supported_length(font, source, position, length))) + if ((*mapped_length = fallback_font_get_supported_length(font, NULL, source, position, length))) { *ret_font = (IDWriteFont *)font; *scale = 1.0f;

1 0

Nikolay Sivov : dwrite/fallback: Consider character size for returned mapped length.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: e25ff734cf05775c5ac136573e97c2067f6049d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e25ff734cf05775c5ac136573e97c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 22:43:08 2022 +0300 dwrite/fallback: Consider character size for returned mapped length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index d23153a2d5e..3f23c72dab4 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2265,7 +2265,7 @@ static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, IDWriteText while (!text_source_get_next_u32_char(&context)) { if (!IDWriteFont3_HasCharacter(font, context.ch)) break; - mapped++; + mapped += context.ch > 0xffff ? 2 : 1; } return mapped;

1 0

Rémi Bernon : win32u: Avoid invalid access when registered device alloc failed. (Coverity).
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: a42b22e027e2be20f7f3a924eddeee92b7bbc99d URL: https://gitlab.winehq.org/wine/wine/-/commit/a42b22e027e2be20f7f3a924eddeee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 6 10:16:58 2022 +0200 win32u: Avoid invalid access when registered device alloc failed. (Coverity). --- dlls/win32u/rawinput.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 2dc03e7fe2d..cf150b60a8c 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -821,6 +821,7 @@ static void register_rawinput_device( const RAWINPUTDEVICE *device ) BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT device_size ) { struct rawinput_device *server_devices; + RAWINPUTDEVICE *new_registered_devices; SIZE_T size; BOOL ret; UINT i; @@ -863,8 +864,15 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d } size = (SIZE_T)device_size * (registered_device_count + device_count); - registered_devices = realloc( registered_devices, size ); - if (registered_devices) for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); + if (!(new_registered_devices = realloc( registered_devices, size ))) + { + pthread_mutex_unlock( &rawinput_mutex ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + registered_devices = new_registered_devices; + for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); if (!(device_count = registered_device_count)) server_devices = NULL; else if (!(server_devices = malloc( device_count * sizeof(*server_devices) ))) @@ -893,12 +901,6 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d pthread_mutex_unlock( &rawinput_mutex ); - if (!registered_devices) - { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - return ret; }

1 0

Rémi Bernon : win32u: Send the total number of registered devices to the server.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: 17bdb5060a6fe30d6aada2e63745f930acdc4f50 URL: https://gitlab.winehq.org/wine/wine/-/commit/17bdb5060a6fe30d6aada2e63745f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 5 11:25:49 2022 +0200 win32u: Send the total number of registered devices to the server. Instead of device_count which is the number of registration updates, and execute the request within the rawinput_mutex to ensure atomicity of the update and consistency between the client and the server state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53468 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53487 --- dlls/win32u/rawinput.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 44951522442..2dc03e7fe2d 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -866,8 +866,15 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d registered_devices = realloc( registered_devices, size ); if (registered_devices) for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); - server_devices = malloc( registered_device_count * sizeof(*server_devices) ); - if (server_devices) for (i = 0; i < registered_device_count; ++i) + if (!(device_count = registered_device_count)) server_devices = NULL; + else if (!(server_devices = malloc( device_count * sizeof(*server_devices) ))) + { + pthread_mutex_unlock( &rawinput_mutex ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + for (i = 0; i < device_count; ++i) { server_devices[i].usage_page = registered_devices[i].usUsagePage; server_devices[i].usage = registered_devices[i].usUsage; @@ -875,14 +882,6 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d server_devices[i].target = wine_server_user_handle( registered_devices[i].hwndTarget ); } - pthread_mutex_unlock( &rawinput_mutex ); - - if (!registered_devices || !server_devices) - { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - SERVER_START_REQ( update_rawinput_devices ) { wine_server_add_data( req, server_devices, device_count * sizeof(*server_devices) ); @@ -892,6 +891,14 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d free( server_devices ); + pthread_mutex_unlock( &rawinput_mutex ); + + if (!registered_devices) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + return ret; }

1 0

Rémi Bernon : win32u: Avoid reallocating rawinput device array with zero size.
by Alexandre Julliard 08 Aug '22

08 Aug '22

Module: wine Branch: master Commit: b5ed53899337660c3fad7bd4023b84eb84eb96f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5ed53899337660c3fad7bd4023b84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 5 15:49:17 2022 +0200 win32u: Avoid reallocating rawinput device array with zero size. It actually frees the pointer. --- dlls/win32u/rawinput.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 8e3f3ace15a..44951522442 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -856,6 +856,12 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d pthread_mutex_lock( &rawinput_mutex ); + if (!registered_device_count && !device_count) + { + pthread_mutex_unlock( &rawinput_mutex ); + return TRUE; + } + size = (SIZE_T)device_size * (registered_device_count + device_count); registered_devices = realloc( registered_devices, size ); if (registered_devices) for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i );

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022