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
June 2021
----- 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
811 discussions
Start a n
N
ew thread
Rémi Bernon : ntoskrnl.exe/tests: Add some HidP get/set usages tests.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 934451f703759b233c25e7f66d6c68b941699283 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=934451f703759b233c25e7f6…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:53 2021 +0200 ntoskrnl.exe/tests: Add some HidP get/set usages tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 24 +++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 154 +++++++++++++++++++++++++++++++---- 2 files changed, 162 insertions(+), 16 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=934451f703759b233c25…
1
0
0
0
Rémi Bernon : ntoskrnl.exe/tests: Add some HidP get/set values tests.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 6e8de89c7cc0b6afb752db6fe648db68101c79cd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6e8de89c7cc0b6afb752db6f…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:52 2021 +0200 ntoskrnl.exe/tests: Add some HidP get/set values tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 33 ++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 275 ++++++++++++++++++++++++++++++++++- 2 files changed, 298 insertions(+), 10 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8de89c7cc0b6afb752…
1
0
0
0
Rémi Bernon : ntoskrnl.exe/tests: Add more reports with complex HID syntax.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: cc4e06949440c0c077f72f1a878cfbd08b49046c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cc4e06949440c0c077f72f1a…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:51 2021 +0200 ntoskrnl.exe/tests: Add more reports with complex HID syntax. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 124 +++++++++++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 280 +++++++++++++++++++++++++++-------- 2 files changed, 335 insertions(+), 69 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc4e06949440c0c077f7…
1
0
0
0
Rémi Bernon : ntoskrnl.exe/tests: Add tests with and without report IDs.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 731dd7de44fa450c7fde6886ec1c54e52e1aa38b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=731dd7de44fa450c7fde6886…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:50 2021 +0200 ntoskrnl.exe/tests: Add tests with and without report IDs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 108 ++++++++++++++++++++++------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 ++++++++++++++---- 3 files changed, 114 insertions(+), 54 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=731dd7de44fa450c7fde…
1
0
0
0
Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_output to the PE side.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: b572cf30253b0922c7c476bfc666c0345eb50256 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b572cf30253b0922c7c476bf…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 15:33:07 2021 +0200 ntdll: Copy the implementation of __wine_dbg_output to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/unix/debug.c | 10 +++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 5 +---- include/wine/debug.h | 1 + 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8cba4fa164a..bd72f50b864 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1621,6 +1621,7 @@ @ extern -arch=i386 __wine_ldt_copy # Debugging +@ stdcall -syscall -norelay __wine_dbg_write(ptr long) @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d86d20448bf..d0c2a89d4bb 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -69,6 +69,22 @@ static void init_options(void) while (debug_options[nb_debug_options].name[0]) nb_debug_options++; } +/* add a string to the output buffer */ +static int append_output( struct debug_info *info, const char *str, size_t len ) +{ + if (len >= sizeof(info->output) - info->out_pos) + { + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + ERR_(thread)( "debug buffer overflow:\n" ); + __wine_dbg_write( str, len ); + RtlRaiseStatus( STATUS_BUFFER_OVERFLOW ); + } + memcpy( info->output + info->out_pos, str, len ); + info->out_pos += len; + return len; +} + /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) * @@ -146,7 +162,19 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ int __cdecl __wine_dbg_output( const char *str ) { - return unix_funcs->dbg_output( str ); + struct debug_info *info = get_info(); + const char *end = strrchr( str, '\n' ); + int ret = 0; + + if (end) + { + ret += append_output( info, str, end + 1 - str ); + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + str = end + 1; + } + if (*str) ret += append_output( info, str, strlen( str )); + return ret; } diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 0272e68bea6..d43cdaeb917 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -249,6 +249,14 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) return memcpy( info->strings + pos, str, n ); } +/*********************************************************************** + * __wine_dbg_write (NTDLL.@) + */ +int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +{ + return write( 2, str, len ); +} + /*********************************************************************** * __wine_dbg_output (NTDLL.@) */ @@ -261,7 +269,7 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - write( 2, info->output, info->out_pos ); + __wine_dbg_write( info->output, info->out_pos ); info->out_pos = 0; str = end + 1; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fca63141ba3..b9f1fee6a9d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,7 +1850,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_output, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index cbe5c9d3ccd..ba37297a324 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 122 +#define NTDLL_UNIXLIB_VERSION 123 struct unix_funcs { @@ -78,9 +78,6 @@ struct unix_funcs NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - - /* debugging functions */ - int (CDECL *dbg_output)( const char *str ); }; #endif /* __NTDLL_UNIXLIB_H */ diff --git a/include/wine/debug.h b/include/wine/debug.h index 2255f62e502..6aac7fe82e8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -143,6 +143,7 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ +extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str );
1
0
0
0
Alexandre Julliard : ntdll: Don't allow single-stepping through syscalls.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 0702d6b8862b6817a994facb62ad7a00bf1d53ba URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0702d6b8862b6817a994facb…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 14:56:36 2021 +0200 ntdll: Don't allow single-stepping through syscalls. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=51273
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ tools/winebuild/import.c | 12 +++++++----- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 89f4fb4151c..d04935bb1b2 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1753,6 +1753,34 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = x86_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)EIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall eip=%08x eflags=%08x\n", EIP_sig(sigcontext), EFL_sig(sigcontext) ); + + frame->eip = *(ULONG *)ESP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + EIP_sig( sigcontext ) = (ULONG)__wine_syscall_dispatcher_prolog_end; + ECX_sig( sigcontext ) = (ULONG)frame; + ESP_sig( sigcontext ) += sizeof(ULONG); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -1855,6 +1883,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *ucontext = sigcontext; void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); + if (handle_syscall_trap( ucontext )) return; + switch (TRAP_sig(ucontext)) { case TRAP_x86_TRCTRAP: /* Single-step exception */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 10aa2a516b0..c36699589d9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2202,6 +2202,35 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, } +/*********************************************************************** + * handle_syscall_trap + * + * Handle a trap exception during a system call. + */ +static BOOL handle_syscall_trap( ucontext_t *sigcontext ) +{ + extern void __wine_syscall_dispatcher_prolog_end(void); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + + /* disallow single-stepping through a syscall */ + + if ((void *)RIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; + + TRACE( "ignoring trap in syscall rip=%p eflags=%08x\n", + (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); + + frame->rip = *(ULONG64 *)RSP_sig( sigcontext ); + frame->eflags = EFL_sig(sigcontext); + frame->restore_flags = CONTEXT_CONTROL; + + RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end; + RCX_sig( sigcontext ) = (ULONG64)frame; + RSP_sig( sigcontext ) += sizeof(ULONG64); + EFL_sig( sigcontext ) &= ~0x100; /* clear single-step flag */ + return TRUE; +} + + /********************************************************************** * segv_handler * @@ -2281,6 +2310,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext context; ucontext_t *ucontext = sigcontext; + if (handle_syscall_trap( sigcontext )) return; + rec.ExceptionAddress = (void *)RIP_sig(ucontext); save_context( &context, sigcontext ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f92c1b89c9c..a194ae50104 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1436,9 +1436,10 @@ static void output_syscall_dispatcher(void) output( "\tmovl %%fs:0x1f8,%%ecx\n" ); /* x86_thread_data()->syscall_frame */ output( "\tmovl $0,0x00(%%ecx)\n" ); /* frame->restore_flags */ output( "\tpopl 0x08(%%ecx)\n" ); /* frame->eip */ - output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tpushfl\n" ); output( "\tpopl 0x04(%%ecx)\n" ); /* frame->eflags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); + output( "\tmovl %%esp,0x0c(%%ecx)\n" ); /* frame->esp */ output( "\tmovw %%cs,0x10(%%ecx)\n" ); output( "\tmovw %%ss,0x12(%%ecx)\n" ); output( "\tmovw %%ds,0x14(%%ecx)\n" ); @@ -1553,6 +1554,11 @@ static void output_syscall_dispatcher(void) case CPU_x86_64: output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq 0x328(%%rcx),%%rcx\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ + output( "\tpushfq\n" ); + output( "\tpopq 0x80(%%rcx)\n" ); + output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ + output( "%s\n", asm_globl("__wine_syscall_dispatcher_prolog_end") ); output( "\tmovq %%rax,0x00(%%rcx)\n" ); output( "\tmovq %%rbx,0x08(%%rcx)\n" ); output( "\tmovq %%rdx,0x18(%%rcx)\n" ); @@ -1562,7 +1568,6 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%r13,0x58(%%rcx)\n" ); output( "\tmovq %%r14,0x60(%%rcx)\n" ); output( "\tmovq %%r15,0x68(%%rcx)\n" ); - output( "\tpopq 0x70(%%rcx)\n" ); /* frame->rip */ output( "\tmovw %%cs,0x78(%%rcx)\n" ); output( "\tmovw %%ds,0x7a(%%rcx)\n" ); output( "\tmovw %%es,0x7c(%%rcx)\n" ); @@ -1570,10 +1575,7 @@ static void output_syscall_dispatcher(void) output( "\tmovq %%rsp,0x88(%%rcx)\n" ); output( "\tmovw %%ss,0x90(%%rcx)\n" ); output( "\tmovw %%gs,0x92(%%rcx)\n" ); - output( "\tmovl $0,0x94(%%rcx)\n" ); /* frame->restore_flags */ output( "\tmovq %%rbp,0x98(%%rcx)\n" ); - output( "\tpushfq\n" ); - output( "\tpopq 0x80(%%rcx)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x70(%%rcx)\n" );
1
0
0
0
Zebediah Figura : ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 5c009c17b3a212c3f5b0034c465077c0c593daae URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5c009c17b3a212c3f5b0034c…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:32 2021 -0500 ws2_32: Reimplement bind() and getsockname() on top of IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME respectively. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 344 ++++++------------------------------------- dlls/ws2_32/tests/afd.c | 8 +- dlls/ws2_32/tests/sock.c | 2 +- dlls/ws2_32/ws2_32_private.h | 4 - 4 files changed, 54 insertions(+), 304 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c009c17b3a212c3f5b0…
1
0
0
0
Zebediah Figura : server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: a997c3980f053159cac5a57e26a1df1a97a1f8c7 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a997c3980f053159cac5a57e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:31 2021 -0500 server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- server/sock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d4633f7a8bb..eb4f0a42f8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1407,7 +1407,7 @@ static void test_bind(void) ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, ¶ms, sizeof(params), &addr, sizeof(addr)); - todo_wine ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); + ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); diff --git a/server/sock.c b/server/sock.c index 8cd3475d7b2..6b0c4af6b11 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2405,6 +2405,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + if (sock->bound) + { + set_error( STATUS_ADDRESS_ALREADY_ASSOCIATED ); + return 0; + } + unix_len = sockaddr_to_unix( ¶ms->addr, in_size - sizeof(int), &unix_addr ); if (!unix_len) {
1
0
0
0
Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: 10bfe80ad5378756aa236219c20dbb1180019116 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=10bfe80ad5378756aa236219…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:30 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=10bfe80ad5378756aa23…
1
0
0
0
Zebediah Figura : server: Return the socket address from IOCTL_AFD_BIND.
by Alexandre Julliard
16 Jun '21
16 Jun '21
Module: wine Branch: master Commit: dd147ed65a70fd6fc125ddc0526e42d364434b99 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=dd147ed65a70fd6fc125ddc0…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:29 2021 -0500 server: Return the socket address from IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index e5acf585dcc..8cd3475d7b2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2449,6 +2449,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->addr_len = sockaddr_from_unix( &bind_addr, &sock->addr.addr, sizeof(sock->addr) ); } + if (get_reply_max_size() >= sock->addr_len) + set_reply_data( &sock->addr, sock->addr_len ); return 1; }
1
0
0
0
← Newer
1
...
34
35
36
37
38
39
40
...
82
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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
Results per page:
10
25
50
100
200