May 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernelbase: Move get_language_sort() to avoid forward declarations.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 093f6cbb8cc7126d1624771f67619e54c43de53c URL: https://source.winehq.org/git/wine.git/?a=commit;h=093f6cbb8cc7126d1624771f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 18:16:04 2022 +0200 kernelbase: Move get_language_sort() to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 86 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 73e6953ec51..5986e3537ee 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -439,49 +439,6 @@ static const struct sortguid *find_sortguid( const GUID *guid ) } -static const struct sortguid *get_language_sort( const WCHAR *locale ) -{ - WCHAR *p, *end, buffer[LOCALE_NAME_MAX_LENGTH], guidstr[39]; - const struct sortguid *ret; - UNICODE_STRING str; - GUID guid; - HKEY key = 0; - DWORD size, type; - - if (locale == LOCALE_NAME_USER_DEFAULT) - { - if (current_locale_sort) return current_locale_sort; - GetUserDefaultLocaleName( buffer, ARRAY_SIZE( buffer )); - } - else lstrcpynW( buffer, locale, LOCALE_NAME_MAX_LENGTH ); - - if (buffer[0] && !RegOpenKeyExW( nls_key, L"Sorting\\Ids", 0, KEY_READ, &key )) - { - for (;;) - { - size = sizeof(guidstr); - if (!RegQueryValueExW( key, buffer, NULL, &type, (BYTE *)guidstr, &size ) && type == REG_SZ) - { - RtlInitUnicodeString( &str, guidstr ); - if (!RtlGUIDFromString( &str, &guid )) - { - ret = find_sortguid( &guid ); - goto done; - } - break; - } - for (p = end = buffer; *p; p++) if (*p == '-' || *p == '_') end = p; - if (end == buffer) break; - *end = 0; - } - } - ret = find_sortguid( &default_sort_guid ); -done: - RegCloseKey( key ); - return ret; -} - - static const NLS_LOCALE_DATA *get_locale_data( UINT idx ) { ULONG offset = locale_table->locales_offset + idx * locale_table->locale_size; @@ -593,6 +550,49 @@ static const NLS_LOCALE_DATA *get_locale_by_name( const WCHAR *name, LCID *lcid } +static const struct sortguid *get_language_sort( const WCHAR *locale ) +{ + WCHAR *p, *end, buffer[LOCALE_NAME_MAX_LENGTH], guidstr[39]; + const struct sortguid *ret; + UNICODE_STRING str; + GUID guid; + HKEY key = 0; + DWORD size, type; + + if (locale == LOCALE_NAME_USER_DEFAULT) + { + if (current_locale_sort) return current_locale_sort; + GetUserDefaultLocaleName( buffer, ARRAY_SIZE( buffer )); + } + else lstrcpynW( buffer, locale, LOCALE_NAME_MAX_LENGTH ); + + if (buffer[0] && !RegOpenKeyExW( nls_key, L"Sorting\\Ids", 0, KEY_READ, &key )) + { + for (;;) + { + size = sizeof(guidstr); + if (!RegQueryValueExW( key, buffer, NULL, &type, (BYTE *)guidstr, &size ) && type == REG_SZ) + { + RtlInitUnicodeString( &str, guidstr ); + if (!RtlGUIDFromString( &str, &guid )) + { + ret = find_sortguid( &guid ); + goto done; + } + break; + } + for (p = end = buffer; *p; p++) if (*p == '-' || *p == '_') end = p; + if (end == buffer) break; + *end = 0; + } + } + ret = find_sortguid( &default_sort_guid ); +done: + RegCloseKey( key ); + return ret; +} + + /****************************************************************************** * NlsValidateLocale (kernelbase.@) *

1 0

