wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Matteo Bruni : d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ae1f9899bb06ff0998dcf6b446f6ea3354f14804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1f9899bb06ff0998dcf6b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 18:49:38 2021 +0200 d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..6d6173824a2 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return;

1 0

Alexandre Julliard : configure: Use CROSSLDFLAGS as flags for cross-compiler tests.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: c7bd6865e7e9149aea3dfe56a407f6c5bcfcb0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7bd6865e7e9149aea3dfe56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 17:08:51 2021 +0200 configure: Use CROSSLDFLAGS as flags for cross-compiler tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51849 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 7fdd2085ad1..2ef854b50a9 100755 --- a/configure +++ b/configure @@ -9621,6 +9621,7 @@ test -n "$CROSSCC" || CROSSCC="false" then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" @@ -9629,6 +9630,7 @@ test -n "$CROSSCC" || CROSSCC="false" CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } if ${wine_cv_crosscc+:} false; then : @@ -10676,6 +10678,7 @@ fi fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi diff --git a/configure.ac b/configure.ac index d9935f63c3a..b17d1ab4c3d 100644 --- a/configure.ac +++ b/configure.ac @@ -951,12 +951,14 @@ then then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") AC_SUBST(CROSSLDFLAGS) CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])]) if test $wine_cv_crosscc = yes @@ -1051,6 +1053,7 @@ then fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi

1 0

