From acef4f775f273bbef63bc81afbad8feaabc7414e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 2 Nov 2018 08:47:44 +0100 Subject: [PATCH] w32: Fix and improve CancelSynchronousIo use. * src/w32-util.c (_gpgme_w32_cancel_synchronous_io): Fix name of DLL and print trace info only on error. -- Fixes-commit: 63ba09b541dabbe838253926896e721cb9be564a Signed-off-by: Werner Koch --- src/w32-util.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/w32-util.c b/src/w32-util.c index 8a04c8c1..798f42b3 100644 --- a/src/w32-util.c +++ b/src/w32-util.c @@ -251,7 +251,7 @@ _gpgme_w32_cancel_synchronous_io (HANDLE thread) { /* Available since Vista; thus we dynload it. */ initialized = 1; - handle = dlopen ("kerner32.dll", RTLD_LAZY); + handle = dlopen ("kernel32.dll", RTLD_LAZY); if (handle) { func = dlsym (handle, "CancelSynchronousIo"); @@ -265,9 +265,11 @@ _gpgme_w32_cancel_synchronous_io (HANDLE thread) if (func) { - int rc = func (thread); - TRACE2 (DEBUG_ENGINE, "gpgme:CancelSynchronousIo", 0, - "called for thread %p; result=%d", thread, rc); + if (!func (thread) && GetLastError() != ERROR_NOT_FOUND) + { + TRACE2 (DEBUG_ENGINE, "gpgme:CancelSynchronousIo", 0, + "called for thread %p: ec=%d", thread, GetLastError ()); + } } else {