Francois Gouget : mstask/tests: Ignore the compare_trigger_state() return value.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 1017c188f70de56426adb2d5df2db9fcefd264f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1017c188f70de56426adb2d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 13 19:59:18 2022 +0200 mstask/tests: Ignore the compare_trigger_state() return value. What counts is the ok() calls that compare_trigger_state() makes. Its return value is meaningless. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_trigger.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index d0f659ef246..e0c1b549ab7 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -35,7 +35,7 @@ static DWORD obj_refcount(void *obj_to_check) return IUnknown_Release(obj); } -static BOOL compare_trigger_state(TASK_TRIGGER found_state, +static void compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) { ok(found_state.cbTriggerSize == expected_state.cbTriggerSize, @@ -105,8 +105,6 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, ok(found_state.wRandomMinutesInterval == expected_state.wRandomMinutesInterval, "wRandomMinutesInterval: Found %d but expected %d\n", found_state.wRandomMinutesInterval, expected_state.wRandomMinutesInterval); - - return TRUE; } static void test_SetTrigger_GetTrigger(void) @@ -342,14 +340,12 @@ static void test_SetTrigger_GetTrigger(void) trigger_state.cbTriggerSize = sizeof(trigger_state) - 1; hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); ok(hres == S_OK, "Failed to GetTrigger\n"); - ok(compare_trigger_state(trigger_state, normal_trigger_state), - "Invalid state\n"); + compare_trigger_state(trigger_state, normal_trigger_state); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = 0; hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); ok(hres == S_OK, "Failed to GetTrigger\n"); - ok(compare_trigger_state(trigger_state, normal_trigger_state), - "Invalid state\n"); + compare_trigger_state(trigger_state, normal_trigger_state); ITaskTrigger_Release(test_trigger); ITask_Release(test_task);

1 0

Francois Gouget : mstask/tests: Fix the compare_trigger_state() failure lines.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 7618c6c6b7be52eb4fc4bb6571e0b2bda8e6f94e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7618c6c6b7be52eb4fc4bb65… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 13 20:00:34 2022 +0200 mstask/tests: Fix the compare_trigger_state() failure lines. compare_trigger_state() is called from multiple places and any failure should be accounted for the calling place's line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_trigger.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e0c1b549ab7..24b873770d2 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -35,74 +35,75 @@ static DWORD obj_refcount(void *obj_to_check) return IUnknown_Release(obj); } -static void compare_trigger_state(TASK_TRIGGER found_state, - TASK_TRIGGER expected_state) +#define compare_trigger_state(found,expected) compare_trigger_state_(__LINE__,found,expected) +static void compare_trigger_state_(int line, TASK_TRIGGER found_state, + TASK_TRIGGER expected_state) { - ok(found_state.cbTriggerSize == expected_state.cbTriggerSize, + ok_(__FILE__, line)(found_state.cbTriggerSize == expected_state.cbTriggerSize, "cbTriggerSize: Found %d but expected %d\n", found_state.cbTriggerSize, expected_state.cbTriggerSize); - ok(found_state.Reserved1 == expected_state.Reserved1, + ok_(__FILE__, line)(found_state.Reserved1 == expected_state.Reserved1, "Reserved1: Found %d but expected %d\n", found_state.Reserved1, expected_state.Reserved1); - ok(found_state.wBeginYear == expected_state.wBeginYear, + ok_(__FILE__, line)(found_state.wBeginYear == expected_state.wBeginYear, "wBeginYear: Found %d but expected %d\n", found_state.wBeginYear, expected_state.wBeginYear); - ok(found_state.wBeginMonth == expected_state.wBeginMonth, + ok_(__FILE__, line)(found_state.wBeginMonth == expected_state.wBeginMonth, "wBeginMonth: Found %d but expected %d\n", found_state.wBeginMonth, expected_state.wBeginMonth); - ok(found_state.wBeginDay == expected_state.wBeginDay, + ok_(__FILE__, line)(found_state.wBeginDay == expected_state.wBeginDay, "wBeginDay: Found %d but expected %d\n", found_state.wBeginDay, expected_state.wBeginDay); - ok(found_state.wEndYear == expected_state.wEndYear, + ok_(__FILE__, line)(found_state.wEndYear == expected_state.wEndYear, "wEndYear: Found %d but expected %d\n", found_state.wEndYear, expected_state.wEndYear); - ok(found_state.wEndMonth == expected_state.wEndMonth, + ok_(__FILE__, line)(found_state.wEndMonth == expected_state.wEndMonth, "wEndMonth: Found %d but expected %d\n", found_state.wEndMonth, expected_state.wEndMonth); - ok(found_state.wEndDay == expected_state.wEndDay, + ok_(__FILE__, line)(found_state.wEndDay == expected_state.wEndDay, "wEndDay: Found %d but expected %d\n", found_state.wEndDay, expected_state.wEndDay); - ok(found_state.wStartHour == expected_state.wStartHour, + ok_(__FILE__, line)(found_state.wStartHour == expected_state.wStartHour, "wStartHour: Found %d but expected %d\n", found_state.wStartHour, expected_state.wStartHour); - ok(found_state.wStartMinute == expected_state.wStartMinute, + ok_(__FILE__, line)(found_state.wStartMinute == expected_state.wStartMinute, "wStartMinute: Found %d but expected %d\n", found_state.wStartMinute, expected_state.wStartMinute); - ok(found_state.MinutesDuration == expected_state.MinutesDuration, + ok_(__FILE__, line)(found_state.MinutesDuration == expected_state.MinutesDuration, "MinutesDuration: Found %ld but expected %ld\n", found_state.MinutesDuration, expected_state.MinutesDuration); - ok(found_state.MinutesInterval == expected_state.MinutesInterval, + ok_(__FILE__, line)(found_state.MinutesInterval == expected_state.MinutesInterval, "MinutesInterval: Found %ld but expected %ld\n", found_state.MinutesInterval, expected_state.MinutesInterval); - ok(found_state.rgFlags == expected_state.rgFlags, + ok_(__FILE__, line)(found_state.rgFlags == expected_state.rgFlags, "rgFlags: Found %ld but expected %ld\n", found_state.rgFlags, expected_state.rgFlags); - ok(found_state.TriggerType == expected_state.TriggerType, + ok_(__FILE__, line)(found_state.TriggerType == expected_state.TriggerType, "TriggerType: Found %d but expected %d\n", found_state.TriggerType, expected_state.TriggerType); - ok(found_state.Type.Daily.DaysInterval == expected_state.Type.Daily.DaysInterval, + ok_(__FILE__, line)(found_state.Type.Daily.DaysInterval == expected_state.Type.Daily.DaysInterval, "Type.Daily.DaysInterval: Found %d but expected %d\n", found_state.Type.Daily.DaysInterval, expected_state.Type.Daily.DaysInterval); - ok(found_state.Reserved2 == expected_state.Reserved2, + ok_(__FILE__, line)(found_state.Reserved2 == expected_state.Reserved2, "Reserved2: Found %d but expected %d\n", found_state.Reserved2, expected_state.Reserved2); - ok(found_state.wRandomMinutesInterval == expected_state.wRandomMinutesInterval, + ok_(__FILE__, line)(found_state.wRandomMinutesInterval == expected_state.wRandomMinutesInterval, "wRandomMinutesInterval: Found %d but expected %d\n", found_state.wRandomMinutesInterval, expected_state.wRandomMinutesInterval); }