Alexandre Julliard : server: Avoid using wine/port.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: c954e5b9e6a6ae47af515926ceebbdf46ca9f4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c954e5b9e6a6ae47af515926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:38:40 2021 +0200 server: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 1 - server/change.c | 2 +- server/class.c | 1 - server/clipboard.c | 1 - server/completion.c | 1 - server/console.c | 1 - server/debugger.c | 1 - server/device.c | 3 +-- server/directory.c | 1 - server/event.c | 1 - server/fd.c | 1 - server/file.c | 1 - server/handle.c | 1 - server/hook.c | 1 - server/mach.c | 1 - server/mailslot.c | 8 ++++---- server/mapping.c | 3 ++- server/mutex.c | 1 - server/named_pipe.c | 1 - server/object.c | 1 - server/process.c | 3 ++- server/ptrace.c | 1 - server/queue.c | 2 +- server/registry.c | 1 - server/request.c | 1 - server/semaphore.c | 1 - server/serial.c | 1 - server/symlink.c | 1 - server/thread.c | 2 +- server/timer.c | 1 - server/trace.c | 1 - server/unicode.c | 3 ++- server/window.c | 1 - server/winstation.c | 1 - 34 files changed, 14 insertions(+), 38 deletions(-) diff --git a/server/atom.c b/server/atom.c index 8d0ffbb05f3..ff0799f5880 100644 --- a/server/atom.c +++ b/server/atom.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/change.c b/server/change.c index 5edeebf89d3..4fdb0394922 100644 --- a/server/change.c +++ b/server/change.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> @@ -32,6 +31,7 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/class.c b/server/class.c index 92cbfa2d7e3..e1e180bd97c 100644 --- a/server/class.c +++ b/server/class.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/clipboard.c b/server/clipboard.c index eb9bd4f7020..8118a467dd8 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/completion.c b/server/completion.c index eb0d256ad09..6933195e72d 100644 --- a/server/completion.c +++ b/server/completion.c @@ -27,7 +27,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> diff --git a/server/console.c b/server/console.c index 3a5b1270116..977c428cf9f 100644 --- a/server/console.c +++ b/server/console.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/debugger.c b/server/debugger.c index ca84a88258f..48adb244b09 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <signal.h> diff --git a/server/device.c b/server/device.c index f61f24ea4ea..d6288920bf4 100644 --- a/server/device.c +++ b/server/device.c @@ -19,8 +19,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/rbtree.h" #include <assert.h> #include <fcntl.h> @@ -33,6 +31,7 @@ #include "windef.h" #include "winternl.h" #include "ddk/wdm.h" +#include "wine/rbtree.h" #include "object.h" #include "file.h" diff --git a/server/directory.c b/server/directory.c index ec8187b425a..70a34d3f1bb 100644 --- a/server/directory.c +++ b/server/directory.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/event.c b/server/event.c index ccdd465dd5b..c7424dfe8ff 100644 --- a/server/event.c +++ b/server/event.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/fd.c b/server/fd.c index ad1b7a1bd4a..37e2eddeaba 100644 --- a/server/fd.c +++ b/server/fd.c @@ -20,7 +20,6 @@ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <dirent.h> diff --git a/server/file.c b/server/file.c index 08b0b59beb0..7cf6f3c0472 100644 --- a/server/file.c +++ b/server/file.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/handle.c b/server/handle.c index 15da701ee99..6a5416bcb84 100644 --- a/server/handle.c +++ b/server/handle.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/hook.c b/server/hook.c index c048908c295..5abdf39ad37 100644 --- a/server/hook.c +++ b/server/hook.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/mach.c b/server/mach.c index 20bc3878560..77f1fdcdb86 100644 --- a/server/mach.c +++ b/server/mach.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/mailslot.c b/server/mailslot.c index 1f4cb87d0fc..4048461a58f 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -21,9 +21,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS #include <assert.h> #include <fcntl.h> @@ -33,7 +30,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> - +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -43,6 +40,9 @@ #ifdef HAVE_SYS_FILIO_H #include <sys/filio.h> #endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" diff --git a/server/mapping.c b/server/mapping.c index 8a53c2d89d3..93dae94b7c4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -19,12 +19,13 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> diff --git a/server/mutex.c b/server/mutex.c index 75ff5117d3f..906e1c060e9 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/named_pipe.c b/server/named_pipe.c index f964ae19637..6964ab1b2ee 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/object.c b/server/object.c index b2779fd61fe..e438a6d41ba 100644 --- a/server/object.c +++ b/server/object.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/process.c b/server/process.c index 8109fbe8de4..d8d09698558 100644 --- a/server/process.c +++ b/server/process.c @@ -19,16 +19,17 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/server/ptrace.c b/server/ptrace.c index b2d23d89aaf..bcd0fe48f16 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/queue.c b/server/queue.c index e4903bcb79f..f38c7e9fb17 100644 --- a/server/queue.c +++ b/server/queue.c @@ -19,12 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/registry.c b/server/registry.c index 427da8a5883..4ba5c86ae58 100644 --- a/server/registry.c +++ b/server/registry.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> diff --git a/server/request.c b/server/request.c index 29b63600f15..4733cef6511 100644 --- a/server/request.c +++ b/server/request.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/semaphore.c b/server/semaphore.c index 543d5883ec8..6a8b871940f 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/serial.c b/server/serial.c index bdc27de8e4f..81926f6d412 100644 --- a/server/serial.c +++ b/server/serial.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/symlink.c b/server/symlink.c index 3879bb685f7..fa97d9155fa 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/thread.c b/server/thread.c index 9d412106809..90f3c5492f8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -19,8 +19,8 @@ */ #include "config.h" -#include "wine/port.h" +#define _GNU_SOURCE /* sched_affinity */ #include <assert.h> #include <errno.h> #include <fcntl.h> diff --git a/server/timer.c b/server/timer.c index 5e265d2ddf6..96dc9d00ca1 100644 --- a/server/timer.c +++ b/server/timer.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/trace.c b/server/trace.c index 11e3eb25da6..a007cb280f0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdarg.h> diff --git a/server/unicode.c b/server/unicode.c index 55f9954f4f4..67698d7639c 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -19,11 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> +#include <fcntl.h> #include <stdio.h> #include <stdarg.h> +#include <unistd.h> #include "windef.h" #include "winternl.h" diff --git a/server/window.c b/server/window.c index 3a88b7f34fa..c94c745bd3c 100644 --- a/server/window.c +++ b/server/window.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/winstation.c b/server/winstation.c index 61f9f77c73f..6f2dfcf4e31 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h>

1 0

