From 1612978cd171ca7315796c28f92588fa2ae6270b Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 24 Jul 2019 11:05:05 -0300
Subject: [PATCH] Updating windows code.

---
 Makefile.in                         |  6 ------
 configure.ac                        |  2 +-
 src/core/valgrind.suppression       | 14 --------------
 src/core/windows/connect.c          |  2 +-
 src/core/windows/event_dispatcher.c |  2 +-
 src/core/windows/log.c              |  2 +-
 src/core/windows/util.c             |  2 +-
 src/ssl/negotiate.c                 | 13 +++----------
 src/ssl/windows/getcrl.c            |  2 +-
 valgrind.suppression                | 14 ++++++++++++++
 10 files changed, 23 insertions(+), 36 deletions(-)
 delete mode 100644 src/core/valgrind.suppression
 create mode 100644 valgrind.suppression

diff --git a/Makefile.in b/Makefile.in
index 42507b0..a46ce0f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -356,12 +356,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
 run: \
 	$(BINDBG)/$(LIBNAME)@EXEEXT@
 
-	@LD_LIBRARY_PATH=$(BINDBG) \
-		$(BINDBG)/$(LIBNAME)@EXEEXT@
-
-mem-check: \
-	$(BINDBG)/$(LIBNAME)@EXEEXT@
-
 ifeq ($(VALGRIND),no)
 
 	@LD_LIBRARY_PATH=$(BINDBG) \
diff --git a/configure.ac b/configure.ac
index 49fc7c8..d6f8aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ case "$host" in
 		app_win32_revision=$(date +%y.%m.%d.%H)
 		AC_SUBST(WIN32_VERSION,$app_win32_revision)
 
-		AC_CONFIG_FILES(src/lib3270/windows/resources.rc)
+		AC_CONFIG_FILES(src/core/windows/resources.rc)
 
 		app_cv_static='yes'
 
diff --git a/src/core/valgrind.suppression b/src/core/valgrind.suppression
deleted file mode 100644
index 0f577b5..0000000
--- a/src/core/valgrind.suppression
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-   libcrypt_FIPS_selftest
-   Memcheck:Cond
-   ...
-   fun:FIPS_selftest
-}
-
-{
-   libcrypt_FIPS_mode_set
-   Memcheck:Cond
-   ...
-   fun:FIPS_mode_set
-}
-
diff --git a/src/core/windows/connect.c b/src/core/windows/connect.c
index 962625f..c6a4203 100644
--- a/src/core/windows/connect.c
+++ b/src/core/windows/connect.c
@@ -37,7 +37,7 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 
-#include "../private.h"
+#include <lib3270-internals.h>
 #include <errno.h>
 #include <lib3270/trace.h>
 #include <lib3270/log.h>
diff --git a/src/core/windows/event_dispatcher.c b/src/core/windows/event_dispatcher.c
index 79ee1a6..52a6c7f 100644
--- a/src/core/windows/event_dispatcher.c
+++ b/src/core/windows/event_dispatcher.c
@@ -32,7 +32,7 @@
   *
   */
 
-#include "../private.h"
+#include <lib3270-internals.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <lib3270/log.h>
diff --git a/src/core/windows/log.c b/src/core/windows/log.c
index cc3355d..6681974 100644
--- a/src/core/windows/log.c
+++ b/src/core/windows/log.c
@@ -32,7 +32,7 @@
 #include <wtsapi32.h>
 #include <lmcons.h>
 
-#include "../private.h"
+#include <lib3270-internals.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <config.h>
diff --git a/src/core/windows/util.c b/src/core/windows/util.c
index 0d7171e..05a6af2 100644
--- a/src/core/windows/util.c
+++ b/src/core/windows/util.c
@@ -34,7 +34,7 @@
 
 #include <winsock2.h>
 #include <windows.h>
-#include "../private.h"
+#include <lib3270-internals.h>
 
 #include "winversc.h"
 #include <ws2tcpip.h>
diff --git a/src/ssl/negotiate.c b/src/ssl/negotiate.c
index 0f18a67..cab16a0 100644
--- a/src/ssl/negotiate.c
+++ b/src/ssl/negotiate.c
@@ -36,6 +36,7 @@
 #include <config.h>
 
 #if defined(HAVE_LIBSSL)
+
 	#include <openssl/ssl.h>
 	#include <openssl/err.h>
 	#include <openssl/x509_vfy.h>
@@ -100,8 +101,8 @@ static int background_ssl_init(H3270 *hSession, void *message)
 	if(hSession->ssl.con == NULL)
 	{
 		((SSL_ERROR_MESSAGE *) message)->error = hSession->ssl.error = ERR_get_error();
-		((SSL_ERROR_MESSAGE *) message)->title = N_( "Security error" );
-		((SSL_ERROR_MESSAGE *) message)->text = N_( "Cant create a new SSL structure for current connection." );
+		((SSL_ERROR_MESSAGE *) message)->title = _( "Security error" );
+		((SSL_ERROR_MESSAGE *) message)->text = _( "Cant create a new SSL structure for current connection." );
 		return -1;
 	}
 
@@ -343,14 +344,6 @@ void ssl_info_callback(INFO_CONST SSL *s, int where, int ret)
 {
 	H3270 *hSession = (H3270 *) SSL_get_ex_data(s,ssl_3270_ex_index);
 
-#ifdef DEBUG
-	if(hSession != lib3270_get_default_session_handle())
-	{
-		trace("%s: hsession=%p, session=%p",__FUNCTION__,hSession,lib3270_get_default_session_handle());
-		exit(-1);
-	}
-#endif // DEBUG
-
 	switch(where)
 	{
 	case SSL_CB_CONNECT_LOOP:
diff --git a/src/ssl/windows/getcrl.c b/src/ssl/windows/getcrl.c
index e40cfc5..5aaf292 100644
--- a/src/ssl/windows/getcrl.c
+++ b/src/ssl/windows/getcrl.c
@@ -52,7 +52,7 @@
 	#include <curl/curl.h>
 #endif // HAVE_LIBCURL
 
-#include "../../private.h"
+#include <lib3270-internals.h>
 #include <trace_dsc.h>
 #include <errno.h>
 #include <lib3270.h>
diff --git a/valgrind.suppression b/valgrind.suppression
new file mode 100644
index 0000000..0f577b5
--- /dev/null
+++ b/valgrind.suppression
@@ -0,0 +1,14 @@
+{
+   libcrypt_FIPS_selftest
+   Memcheck:Cond
+   ...
+   fun:FIPS_selftest
+}
+
+{
+   libcrypt_FIPS_mode_set
+   Memcheck:Cond
+   ...
+   fun:FIPS_mode_set
+}
+
--
libgit2 0.21.2