wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Francois Gouget : user32/tests: Preserve the initial GetLastError() value for test_ClipboardOwner().
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 91a791e5177ac4a529f83262feb973371f1c2d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a791e5177ac4a529f83262… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 10 12:10:46 2021 +0200 user32/tests: Preserve the initial GetLastError() value for test_ClipboardOwner(). One of the tests expects GetLastError() to still return 0xdeadbeef after has_no_open_wnd(), which would not be the case if another process did open the clipboard. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5071008a0ab..5951fc3247f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -65,6 +65,7 @@ static BOOL open_clipboard(HWND hwnd) static BOOL has_no_open_wnd(void) { DWORD start = GetTickCount(); + DWORD le = GetLastError(); while (1) { HWND clipwnd = GetOpenClipboardWindow(); @@ -72,7 +73,7 @@ static BOOL has_no_open_wnd(void) if (GetTickCount() - start > 100) { char classname[256]; - DWORD le = GetLastError(); + le = GetLastError(); /* See open_clipboard() */ GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); trace("%p (%s) opened the clipboard\n", clipwnd, classname); @@ -80,6 +81,7 @@ static BOOL has_no_open_wnd(void) return FALSE; } Sleep(15); + SetLastError(le); } }

1 0

Connor McAdams : d3dx9: Remove unnecessary call to D3DXMatrixTranspose.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: cd0e0bbcf70fed9ae55f87a9244509f99e4eb82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0e0bbcf70fed9ae55f87a9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 3 11:57:00 2021 -0400 d3dx9: Remove unnecessary call to D3DXMatrixTranspose. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 376b97f5ea6..7033972af36 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1112,7 +1112,6 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) { D3DXMATRIX mat, *m, min; - D3DXMatrixTranspose(&mat, &min); if (is_pointer) min = *(D3DXMATRIX *)(indata[index / 16]);

1 0

Hans Leidekker : secur32: Translate errors from push/pull callbacks.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: cae161389b688b414b1c187fd7d3d61595544021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae161389b688b414b1c187f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 14:37:25 2021 +0200 secur32: Translate errors from push/pull callbacks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51192 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 12 +++++------- dlls/secur32/schannel_gnutls.c | 19 +++++++++++++++---- dlls/secur32/schannel_macosx.c | 4 ++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 50a1c848c0e..9c7e98b32a4 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -759,9 +759,8 @@ static char * CDECL schan_get_buffer(const struct schan_transport *t, struct sch * *buff_len > 0 indicates that some data was read. May be less than * what was requested, in which case the caller should call again if/ * when they want more. - * EAGAIN when no data could be read without blocking + * -1 when no data could be read without blocking * another errno-style error value on failure - * */ static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) { @@ -774,7 +773,7 @@ static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_ b = schan_get_buffer(t, &t->in, &local_len); if (!b) - return EAGAIN; + return -1; memcpy(buff, b, local_len); t->in.offset += local_len; @@ -797,10 +796,9 @@ static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_ * 0 on success * *buff_len will be > 0 indicating how much data was written. May be less * than what was requested, in which case the caller should call again - if/when they want to write more. - * EAGAIN when no data could be written without blocking + * if/when they want to write more. + * -1 when no data could be written without blocking * another errno-style error value on failure - * */ static int CDECL schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) { @@ -813,7 +811,7 @@ static int CDECL schan_push(struct schan_transport *t, const void *buff, size_t b = schan_get_buffer(t, &t->out, &local_len); if (!b) - return EAGAIN; + return -1; memcpy(b, buff, local_len); t->out.offset += local_len; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 76ab230137d..93868d10b3b 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdio.h> +#include <errno.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -204,9 +205,14 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); int ret = callbacks->pull(transport, buff, &buff_len); - if (ret) + if (ret == -1) { - pgnutls_transport_set_errno(s, ret); + pgnutls_transport_set_errno(s, EAGAIN); + return -1; + } + if (ret < 0) + { + FIXME("unhandled error from pull callback %d\n", ret); return -1; } @@ -219,9 +225,14 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); int ret = callbacks->push(transport, buff, &buff_len); - if (ret) + if (ret == -1) + { + pgnutls_transport_set_errno(s, EAGAIN); + return -1; + } + if (ret < 0) { - pgnutls_transport_set_errno(s, ret); + FIXME("unhandled error from push callback %d\n", ret); return -1; } diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index daf9d835835..f4f84557dfe 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -672,7 +672,7 @@ static OSStatus pull_adapter(SSLConnectionRef transport, void *buff, SIZE_T *buf ret = noErr; } } - else if (status == EAGAIN) + else if (status == -1) { TRACE("Would block before being able to pull anything\n"); ret = errSSLWouldBlock; @@ -723,7 +723,7 @@ static OSStatus push_adapter(SSLConnectionRef transport, const void *buff, SIZE_ TRACE("Pushed %lu bytes\n", *buff_len); ret = noErr; } - else if (status == EAGAIN) + else if (status == -1) { TRACE("Would block before being able to push anything\n"); ret = errSSLWouldBlock;

1 0

Alexandre Julliard : ntdll: Simplify the platform-specific dispatcher interface.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: fa5759b9efad3b00e8ce349889e411792748f87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5759b9efad3b00e8ce3498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 12:40:08 2021 +0200 ntdll: Simplify the platform-specific dispatcher interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 9 +++------ dlls/ntdll/unix/signal_arm.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 28 +++++++++++++--------------- dlls/ntdll/unix/signal_i386.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/signal_x86_64.c | 29 ++++++++++++++--------------- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 14 +++++--------- 7 files changed, 64 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa5759b9efad3b00e8ce…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on ARM.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 7954b86f6b417e7dfb2d8eab7d9c85c06ef123b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7954b86f6b417e7dfb2d8eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 11:24:28 2021 +0200 ntdll: Switch to the kernel stack for syscalls on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 271 ++++++++++++++++++++++++++----------------- tools/winebuild/import.c | 52 ++++++--- 2 files changed, 200 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7954b86f6b417e7dfb2d…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on ARM64.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 08c4419a49655801cba2b71ea327534ff7fd4278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c4419a49655801cba2b71e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 11:17:36 2021 +0200 ntdll: Switch to the kernel stack for syscalls on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 273 ++++++++++++++++++++++++----------------- tools/winebuild/import.c | 155 +++++++++++++++-------- 2 files changed, 267 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08c4419a49655801cba2…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on x86-64.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 25b093f3845a0ae1b2e2fe1c0701e98064f8e8d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b093f3845a0ae1b2e2fe1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:57:26 2021 +0200 ntdll: Switch to the kernel stack for syscalls on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 266 +++++++++++++--------------------------- tools/winebuild/import.c | 169 +++++++++++-------------- 2 files changed, 161 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25b093f3845a0ae1b2e2…

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack for syscalls on i386.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 308a5e7c4d01525184b057058949c68c0ee77dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=308a5e7c4d01525184b05705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:57:20 2021 +0200 ntdll: Switch to the kernel stack for syscalls on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 250 ++++++++++++++++++++---------------------- tools/winebuild/import.c | 192 ++++++++++++-------------------- 2 files changed, 186 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308a5e7c4d01525184b0…

1 0

Alexandre Julliard : ntdll: Always allocate extra stack space for the kernel stack.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 6b277dc89d5532b83dc4116d7eba70e88d508fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b277dc89d5532b83dc4116d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:56:36 2021 +0200 ntdll: Always allocate extra stack space for the kernel stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 33 +++++++++++---------------------- dlls/ntdll/unix/unix_private.h | 8 ++++---- dlls/ntdll/unix/virtual.c | 9 ++++----- 4 files changed, 20 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b277dc89d5532b83dc4…

1 0

Alexandre Julliard : ntdll: Allow the dispatcher functions to return to the caller.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: e8753b4bc2a7a248667de54cd18808352db4f543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8753b4bc2a7a248667de54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 10:56:23 2021 +0200 ntdll: Allow the dispatcher functions to return to the caller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 +++++----- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cec2ef250a3..19e9d603d52 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -354,10 +354,10 @@ static int wait_select_reply( void *cookie ) /*********************************************************************** * invoke_user_apc */ -static void invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTATUS status ) +static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTATUS status ) { - call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2], - wine_server_get_ptr( apc->func ), pKiUserApcDispatcher, status ); + return call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2], + wine_server_get_ptr( apc->func ), pKiUserApcDispatcher, status ); } @@ -675,7 +675,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f } ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); - if (ret == STATUS_USER_APC) invoke_user_apc( NULL, &apc, ret ); + if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret ); /* A test on Windows 2000 shows that Windows always yields during a wait, but a wait that is hit by an event gets a priority @@ -696,7 +696,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) if (alertable) { status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); - if (status == STATUS_USER_APC) invoke_user_apc( context, &apc, status ); + if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status ); } status = NtSetContextThread( GetCurrentThread(), context ); if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 54b748e99cb..d460be909a4 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1163,7 +1163,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return NtContinue( context, FALSE ); - if (first_chance) call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); + if (first_chance) return call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); if (rec->ExceptionFlags & EH_STACK_INVALID) ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 5ebbc6d702b..e2a6ea1591f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -284,13 +284,13 @@ extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO extern void dbg_init(void) DECLSPEC_HIDDEN; -extern void WINAPI DECLSPEC_NORETURN call_user_apc_dispatcher( CONTEXT *context_ptr, ULONG_PTR arg1, - ULONG_PTR arg2, ULONG_PTR arg3, - PNTAPCFUNC func, - void (WINAPI *dispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC), - NTSTATUS status ) DECLSPEC_HIDDEN; -extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI call_user_apc_dispatcher( CONTEXT *context_ptr, ULONG_PTR arg1, + ULONG_PTR arg2, ULONG_PTR arg3, + PNTAPCFUNC func, + void (WINAPI *dispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC), + NTSTATUS status ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; extern void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) DECLSPEC_HIDDEN; #define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021