Alexandre Julliard : tools: Avoid using wine/port.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ae9f64c4642fdb3d1ff3bc54220ae55b2e0a3e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9f64c4642fdb3d1ff3bc54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:35:03 2021 +0200 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 98 +++-------------------------------------------------- configure.ac | 36 ++------------------ include/config.h.in | 24 ------------- libs/wine/config.c | 2 -- 4 files changed, 6 insertions(+), 154 deletions(-) diff --git a/configure b/configure index 8a7e8fece1e..7fdd2085ad1 100755 --- a/configure +++ b/configure @@ -7480,7 +7480,6 @@ for ac_header in \ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -17893,8 +17892,6 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -17992,13 +17989,12 @@ fi ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" -for ac_func in dladdr dlinfo +for ac_func in dlinfo do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "dlinfo" "ac_cv_func_dlinfo" +if test "x$ac_cv_func_dlinfo" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DLINFO 1 _ACEOF fi @@ -18569,47 +18565,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5 -$as_echo_n "checking for if_nameindex... " >&6; } -if ${wine_cv_have_if_nameindex+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif -int -main () -{ -struct if_nameindex *p = if_nameindex(); return p->if_index; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_if_nameindex=yes -else - wine_cv_have_if_nameindex=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_if_nameindex" >&5 -$as_echo "$wine_cv_have_if_nameindex" >&6; } -if test "$wine_cv_have_if_nameindex" = "yes" -then - -$as_echo "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 $as_echo_n "checking for sigaddset... " >&6; } if ${wine_cv_have_sigaddset+:} false; then : @@ -18751,22 +18706,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi -ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -" -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 -_ACEOF - - fi ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -18867,15 +18806,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -fi ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then : @@ -19028,26 +18958,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -" -if test "x$ac_cv_member_ns_msg__msg_ptr" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_NS_MSG__MSG_PTR 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index 39fb1eabc4b..d9935f63c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -451,7 +451,6 @@ AC_CHECK_HEADERS(\ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -2125,8 +2124,6 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -2157,7 +2154,7 @@ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) -WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) +WINE_CHECK_LIB_FUNCS(dlinfo,[$DL_LIBS]) dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) @@ -2262,22 +2259,6 @@ AC_CHECK_MEMBERS([struct ff_effect.direction],,, #include <linux/input.h> #endif]) -AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif]], - [[struct if_nameindex *p = if_nameindex(); return p->if_index;]])],[wine_cv_have_if_nameindex=yes],[wine_cv_have_if_nameindex=no])) -if test "$wine_cv_have_if_nameindex" = "yes" -then - AC_DEFINE(HAVE_IF_NAMEINDEX, 1, [Define to 1 if you have the `if_nameindex' function.]) -fi - AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) if test "$wine_cv_have_sigaddset" = "yes" @@ -2332,7 +2313,7 @@ then fi dnl Check for socket structure members -AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,, +AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr_un.sun_len],,, [#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -2360,7 +2341,6 @@ AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt dnl Check for stat.st_blocks and ns-resolved times AC_CHECK_MEMBERS([ - struct stat.st_blocks, struct stat.st_mtim, struct stat.st_mtimespec, struct stat.st_ctim, @@ -2400,18 +2380,6 @@ AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,, #include <resolv.h> #endif]) -dnl Check for ns_msg ptr member -AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, -[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif]) - dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/include/config.h.in b/include/config.h.in index fc3749895a3..f262f8a0a12 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,9 +59,6 @@ file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H -/* Define to 1 if you have the `dladdr' function. */ -#undef HAVE_DLADDR - /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -150,9 +147,6 @@ /* Define if we have the libgphoto2_port development environment */ #undef HAVE_GPHOTO2_PORT -/* Define to 1 if you have the <grp.h> header file. */ -#undef HAVE_GRP_H - /* Define to 1 if you have the <gsm/gsm.h> header file. */ #undef HAVE_GSM_GSM_H @@ -171,9 +165,6 @@ /* Define to 1 if you have the <ifaddrs.h> header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nameindex' function. */ -#undef HAVE_IF_NAMEINDEX - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -447,9 +438,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H -/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ -#undef HAVE_NS_MSG__MSG_PTR - /* Define to 1 if OpenAL is available */ #undef HAVE_OPENAL @@ -621,9 +609,6 @@ /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID -/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ -#undef HAVE_STRUCT_SOCKADDR_SA_LEN - /* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN @@ -642,9 +627,6 @@ /* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC -/* Define to 1 if `st_blocks' is a member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_BLOCKS - /* Define to 1 if `st_ctim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_CTIM @@ -963,12 +945,6 @@ function. */ #undef HAVE___CLEAR_CACHE -/* Define to 1 if you have the `__res_getservers' function. */ -#undef HAVE___RES_GETSERVERS - -/* Define to 1 if you have the `__res_get_state' function. */ -#undef HAVE___RES_GET_STATE - /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. */ #undef MAJOR_IN_MKDEV diff --git a/libs/wine/config.c b/libs/wine/config.c index 368491c3ae9..b8f1bd5f86d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -109,7 +109,6 @@ static char *build_path( const char *dir, const char *name ) /* return the directory that contains the library at run-time */ static char *get_runtime_libdir(void) { -#ifdef HAVE_DLADDR Dl_info info; char *libdir; @@ -123,7 +122,6 @@ static char *get_runtime_libdir(void) libdir[len] = 0; return libdir; } -#endif /* HAVE_DLADDR */ return NULL; }

