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

Alexandre Julliard : gphoto2.ds: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: a18462424fd6cc20fefb364587611d2a86598a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18462424fd6cc20fefb3645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:46:38 2020 +0200 gphoto2.ds: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 32f526782e..e5df69f4a6 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -27,7 +27,6 @@ #include "gphoto2_i.h" #include "wingdi.h" #include "winuser.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -46,10 +45,10 @@ MAKE_FUNCPTR(jpeg_destroy_decompress); static void *load_libjpeg(void) { - if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { + if((libjpeg_handle = dlopen(SONAME_LIBJPEG, RTLD_NOW)) != NULL) { #define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(libjpeg_handle, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(libjpeg_handle, #f)) == NULL) { \ libjpeg_handle = NULL; \ return NULL; \ }

1 0

Alexandre Julliard : kerberos: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 64c89517250330618fddb4db75b1a84917cc0125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c89517250330618fddb4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:47:19 2020 +0200 kerberos: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index f426290673..44d6b86e01 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -44,7 +44,6 @@ #include "ntsecpkg.h" #include "winternl.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -119,14 +118,14 @@ MAKE_FUNCPTR(krb5_unparse_name_flags); static void load_krb5(void) { - if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) + if (!(libkrb5_handle = dlopen(SONAME_LIBKRB5, RTLD_NOW))) { WARN("Failed to load %s, Kerberos support will be disabled\n", SONAME_LIBKRB5); return; } #define LOAD_FUNCPTR(f) \ - if (!(p_##f = wine_dlsym(libkrb5_handle, #f, NULL, 0))) \ + if (!(p_##f = dlsym(libkrb5_handle, #f))) \ { \ ERR("Failed to load %s\n", #f); \ goto fail; \ @@ -161,7 +160,7 @@ static void load_krb5(void) return; fail: - wine_dlclose(libkrb5_handle, NULL, 0); + dlclose(libkrb5_handle); libkrb5_handle = NULL; } @@ -623,14 +622,14 @@ MAKE_FUNCPTR(gss_wrap_iov); static BOOL load_gssapi_krb5(void) { - if (!(libgssapi_krb5_handle = wine_dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW, NULL, 0 ))) + if (!(libgssapi_krb5_handle = dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW ))) { ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgssapi_krb5_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgssapi_krb5_handle, #f ))) \ { \ ERR( "Failed to load %s\n", #f ); \ goto fail; \ @@ -658,14 +657,14 @@ static BOOL load_gssapi_krb5(void) return TRUE; fail: - wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + dlclose( libgssapi_krb5_handle ); libgssapi_krb5_handle = NULL; return FALSE; } static void unload_gssapi_krb5(void) { - wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + dlclose( libgssapi_krb5_handle ); libgssapi_krb5_handle = NULL; }

1 0

Alexandre Julliard : dxgi: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 0e91ced126e84f30ee14d6cddde39d9696c978b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e91ced126e84f30ee14d6cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:45:44 2020 +0200 dxgi: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b86a79a94c..f19b58da2e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -30,7 +30,6 @@ #ifndef USE_WIN32_VULKAN #define WINE_VK_HOST #endif -#include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" #include <vkd3d.h> @@ -952,18 +951,18 @@ static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle) static void *load_library(const char *name) { - return wine_dlopen(name, RTLD_NOW, NULL, 0); + return dlopen(name, RTLD_NOW); } static void *get_library_proc(void *handle, const char *name) { - return wine_dlsym(handle, name, NULL, 0); + return dlsym(handle, name); } static void close_library(void *handle) { if (handle) - wine_dlclose(handle, NULL, 0); + dlclose(handle); } static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle)

1 0

