secur32: Always tell the user that libgnutls could not be loaded (try 2)
Bruno Jesus
00cpxxx at gmail.com
Tue Dec 30 21:02:25 CST 2014
Try 2:
Use wine diag as suggested by Henri.
On Sun, Dec 28, 2014 at 10:00 AM, Bruno Jesus <00cpxxx at gmail.com> wrote:
> Ensures a message is printed in the standard output to make the
> problem obvious. Will solve problems like the one in
> https://bugs.winehq.org/show_bug.cgi?id=35180#c4:
>
> "So I grepped the "strace -f" for some shared object loadings, and found
> that it tries to load /usr/lib/libgnutls.so.26.
>
> In schannel_gnutls.c a WARN should be printed when the loading fails, but it
> is only printed when starting with:
> $ WINEDEBUG=+secur32 wine Launcher
> warn:secur32:schan_imp_init Failed to load libgnutls.
>
> My system is a Debian Jessie/testing 64 bit.
> Around a month ago the package libgnutls26:i386 was removed."
-------------- next part --------------
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 638b3c5..1173574 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -39,6 +39,7 @@
#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H)
WINE_DEFAULT_DEBUG_CHANNEL(secur32);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
static void *libgnutls_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f
@@ -480,7 +481,7 @@ BOOL schan_imp_init(void)
libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0);
if (!libgnutls_handle)
{
- WARN("Failed to load libgnutls.\n");
+ ERR_(winediag)("Failed to load libgnutls, secure connections will not be available.\n");
return FALSE;
}
More information about the wine-patches
mailing list