April 2020 - Wine-commits - list.winehq.org

Jacek Caban : wine/asm.h: Introduce __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: aa6c442cac0a89a5e1eee94fdb111022b4c4ffe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6c442cac0a89a5e1eee94f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:26 2020 +0200 wine/asm.h: Introduce __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wine/asm.h b/include/wine/asm.h index 2a4f06cb92..7165f47e96 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -102,6 +102,7 @@ #if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) +#define __ASM_USE_THISCALL_WRAPPER # ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \ __declspec(naked) void __thiscall_##func(void) \

1 0

Jacek Caban : msvcirt: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: acc42a9c71461ae15165d8d6b49ada37fef2eff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc42a9c71461ae15165d8d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:36 2020 +0200 msvcirt: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 360d34653f..f76eaf6d7a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4459,7 +4459,7 @@ void __cdecl ios_sync_with_stdio(void) } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : msvcp60: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 4e44edd209ef81a584d2d125d41b18e23141d200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e44edd209ef81a584d2d125… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:44 2020 +0200 msvcp60: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 450fd80133..d2bd9864d0 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : msvcp: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 12ead6742f8f32b4b2190cab8437f1b649960e59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ead6742f8f32b4b2190cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:58 2020 +0200 msvcp: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index b2bec6570b..721d02c548 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -263,7 +263,7 @@ static void init_ ## type ## _cxx(char *base) \ #define DEFINE_CXX_DATA4(name, cl1, cl2, cl3, cl4, dtor) \ DEFINE_CXX_DATA(name, 4, cl1, cl2, cl3, cl4, dtor) -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 15a6548b21..e9f6b6b804 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -969,7 +969,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->ref = NULL; } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void call_dtor(const cxx_exception_type *type, void *func, void *object); __ASM_GLOBAL_FUNC( call_dtor, diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index acb13af51c..4fb7ab24c1 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -711,7 +711,7 @@ unsigned int __cdecl _Random_device(void) #endif #if _MSVCP_VER >= 110 -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index e33fc6434f..677234974e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 95e117b3dcd604b544b816c230a4ee8252f0f2f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e117b3dcd604b544b816c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:12 2020 +0200 msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/scheduler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 500549c31e..16efc88755 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1713,7 +1713,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->ref = NULL; } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void call_dtor(const cxx_exception_type *type, void *func, void *object); __ASM_GLOBAL_FUNC( call_dtor, diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 68003e03f6..59e177b5ae 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1058,7 +1058,7 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void * CurrentScheduler_ScheduleTask(proc, data); } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : riched20/tests: Don't use thiscall wrappers on clang MSVC target.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 270599cc816cb590274cba2d4a6e5432ccdc9bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=270599cc816cb590274cba2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:25 2020 +0200 riched20/tests: Don't use thiscall wrappers on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 487b9a02f0..1528bef523 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -48,7 +48,7 @@ static PCreateTextServices pCreateTextServices; /* Use a special table for x86 machines to convert the thiscall * calling convention. This isn't needed on other platforms. */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) static ITextServicesVtbl itextServicesStdcallVtbl; #define TXTSERV_VTABLE(This) (&itextServicesStdcallVtbl) #else /* __i386__ */ @@ -492,7 +492,7 @@ typedef struct static void setup_thiscall_wrappers(void) { -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) void** pVtable; void** pVtableEnd; THISCALL_TO_STDCALL_THUNK *thunk;

1 0

Jacek Caban : riched20: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 650aebadb7ade8b95766b5f2a9062c2210b0eca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650aebadb7ade8b95766b5f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:39 2020 +0200 riched20: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1f033b4187..02bff7cceb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -276,7 +276,7 @@ void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_ /* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; -#if defined(__i386__) && !defined(__MINGW32__) /* Use wrappers to perform thiscall on i386 */ +#ifdef __ASM_USE_THISCALL_WRAPPER #define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) #else /* __i386__ */ #define TXTHOST_VTABLE(This) (This)->lpVtbl diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 608901a5e2..a65169056e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,7 +47,7 @@ #include "wine/heap.h" #include "wine/list.h" -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; #endif /* __i386__ */ diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3f25625ed5..5992fc0b06 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -522,7 +522,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth(ITextHos } -#if defined(__i386__) && !defined(__MINGW32__) /* thiscall functions are i386-specific */ +#ifdef __ASM_USE_THISCALL_WRAPPER #define STDCALL(func) (void *) __stdcall_ ## func #ifdef _MSC_VER

1 0

Jacek Caban : rpcrt4: Don't use GetExceptionCode outside __except block.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 7b0830c98d1af50e4a6199f83c3c412aaedccb33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b0830c98d1af50e4a6199f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:33:14 2020 +0200 rpcrt4: Don't use GetExceptionCode outside __except block. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_epmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 803c9f851b..6444f29e79 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -183,7 +183,7 @@ static RPC_STATUS get_epm_handle_server(RPC_BINDING_HANDLE *epm_handle) static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { - switch (GetExceptionCode()) + switch (__eptr->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION:

1 0

Serge Gautherie : rpcrt4: Remove inexistent CreateServerInterfaceFromStub().
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 98eaef3ad945eae570f92184725115613f6a3951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eaef3ad945eae570f92184… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Apr 27 04:00:29 2020 +0200 rpcrt4: Remove inexistent CreateServerInterfaceFromStub(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 04927764ef..135beab0ff 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -9,7 +9,6 @@ @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stub CreateServerInterfaceFromStub # wxp @ stdcall DceErrorInqTextA (long ptr) @ stdcall DceErrorInqTextW (long ptr) @ stdcall -private DllRegisterServer()

1 0

Alexandre Julliard : configure: Check for deprecation warnings from sys/sysctl.h.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 9a37560060227c42258d81367b2c344fc79b93aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a37560060227c42258d8136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 14:53:02 2020 +0200 configure: Check for deprecation warnings from sys/sysctl.h. The warning was added in glibc 2.30. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++++++++++++- configure.ac | 12 +++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1f4080fc54..0b368610fa 100755 --- a/configure +++ b/configure @@ -7559,7 +7559,7 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h +for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> @@ -7577,6 +7577,26 @@ fi done +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +for ac_header in sys/sysctl.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif +" +if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SYSCTL_H 1 +_ACEOF + +fi + +done + +CFLAGS=$saved_sysctl_h_CFLAGS + for ac_header in \ netinet/ip.h \ net/if.h \ diff --git a/configure.ac b/configure.ac index ce2c94eca2..be3bc65175 100644 --- a/configure.ac +++ b/configure.ac @@ -547,12 +547,22 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) +dnl check for broken Linux sysctl.h that causes deprecation warnings +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +AC_CHECK_HEADERS([sys/sysctl.h],,, + [#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif]) +CFLAGS=$saved_sysctl_h_CFLAGS + AC_CHECK_HEADERS(\ netinet/ip.h \ net/if.h \

1 0