Alexandre Julliard : bcrypt: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 3caa3331279be2c99747cde8e369011378b38e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3caa3331279be2c99747cde8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:27 2020 +0200 bcrypt: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 - dlls/bcrypt/gnutls.c | 31 +++++++++++++++---------------- dlls/bcrypt/macos.c | 1 - 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c2939ea815..5f0b9f1ca8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -37,7 +37,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1d78b9f4d1..2b11566566 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -39,7 +39,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" #ifdef HAVE_GNUTLS_CIPHER_INIT @@ -180,14 +179,14 @@ BOOL gnutls_initialize(void) { int ret; - if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for encryption\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ { \ ERR( "failed to load %s\n", #f ); \ goto fail; \ @@ -209,12 +208,12 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR - if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + if (!(pgnutls_cipher_tag = dlsym( libgnutls_handle, "gnutls_cipher_tag" ))) { WARN("gnutls_cipher_tag not found\n"); pgnutls_cipher_tag = compat_gnutls_cipher_tag; } - if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 ))) + if (!(pgnutls_cipher_add_auth = dlsym( libgnutls_handle, "gnutls_cipher_add_auth" ))) { WARN("gnutls_cipher_add_auth not found\n"); pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; @@ -225,47 +224,47 @@ BOOL gnutls_initialize(void) pgnutls_perror( ret ); goto fail; } - if (!(pgnutls_pubkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw", NULL, 0 ))) + if (!(pgnutls_pubkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw" ))) { WARN("gnutls_pubkey_import_ecc_raw not found\n"); pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; } - if (!(pgnutls_privkey_export_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw", NULL, 0 ))) + if (!(pgnutls_privkey_export_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw" ))) { WARN("gnutls_privkey_export_rsa_raw not found\n"); pgnutls_privkey_export_rsa_raw = compat_gnutls_privkey_export_rsa_raw; } - if (!(pgnutls_privkey_export_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw", NULL, 0 ))) + if (!(pgnutls_privkey_export_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw" ))) { WARN("gnutls_privkey_export_ecc_raw not found\n"); pgnutls_privkey_export_ecc_raw = compat_gnutls_privkey_export_ecc_raw; } - if (!(pgnutls_privkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw", NULL, 0 ))) + if (!(pgnutls_privkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw" ))) { WARN("gnutls_privkey_import_ecc_raw not found\n"); pgnutls_privkey_import_ecc_raw = compat_gnutls_privkey_import_ecc_raw; } - if (!(pgnutls_pk_to_sign = wine_dlsym( libgnutls_handle, "gnutls_pk_to_sign", NULL, 0 ))) + if (!(pgnutls_pk_to_sign = dlsym( libgnutls_handle, "gnutls_pk_to_sign" ))) { WARN("gnutls_pk_to_sign not found\n"); pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; } - if (!(pgnutls_pubkey_verify_hash2 = wine_dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2", NULL, 0 ))) + if (!(pgnutls_pubkey_verify_hash2 = dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2" ))) { WARN("gnutls_pubkey_verify_hash2 not found\n"); pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; } - if (!(pgnutls_pubkey_import_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw", NULL, 0 ))) + if (!(pgnutls_pubkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw" ))) { WARN("gnutls_pubkey_import_rsa_raw not found\n"); pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; } - if (!(pgnutls_privkey_generate = wine_dlsym( libgnutls_handle, "gnutls_privkey_generate", NULL, 0 ))) + if (!(pgnutls_privkey_generate = dlsym( libgnutls_handle, "gnutls_privkey_generate" ))) { WARN("gnutls_privkey_generate not found\n"); pgnutls_privkey_generate = compat_gnutls_privkey_generate; } - if (!(pgnutls_decode_rs_value = wine_dlsym( libgnutls_handle, "gnutls_decode_rs_value", NULL, 0 ))) + if (!(pgnutls_decode_rs_value = dlsym( libgnutls_handle, "gnutls_decode_rs_value" ))) { WARN("gnutls_decode_rs_value not found\n"); pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; @@ -280,7 +279,7 @@ BOOL gnutls_initialize(void) return TRUE; fail: - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; return FALSE; } @@ -288,7 +287,7 @@ fail: void gnutls_uninitialize(void) { pgnutls_global_deinit(); - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; } diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 9ff9772c15..f635ba4bc8 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -38,7 +38,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" #if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT)

1 0

Alexandre Julliard : configure: Add -ldl to default libs if necessary.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 149e03c72ae112a1091bca9012e2a59de156e949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=149e03c72ae112a1091bca90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:43:55 2020 +0200 configure: Add -ldl to default libs if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 50 +++++++++++++++++++++++++++++--------------------- configure.ac | 6 +----- include/config.h.in | 3 --- include/wine/port.h | 5 +++++ libs/wine/Makefile.in | 2 +- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 018fb1bfd7..116825768c 100755 --- a/configure +++ b/configure @@ -629,7 +629,6 @@ LDAP_LIBS LDAP_CFLAGS RT_LIBS POLL_LIBS -DL_LIBS TOOLSEXT MSVCRTFLAGS EXCESS_PRECISION_CFLAGS @@ -17789,7 +17788,6 @@ for ac_func in \ __res_get_state \ __res_getservers \ _spawnvp \ - dlopen \ epoll_create \ ffs \ finitef \ @@ -17847,15 +17845,12 @@ done CFLAGS="$ac_save_CFLAGS" -if test "$ac_cv_func_dlopen" = no -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17874,24 +17869,38 @@ return dlopen (); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no +for ac_lib in '' dl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h - DL_LIBS="-ldl" +done +if ${ac_cv_search_dlopen+:} false; then : +else + ac_cv_search_dlopen=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" for ac_func in dladdr @@ -20006,7 +20015,6 @@ NETAPI_LIBS = $NETAPI_LIBS VKD3D_CFLAGS = $VKD3D_CFLAGS VKD3D_LIBS = $VKD3D_LIBS EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS -DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS RT_LIBS = $RT_LIBS LDAP_CFLAGS = $LDAP_CFLAGS diff --git a/configure.ac b/configure.ac index 9bae6a5dda..76d5d5ed72 100644 --- a/configure.ac +++ b/configure.ac @@ -2132,7 +2132,6 @@ AC_CHECK_FUNCS(\ __res_get_state \ __res_getservers \ _spawnvp \ - dlopen \ epoll_create \ ffs \ finitef \ @@ -2180,10 +2179,7 @@ AC_CHECK_FUNCS(\ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl -if test "$ac_cv_func_dlopen" = no -then - AC_CHECK_LIB(dl,dlopen,[AC_DEFINE(HAVE_DLOPEN,1) AC_SUBST(DL_LIBS,"-ldl")]) -fi +AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr,[$DL_LIBS]) dnl Check for -lpoll for Mac OS X/Darwin diff --git a/include/config.h.in b/include/config.h.in index b6da8d8684..db9c7a1e7d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,9 +110,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `dlopen' function. */ -#undef HAVE_DLOPEN - /* Define to 1 if you have the <EGL/egl.h> header file. */ #undef HAVE_EGL_EGL_H diff --git a/include/wine/port.h b/include/wine/port.h index feb0558655..8514a4a43b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -55,6 +55,11 @@ #define mkdir(path,mode) mkdir(path) +static inline void *dlopen(const char *name, int flags) { return NULL; } +static inline void *dlsym(void *handle, const char *name) { return NULL; } +static inline int dlclose(void *handle) { return 0; } +static inline const char *dlerror(void) { return "No dlopen support on Windows"; } + #ifdef _MSC_VER #define ftruncate chsize diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 66ecf13c67..fe2a2b45e5 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,4 @@ -EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) +EXTRALIBS = $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) C_SRCS = \ c_037.c \

1 0

Zebediah Figura : winegstreamer: Check the format GUID, size, and pointer in amt_to_gst_caps().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ac531be92eecfde35fc48fb50e9070d21d6578c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac531be92eecfde35fc48fb5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:43:35 2020 -0500 winegstreamer: Check the format GUID, size, and pointer in amt_to_gst_caps(). Some application filters enumerate types without a format block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2d9efe8ead..2186192b59 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -387,6 +387,10 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) unsigned int i; GstCaps *caps; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + || mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat) + return NULL; + for (i = 0; i < ARRAY_SIZE(format_map); ++i) { if (IsEqualGUID(&mt->subtype, format_map[i].subtype)) @@ -425,6 +429,10 @@ static GstCaps *amt_to_gst_caps_audio(const AM_MEDIA_TYPE *mt) GstAudioFormat format = GST_AUDIO_FORMAT_UNKNOWN; GstAudioInfo info; + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(WAVEFORMATEX) || !mt->pbFormat) + return NULL; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_PCM)) format = gst_audio_format_build_integer(wfx->wBitsPerSample != 8, G_LITTLE_ENDIAN, wfx->wBitsPerSample, wfx->wBitsPerSample);

