diff --git a/install-cross.sh b/install-cross.sh index 2efe6b3..d05b366 100755 --- a/install-cross.sh +++ b/install-cross.sh @@ -64,6 +64,11 @@ do case $parameter in + ar) + zypper ar --refresh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_42.1/ mingw32 + zypper ar --refresh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_42.1/ mingw64 + ;; + 32) install_packages mingw32 ;; diff --git a/src/include/pw3270/hllapi.h b/src/include/pw3270/hllapi.h index 32deb93..d1da897 100644 --- a/src/include/pw3270/hllapi.h +++ b/src/include/pw3270/hllapi.h @@ -140,7 +140,7 @@ extern "C" { HLLAPI_API_CALL hllapi_erase_eol(void); HLLAPI_API_CALL hllapi_erase_input(void); - HLLAPI_API_CALL hllapi_action(LPSTR buffer); + HLLAPI_API_CALL hllapi_action(LPSTR buffer); HLLAPI_API_CALL hllapi_print(void); diff --git a/src/plugins/hllapi/calls.cc b/src/plugins/hllapi/calls.cc index aeace45..5114002 100644 --- a/src/plugins/hllapi/calls.cc +++ b/src/plugins/hllapi/calls.cc @@ -97,18 +97,16 @@ HLLAPI_API_CALL hllapi_connect(LPSTR uri, WORD wait) { - int rc = HLLAPI_STATUS_SUCCESS; - try { - rc = session::get_default()->connect(uri,hllapi_timeout); + session::get_default()->connect(uri,hllapi_timeout); } catch(std::exception &e) { return HLLAPI_STATUS_SYSTEM_ERROR; } - return rc; + return hllapi_get_state(); } HLLAPI_API_CALL hllapi_is_connected(void) @@ -120,11 +118,11 @@ { switch(hllapi_get_message_id()) { - case LIB3270_MESSAGE_NONE: /* 0 - No message */ - return HLLAPI_STATUS_SUCCESS; + case LIB3270_MESSAGE_NONE: // 0 - No message + return HLLAPI_STATUS_SUCCESS; // keyboard was unlocked and ready for input. - case LIB3270_MESSAGE_DISCONNECTED: /* 4 - Disconnected from host */ - return HLLAPI_STATUS_DISCONNECTED; + case LIB3270_MESSAGE_DISCONNECTED: // 4 - Disconnected from host + return HLLAPI_STATUS_DISCONNECTED; // Your application program was not connected to a valid session. case LIB3270_MESSAGE_MINUS: case LIB3270_MESSAGE_PROTECTED: @@ -132,7 +130,7 @@ case LIB3270_MESSAGE_OVERFLOW: case LIB3270_MESSAGE_INHIBIT: case LIB3270_MESSAGE_KYBDLOCK: - return HLLAPI_STATUS_KEYBOARD_LOCKED; + return HLLAPI_STATUS_KEYBOARD_LOCKED; // keyboard is locked. case LIB3270_MESSAGE_SYSWAIT: case LIB3270_MESSAGE_TWAIT: @@ -140,7 +138,7 @@ case LIB3270_MESSAGE_X: case LIB3270_MESSAGE_RESOLVING: case LIB3270_MESSAGE_CONNECTING: - return HLLAPI_STATUS_WAITING; + return HLLAPI_STATUS_WAITING; // time-out while still busy (in XCLOCK or XSYSTEM in X) for the 3270 terminal emulation. } return HLLAPI_STATUS_SYSTEM_ERROR; @@ -154,12 +152,14 @@ HLLAPI_API_CALL hllapi_wait_for_ready(WORD seconds) { - return session::get_default()->wait_for_ready(seconds); + session::get_default()->wait_for_ready(seconds); + return hllapi_get_state(); } HLLAPI_API_CALL hllapi_wait(WORD seconds) { - return session::get_default()->wait(seconds); + session::get_default()->wait(seconds); + return hllapi_get_state(); } HLLAPI_API_CALL hllapi_get_message_id(void) -- libgit2 0.21.2