1 0

Jacek Caban : win32u: Handle sys color brushes in fill_rect.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 781b9544244bce97a44c5eb5916da23437653991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=781b9544244bce97a44c5eb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 13:57:38 2022 +0200 win32u: Handle sys color brushes in fill_rect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53004 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/defwnd.c | 2 ++ dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 67472246960..27120a96d98 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -35,6 +35,8 @@ void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) { HBRUSH prev_brush; + if (hbrush <= (HBRUSH)(COLOR_MENUBAR + 1)) hbrush = get_sys_color_brush( HandleToULong(hbrush) - 1 ); + prev_brush = NtGdiSelectBrush( dc, hbrush ); NtGdiPatBlt( dc, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, PATCOPY ); if (prev_brush) NtGdiSelectBrush( dc, prev_brush ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 114016954aa..5fec4ade0f8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4506,7 +4506,7 @@ static HBRUSH get_55aa_brush(void) return brush_55aa; } -static HBRUSH get_sys_color_brush( unsigned int index ) +HBRUSH get_sys_color_brush( unsigned int index ) { if (index == COLOR_55AA_BRUSH) return get_55aa_brush(); if (index >= ARRAY_SIZE( system_colors )) return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e459e6df6bd..d02871a6ad1 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -404,6 +404,7 @@ extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect( UINT dpi ) DECLSPEC_HIDDEN; +extern HBRUSH get_sys_color_brush( unsigned int index ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; extern int get_system_metrics( int index ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : ntdll: Use heap_validate_ptr in validate_block_pointer.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 13c836626d8aa35ef271c1bd7e626f7da3f191d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13c836626d8aa35ef271c1bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 14:54:01 2022 +0200 ntdll: Use heap_validate_ptr in validate_block_pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 255a3850c70..7ccaf5748e2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1437,14 +1437,13 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * } -static BOOL heap_validate_ptr( HEAP *heap, const void *ptr ) +static BOOL heap_validate_ptr( HEAP *heap, const void *ptr, SUBHEAP **subheap ) { const ARENA_INUSE *arena = (const ARENA_INUSE *)ptr - 1; const ARENA_LARGE *large_arena; - SUBHEAP *subheap; - if (!(subheap = find_subheap( heap, arena )) || - ((const char *)arena < (char *)subheap->base + subheap->headerSize)) + if (!(*subheap = find_subheap( heap, arena )) || + ((const char *)arena < (char *)(*subheap)->base + (*subheap)->headerSize)) { if (!(large_arena = find_large_block( heap, ptr ))) { @@ -1455,7 +1454,7 @@ static BOOL heap_validate_ptr( HEAP *heap, const void *ptr ) return validate_large_arena( heap, large_arena, QUIET ); } - return HEAP_ValidateInUseArena( subheap, arena, QUIET ); + return HEAP_ValidateInUseArena( *subheap, arena, QUIET ); } static BOOL heap_validate( HEAP *heap, BOOL quiet ) @@ -1506,24 +1505,20 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE SUBHEAP *subheap; BOOL ret = FALSE; + if (heap->flags & HEAP_VALIDATE) return heap_validate_ptr( heap, arena + 1, ret_subheap ); + if (!(*ret_subheap = subheap = find_subheap( heap, arena ))) { - ARENA_LARGE *large_arena = find_large_block( heap, arena + 1 ); - - if (!large_arena) + if (!find_large_block( heap, arena + 1 )) { WARN( "Heap %p: pointer %p is not inside heap\n", heap, arena + 1 ); return FALSE; } - if ((heap->flags & HEAP_VALIDATE) && !validate_large_arena( heap, large_arena, QUIET )) - return FALSE; return TRUE; } if ((const char *)arena < (char *)subheap->base + subheap->headerSize) WARN( "Heap %p: pointer %p is inside subheap %p header\n", subheap->heap, arena + 1, subheap ); - else if (subheap->heap->flags & HEAP_VALIDATE) /* do the full validation */ - ret = HEAP_ValidateInUseArena( subheap, arena, QUIET ); else if ((ULONG_PTR)arena % ALIGNMENT != ARENA_OFFSET) WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, arena ); else if (arena->magic == ARENA_PENDING_MAGIC) @@ -2102,6 +2097,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) */ BOOLEAN WINAPI RtlValidateHeap( HANDLE heap, ULONG flags, const void *ptr ) { + SUBHEAP *subheap; HEAP *heapPtr; BOOLEAN ret; @@ -2110,7 +2106,7 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE heap, ULONG flags, const void *ptr ) else { heap_lock( heapPtr, flags ); - if (ptr) ret = heap_validate_ptr( heapPtr, ptr ); + if (ptr) ret = heap_validate_ptr( heapPtr, ptr, &subheap ); else ret = heap_validate( heapPtr, QUIET ); heap_unlock( heapPtr, flags ); }

1 0

Rémi Bernon : ntdll: Simplify validate_large_arena.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 6ab02001195609a08fa6aca03223b7ff234d8e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab02001195609a08fa6aca0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 16 11:56:04 2022 +0200 ntdll: Simplify validate_large_arena. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 73 +++++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 295b215b3b2..504fd3fa743 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -926,66 +926,31 @@ static ARENA_LARGE *find_large_block( const HEAP *heap, const void *ptr ) return NULL; } - -/*********************************************************************** - * validate_large_arena - */ -static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena, BOOL quiet ) +static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena ) { - DWORD flags = heap->flags; + const char *err = NULL; - if ((ULONG_PTR)arena % page_size) - { - if (quiet == NOISY) - { - ERR( "Heap %p: invalid large arena pointer %p\n", heap, arena ); - if (TRACE_ON(heap)) heap_dump( heap ); - } - else if (WARN_ON(heap)) - { - WARN( "Heap %p: unaligned arena pointer %p\n", heap, arena ); - if (TRACE_ON(heap)) heap_dump( heap ); - } - return FALSE; - } - if (arena->size != ARENA_LARGE_SIZE || arena->magic != ARENA_LARGE_MAGIC) - { - if (quiet == NOISY) - { - ERR( "Heap %p: invalid large arena %p values %x/%x\n", - heap, arena, arena->size, arena->magic ); - if (TRACE_ON(heap)) heap_dump( heap ); - } - else if (WARN_ON(heap)) - { - WARN( "Heap %p: invalid large arena %p values %x/%x\n", - heap, arena, arena->size, arena->magic ); - if (TRACE_ON(heap)) heap_dump( heap ); - } - return FALSE; - } - if (arena->data_size > arena->block_size - sizeof(*arena)) - { - ERR( "Heap %p: invalid large arena %p size %lx/%lx\n", - heap, arena, arena->data_size, arena->block_size ); - return FALSE; - } - if (flags & HEAP_TAIL_CHECKING_ENABLED) + if ((ULONG_PTR)arena & COMMIT_MASK) + err = "invalid block alignment"; + else if (arena->size != ARENA_LARGE_SIZE || arena->magic != ARENA_LARGE_MAGIC) + err = "invalid block header"; + else if (!contains( arena, arena->block_size, arena + 1, arena->data_size )) + err = "invalid block size"; + else if (heap->flags & HEAP_TAIL_CHECKING_ENABLED) { SIZE_T i, unused = arena->block_size - sizeof(*arena) - arena->data_size; const unsigned char *data = (const unsigned char *)(arena + 1) + arena->data_size; + for (i = 0; i < unused && !err; i++) if (data[i] != ARENA_TAIL_FILLER) err = "invalid block tail"; + } - for (i = 0; i < unused; i++) - { - if (data[i] == ARENA_TAIL_FILLER) continue; - ERR("Heap %p: block %p tail overwritten at %p (byte %lu/%lu == 0x%02x)\n", - heap, arena + 1, data + i, i, unused, data[i] ); - return FALSE; - } + if (err) + { + ERR( "heap %p, block %p: %s\n", heap, arena, err ); + if (TRACE_ON(heap)) heap_dump( heap ); } - return TRUE; -} + return !err; +} /*********************************************************************** * HEAP_CreateSubHeap @@ -1451,7 +1416,7 @@ static BOOL heap_validate_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subh return FALSE; } - return validate_large_arena( heap, large_arena, QUIET ); + return validate_large_arena( heap, large_arena ); } return HEAP_ValidateInUseArena( *subheap, arena, QUIET ); @@ -1489,7 +1454,7 @@ static BOOL heap_validate( HEAP *heap, BOOL quiet ) } LIST_FOR_EACH_ENTRY( large_arena, &heap->large_list, ARENA_LARGE, entry ) - if (!validate_large_arena( heap, large_arena, quiet )) return FALSE; + if (!validate_large_arena( heap, large_arena )) return FALSE; return TRUE; }

1 0

Martin Storsjö : msvcrt: Hook up __C_specific_handler and __jump_unwind for arm.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: ce4fdb15177e53b8e4ae959280bcbdb754576ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4fdb15177e53b8e4ae9592… Author: Martin Storsjö <martin(a)martin.st> Date: Sun May 15 14:49:46 2022 +0300 msvcrt: Hook up __C_specific_handler and __jump_unwind for arm. This was set up for arm in ntdll and ucrtbase in 3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed. Also hook them up similarly in msvcr110, msvcr120 and msvcr120_app. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64b634b582e..7bdae76cf68 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -872,7 +872,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @@ -948,7 +948,7 @@ @ cdecl __iscsymf(long) @ stub __iswcsym @ stub __iswcsymf -@ stub -arch=arm __jump_unwind +@ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv @ cdecl __lconv_init() @ cdecl -arch=i386 -norelay __libm_sse2_acos() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 68855b90096..4cafd8ba247 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -856,7 +856,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @@ -938,7 +938,7 @@ @ cdecl __iscsymf(long) @ stub __iswcsym @ stub __iswcsymf -@ stub -arch=arm __jump_unwind +@ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv @ cdecl __lconv_init() @ cdecl -arch=i386 -norelay __libm_sse2_acos() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index eabb304dd6d..d964de1fb36 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -850,7 +850,7 @@ @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler +@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) msvcr120.__CppXcptFilter @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) msvcr120.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) msvcr120.__CxxExceptionFilter @@ -914,7 +914,7 @@ @ cdecl __iscsymf(long) msvcr120.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub -arch=arm __jump_unwind +@ stdcall -arch=arm __jump_unwind(ptr ptr) msvcr120.__jump_unwind # extern __lconv @ cdecl __lconv_init() msvcr120.__lconv_init @ cdecl -arch=i386 -norelay __libm_sse2_acos() msvcr120.__libm_sse2_acos diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index de7cf0116d8..3aab3600e1d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -172,7 +172,7 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) # stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDtor @@ -218,6 +218,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) +@ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind @ extern __lc_codepage MSVCRT___lc_codepage @ stub __lc_collate @ extern __lc_collate_cp MSVCRT___lc_collate_cp

1 0

Paul Gofman : ntdll: Move init_cpu_info() below create_logical_proc_info().
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: aadc1a0a80bf7db28a1430ec4e5852ee826e9800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadc1a0a80bf7db28a1430ec… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 3 16:20:17 2022 -0500 ntdll: Move init_cpu_info() below create_logical_proc_info(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 64829559c1d..0710b72e42f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -536,46 +536,6 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) #endif /* End architecture specific feature detection for CPUs */ -/****************************************************************** - * init_cpu_info - * - * inits a couple of places with CPU related information: - * - cpu_info in this file - * - Peb->NumberOfProcessors - * - SharedUserData->ProcessFeatures[] array - */ -void init_cpu_info(void) -{ - long num; - -#ifdef _SC_NPROCESSORS_ONLN - num = sysconf(_SC_NPROCESSORS_ONLN); - if (num < 1) - { - num = 1; - WARN("Failed to detect the number of processors.\n"); - } -#elif defined(CTL_HW) && defined(HW_NCPU) - int mib[2]; - size_t len = sizeof(num); - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - if (sysctl(mib, 2, &num, &len, NULL, 0) != 0) - { - num = 1; - WARN("Failed to detect the number of processors.\n"); - } -#else - num = 1; - FIXME("Detecting the number of processors is not supported.\n"); -#endif - peb->NumberOfProcessors = num; - get_cpuinfo( &cpu_info ); - TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n", - cpu_info.ProcessorArchitecture, cpu_info.ProcessorLevel, cpu_info.ProcessorRevision, - cpu_info.ProcessorFeatureBits ); -} - static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; @@ -1254,6 +1214,46 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION * } #endif +/****************************************************************** + * init_cpu_info + * + * inits a couple of places with CPU related information: + * - cpu_info in this file + * - Peb->NumberOfProcessors + * - SharedUserData->ProcessFeatures[] array + */ +void init_cpu_info(void) +{ + long num; + +#ifdef _SC_NPROCESSORS_ONLN + num = sysconf(_SC_NPROCESSORS_ONLN); + if (num < 1) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#elif defined(CTL_HW) && defined(HW_NCPU) + int mib[2]; + size_t len = sizeof(num); + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &num, &len, NULL, 0) != 0) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#else + num = 1; + FIXME("Detecting the number of processors is not supported.\n"); +#endif + peb->NumberOfProcessors = num; + get_cpuinfo( &cpu_info ); + TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n", + cpu_info.ProcessorArchitecture, cpu_info.ProcessorLevel, cpu_info.ProcessorRevision, + cpu_info.ProcessorFeatureBits ); +} + static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info;

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: ee937e8e4bd63f1fa4139438f669b2ffe1fc0b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee937e8e4bd63f1fa4139438… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 10:32:30 2022 +0200 windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/force_feedback.c | 36 ++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 027ef459a1a..7ac69bcec1b 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -464,11 +464,43 @@ static HRESULT WINAPI motor_TryResetAsync( IForceFeedbackMotor *iface, IAsyncOpe return async_operation_boolean_create( (IUnknown *)iface, NULL, motor_try_reset_async, async_op ); } +static HRESULT WINAPI motor_unload_effect_async( IUnknown *iface, IUnknown *param, PROPVARIANT *result ) +{ + struct effect *effect = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)param ); + IDirectInputEffect *dinput_effect; + HRESULT hr; + + EnterCriticalSection( &effect->cs ); + dinput_effect = effect->effect; + effect->effect = NULL; + LeaveCriticalSection( &effect->cs ); + + if (!dinput_effect) hr = S_OK; + else + { + hr = IDirectInputEffect_Unload( dinput_effect ); + IDirectInputEffect_Release( dinput_effect ); + } + + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); + return hr; +} + static HRESULT WINAPI motor_TryUnloadEffectAsync( IForceFeedbackMotor *iface, IForceFeedbackEffect *effect, IAsyncOperation_boolean **async_op ) { - FIXME( "iface %p, effect %p, async_op %p stub!\n", iface, effect, async_op ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)effect ); + HRESULT hr = S_OK; + + TRACE( "iface %p, effect %p, async_op %p.\n", iface, effect, async_op ); + + EnterCriticalSection( &impl->cs ); + if (!impl->effect) hr = E_FAIL; + LeaveCriticalSection( &impl->cs ); + if (FAILED(hr)) return hr; + + return async_operation_boolean_create( (IUnknown *)iface, (IUnknown *)effect, motor_unload_effect_async, async_op ); } static const struct IForceFeedbackMotorVtbl motor_vtbl =

