Commit 1612978cd171ca7315796c28f92588fa2ae6270b
1 parent
3b6fd918
Exists in
master
and in
3 other branches
Updating windows code.
Showing
10 changed files
with
23 additions
and
36 deletions
Show diff stats
Makefile.in
| @@ -356,12 +356,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ | @@ -356,12 +356,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ | ||
| 356 | run: \ | 356 | run: \ |
| 357 | $(BINDBG)/$(LIBNAME)@EXEEXT@ | 357 | $(BINDBG)/$(LIBNAME)@EXEEXT@ |
| 358 | 358 | ||
| 359 | - @LD_LIBRARY_PATH=$(BINDBG) \ | ||
| 360 | - $(BINDBG)/$(LIBNAME)@EXEEXT@ | ||
| 361 | - | ||
| 362 | -mem-check: \ | ||
| 363 | - $(BINDBG)/$(LIBNAME)@EXEEXT@ | ||
| 364 | - | ||
| 365 | ifeq ($(VALGRIND),no) | 359 | ifeq ($(VALGRIND),no) |
| 366 | 360 | ||
| 367 | @LD_LIBRARY_PATH=$(BINDBG) \ | 361 | @LD_LIBRARY_PATH=$(BINDBG) \ |
configure.ac
| @@ -87,7 +87,7 @@ case "$host" in | @@ -87,7 +87,7 @@ case "$host" in | ||
| 87 | app_win32_revision=$(date +%y.%m.%d.%H) | 87 | app_win32_revision=$(date +%y.%m.%d.%H) |
| 88 | AC_SUBST(WIN32_VERSION,$app_win32_revision) | 88 | AC_SUBST(WIN32_VERSION,$app_win32_revision) |
| 89 | 89 | ||
| 90 | - AC_CONFIG_FILES(src/lib3270/windows/resources.rc) | 90 | + AC_CONFIG_FILES(src/core/windows/resources.rc) |
| 91 | 91 | ||
| 92 | app_cv_static='yes' | 92 | app_cv_static='yes' |
| 93 | 93 |
src/core/valgrind.suppression
src/core/windows/connect.c
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | #include <windows.h> | 37 | #include <windows.h> |
| 38 | #include <ws2tcpip.h> | 38 | #include <ws2tcpip.h> |
| 39 | 39 | ||
| 40 | -#include "../private.h" | 40 | +#include <lib3270-internals.h> |
| 41 | #include <errno.h> | 41 | #include <errno.h> |
| 42 | #include <lib3270/trace.h> | 42 | #include <lib3270/trace.h> |
| 43 | #include <lib3270/log.h> | 43 | #include <lib3270/log.h> |
src/core/windows/event_dispatcher.c
src/core/windows/log.c
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | #include <wtsapi32.h> | 32 | #include <wtsapi32.h> |
| 33 | #include <lmcons.h> | 33 | #include <lmcons.h> |
| 34 | 34 | ||
| 35 | -#include "../private.h" | 35 | +#include <lib3270-internals.h> |
| 36 | #include <stdio.h> | 36 | #include <stdio.h> |
| 37 | #include <stdarg.h> | 37 | #include <stdarg.h> |
| 38 | #include <config.h> | 38 | #include <config.h> |
src/core/windows/util.c
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | 34 | ||
| 35 | #include <winsock2.h> | 35 | #include <winsock2.h> |
| 36 | #include <windows.h> | 36 | #include <windows.h> |
| 37 | -#include "../private.h" | 37 | +#include <lib3270-internals.h> |
| 38 | 38 | ||
| 39 | #include "winversc.h" | 39 | #include "winversc.h" |
| 40 | #include <ws2tcpip.h> | 40 | #include <ws2tcpip.h> |
src/ssl/negotiate.c
| @@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
| 36 | #include <config.h> | 36 | #include <config.h> |
| 37 | 37 | ||
| 38 | #if defined(HAVE_LIBSSL) | 38 | #if defined(HAVE_LIBSSL) |
| 39 | + | ||
| 39 | #include <openssl/ssl.h> | 40 | #include <openssl/ssl.h> |
| 40 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
| 41 | #include <openssl/x509_vfy.h> | 42 | #include <openssl/x509_vfy.h> |
| @@ -100,8 +101,8 @@ static int background_ssl_init(H3270 *hSession, void *message) | @@ -100,8 +101,8 @@ static int background_ssl_init(H3270 *hSession, void *message) | ||
| 100 | if(hSession->ssl.con == NULL) | 101 | if(hSession->ssl.con == NULL) |
| 101 | { | 102 | { |
| 102 | ((SSL_ERROR_MESSAGE *) message)->error = hSession->ssl.error = ERR_get_error(); | 103 | ((SSL_ERROR_MESSAGE *) message)->error = hSession->ssl.error = ERR_get_error(); |
| 103 | - ((SSL_ERROR_MESSAGE *) message)->title = N_( "Security error" ); | ||
| 104 | - ((SSL_ERROR_MESSAGE *) message)->text = N_( "Cant create a new SSL structure for current connection." ); | 104 | + ((SSL_ERROR_MESSAGE *) message)->title = _( "Security error" ); |
| 105 | + ((SSL_ERROR_MESSAGE *) message)->text = _( "Cant create a new SSL structure for current connection." ); | ||
| 105 | return -1; | 106 | return -1; |
| 106 | } | 107 | } |
| 107 | 108 | ||
| @@ -343,14 +344,6 @@ void ssl_info_callback(INFO_CONST SSL *s, int where, int ret) | @@ -343,14 +344,6 @@ void ssl_info_callback(INFO_CONST SSL *s, int where, int ret) | ||
| 343 | { | 344 | { |
| 344 | H3270 *hSession = (H3270 *) SSL_get_ex_data(s,ssl_3270_ex_index); | 345 | H3270 *hSession = (H3270 *) SSL_get_ex_data(s,ssl_3270_ex_index); |
| 345 | 346 | ||
| 346 | -#ifdef DEBUG | ||
| 347 | - if(hSession != lib3270_get_default_session_handle()) | ||
| 348 | - { | ||
| 349 | - trace("%s: hsession=%p, session=%p",__FUNCTION__,hSession,lib3270_get_default_session_handle()); | ||
| 350 | - exit(-1); | ||
| 351 | - } | ||
| 352 | -#endif // DEBUG | ||
| 353 | - | ||
| 354 | switch(where) | 347 | switch(where) |
| 355 | { | 348 | { |
| 356 | case SSL_CB_CONNECT_LOOP: | 349 | case SSL_CB_CONNECT_LOOP: |
src/ssl/windows/getcrl.c
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | #include <curl/curl.h> | 52 | #include <curl/curl.h> |
| 53 | #endif // HAVE_LIBCURL | 53 | #endif // HAVE_LIBCURL |
| 54 | 54 | ||
| 55 | -#include "../../private.h" | 55 | +#include <lib3270-internals.h> |
| 56 | #include <trace_dsc.h> | 56 | #include <trace_dsc.h> |
| 57 | #include <errno.h> | 57 | #include <errno.h> |
| 58 | #include <lib3270.h> | 58 | #include <lib3270.h> |