1 0

Jacek Caban : win32u: Move ntgdi implementation from gdi32.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 08f677cadf30b750d1661f7ef781b9c3aba6f1fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f677cadf30b750d1661f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:35 2021 +0200 win32u: Move ntgdi implementation from gdi32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 38 +-- dlls/gdi32/objects.c | 2 - dlls/win32u/Makefile.in | 34 ++- dlls/{gdi32 => win32u}/bitblt.c | 0 dlls/{gdi32 => win32u}/bitmap.c | 0 dlls/{gdi32 => win32u}/brush.c | 0 dlls/{gdi32 => win32u}/clipping.c | 0 dlls/{gdi32 => win32u}/dc.c | 0 dlls/{gdi32 => win32u}/dib.c | 0 dlls/{gdi32 => win32u}/dibdrv/bitblt.c | 0 dlls/{gdi32 => win32u}/dibdrv/dc.c | 0 dlls/{gdi32 => win32u}/dibdrv/dibdrv.h | 0 dlls/{gdi32 => win32u}/dibdrv/graphics.c | 0 dlls/{gdi32 => win32u}/dibdrv/objects.c | 0 dlls/{gdi32 => win32u}/dibdrv/opengl.c | 0 dlls/{gdi32 => win32u}/dibdrv/primitives.c | 0 dlls/{gdi32 => win32u}/driver.c | 0 dlls/{gdi32 => win32u}/emfdrv.c | 0 dlls/{gdi32 => win32u}/font.c | 0 dlls/{gdi32 => win32u}/freetype.c | 2 - dlls/{gdi32 => win32u}/gdiobj.c | 13 +- dlls/win32u/main.c | 5 +- dlls/{gdi32 => win32u}/mapping.c | 0 dlls/{gdi32 => win32u}/ntgdi_private.h | 0 dlls/{gdi32 => win32u}/opentype.c | 0 dlls/{gdi32 => win32u}/painting.c | 0 dlls/{gdi32 => win32u}/palette.c | 0 dlls/{gdi32 => win32u}/path.c | 0 dlls/{gdi32 => win32u}/pen.c | 0 dlls/{gdi32 => win32u}/printdrv.c | 0 dlls/{gdi32 => win32u}/region.c | 0 dlls/win32u/syscall.c | 20 +- dlls/{gdi32 => win32u}/vertical.c | 0 dlls/{gdi32 => win32u}/vulkan.c | 0 dlls/win32u/win32u.spec | 362 ++++++++++++++++------------- dlls/{gdi32 => win32u}/win32u_private.h | 8 +- dlls/{gdi32 => win32u}/wrappers.c | 26 +-- 37 files changed, 263 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08f677cadf30b750d166…

1 0

Jacek Caban : gdi32: Use __wine_ prefix for Wine ntgdi extensions.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 7757f4ee7ee9cf56ee8fb3619bc80892ebe89e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7757f4ee7ee9cf56ee8fb361… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:26 2021 +0200 gdi32: Use __wine_ prefix for Wine ntgdi extensions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 5 ++++- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/emfdc.c | 4 ++-- dlls/gdi32/font.c | 5 ++++- dlls/gdi32/gdi_private.h | 7 ------- dlls/gdi32/gdiobj.c | 6 +++--- dlls/gdi32/icm.c | 4 ++-- dlls/gdi32/metadc.c | 4 ++-- dlls/gdi32/text.c | 2 +- dlls/gdi32/win32u_private.h | 6 ------ dlls/gdi32/wrappers.c | 6 +++--- include/ntgdi.h | 8 ++++++++ 12 files changed, 31 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7757f4ee7ee9cf56ee8f…