1 0

Zebediah Figura : quartz: Get rid of the "width" and "height" fields of video_window.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 4d7ac46b2724366d8f97d33d9d2ca7016bacb5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d7ac46b2724366d8f97d33d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:43 2020 -0500 quartz: Get rid of the "width" and "height" fields of video_window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 - dlls/quartz/window.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index b0fb91c665..9c39b642c4 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -92,7 +92,6 @@ struct video_window IVideoWindow IVideoWindow_iface; HWND hwnd; - LONG width, height; BOOL AutoShow; HWND hwndDrain; HWND hwndOwner; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 61673cab04..b8fbd2694c 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -70,9 +70,6 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM case WM_SIZE: if (window->ops->resize) return window->ops->resize(window, LOWORD(lparam), HIWORD(lparam)); - - window->width = LOWORD(lparam); - window->height = HIWORD(lparam); } return DefWindowProcW(hwnd, message, wparam, lparam); @@ -370,24 +367,27 @@ HRESULT WINAPI BaseControlWindowImpl_get_Left(IVideoWindow *iface, LONG *left) HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG width) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, width %d.\n", window, width); - if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, window->height, + GetWindowRect(window->hwnd, &rect); + if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; - window->width = width; return S_OK; } HRESULT WINAPI BaseControlWindowImpl_get_Width(IVideoWindow *iface, LONG *width) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, width %p.\n", window, width); - *width = window->width; + GetWindowRect(window->hwnd, &rect); + *width = rect.right - rect.left; return S_OK; } @@ -421,24 +421,27 @@ HRESULT WINAPI BaseControlWindowImpl_get_Top(IVideoWindow *iface, LONG *top) HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG height) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, height %d.\n", window, height); - if (!SetWindowPos(window->hwnd, NULL, 0, 0, window->width, + GetWindowRect(window->hwnd, &rect); + if (!SetWindowPos(window->hwnd, NULL, 0, 0, rect.right - rect.left, height, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; - window->height = height; return S_OK; } HRESULT WINAPI BaseControlWindowImpl_get_Height(IVideoWindow *iface, LONG *height) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, height %p.\n", window, height); - *height = window->height; + GetWindowRect(window->hwnd, &rect); + *height = rect.bottom - rect.top; return S_OK; } @@ -555,9 +558,6 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface, if (!SetWindowPos(window->hwnd, NULL, left, top, width, height, SWP_NOACTIVATE | SWP_NOZORDER)) return E_FAIL; - - window->width = width; - window->height = height; return S_OK; } @@ -572,8 +572,8 @@ HRESULT WINAPI BaseControlWindowImpl_GetWindowPosition(IVideoWindow *iface, GetWindowRect(window->hwnd, &rect); *left = rect.left; *top = rect.top; - *width = window->width; - *height = window->height; + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; return S_OK; }

