winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2023
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
667 discussions
Start a n
N
ew thread
Alexandre Julliard : winebuild: Ignore syscalls that point to an alias.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: afb8d94e2f5e79ddeef4f9d63966787557a3d0ac URL:
https://gitlab.winehq.org/wine/wine/-/commit/afb8d94e2f5e79ddeef4f9d6396678…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 18:38:51 2023 +0200 winebuild: Ignore syscalls that point to an alias. --- tools/winebuild/import.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 99258a94527..de4bc26f60d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1402,6 +1402,7 @@ void output_syscalls( DLLSPEC *spec ) { ORDDEF *odp = &spec->entry_points[i]; if (!(odp->flags & FLAG_SYSCALL)) continue; + if (strcmp( odp->name, odp->link_name )) continue; /* ignore syscall aliases */ if (!syscalls) syscalls = xmalloc( (spec->nb_entry_points - i) * sizeof(*syscalls) ); syscalls[count++] = odp; }
1
0
0
0
Alexandre Julliard : ntdll/tests: Add tests for cross-process notifications.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: b892d12c8c12719fb377de9cc34ed4e8d319e1ae URL:
https://gitlab.winehq.org/wine/wine/-/commit/b892d12c8c12719fb377de9cc34ed4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:53:20 2023 +0200 ntdll/tests: Add tests for cross-process notifications. --- dlls/ntdll/tests/wow64.c | 254 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 252 insertions(+), 2 deletions(-)
1
0
0
0
Alexandre Julliard : wow64: Implement Wow64ProcessPendingCrossProcessItems().
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: 0b0dbf6acc81e858bf54ecef6b274a601f934ac5 URL:
https://gitlab.winehq.org/wine/wine/-/commit/0b0dbf6acc81e858bf54ecef6b274a…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:49:16 2023 +0200 wow64: Implement Wow64ProcessPendingCrossProcessItems(). --- dlls/wow64/syscall.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/wow64.spec | 1 + include/winternl.h | 1 + 3 files changed, 64 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index f5a020bac0a..4b13fd9d3cd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1262,6 +1262,68 @@ void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ) } +/********************************************************************** + * Wow64ProcessPendingCrossProcessItems (wow64.@) + */ +void WINAPI Wow64ProcessPendingCrossProcessItems(void) +{ + CROSS_PROCESS_WORK_LIST *list = (void *)wow64info->CrossProcessWorkList; + CROSS_PROCESS_WORK_ENTRY *entry; + BOOLEAN flush = FALSE; + UINT next; + + if (!list) return; + entry = RtlWow64PopAllCrossProcessWorkFromWorkList( &list->work_list, &flush ); + + if (flush) + { + if (pBTCpuNotifyFlushInstructionCache2) pBTCpuNotifyFlushInstructionCache2( NULL, ~0ull ); + while (entry) + { + next = entry->next; + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, entry ); + entry = CROSS_PROCESS_LIST_ENTRY( &list->work_list, next ); + } + return; + } + + while (entry) + { + switch (entry->id) + { + case CrossProcessPreVirtualAlloc: + /* FIXME */ + break; + case CrossProcessPostVirtualAlloc: + if (!pBTCpuNotifyMemoryAlloc) break; + pBTCpuNotifyMemoryAlloc( (void *)entry->addr, entry->size, entry->args[0], entry->args[1] ); + break; + case CrossProcessPreVirtualFree: + if (!pBTCpuNotifyMemoryFree) break; + pBTCpuNotifyMemoryFree( (void *)entry->addr, entry->size, entry->args[0] ); + break; + case CrossProcessPostVirtualFree: + /* FIXME */ + break; + case CrossProcessPreVirtualProtect: + if (!pBTCpuNotifyMemoryProtect) break; + pBTCpuNotifyMemoryProtect( (void *)entry->addr, entry->size, entry->args[0] ); + break; + case CrossProcessPostVirtualProtect: + /* FIXME */ + break; + case CrossProcessFlushCache: + if (!pBTCpuNotifyFlushInstructionCache2) break; + pBTCpuNotifyFlushInstructionCache2( (void *)entry->addr, entry->size ); + break; + } + next = entry->next; + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, entry ); + entry = CROSS_PROCESS_LIST_ENTRY( &list->work_list, next ); + } +} + + /********************************************************************** * Wow64RaiseException (wow64.@) */ diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 1f09e1411bb..760f88ada77 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -16,6 +16,7 @@ @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stdcall Wow64PrepareForException(ptr ptr) +@ stdcall Wow64ProcessPendingCrossProcessItems() @ stdcall Wow64RaiseException(long ptr) @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC diff --git a/include/winternl.h b/include/winternl.h index 9d92e1cd6ff..bb0eee70ef3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4167,6 +4167,7 @@ void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*); NTSTATUS WINAPI Wow64KiUserCallbackDispatcher(ULONG,void*,ULONG,void**,ULONG*); void WINAPI Wow64PassExceptionToGuest(EXCEPTION_POINTERS*); void WINAPI Wow64PrepareForException(EXCEPTION_RECORD*,CONTEXT*); +void WINAPI Wow64ProcessPendingCrossProcessItems(void); NTSTATUS WINAPI Wow64RaiseException(int,EXCEPTION_RECORD*); NTSTATUS WINAPI Wow64SystemServiceEx(UINT,UINT*);
1
0
0
0
Alexandre Julliard : wow64: Send cross-process notifications.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: f6dbcccab9e33f05b4df9ba3824a849b172b97c3 URL:
https://gitlab.winehq.org/wine/wine/-/commit/f6dbcccab9e33f05b4df9ba3824a84…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:47:14 2023 +0200 wow64: Send cross-process notifications. --- dlls/wow64/process.c | 16 ------- dlls/wow64/syscall.c | 2 +- dlls/wow64/virtual.c | 116 +++++++++++++++++++++++++++++++++++++++------ dlls/wow64/wow64_private.h | 2 +- 4 files changed, 103 insertions(+), 33 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 2b6674ccf1b..880b7623b10 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -426,22 +426,6 @@ NTSTATUS WINAPI wow64_NtDebugActiveProcess( UINT *args ) } -/********************************************************************** - * wow64_NtFlushInstructionCache - */ -NTSTATUS WINAPI wow64_NtFlushInstructionCache( UINT *args ) -{ - HANDLE process = get_handle( &args ); - const void *addr = get_ptr( &args ); - SIZE_T size = get_ulong( &args ); - - if (pBTCpuNotifyFlushInstructionCache2 && RtlIsCurrentProcess( process )) - pBTCpuNotifyFlushInstructionCache2( addr, size ); - - return NtFlushInstructionCache( process, addr, size ); -} - - /********************************************************************** * wow64_NtFlushProcessWriteBuffers */ diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 70c63535ae6..f5a020bac0a 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -115,7 +115,7 @@ void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ) = NULL void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ) = NULL; void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG ) = NULL; void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ) = NULL; -void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T, ULONG ) = NULL; void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ) = NULL; void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 6a63f3793bb..79b4e9c2288 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -32,6 +32,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); +static BOOL WINAPIV send_cross_process_notification( HANDLE process, UINT id, const void *addr, SIZE_T size, + int nb_args, ... ) +{ + CROSS_PROCESS_WORK_LIST *list; + CROSS_PROCESS_WORK_ENTRY *entry; + void *unused; + HANDLE section; + va_list args; + int i; + + RtlOpenCrossProcessEmulatorWorkConnection( process, §ion, (void **)&list ); + if (!list) return FALSE; + if ((entry = RtlWow64PopCrossProcessWorkFromFreeList( &list->free_list ))) + { + entry->id = id; + entry->addr = (ULONG_PTR)addr; + entry->size = size; + if (nb_args) + { + va_start( args, nb_args ); + for (i = 0; i < nb_args; i++) entry->args[i] = va_arg( args, int ); + va_end( args ); + } + RtlWow64PushCrossProcessWorkOntoWorkList( &list->work_list, entry, &unused ); + } + NtUnmapViewOfSection( GetCurrentProcess(), list ); + NtClose( section ); + return TRUE; +} + static MEMORY_RANGE_ENTRY *memory_range_entry_array_32to64( const MEMORY_RANGE_ENTRY32 *addresses32, ULONG count ) @@ -118,16 +148,27 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemory( UINT *args ) ULONG type = get_ulong( &args ); ULONG protect = get_ulong( &args ); - void *addr; - SIZE_T size; + void *addr = ULongToPtr( *addr32 ); + SIZE_T size = *size32; + BOOL is_current = RtlIsCurrentProcess( process ); NTSTATUS status; - status = NtAllocateVirtualMemory( process, addr_32to64( &addr, addr32 ), get_zero_bits( zero_bits ), - size_32to64( &size, size32 ), type, protect ); + if (!addr) type |= MEM_RESERVE; + + if (!is_current) + send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + addr, size, 3, type, protect, 0 ); + + status = NtAllocateVirtualMemory( process, &addr, get_zero_bits( zero_bits ), &size, type, protect ); if (!status) { - if (pBTCpuNotifyMemoryAlloc && RtlIsCurrentProcess(process)) - pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); + if (is_current) + { + if (pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); + } + else send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + addr, size, 3, type, protect, 0 ); + put_addr( addr32, addr ); put_size( size32, size ); } @@ -148,20 +189,30 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) MEM_EXTENDED_PARAMETER32 *params32 = get_ptr( &args ); ULONG count = get_ulong( &args ); - void *addr; - SIZE_T size; + void *addr = ULongToPtr( *addr32 ); + SIZE_T size = *size32; NTSTATUS status; MEM_EXTENDED_PARAMETER *params64; BOOL is_current = RtlIsCurrentProcess( process ); BOOL set_limit = (!*addr32 && is_current); + if (!addr) type |= MEM_RESERVE; + if ((status = mem_extended_parameters_32to64( ¶ms64, params32, &count, set_limit ))) return status; - status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), - type, protect, params64, count ); + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + addr, size, 3, type, protect, 0 ); + + status = NtAllocateVirtualMemoryEx( process, &addr, &size, type, protect, params64, count ); if (!status) { - if (pBTCpuNotifyMemoryAlloc && is_current) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); + if (is_current) + { + if (pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); + } + else send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + addr, size, 3, type, protect, 0 ); + put_addr( addr32, addr ); put_size( size32, size ); } @@ -181,6 +232,25 @@ NTSTATUS WINAPI wow64_NtAreMappedFilesTheSame( UINT *args ) } +/********************************************************************** + * wow64_NtFlushInstructionCache + */ +NTSTATUS WINAPI wow64_NtFlushInstructionCache( UINT *args ) +{ + HANDLE process = get_handle( &args ); + const void *addr = get_ptr( &args ); + SIZE_T size = get_ulong( &args ); + + if (RtlIsCurrentProcess( process )) + { + if (pBTCpuNotifyFlushInstructionCache2) pBTCpuNotifyFlushInstructionCache2( addr, size ); + } + else send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); + + return NtFlushInstructionCache( process, addr, size ); +} + + /********************************************************************** * wow64_NtFlushVirtualMemory */ @@ -218,14 +288,22 @@ NTSTATUS WINAPI wow64_NtFreeVirtualMemory( UINT *args ) void *addr = ULongToPtr( *addr32 ); SIZE_T size = *size32; + BOOL is_current = RtlIsCurrentProcess( process ); NTSTATUS status; - if (pBTCpuNotifyMemoryFree && RtlIsCurrentProcess( process )) - pBTCpuNotifyMemoryFree( addr, size ); + if (is_current) + { + if (pBTCpuNotifyMemoryFree) pBTCpuNotifyMemoryFree( addr, size, type ); + } + else send_cross_process_notification( process, CrossProcessPreVirtualFree, + addr, size, 2, type, 0 ); status = NtFreeVirtualMemory( process, &addr, &size, type ); if (!status) { + if (!is_current) + send_cross_process_notification( process, CrossProcessPostVirtualFree, + addr, size, 2, type, 0 ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -428,14 +506,22 @@ NTSTATUS WINAPI wow64_NtProtectVirtualMemory( UINT *args ) void *addr = ULongToPtr( *addr32 ); SIZE_T size = *size32; + BOOL is_current = RtlIsCurrentProcess( process ); NTSTATUS status; - if (pBTCpuNotifyMemoryProtect && RtlIsCurrentProcess(process)) - pBTCpuNotifyMemoryProtect( addr, size, new_prot ); + if (is_current) + { + if (pBTCpuNotifyMemoryProtect) pBTCpuNotifyMemoryProtect( addr, size, new_prot ); + } + else send_cross_process_notification( process, CrossProcessPreVirtualProtect, + addr, size, 2, new_prot, 0 ); status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); if (!status) { + if (!is_current) + send_cross_process_notification( process, CrossProcessPostVirtualProtect, + addr, size, 2, new_prot, 0 ); put_addr( addr32, addr ); put_size( size32, size ); } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 5b09d16c9d9..6f98a5f7a57 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -43,7 +43,7 @@ extern void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ) extern void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ); extern void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG ); extern void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ); -extern void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ); +extern void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T, ULONG ); extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ); extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ); extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * );
1
0
0
0
Alexandre Julliard : ntdll: Implement RtlOpenCrossProcessEmulatorWorkConnection().
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: b5215075913788599d41309d58b287a38894d166 URL:
https://gitlab.winehq.org/wine/wine/-/commit/b5215075913788599d41309d58b287…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:39:42 2023 +0200 ntdll: Implement RtlOpenCrossProcessEmulatorWorkConnection(). --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/wow64.c | 29 ++++++++++++++++++++++++++++- include/winternl.h | 1 + 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 367eae408ae..9c000fe293b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -901,6 +901,7 @@ @ stdcall RtlOemStringToUnicodeSize(ptr) @ stdcall RtlOemStringToUnicodeString(ptr ptr long) @ stdcall RtlOemToUnicodeN(ptr long ptr ptr long) +@ stdcall -arch=win64 RtlOpenCrossProcessEmulatorWorkConnection(long ptr ptr) @ stdcall RtlOpenCurrentUser(long ptr) @ stdcall RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr long) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 62a927494b9..4ddf3ad59bd 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -303,6 +303,34 @@ done: } +/********************************************************************** + * RtlOpenCrossProcessEmulatorWorkConnection (NTDLL.@) + */ +void WINAPI RtlOpenCrossProcessEmulatorWorkConnection( HANDLE process, HANDLE *section, void **addr ) +{ + WOW64INFO wow64info; + BOOLEAN is_wow64; + SIZE_T size = 0; + + *addr = NULL; + *section = 0; + + if (RtlWow64GetSharedInfoProcess( process, &is_wow64, &wow64info )) return; + if (!is_wow64) return; + if (!wow64info.SectionHandle) return; + + if (NtDuplicateObject( process, (HANDLE)(ULONG_PTR)wow64info.SectionHandle, + GetCurrentProcess(), section, 0, 0, DUPLICATE_SAME_ACCESS )) + return; + + if (!NtMapViewOfSection( *section, GetCurrentProcess(), addr, 0, 0, NULL, + &size, ViewShare, 0, PAGE_READWRITE )) return; + + NtClose( *section ); + *section = 0; +} + + /********************************************************************** * RtlWow64PopAllCrossProcessWorkFromWorkList (NTDLL.@) */ diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index cc160c061cc..13c7326b1ca 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); static NTSTATUS (WINAPI *pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); +static void (WINAPI *pRtlOpenCrossProcessEmulatorWorkConnection)(HANDLE,HANDLE*,void**); static USHORT (WINAPI *pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI *pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI *pRtlWow64GetSharedInfoProcess)(HANDLE,BOOLEAN*,WOW64INFO*); @@ -92,6 +93,7 @@ static void init(void) GET_PROC( NtQuerySystemInformation ); GET_PROC( NtQuerySystemInformationEx ); GET_PROC( RtlGetNativeSystemInformation ); + GET_PROC( RtlOpenCrossProcessEmulatorWorkConnection ); GET_PROC( RtlWow64GetCurrentMachine ); GET_PROC( RtlWow64GetProcessMachines ); GET_PROC( RtlWow64GetSharedInfoProcess ); @@ -443,8 +445,33 @@ static void test_peb_teb(void) ok( ret, "ReadProcessMemory failed %lu\n", GetLastError() ); ok( !memcmp( data, addr, size ), "wrong data\n" ); free( data ); - UnmapViewOfFile( addr ); CloseHandle( handle ); + + if (pRtlOpenCrossProcessEmulatorWorkConnection) + { + pRtlOpenCrossProcessEmulatorWorkConnection( pi.hProcess, &handle, &data ); + ok( handle != 0, "got 0 handle\n" ); + ok( data != NULL, "got NULL data\n" ); + ok( !memcmp( data, addr, size ), "wrong data\n" ); + UnmapViewOfFile( data ); + data = NULL; + size = 0; + status = NtMapViewOfSection( handle, GetCurrentProcess(), &data, 0, 0, NULL, + &size, ViewShare, 0, PAGE_READWRITE ); + ok( !status, "NtMapViewOfSection failed %lx\n", status ); + ok( !memcmp( data, addr, size ), "wrong data\n" ); + ok( CloseHandle( handle ), "invalid handle\n" ); + UnmapViewOfFile( data ); + + handle = (HANDLE)0xdead; + data = (void *)0xdeadbeef; + pRtlOpenCrossProcessEmulatorWorkConnection( GetCurrentProcess(), &handle, &data ); + ok( !handle, "got handle %p\n", handle ); + ok( !data, "got data %p\n", data ); + } + else skip( "RtlOpenCrossProcessEmulatorWorkConnection not supported\n" ); + + UnmapViewOfFile( addr ); } else trace( "no WOW64INFO section handle\n" ); } diff --git a/include/winternl.h b/include/winternl.h index cca48da8068..9d92e1cd6ff 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -5017,6 +5017,7 @@ NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_v /* 32-bit or 64-bit only functions */ #ifdef _WIN64 +NTSYSAPI void WINAPI RtlOpenCrossProcessEmulatorWorkConnection(HANDLE,HANDLE*,void**); NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); NTSYSAPI NTSTATUS WINAPI RtlWow64GetCurrentCpuArea(USHORT*,void**,void**); NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*);
1
0
0
0
Alexandre Julliard : wow64: Create the cross-process work list.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: f6ccadda8adfcc4d3463873b22fc5c3b5509bd72 URL:
https://gitlab.winehq.org/wine/wine/-/commit/f6ccadda8adfcc4d3463873b22fc5c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:33:59 2023 +0200 wow64: Create the cross-process work list. --- dlls/ntdll/tests/wow64.c | 1 + dlls/wow64/syscall.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 418c2c6145f..cc160c061cc 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -436,6 +436,7 @@ static void test_peb_teb(void) status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, NULL, &size, ViewShare, 0, PAGE_READWRITE ); ok( !status, "NtMapViewOfSection failed %lx\n", status ); + ok( size == 0x4000, "unexpected size %Ix\n", size ); data = malloc( size ); ret = ReadProcessMemory( pi.hProcess, (void *)(ULONG_PTR)wow64info->CrossProcessWorkList, data, size, &size ); diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 113e9f538fb..70c63535ae6 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -798,6 +798,40 @@ static const WCHAR *get_cpu_dll_name(void) } +/********************************************************************** + * create_cross_process_work_list + */ +static NTSTATUS create_cross_process_work_list( WOW64INFO *wow64info ) +{ + SIZE_T map_size = 0x4000; + LARGE_INTEGER size; + NTSTATUS status; + HANDLE section; + CROSS_PROCESS_WORK_LIST *list = NULL; + CROSS_PROCESS_WORK_ENTRY *end; + UINT i; + + size.QuadPart = map_size; + status = NtCreateSection( §ion, SECTION_ALL_ACCESS, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); + if (status) return status; + status = NtMapViewOfSection( section, GetCurrentProcess(), (void **)&list, default_zero_bits, 0, NULL, + &map_size, ViewShare, MEM_TOP_DOWN, PAGE_READWRITE ); + if (status) + { + NtClose( section ); + return status; + } + + end = (CROSS_PROCESS_WORK_ENTRY *)((char *)list + map_size); + for (i = 0; list->entries + i + 1 <= end; i++) + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, &list->entries[i] ); + + wow64info->SectionHandle = (ULONG_PTR)section; + wow64info->CrossProcessWorkList = (ULONG_PTR)list; + return STATUS_SUCCESS; +} + + /********************************************************************** * process_init */ @@ -863,6 +897,8 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex init_syscall_table( module, p__wine_syscall_dispatcher, &ntdll_syscall_table ); + if (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE) create_cross_process_work_list( wow64info ); + init_file_redirects(); return TRUE;
1
0
0
0
Alexandre Julliard : ntdll: Implement the cross-process work list functions.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: 049fb065c49cc5270a7413b71ff5b6826f6da3f0 URL:
https://gitlab.winehq.org/wine/wine/-/commit/049fb065c49cc5270a7413b71ff5b6…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:32:18 2023 +0200 ntdll: Implement the cross-process work list functions. --- dlls/ntdll/ntdll.spec | 5 ++ dlls/ntdll/process.c | 114 ++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/wow64.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 49 ++++++++++++++++ 4 files changed, 316 insertions(+), 2 deletions(-)
1
0
0
0
Zebediah Figura : server: Signal AFD_POLL_BIT_WRITE at the same time as AFD_POLL_BIT_CONNECT.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: dbe7788817a6e0192ce953e6b9a32d8e9318d2df URL:
https://gitlab.winehq.org/wine/wine/-/commit/dbe7788817a6e0192ce953e6b9a32d…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 24 21:08:25 2023 -0500 server: Signal AFD_POLL_BIT_WRITE at the same time as AFD_POLL_BIT_CONNECT. Wine-Bug:
https://bugs.winehq.org//show_bug.cgi?id=55333
--- server/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/sock.c b/server/sock.c index 7e8192f82a6..b63412ab216 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1293,7 +1293,10 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) + { post_socket_event( sock, AFD_POLL_BIT_CONNECT ); + post_socket_event( sock, AFD_POLL_BIT_WRITE ); + } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR ); break;
1
0
0
0
Piotr Caban : msvcr120/tests: Add Context::IsCurrentTaskCollectionCanceling tests.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: 846636274fa1180c9f5ef6580e4bf8beaa0c14b2 URL:
https://gitlab.winehq.org/wine/wine/-/commit/846636274fa1180c9f5ef6580e4bf8…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 25 19:21:11 2023 +0200 msvcr120/tests: Add Context::IsCurrentTaskCollectionCanceling tests. --- dlls/msvcr120/tests/msvcr120.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index d21e73244c2..672be695c3d 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -251,6 +251,7 @@ static void (__thiscall *p__Condition_variable_notify_all)(_Condition_variable*) static Context* (__cdecl *p_Context_CurrentContext)(void); static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); +static MSVCRT_bool (__cdecl *p_Context_IsCurrentTaskCollectionCanceling)(void); static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor)(_StructuredTaskCollection*, void*); static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); @@ -317,6 +318,7 @@ static BOOL init(void) SET(p__Context__CurrentContext, "?_CurrentContext@_Context@details@Concurrency@@SA?AV123@XZ"); SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); + SET(p_Context_IsCurrentTaskCollectionCanceling, "?IsCurrentTaskCollectionCanceling@Context@Concurrency@@SA_NXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p__StructuredTaskCollection_ctor, "??0_StructuredTaskCollection@details@Concurrency@@QEAA@PEAV_CancellationTokenState@12@@Z"); @@ -1409,6 +1411,9 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) chore->chore.task_collection); ok(!canceling, "Task is already canceling\n"); + ok(!p_Context_IsCurrentTaskCollectionCanceling(), + "IsCurrentTaskCollectionCanceling returned TRUE\n"); + call_func1(p__Cancellation_beacon_ctor, &beacon); ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); @@ -1440,6 +1445,9 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) chore->chore.task_collection); ok(canceling, "Task is not canceling\n"); + ok(p_Context_IsCurrentTaskCollectionCanceling(), + "IsCurrentTaskCollectionCanceling returned FALSE\n"); + ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon); ok(*beacon2.cancelling == 1, "beacon not signalled (%x)\n", *beacon2.cancelling); @@ -1622,10 +1630,14 @@ static void test_StructuredTaskCollection(void) ret = WaitForSingleObject(chore_evt1, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + ok(!p_Context_IsCurrentTaskCollectionCanceling(), + "IsCurrentTaskCollectionCanceling returned TRUE\n"); call_func1(p__Cancellation_beacon_ctor, &beacon); ok(!*beacon.cancelling, "beacon signalled\n"); call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + ok(!p_Context_IsCurrentTaskCollectionCanceling(), + "IsCurrentTaskCollectionCanceling returned TRUE\n"); ok(!*beacon.cancelling, "beacon signalled\n"); b = SetEvent(chore_evt2);
1
0
0
0
Piotr Caban : msvcr120/tests: Add _Cancellation_beacon tests.
by Alexandre Julliard
28 Aug '23
28 Aug '23
Module: wine Branch: master Commit: 5c574f68b8164653cc8cf05719f153320d64cc6c URL:
https://gitlab.winehq.org/wine/wine/-/commit/5c574f68b8164653cc8cf05719f153…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 25 15:46:06 2023 +0200 msvcr120/tests: Add _Cancellation_beacon tests. --- dlls/msvcr120/tests/msvcr120.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 11a8594e749..d21e73244c2 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -183,6 +183,10 @@ typedef struct _UnrealizedChore void *unk[6]; } _UnrealizedChore; +typedef struct { + MSVCRT_bool *cancelling; +} _Cancellation_beacon; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -255,6 +259,9 @@ static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskC static void (__thiscall *p__StructuredTaskCollection__Cancel)(_StructuredTaskCollection*); static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_StructuredTaskCollection*); +static _Cancellation_beacon* (__thiscall *p__Cancellation_beacon_ctor)(_Cancellation_beacon*); +static void (__thiscall *p__Cancellation_beacon_dtor)(_Cancellation_beacon*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -355,6 +362,10 @@ static BOOL init(void) "?notify_all@_Condition_variable@details@Concurrency@@QEAAXXZ"); SET(p_Context_CurrentContext, "?CurrentContext@Context@Concurrency@@SAPEAV12@XZ"); + SET(p__Cancellation_beacon_ctor, + "??0_Cancellation_beacon@details@Concurrency@@QEAA@XZ"); + SET(p__Cancellation_beacon_dtor, + "??1_Cancellation_beacon@details@Concurrency@@QEAA@XZ"); } else { #ifdef __arm__ SET(p__StructuredTaskCollection_ctor, @@ -399,6 +410,10 @@ static BOOL init(void) "?notify_one@_Condition_variable@details@Concurrency@@QAAXXZ"); SET(p__Condition_variable_notify_all, "?notify_all@_Condition_variable@details@Concurrency@@QAAXXZ"); + SET(p__Cancellation_beacon_ctor, + "??0_Cancellation_beacon@details@Concurrency@@QAA@XZ"); + SET(p__Cancellation_beacon_dtor, + "??1_Cancellation_beacon@details@Concurrency@@QAA@XZ"); #else SET(p__StructuredTaskCollection_ctor, "??0_StructuredTaskCollection@details@Concurrency@@QAE@PAV_CancellationTokenState@12@@Z"); @@ -442,6 +457,10 @@ static BOOL init(void) "?notify_one@_Condition_variable@details@Concurrency@@QAEXXZ"); SET(p__Condition_variable_notify_all, "?notify_all@_Condition_variable@details@Concurrency@@QAEXXZ"); + SET(p__Cancellation_beacon_ctor, + "??0_Cancellation_beacon@details@Concurrency@@QAE@XZ"); + SET(p__Cancellation_beacon_dtor, + "??1_Cancellation_beacon@details@Concurrency@@QAE@XZ"); #endif SET(p_Context_CurrentContext, "?CurrentContext@Context@Concurrency@@SAPAV12@XZ"); @@ -1366,6 +1385,7 @@ struct chore static void __cdecl chore_proc(_UnrealizedChore *_this) { struct chore *chore = CONTAINING_RECORD(_this, struct chore, chore); + _Cancellation_beacon beacon, beacon2; if (chore->start_event) { @@ -1388,6 +1408,13 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); ok(!canceling, "Task is already canceling\n"); + + call_func1(p__Cancellation_beacon_ctor, &beacon); + ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); + + call_func1(p__Cancellation_beacon_ctor, &beacon2); + ok(beacon.cancelling != beacon2.cancelling, "beacons point to the same data\n"); + ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); } if (!chore->wait_event) @@ -1412,6 +1439,15 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); ok(canceling, "Task is not canceling\n"); + + ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + call_func1(p__Cancellation_beacon_dtor, &beacon); + ok(*beacon2.cancelling == 1, "beacon not signalled (%x)\n", *beacon2.cancelling); + call_func1(p__Cancellation_beacon_dtor, &beacon2); + + call_func1(p__Cancellation_beacon_ctor, &beacon); + ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + call_func1(p__Cancellation_beacon_dtor, &beacon); } } @@ -1426,6 +1462,7 @@ static void test_StructuredTaskCollection(void) HANDLE chore_start_evt, chore_evt1, chore_evt2; _StructuredTaskCollection task_coll; struct chore chore1, chore2; + _Cancellation_beacon beacon; DWORD main_thread_id; Context *context; int status; @@ -1585,13 +1622,20 @@ static void test_StructuredTaskCollection(void) ret = WaitForSingleObject(chore_evt1, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + call_func1(p__Cancellation_beacon_ctor, &beacon); + ok(!*beacon.cancelling, "beacon signalled\n"); + call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + ok(!*beacon.cancelling, "beacon signalled\n"); b = SetEvent(chore_evt2); ok(b, "SetEvent failed\n"); + ok(!*beacon.cancelling, "beacon signalled\n"); status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(!*beacon.cancelling, "beacon signalled\n"); + call_func1(p__Cancellation_beacon_dtor, &beacon); call_func1(p__StructuredTaskCollection_dtor, &task_coll); /* cancel task collection without scheduled tasks */
1
0
0
0
← Newer
1
...
8
9
10
11
12
13
14
...
67
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Results per page:
10
25
50
100
200