1 0

Jacek Caban : gdi32: Use __wine_unix_call interface for Unix library.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: f309721d13d8d728732ca97224c7502493ff6026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f309721d13d8d728732ca972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:19 2021 +0200 gdi32: Use __wine_unix_call interface for Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/font.c | 27 +++++++++++++++------------ dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 6a5df55bfeb..fbfc11d7b60 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,9 +1,10 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll +UNIXLIB = gdi32.so IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) -lm DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f69713c8025..8404630bb48 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -27,9 +27,9 @@ #include "ntgdi_private.h" #include "dibdrv.h" +#include "wine/unixlib.h" #include "wine/wgl.h" #include "wine/wgl_driver.h" -#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -232,7 +232,7 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect, FALSE ); ret = TRUE; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "invalid bits pointer %p\n", src_bits ); ret = FALSE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8cc60d5a16f..3c5911785fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -40,7 +40,8 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "wine/exception.h" + +#include "wine/unixlib.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -528,17 +529,19 @@ static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - SIZE_T len; - - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R'}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R'}; + const char *dir; + ULONG len = MAX_PATH; - if (!RtlQueryEnvironmentVariable( NULL, winedatadirW, ARRAYSIZE(winedatadirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\" WINE_FONT_DIR "\\" ); - else if (!RtlQueryEnvironmentVariable( NULL, winebuilddirW, ARRAYSIZE(winebuilddirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\fonts\\" ); + if ((dir = ntdll_get_data_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\" WINE_FONT_DIR "\\" ); + } + else if ((dir = ntdll_get_build_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\fonts\\" ); + } if (file) lstrcatW( path, file ); } @@ -6456,7 +6459,7 @@ HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG { *count = num_fonts; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "page fault while writing to *count (%p)\n", count ); NtGdiRemoveFontMemResourceEx( ret ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index bbfe50d2c8b..ff7ee2cacda 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,6 +38,7 @@ #include "ntgdi_private.h" #include "wine/debug.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -1250,13 +1251,11 @@ static struct unix_funcs unix_funcs = __wine_set_visible_region, }; -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +NTSTATUS initialize( void *args ) { pthread_mutexattr_t attr; unsigned int dpi; - if (reason != DLL_PROCESS_ATTACH) return 0; - pthread_mutexattr_init( &attr ); pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); pthread_mutex_init( &gdi_lock, &attr ); @@ -1268,7 +1267,12 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p dpi = font_init(); init_stock_objects( dpi ); - user_callbacks = ptr_in; - *(struct unix_funcs **)ptr_out = &unix_funcs; + user_callbacks = *(const struct user_callbacks **)args; + *(const struct unix_funcs **)args = &unix_funcs; return 0; } + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + initialize +}; diff --git a/dlls/gdi32/wrappers.c b/dlls/gdi32/wrappers.c index e6e7985e482..f37fbd57b0d 100644 --- a/dlls/gdi32/wrappers.c +++ b/dlls/gdi32/wrappers.c @@ -20,11 +20,12 @@ #include "gdi_private.h" #include "win32u_private.h" +#include "wine/unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); -static struct unix_funcs *unix_funcs; +static const struct unix_funcs *unix_funcs; INT WINAPI NtGdiAbortDoc( HDC hdc ) { @@ -1151,5 +1152,14 @@ static const struct user_callbacks user_callbacks = BOOL wrappers_init(void) { - return !__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &user_callbacks, &unix_funcs ); + unixlib_handle_t handle; + const void *args = &user_callbacks; + + if (NtQueryVirtualMemory( GetCurrentProcess(), gdi32_module, MemoryWineUnixFuncs, + &handle, sizeof(handle), NULL )) + return FALSE; + + if (__wine_unix_call( handle, 0, &args )) return FALSE; + unix_funcs = args; + return TRUE; }

1 0

Jacek Caban : ntdll: Handle Unix lib exception outside Unix stack.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e0a934d0ef2d690caa700f2bcbe2359b8141fc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a934d0ef2d690caa700f2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:12 2021 +0200 ntdll: Handle Unix lib exception outside Unix stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 584c1f2f0bf..88f0f4ff76d 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -645,7 +645,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index df0c7dad1da..ce7e1689434 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -794,7 +794,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a709c85b4da..c38c4d046d7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1697,7 +1697,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD i, *stack; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p ip=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ffe7ef7db07..a99cf2ae9c1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2478,7 +2478,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct syscall_frame *frame = amd64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,