1 0

Zebediah Figura : rpcrt4: Implement NdrClientCall3().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 9369aea260e144f12d95c6b6386f095a58a031db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9369aea260e144f12d95c6b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 4 18:15:30 2020 -0500 rpcrt4: Implement NdrClientCall3(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcndr.h | 4 ++- 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0ef421daf2..13a60522fe 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2210,3 +2210,66 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) return S_OK; } + +static const RPC_SYNTAX_IDENTIFIER ndr_syntax_id = + {{0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8, 0x08, 0x00, 0x2b, 0x10, 0x48, 0x60}}, {2, 0}}; + +LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_client_call( MIDL_STUBLESS_PROXY_INFO *info, + ULONG proc, void *retval, void **stack_top, void **fpu_stack ) +{ + ULONG_PTR i; + + TRACE("info %p, proc %u, retval %p, stack_top %p, fpu_stack %p\n", + info, proc, retval, stack_top, fpu_stack); + + for (i = 0; i < info->nCount; ++i) + { + const MIDL_SYNTAX_INFO *syntax_info = &info->pSyntaxInfo[i]; + const RPC_SYNTAX_IDENTIFIER *id = &syntax_info->TransferSyntax; + + TRACE("Found syntax %s, version %u.%u.\n", debugstr_guid(&id->SyntaxGUID), + id->SyntaxVersion.MajorVersion, id->SyntaxVersion.MinorVersion); + if (!memcmp(id, &ndr_syntax_id, sizeof(RPC_SYNTAX_IDENTIFIER))) + { + if (retval) + FIXME("Complex return types are not supported.\n"); + + return ndr_client_call( info->pStubDesc, + syntax_info->ProcString + syntax_info->FmtStringOffset[proc], stack_top, fpu_stack ); + } + } + + FIXME("NDR64 syntax is not supported.\n"); + return 0; +} + +#ifdef __x86_64__ + +__ASM_GLOBAL_FUNC( NdrClientCall3, + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x20(%rsp),%r9\n\t" + "pushq $0\n\t" + "subq $0x20,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr64_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#elif defined(_WIN64) + +/*********************************************************************** + * NdrClientCall3 [RPCRT4.@] + */ +CLIENT_CALL_RETURN WINAPIV NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) +{ + __ms_va_list args; + LONG_PTR ret; + + __ms_va_start( args, retval ); + ret = ndr64_client_call( info, proc, retval, va_arg( args, void ** ), NULL ); + __ms_va_end( args ); + return *(CLIENT_CALL_RETURN *)&ret; +} + +#endif diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5d558bff75..2673771ef5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -128,6 +128,7 @@ @ stdcall NdrClearOutParameters(ptr ptr ptr) @ varargs NdrClientCall2(ptr ptr) @ varargs -arch=i386 NdrClientCall(ptr ptr) NdrClientCall2 +@ varargs -arch=win64 NdrClientCall3(ptr long ptr) @ stdcall NdrClientContextMarshall(ptr ptr long) @ stdcall NdrClientContextUnmarshall(ptr ptr ptr) @ stub NdrClientInitialize diff --git a/include/rpcndr.h b/include/rpcndr.h index ac9da115ca..729b881c9b 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -663,10 +663,12 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); +CLIENT_CALL_RETURN RPC_VAR_ENTRY + NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY - NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); + NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY

1 0

Rémi Bernon : winedbg: Clean handle_debug_event return value.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 263c2837356448dcec1245f94ac22e976d7f8962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=263c2837356448dcec1245f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 4 11:30:16 2020 +0200 winedbg: Clean handle_debug_event return value. As in the previous patch, return TRUE if the debug event should be ignored or FALSE is we should tell gdb. There's no need to have an in_trap context member for that. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 58 ++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5b7fdaa83e..3d605e4fd0 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -102,7 +102,6 @@ struct gdb_context DEBUG_EVENT de; DWORD de_reply; unsigned last_sig; - BOOL in_trap; /* Win32 information */ struct dbg_process* process; /* Unix environment */ @@ -386,7 +385,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e } } -static void handle_debug_event(struct gdb_context* gdbctx) +static BOOL handle_debug_event(struct gdb_context* gdbctx) { DEBUG_EVENT *de = &gdbctx->de; struct dbg_thread *thread; @@ -405,7 +404,9 @@ static void handle_debug_event(struct gdb_context* gdbctx) case CREATE_PROCESS_DEBUG_EVENT: gdbctx->process = dbg_add_process(&be_process_gdbproxy_io, de->dwProcessId, de->u.CreateProcessInfo.hProcess); - if (!gdbctx->process) break; + if (!gdbctx->process) + return TRUE; + memory_get_string_indirect(gdbctx->process, de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.fUnicode, @@ -430,7 +431,7 @@ static void handle_debug_event(struct gdb_context* gdbctx) dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); - break; + return TRUE; case LOAD_DLL_DEBUG_EVENT: memory_get_string_indirect(gdbctx->process, @@ -445,20 +446,21 @@ static void handle_debug_event(struct gdb_context* gdbctx) de->u.LoadDll.nDebugInfoSize); dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); - break; + return TRUE; case UNLOAD_DLL_DEBUG_EVENT: fprintf(stderr, "%08x:%08x: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); SymUnloadModule(gdbctx->process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); - break; + return TRUE; case EXCEPTION_DEBUG_EVENT: TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); - gdbctx->in_trap = !handle_exception(gdbctx, &de->u.Exception); + if (handle_exception(gdbctx, &de->u.Exception)) + return TRUE; break; case CREATE_THREAD_DEBUG_EVENT: @@ -469,14 +471,14 @@ static void handle_debug_event(struct gdb_context* gdbctx) de->dwThreadId, de->u.CreateThread.hThread, de->u.CreateThread.lpThreadLocalBase); - break; + return TRUE; case EXIT_THREAD_DEBUG_EVENT: fprintf(stderr, "%08x:%08x: exit thread (%u)\n", de->dwProcessId, de->dwThreadId, de->u.ExitThread.dwExitCode); if ((thread = dbg_get_thread(gdbctx->process, de->dwThreadId))) dbg_del_thread(thread); - break; + return TRUE; case EXIT_PROCESS_DEBUG_EVENT: fprintf(stderr, "%08x:%08x: exit process (%u)\n", @@ -486,8 +488,7 @@ static void handle_debug_event(struct gdb_context* gdbctx) gdbctx->process = NULL; /* now signal gdb that we're done */ gdbctx->last_sig = SIGTERM; - gdbctx->in_trap = TRUE; - break; + return FALSE; case OUTPUT_DEBUG_STRING_EVENT: memory_get_string(gdbctx->process, @@ -495,25 +496,25 @@ static void handle_debug_event(struct gdb_context* gdbctx) de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); fprintf(stderr, "%08x:%08x: output debug string (%s)\n", de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); - break; + return TRUE; case RIP_EVENT: fprintf(stderr, "%08x:%08x: rip error=%u type=%u\n", de->dwProcessId, de->dwThreadId, de->u.RipInfo.dwError, de->u.RipInfo.dwType); - break; + return TRUE; default: FIXME("%08x:%08x: unknown event (%u)\n", de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); } - if (!gdbctx->in_trap || !gdbctx->process) return; - LIST_FOR_EACH_ENTRY(thread, &gdbctx->process->threads, struct dbg_thread, entry) { if (!thread->suspended) SuspendThread(thread->handle); thread->suspended = TRUE; } + + return FALSE; } static void handle_step_or_continue(struct gdb_context* gdbctx, int tid, BOOL step, int sig) @@ -568,7 +569,6 @@ static void wait_for_debuggee(struct gdb_context* gdbctx) if (gdbctx->de.dwDebugEventCode) ContinueDebugEvent(gdbctx->de.dwProcessId, gdbctx->de.dwThreadId, gdbctx->de_reply); - gdbctx->in_trap = FALSE; for (;;) { if (!WaitForDebugEvent(&gdbctx->de, 10)) @@ -588,11 +588,8 @@ static void wait_for_debuggee(struct gdb_context* gdbctx) break; } } - handle_debug_event(gdbctx); - assert(!gdbctx->process || - gdbctx->process->pid == 0 || - gdbctx->de.dwProcessId == gdbctx->process->pid); - if (gdbctx->in_trap) break; + if (!handle_debug_event(gdbctx)) + break; ContinueDebugEvent(gdbctx->de.dwProcessId, gdbctx->de.dwThreadId, DBG_CONTINUE); } } @@ -1109,8 +1106,6 @@ static enum packet_return packet_read_registers(struct gdb_context* gdbctx) dbg_ctx_t ctx; size_t i; - assert(gdbctx->in_trap); - if (!thread) return packet_error; if (!thread->process) return packet_error; if (!(backend = thread->process->be_cpu)) return packet_error; @@ -1134,8 +1129,6 @@ static enum packet_return packet_write_registers(struct gdb_context* gdbctx) const char *ptr; size_t i; - assert(gdbctx->in_trap); - if (!thread) return packet_error; if (!thread->process) return packet_error; if (!(backend = thread->process->be_cpu)) return packet_error; @@ -1190,7 +1183,6 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) char buffer[32]; SIZE_T r = 0; - assert(gdbctx->in_trap); if (sscanf(gdbctx->in_packet, "%p,%x", &addr, &len) != 2) return packet_error; if (len <= 0) return packet_error; TRACE("Read %u bytes at %p\n", len, addr); @@ -1220,7 +1212,6 @@ static enum packet_return packet_write_memory(struct gdb_context* gdbctx) char buffer[32]; SIZE_T w; - assert(gdbctx->in_trap); ptr = memchr(gdbctx->in_packet, ':', gdbctx->in_packet_len); if (ptr == NULL) { @@ -1262,8 +1253,6 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) dbg_ctx_t ctx; size_t reg; - assert(gdbctx->in_trap); - if (!thread) return packet_error; if (!thread->process) return packet_error; if (!(backend = thread->process->be_cpu)) return packet_error; @@ -1295,8 +1284,6 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) size_t reg; char *ptr; - assert(gdbctx->in_trap); - if (!thread) return packet_error; if (!thread->process) return packet_error; if (!(backend = thread->process->be_cpu)) return packet_error; @@ -2245,7 +2232,6 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->other_tid = -1; list_init(&gdbctx->xpoint_list); gdbctx->last_sig = 0; - gdbctx->in_trap = FALSE; gdbctx->process = NULL; gdbctx->no_ack_mode = FALSE; for (i = 0; i < ARRAY_SIZE(gdbctx->wine_segs); i++) @@ -2261,13 +2247,9 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne assert(gdbctx->process == NULL && gdbctx->de.dwProcessId == dbg_curr_pid); /* gdbctx->dwProcessId = pid; */ if (!gdb_startup(gdbctx, flags, port)) return FALSE; - assert(!gdbctx->in_trap); - } - else - { - handle_debug_event(gdbctx); - if (gdbctx->in_trap) break; } + else if (!handle_debug_event(gdbctx)) + break; ContinueDebugEvent(gdbctx->de.dwProcessId, gdbctx->de.dwThreadId, DBG_CONTINUE); } return TRUE;