1 0

Jacek Caban : user32: Remove no longer used WINPOS_WindowFromPoint.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: e2d79b395d9efe38f149bc6209df14ec5b934045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2d79b395d9efe38f149bc62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 18:12:04 2022 +0200 user32: Remove no longer used WINPOS_WindowFromPoint. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 95 ---------------------------------------------------- 2 files changed, 96 deletions(-) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index c9ac3b8e977..2155ea51e94 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -60,7 +60,6 @@ static inline void WIN_ReleasePtr( WND *ptr ) extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; -extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a5bc7d9ce17..5987d06c257 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -109,101 +109,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) } -/*********************************************************************** - * list_children_from_point - * - * Get the list of children that can contain point from the server. - * Point is in screen coordinates. - * Returned list must be freed by caller. - */ -static HWND *list_children_from_point( HWND hwnd, POINT pt ) -{ - HWND *list; - int i, size = 128; - - for (;;) - { - int count = 0; - - if (!(list = HeapAlloc( GetProcessHeap(), 0, size * sizeof(HWND) ))) break; - - SERVER_START_REQ( get_window_children_from_point ) - { - req->parent = wine_server_user_handle( hwnd ); - req->x = pt.x; - req->y = pt.y; - req->dpi = get_thread_dpi(); - wine_server_set_reply( req, list, (size-1) * sizeof(user_handle_t) ); - if (!wine_server_call( req )) count = reply->count; - } - SERVER_END_REQ; - if (count && count < size) - { - /* start from the end since HWND is potentially larger than user_handle_t */ - for (i = count - 1; i >= 0; i--) - list[i] = wine_server_ptr_handle( ((user_handle_t *)list)[i] ); - list[count] = 0; - return list; - } - HeapFree( GetProcessHeap(), 0, list ); - if (!count) break; - size = count + 1; /* restart with a large enough buffer */ - } - return NULL; -} - - -/*********************************************************************** - * WINPOS_WindowFromPoint - * - * Find the window and hittest for a given point. - */ -HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) -{ - int i, res; - HWND ret, *list; - POINT win_pt; - - if (!hwndScope) hwndScope = GetDesktopWindow(); - - *hittest = HTNOWHERE; - - if (!(list = list_children_from_point( hwndScope, pt ))) return 0; - - /* now determine the hittest */ - - for (i = 0; list[i]; i++) - { - LONG style = GetWindowLongW( list[i], GWL_STYLE ); - - /* If window is minimized or disabled, return at once */ - if (style & WS_DISABLED) - { - *hittest = HTERROR; - break; - } - /* Send WM_NCCHITTEST (if same thread) */ - if (!WIN_IsCurrentThread( list[i] )) - { - *hittest = HTCLIENT; - break; - } - win_pt = point_thread_to_win_dpi( list[i], pt ); - res = SendMessageW( list[i], WM_NCHITTEST, 0, MAKELPARAM( win_pt.x, win_pt.y )); - if (res != HTTRANSPARENT) - { - *hittest = res; /* Found the window */ - break; - } - /* continue search with next window in z-order */ - } - ret = list[i]; - HeapFree( GetProcessHeap(), 0, list ); - TRACE( "scope %p (%d,%d) returning %p\n", hwndScope, pt.x, pt.y, ret ); - return ret; -} - - /******************************************************************* * WindowFromPoint (USER32.@) */

1 0