June 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : winver: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: fb84605470848103b4a7895bf4c981101a41d4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb84605470848103b4a7895b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:41 2021 +0800 winver: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/Makefile.in | 2 +- programs/winver/version.rc | 5 +++++ programs/winver/winver.c | 3 +++ programs/winver/winver.manifest | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 0caef713865..8f74ab774df 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,5 +1,5 @@ MODULE = winver.exe -IMPORTS = shell32 +IMPORTS = shell32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/winver/version.rc b/programs/winver/version.rc index ae042fb82a0..c079dde644a 100644 --- a/programs/winver/version.rc +++ b/programs/winver/version.rc @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define WINE_FILEDESCRIPTION_STR "Windows Version" #define WINE_FILENAME_STR "winver.exe" @@ -25,3 +27,6 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.0" #include "wine/wine_common_ver.rc" + +/* @makedep: winver.manifest */ +1 RT_MANIFEST winver.manifest diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 019eb5248b2..ee3120443eb 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -19,6 +19,7 @@ */ #include "windows.h" +#include "commctrl.h" #include "shellapi.h" int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) @@ -26,6 +27,8 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) char name[128] = "Wine "; const char * (CDECL *wine_get_version)(void); + InitCommonControls(); + wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" ); if (wine_get_version) strcat( name, wine_get_version() ); return !ShellAboutA( NULL, name, NULL, 0 ); diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest new file mode 100644 index 00000000000..519bd175c19 --- /dev/null +++ b/programs/winver/winver.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winver" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly>

1 0

Zhiyi Zhang : wordpad: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: b564414e9b40ff749ac0a0ab7b90a2a16a0fe795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b564414e9b40ff749ac0a0ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:50 2021 +0800 wordpad: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.manifest | 16 ++++++++++++++++ programs/wordpad/wordpad.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/wordpad/wordpad.manifest b/programs/wordpad/wordpad.manifest new file mode 100644 index 00000000000..51fb21fa97d --- /dev/null +++ b/programs/wordpad/wordpad.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Wordpad" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index abf9ed9c50a..324b6d06d53 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -301,6 +301,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: wordpad.manifest */ +1 RT_MANIFEST wordpad.manifest + /* @makedep: toolbar.bmp */ IDB_TOOLBAR BITMAP "toolbar.bmp"

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

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: 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: 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 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 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: 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

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