1 0

Jacek Caban : ntdll: Allow Unix libraries to use exception macros.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 2ec2e136bfc6cc2cfe895b1268cca3b342737001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec2e136bfc6cc2cfe895b12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:06 2021 +0200 ntdll: Allow Unix libraries to use exception macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 1 - dlls/ntdll/unix/signal_arm64.c | 1 - dlls/ntdll/unix/signal_i386.c | 1 - dlls/ntdll/unix/signal_x86_64.c | 1 - dlls/ntdll/unix/thread.c | 10 +++++++++ dlls/ntdll/unix/virtual.c | 30 -------------------------- include/wine/unixlib.h | 47 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f024879b81f..584c1f2f0bf 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -61,7 +61,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/asm.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 145277b5418..df0c7dad1da 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -64,7 +64,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/asm.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e123f2c2a79..a709c85b4da 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -60,7 +60,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/asm.h" -#include "wine/exception.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9b18180301a..ffe7ef7db07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -75,7 +75,6 @@ #include "windef.h" #include "winternl.h" #include "ddk/wdm.h" -#include "wine/exception.h" #include "wine/list.h" #include "wine/asm.h" #include "unix_private.h" diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 839a75b4cac..384ac1d4119 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1737,6 +1737,16 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma } +/*********************************************************************** + * ntdll_set_exception_jmp_buf + */ +void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ) +{ + assert( !jmp || !ntdll_get_thread_data()->jmp_buf ); + ntdll_get_thread_data()->jmp_buf = jmp; +} + + BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { #ifdef linux diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 63655f0c928..924aa78b306 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -59,7 +59,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/list.h" #include "wine/rbtree.h" #include "unix_private.h" @@ -104,35 +103,6 @@ struct file_view unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; -#undef __TRY -#undef __EXCEPT -#undef __ENDTRY - -#define __TRY \ - do { __wine_jmp_buf __jmp; \ - int __first = 1; \ - assert( !ntdll_get_thread_data()->jmp_buf ); \ - for (;;) if (!__first) \ - { \ - do { - -#define __EXCEPT \ - } while(0); \ - ntdll_get_thread_data()->jmp_buf = NULL; \ - break; \ - } else { \ - if (__wine_setjmpex( &__jmp, NULL )) { \ - do { - -#define __ENDTRY \ - } while (0); \ - break; \ - } \ - ntdll_get_thread_data()->jmp_buf = &__jmp; \ - __first = 0; \ - } \ - } while (0); - /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 4abc3172192..920e3d32dc5 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -26,6 +26,8 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +#ifdef WINE_UNIX_LIB + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void); @@ -33,4 +35,49 @@ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD d extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ); +/* exception handling */ + +#ifdef __i386__ +typedef struct { int reg[16]; } __wine_jmp_buf; +#elif defined(__x86_64__) +typedef struct { DECLSPEC_ALIGN(16) struct { unsigned __int64 Part[2]; } reg[16]; } __wine_jmp_buf; +#elif defined(__arm__) +typedef struct { int reg[28]; } __wine_jmp_buf; +#elif defined(__aarch64__) +typedef struct { __int64 reg[24]; } __wine_jmp_buf; +#else +typedef struct { int reg; } __wine_jmp_buf; +#endif + +extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, + EXCEPTION_REGISTRATION_RECORD *frame ); +extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ); +extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); + +#define __TRY \ + do { __wine_jmp_buf __jmp; \ + int __first = 1; \ + for (;;) if (!__first) \ + { \ + do { + +#define __EXCEPT \ + } while(0); \ + ntdll_set_exception_jmp_buf( NULL ); \ + break; \ + } else { \ + if (__wine_setjmpex( &__jmp, NULL )) { \ + do { + +#define __ENDTRY \ + } while (0); \ + break; \ + } \ + ntdll_set_exception_jmp_buf( &__jmp ); \ + __first = 0; \ + } \ + } while (0); + +#endif /* WINE_UNIX_LIB */ + #endif /* __WINE_WINE_UNIXLIB_H */

1 0

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 October 2021