1 0

Rémi Bernon : winedbg: Recompute signal from debug event as needed.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 5c16408e901240704516ffb972420a5b2bace3b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c16408e901240704516ffb9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 4 11:30:17 2020 +0200 winedbg: Recompute signal from debug event as needed. No real need for a context member for that as well, the mapping is quite straightforward. It also simplifies handle_exception. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 69 +++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3d605e4fd0..3903f11347 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -101,7 +101,6 @@ struct gdb_context /* current Win32 trap env */ DEBUG_EVENT de; DWORD de_reply; - unsigned last_sig; /* Win32 information */ struct dbg_process* process; /* Unix environment */ @@ -309,26 +308,28 @@ static void dbg_thread_set_single_step(struct dbg_thread *thread, BOOL enable) ERR("set_context failed for thread %04x:%04x\n", thread->process->pid, thread->tid); } -static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* exc) +static unsigned char signal_from_debug_event(DEBUG_EVENT* de) { - EXCEPTION_RECORD* rec = &exc->ExceptionRecord; + DWORD ec; - switch (rec->ExceptionCode) + if (de->dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) + return SIGTERM; + if (de->dwDebugEventCode != EXCEPTION_DEBUG_EVENT) + return SIGTRAP; + + ec = de->u.Exception.ExceptionRecord.ExceptionCode; + switch (ec) { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_PRIV_INSTRUCTION: case EXCEPTION_STACK_OVERFLOW: case EXCEPTION_GUARD_PAGE: - gdbctx->last_sig = SIGSEGV; - return FALSE; + return SIGSEGV; case EXCEPTION_DATATYPE_MISALIGNMENT: - gdbctx->last_sig = SIGBUS; - return FALSE; + return SIGBUS; case EXCEPTION_SINGLE_STEP: - /* fall through */ case EXCEPTION_BREAKPOINT: - gdbctx->last_sig = SIGTRAP; - return FALSE; + return SIGTRAP; case EXCEPTION_FLT_DENORMAL_OPERAND: case EXCEPTION_FLT_DIVIDE_BY_ZERO: case EXCEPTION_FLT_INEXACT_RESULT: @@ -336,22 +337,32 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e case EXCEPTION_FLT_OVERFLOW: case EXCEPTION_FLT_STACK_CHECK: case EXCEPTION_FLT_UNDERFLOW: - gdbctx->last_sig = SIGFPE; - return FALSE; + return SIGFPE; case EXCEPTION_INT_DIVIDE_BY_ZERO: case EXCEPTION_INT_OVERFLOW: - gdbctx->last_sig = SIGFPE; - return FALSE; + return SIGFPE; case EXCEPTION_ILLEGAL_INSTRUCTION: - gdbctx->last_sig = SIGILL; - return FALSE; + return SIGILL; case CONTROL_C_EXIT: - gdbctx->last_sig = SIGINT; - return FALSE; + return SIGINT; case STATUS_POSSIBLE_DEADLOCK: - /* FIXME: we could also add here a O packet with additional information */ - gdbctx->last_sig = SIGALRM; - return FALSE; + return SIGALRM; + /* should not be here */ + case EXCEPTION_INVALID_HANDLE: + case EXCEPTION_NAME_THREAD: + return SIGTRAP; + default: + ERR("Unknown exception code 0x%08x\n", ec); + return SIGABRT; + } +} + +static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* exc) +{ + EXCEPTION_RECORD* rec = &exc->ExceptionRecord; + + switch (rec->ExceptionCode) + { case EXCEPTION_NAME_THREAD: { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; @@ -379,8 +390,6 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e case EXCEPTION_INVALID_HANDLE: return TRUE; default: - fprintf(stderr, "Unhandled exception code 0x%08x\n", rec->ExceptionCode); - gdbctx->last_sig = SIGABRT; return FALSE; } } @@ -486,8 +495,6 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) dbg_del_process(gdbctx->process); gdbctx->process = NULL; - /* now signal gdb that we're done */ - gdbctx->last_sig = SIGTERM; return FALSE; case OUTPUT_DEBUG_STRING_EVENT: @@ -869,8 +876,6 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) if (process != NULL) { - unsigned char sig; - if (!(backend = process->be_cpu)) return packet_error; if (!(thread = dbg_get_thread(process, gdbctx->de.dwThreadId)) || @@ -879,8 +884,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) packet_reply_open(gdbctx); packet_reply_add(gdbctx, "T"); - sig = gdbctx->last_sig; - packet_reply_val(gdbctx, sig, 1); + packet_reply_val(gdbctx, signal_from_debug_event(&gdbctx->de), 1); packet_reply_add(gdbctx, "thread:"); packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); packet_reply_add(gdbctx, ";"); @@ -957,7 +961,7 @@ static enum packet_return packet_verbose_cont(struct gdb_context* gdbctx) case 'C': case 'S': if (sscanf(buf, ";%*c%2x", &sig) <= 0 || - sig != gdbctx->last_sig) + sig != signal_from_debug_event(&gdbctx->de)) return packet_error; buf += 4; break; @@ -997,7 +1001,7 @@ static enum packet_return packet_continue_signal(struct gdb_context* gdbctx) FIXME("Continue at address %p not supported\n", addr); if (n < 1) return packet_error; - if (sig != gdbctx->last_sig) + if (sig != signal_from_debug_event(&gdbctx->de)) { ERR("Changing signals is not supported.\n"); return packet_error; @@ -2231,7 +2235,6 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->exec_tid = -1; gdbctx->other_tid = -1; list_init(&gdbctx->xpoint_list); - gdbctx->last_sig = 0; gdbctx->process = NULL; gdbctx->no_ack_mode = FALSE; for (i = 0; i < ARRAY_SIZE(gdbctx->wine_segs); i++)

1 0