[neon/backports-focal/libgwenhywfar/Neon/release] /: New upstream version 5.7.2
Micha Lenk
null at kde.org
Mon Sep 27 15:37:13 BST 2021
Git commit 0e45be5b1333946b8a5464043ef5cad095b699c0 by Micha Lenk.
Committed on 19/09/2021 at 12:16.
Pushed by jriddell into branch 'Neon/release'.
New upstream version 5.7.2
M +40 -36 ChangeLog
M +1 -1 Makefile.in
M +2 -2 configure
M +2 -2 configure.ac
M +1 -1 gwenhywfar.spec
M +1 -1 src/base/logger_p.h
M +1 -1 src/base/plugindescr.h
M +1 -1 src/crypt3/cryptkeyrsa.h
M +9 -24 src/crypttoken/ct.c
M +97 -104 src/crypttoken/ctplugin.c
M +8 -2 src/gui/gui.h
M +2 -2 src/gwenhywfarapi.h
M +4 -4 src/ressource.rc
M +3 -1 src/testlib.c
M +3 -3 src/version.h
https://invent.kde.org/neon/backports-focal/libgwenhywfar/commit/0e45be5b1333946b8a5464043ef5cad095b699c0
diff --git a/ChangeLog b/ChangeLog
index a5b9828..e9aac73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+------------------------------------------------------------------
+2021-09-18 17:13:54 +0200 Martin Preuss
+Prepared release 5.7.2.
+
+------------------------------------------------------------------
+2021-09-18 17:12:37 +0200 Martin Preuss
+CryptToken: Fixed a problem (callers rely on the return value of GWEN_Crypt_Token_BeginEnterPin !=0).
+
+------------------------------------------------------------------
+2021-09-11 19:23:37 +0200 Martin Preuss
+Don't use deprecated functions.
+
+------------------------------------------------------------------
+2021-09-11 19:23:16 +0200 Martin Preuss
+Marked GWEN_Gui_ShowBox() and GWEN_Gui_HideBox() deprecated.
+
+------------------------------------------------------------------
+2021-09-11 19:22:48 +0200 Martin Preuss
+Renamed def "DEPRECATED" to "GWEN_DEPRECATED".
+
+------------------------------------------------------------------
+2021-09-11 19:00:13 +0200 Martin Preuss
+CryptToken: No longer use GWEN_Gui_ShowBox() and GWEN_Gui_HideBox().
+Those GUI functions need the GUI to run in the background which doesn't work
+well in most apps where the program code runs inside the same thread as the
+GUI code.
+Therefore sometimes dialog boxes aren't correctly refreshed or shown on
+some platforms.
+
+A message in the log window seems to be the best and simplest solution to
+the surprising complexity of the problem.
+
+------------------------------------------------------------------
+2021-09-11 18:14:25 +0200 Martin Preuss
+ctplugin: Simplified code (esp. use fn GWEN_Gui_ProgressLog2).
+
+------------------------------------------------------------------
+2021-09-10 16:32:12 +0200 Martin Preuss
+Released 5.7.1
+
------------------------------------------------------------------
2021-09-10 14:10:13 +0200 Martin Preuss
Prepared release 5.7.1.
@@ -425,39 +465,3 @@ gwenbuild: Removed <options>, <option> can now occurr directly below <project>.
2021-04-05 21:45:00 +0200 Martin Preuss
gwenbuild: Added <checkCompiler>.
IS currently used to determine whether symbol visibility is supported.
-
-------------------------------------------------------------------
-2021-04-05 21:43:55 +0200 Martin Preuss
-gwenbuild: Fixed a buf in cbuilder.gwb.
-
-------------------------------------------------------------------
-2021-04-05 17:53:18 +0200 Martin Preuss
-gwenbuild: Added some introductory text to README. Removed no longer needed texts.
-
-------------------------------------------------------------------
-2021-04-05 17:52:46 +0200 Martin Preuss
-gwenbuild: Allow to read and store pkg-config variables for dependencies.
-
-------------------------------------------------------------------
-2021-04-05 17:52:06 +0200 Martin Preuss
-gwenbuild: Add option to "setup" command to dump generated context.
-
-------------------------------------------------------------------
-2021-04-05 17:51:28 +0200 Martin Preuss
-gwenbuild: Added "rm" commands to sharedlib.gwb
-
-------------------------------------------------------------------
-2021-04-05 17:50:57 +0200 Martin Preuss
-gwenbuild: Fixed a bug in app.gwb.
-Don't link against whole archive (this is only needed for libs).
-
-------------------------------------------------------------------
-2021-04-05 17:49:54 +0200 Martin Preuss
-gwenbuild: Fixed a bug in GWB_Builder_AddRelativeFolderToBuffer().
-Don't return an empty path. If it is empty return ".".
-
-------------------------------------------------------------------
-2021-04-05 14:42:33 +0200 Martin Preuss
-gwenbuild: Delete output file in TmpLib before building.
-Otherwise sub-libraries are added every time a build is started resulting
-in duplicate objects in *.a libs.
diff --git a/Makefile.in b/Makefile.in
index fe32c5c..7777431 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1100,8 +1100,8 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- at IF_MAKE_I18N_FILES_FALSE@install-data-local:
@IF_MAKE_I18N_FILES_FALSE at uninstall-local:
+ at IF_MAKE_I18N_FILES_FALSE@install-data-local:
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
diff --git a/configure b/configure
index 2997914..e66618c 100755
--- a/configure
+++ b/configure
@@ -2919,7 +2919,7 @@ ac_config_headers="$ac_config_headers config.h"
#
GWENHYWFAR_VERSION_MAJOR=5
GWENHYWFAR_VERSION_MINOR=7
-GWENHYWFAR_VERSION_PATCHLEVEL=1
+GWENHYWFAR_VERSION_PATCHLEVEL=2
GWENHYWFAR_VERSION_BUILD=0
GWENHYWFAR_VERSION_TAG="stable"
@@ -2931,7 +2931,7 @@ GWENHYWFAR_VERSION_TAG="stable"
#
GWENHYWFAR_SO_CURRENT="86"
GWENHYWFAR_SO_AGE="7"
-GWENHYWFAR_SO_REVISION="1"
+GWENHYWFAR_SO_REVISION="2"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
diff --git a/configure.ac b/configure.ac
index 04e7d67..21790ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_HEADERS([config.h])
#
GWENHYWFAR_VERSION_MAJOR=5
GWENHYWFAR_VERSION_MINOR=7
-GWENHYWFAR_VERSION_PATCHLEVEL=1
+GWENHYWFAR_VERSION_PATCHLEVEL=2
GWENHYWFAR_VERSION_BUILD=0
dnl "stable", "rcX", "betaX", "cvs"
GWENHYWFAR_VERSION_TAG="stable"
@@ -42,7 +42,7 @@ GWENHYWFAR_VERSION_TAG="stable"
#
GWENHYWFAR_SO_CURRENT="86"
GWENHYWFAR_SO_AGE="7"
-GWENHYWFAR_SO_REVISION="1"
+GWENHYWFAR_SO_REVISION="2"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index 0d95fac..6d931b8 100644
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -3,7 +3,7 @@
%define name gwenhywfar
-%define version 5.7.1
+%define version 5.7.2
%define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\"
%define rpm_cflags \"-O2 -march=i486 -mcpu=i586\"
diff --git a/src/base/logger_p.h b/src/base/logger_p.h
index 2a44950..cb75604 100644
--- a/src/base/logger_p.h
+++ b/src/base/logger_p.h
@@ -99,7 +99,7 @@ void GWEN_Logger_AddLogger(GWEN_LOGGER *oldLogger, GWEN_LOGGER *newLogger);
* GWEN_Logger_Open on that logger prior to calling this function.
*/
GWENHYWFAR_API
-void GWEN_Logger_SetDefaultLogger(GWEN_LOGGER *lg) DEPRECATED ;
+void GWEN_Logger_SetDefaultLogger(GWEN_LOGGER *lg) GWEN_DEPRECATED ;
#endif // ifndef NO_DEPRECATED_SYMBOLS
diff --git a/src/base/plugindescr.h b/src/base/plugindescr.h
index f6a090d..ac943ac 100644
--- a/src/base/plugindescr.h
+++ b/src/base/plugindescr.h
@@ -150,7 +150,7 @@ void GWEN_PluginDescription_SetFileName(GWEN_PLUGIN_DESCRIPTION *pd,
* @param s name of the format (e.g. <i>html</i>)
* @param buf buffer to append the description to
*/
-GWENHYWFAR_API DEPRECATED
+GWENHYWFAR_API GWEN_DEPRECATED
int
GWEN_PluginDescription_GetLongDescrByFormat(const GWEN_PLUGIN_DESCRIPTION *pd,
const char *s,
diff --git a/src/crypt3/cryptkeyrsa.h b/src/crypt3/cryptkeyrsa.h
index 57223b3..80bbdfd 100644
--- a/src/crypt3/cryptkeyrsa.h
+++ b/src/crypt3/cryptkeyrsa.h
@@ -54,7 +54,7 @@ GWENHYWFAR_API int GWEN_Crypt_KeyRsa_GeneratePair(unsigned int nbytes,
* @deprecated Please use @ref GWEN_Crypt_KeyRsa_GeneratePair instead since
* nbits should be a multiple of 8 anyway according to Libgcrypt.
*/
-GWENHYWFAR_API DEPRECATED
+GWENHYWFAR_API GWEN_DEPRECATED
int GWEN_Crypt_KeyRsa_GeneratePair2(unsigned int nbits, int use65537e,
GWEN_CRYPT_KEY **pPubKey,
GWEN_CRYPT_KEY **pSecretKey);
diff --git a/src/crypttoken/ct.c b/src/crypttoken/ct.c
index 1de8ef6..8b77cfb 100644
--- a/src/crypttoken/ct.c
+++ b/src/crypttoken/ct.c
@@ -991,41 +991,26 @@ int GWEN_Crypt_Token_SetPinStatus(GWEN_CRYPT_TOKEN *ct,
-uint32_t GWEN_Crypt_Token_BeginEnterPin(GWEN_CRYPT_TOKEN *ct,
+uint32_t GWEN_Crypt_Token_BeginEnterPin(GWEN_UNUSED GWEN_CRYPT_TOKEN *ct,
GWEN_UNUSED GWEN_CRYPT_PINTYPE pt,
uint32_t gid)
{
- char buffer[512];
-
- assert(ct);
- assert(ct->refCount);
-
- buffer[0]=0;
- buffer[sizeof(buffer)-1]=0;
+ int rv;
- snprintf(buffer, sizeof(buffer)-1, "%s",
- I18N("Please enter your PIN into the card reader."
- "<html>"
- "Please enter your PIN into the card reader."
- "</html>"));
- return GWEN_Gui_ShowBox(GWEN_GUI_SHOWBOX_FLAGS_BEEP,
- I18N("Secure PIN Input"),
- buffer, gid);
+ rv=GWEN_Gui_ProgressLog(gid, GWEN_LoggerLevel_Warning, I18N("Waiting for pin entry on card reader..."));
+ if (rv<0)
+ return 0;
+ return 0xffffffff;
}
-int GWEN_Crypt_Token_EndEnterPin(GWEN_CRYPT_TOKEN *ct,
+int GWEN_Crypt_Token_EndEnterPin(GWEN_UNUSED GWEN_CRYPT_TOKEN *ct,
GWEN_UNUSED GWEN_CRYPT_PINTYPE pt,
GWEN_UNUSED int ok,
- uint32_t id)
+ uint32_t gid)
{
- assert(ct);
- assert(ct->refCount);
-
- GWEN_Gui_HideBox(id);
-
- return 0;
+ return GWEN_Gui_ProgressLog(gid, GWEN_LoggerLevel_Warning, I18N("Pin entry on card reader finished."));
}
diff --git a/src/crypttoken/ctplugin.c b/src/crypttoken/ctplugin.c
index 4476c58..e919e88 100644
--- a/src/crypttoken/ctplugin.c
+++ b/src/crypttoken/ctplugin.c
@@ -32,6 +32,10 @@
+static int _checkPlugin(GWEN_PLUGIN *pl, GWEN_BUFFER *typeName, GWEN_BUFFER *tokenName, uint32_t progressId);
+
+
+
GWEN_INHERIT(GWEN_PLUGIN, GWEN_CRYPT_TOKEN_PLUGIN)
@@ -347,119 +351,33 @@ int GWEN_Crypt_Token_PluginManager_CheckToken(GWEN_PLUGIN_MANAGER *pm,
GWEN_XMLNODE *n;
int err;
GWEN_PLUGIN *pl;
- char logbuffer[256];
n=GWEN_PluginDescription_GetXmlNode(pd);
assert(n);
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Loading plugin \"%s\""),
- GWEN_PluginDescription_GetName(pd));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Notice,
- logbuffer);
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Notice,
+ I18N("Loading plugin \"%s\""),
+ GWEN_PluginDescription_GetName(pd));
/* device type matches, check this plugin */
pl=GWEN_PluginManager_GetPlugin(pm, GWEN_PluginDescription_GetName(pd));
if (pl) {
- GWEN_BUFFER *lTokenName;
- int rv;
-
- lTokenName=GWEN_Buffer_dup(tokenName);
-
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Checking plugin \"%s\""),
- GWEN_Plugin_GetName(pl));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Notice,
- logbuffer);
-
- DBG_INFO(GWEN_LOGDOMAIN,
- "Checking plugin \"%s\" for [%s]",
- GWEN_Plugin_GetName(pl),
- GWEN_Buffer_GetStart(lTokenName));
-
- rv=GWEN_Crypt_Token_Plugin_CheckToken(pl, lTokenName);
- switch (rv) {
- case 0:
- /* responsive plugin found */
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Plugin \"%s\" supports this token"),
- GWEN_Plugin_GetName(pl));
- logbuffer[sizeof(logbuffer)-1]=0;
- err=GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Notice,
- logbuffer);
- if (err==GWEN_ERROR_USER_ABORTED) {
- GWEN_Gui_ProgressEnd(progressId);
- GWEN_Buffer_free(lTokenName);
- GWEN_PluginDescription_List2Iterator_free(pit);
- GWEN_PluginDescription_List2_freeAll(pdl);
- return err;
- }
-
- GWEN_Buffer_Reset(typeName);
- GWEN_Buffer_AppendString(typeName, GWEN_Plugin_GetName(pl));
- GWEN_Buffer_Reset(tokenName);
- GWEN_Buffer_AppendBuffer(tokenName, lTokenName);
- GWEN_Buffer_free(lTokenName);
- GWEN_PluginDescription_List2Iterator_free(pit);
- GWEN_PluginDescription_List2_freeAll(pdl);
- GWEN_Gui_ProgressEnd(progressId);
- return 0;
-
- case GWEN_ERROR_NOT_IMPLEMENTED:
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Plugin \"%s\": Function not implemented"),
- GWEN_Plugin_GetName(pl));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Notice,
- logbuffer);
- break;
-
- case GWEN_ERROR_NOT_SUPPORTED:
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Plugin \"%s\" does not support this token"),
- GWEN_Plugin_GetName(pl));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Info,
- logbuffer);
- break;
-
- case GWEN_ERROR_BAD_NAME:
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Plugin \"%s\" supports this token, but the name "
- "did not match"),
- GWEN_Plugin_GetName(pl));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Info,
- logbuffer);
- break;
-
- default:
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Plugin \"%s\": Unexpected error (%d)"),
- GWEN_Plugin_GetName(pl), rv);
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Info,
- logbuffer);
- break;
- } /* switch */
- } /* if plugin loaded */
+ int rv;
+
+ rv=_checkPlugin(pl, typeName, tokenName, progressId);
+ if (rv!=0) {
+ GWEN_PluginDescription_List2Iterator_free(pit);
+ GWEN_PluginDescription_List2_freeAll(pdl);
+ GWEN_Gui_ProgressEnd(progressId);
+ return (rv==1)?0:rv;
+ }
+ } /* if plugin loaded */
else {
- snprintf(logbuffer, sizeof(logbuffer)-1,
- I18N("Could not load plugin \"%s\""),
- GWEN_PluginDescription_GetName(pd));
- logbuffer[sizeof(logbuffer)-1]=0;
- GWEN_Gui_ProgressLog(progressId,
- GWEN_LoggerLevel_Warning,
- logbuffer);
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Warning,
+ I18N("Could not load plugin \"%s\""),
+ GWEN_PluginDescription_GetName(pd));
}
cnt++;
@@ -487,6 +405,81 @@ int GWEN_Crypt_Token_PluginManager_CheckToken(GWEN_PLUGIN_MANAGER *pm,
+/* return: 0=not supported, 1=supported, negative otherwise */
+int _checkPlugin(GWEN_PLUGIN *pl, GWEN_BUFFER *typeName, GWEN_BUFFER *tokenName, uint32_t progressId)
+{
+ GWEN_BUFFER *lTokenName=NULL;
+ int rv;
+ int err;
+
+ lTokenName=GWEN_Buffer_dup(tokenName);
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Notice,
+ I18N("Checking plugin \"%s\""),
+ GWEN_Plugin_GetName(pl));
+
+ DBG_INFO(GWEN_LOGDOMAIN,
+ "Checking plugin \"%s\" for [%s]",
+ GWEN_Plugin_GetName(pl),
+ GWEN_Buffer_GetStart(lTokenName));
+
+ rv=GWEN_Crypt_Token_Plugin_CheckToken(pl, lTokenName);
+ switch (rv) {
+ case 0:
+ /* responsive plugin found */
+ err=GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Notice,
+ I18N("Plugin \"%s\" supports this token"),
+ GWEN_Plugin_GetName(pl));
+ if (err==GWEN_ERROR_USER_ABORTED) {
+ GWEN_Buffer_free(lTokenName);
+ return err;
+ }
+
+ GWEN_Buffer_Reset(typeName);
+ GWEN_Buffer_AppendString(typeName, GWEN_Plugin_GetName(pl));
+ GWEN_Buffer_Reset(tokenName);
+ GWEN_Buffer_AppendBuffer(tokenName, lTokenName);
+ GWEN_Buffer_free(lTokenName);
+ return 1;
+
+ case GWEN_ERROR_NOT_IMPLEMENTED:
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Notice,
+ I18N("Plugin \"%s\": Function not implemented"),
+ GWEN_Plugin_GetName(pl));
+ break;
+
+ case GWEN_ERROR_NOT_SUPPORTED:
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Info,
+ I18N("Plugin \"%s\" does not support this token"),
+ GWEN_Plugin_GetName(pl));
+ break;
+
+ case GWEN_ERROR_BAD_NAME:
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Info,
+ I18N("Plugin \"%s\" supports this token, but the name did not match"),
+ GWEN_Plugin_GetName(pl));
+ break;
+
+ default:
+ GWEN_Gui_ProgressLog2(progressId,
+ GWEN_LoggerLevel_Info,
+ I18N("Plugin \"%s\": Unexpected error (%d)"),
+ GWEN_Plugin_GetName(pl), rv);
+ return GWEN_ERROR_GENERIC;
+ break;
+ } /* switch */
+
+ return 0;
+}
+
+
+
+
+
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 8d739e7..5794e6c 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -581,13 +581,16 @@ int GWEN_Gui_InputBox(uint32_t flags,
* <p>
* This function MUST return immediately (non-blocking).
* </p>
+ * <p>
+ * This function is deprecated (please use GWEN_Gui_ProgressLog() or others).
+ * </p>
* @return returns an id to be presented to @ref GWEN_Gui_HideBox.
* @param flags flags, see @ref GWEN_GUI_SHOWBOX_FLAGS_BEEP ff
* @param title title of the box
* @param text Text of the box: UTF-8, with both a normal text and a HTML variant of the text in the same string. See text restrictions note above.
* @param guiid id as returned by @ref GWEN_Gui_ProgressStart or @ref GWEN_Gui_ShowBox)
*/
-GWENHYWFAR_API
+GWENHYWFAR_API GWEN_DEPRECATED
uint32_t GWEN_Gui_ShowBox(uint32_t flags,
const char *title,
const char *text,
@@ -598,10 +601,13 @@ uint32_t GWEN_Gui_ShowBox(uint32_t flags,
* <p>
* This function MUST return immediately (non-blocking).
* </p>
+ * <p>
+ * This function is deprecated.
+ * </p>
* @param id id returned by @ref GWEN_Gui_ShowBox. If @b 0 then the last
* message shown is referred to.
*/
-GWENHYWFAR_API
+GWENHYWFAR_API GWEN_DEPRECATED
void GWEN_Gui_HideBox(uint32_t id);
diff --git a/src/gwenhywfarapi.h b/src/gwenhywfarapi.h
index 3b60b15..1da1a29 100644
--- a/src/gwenhywfarapi.h
+++ b/src/gwenhywfarapi.h
@@ -141,12 +141,12 @@
#if __GNUC_PREREQ(3, 0)
/* Only available in gcc >= 3.0.x */
-# define DEPRECATED __attribute__((deprecated))
+# define GWEN_DEPRECATED __attribute__((deprecated))
# define GWEN_UNUSED __attribute__((unused))
# define GWEN_LIKELY(cond) __builtin_expect(!!(cond), 1)
# define GWEN_UNLIKELY(cond) __builtin_expect(!!(cond), 0)
#else
-# define DEPRECATED
+# define GWEN_DEPRECATED
# define GWEN_UNUSED
# define GWEN_LIKELY(cond) (!!(cond))
# define GWEN_UNLIKELY(cond) (!!(cond))
diff --git a/src/ressource.rc b/src/ressource.rc
index 07675b7..8a79c76 100644
--- a/src/ressource.rc
+++ b/src/ressource.rc
@@ -43,8 +43,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
// Version
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5, 7, 1, 0
- PRODUCTVERSION 5, 7, 1, 0
+ FILEVERSION 5, 7, 2, 0
+ PRODUCTVERSION 5, 7, 2, 0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L // Windows NT
@@ -58,14 +58,14 @@ BEGIN
//VALUE "Comments", "\0"
VALUE "CompanyName", " Aquamaniac\0"
VALUE "FileDescription", "Multi purpose library\0"
- VALUE "FileVersion", "v5.7.1\0"
+ VALUE "FileVersion", "v5.7.2\0"
VALUE "InternalName", "Gwenhywfar\0"
VALUE "LegalCopyright", "Copyright � 2003 by Martin Preuss\0"
VALUE "LegalTrademarks", "Aquamaniac\0"
VALUE "OriginalFilename", "GWENHYWFAR32.DLL\0"
//VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Gwenhywfar\0"
- VALUE "ProductVersion", "v5.7.1stable-0\0"
+ VALUE "ProductVersion", "v5.7.2stable-0\0"
VALUE "Author", "Martin Preuss\0"
VALUE "Email", "martin at libchipcard.de\0"
VALUE "Homepage", "http://gwenhywfar.sf.net/\0"
diff --git a/src/testlib.c b/src/testlib.c
index 947e9e7..ffcb8c1 100644
--- a/src/testlib.c
+++ b/src/testlib.c
@@ -74,8 +74,9 @@ int check1()
-int test_gui(int test_with_interaction)
+int test_gui(GWEN_UNUSED int test_with_interaction)
{
+#if 0
char buffer[50];
int rv;
GWEN_GUI *gui = GWEN_Gui_CGui_new();
@@ -113,6 +114,7 @@ int test_gui(int test_with_interaction)
}
GWEN_Gui_free(gui);
+#endif
return 0;
}
diff --git a/src/version.h b/src/version.h
index 45720de..e634eb4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,11 +32,11 @@
#define GWEN_VERSION_MAJOR 5
#define GWENHYWFAR_VERSION_MAJOR 5
#define GWENHYWFAR_VERSION_MINOR 7
-#define GWENHYWFAR_VERSION_PATCHLEVEL 1
+#define GWENHYWFAR_VERSION_PATCHLEVEL 2
#define GWENHYWFAR_VERSION_BUILD 0
#define GWENHYWFAR_VERSION_TAG "stable"
-#define GWENHYWFAR_VERSION_FULL_STRING "5.7.1stable-0"
-#define GWENHYWFAR_VERSION_STRING "5.7.1"
+#define GWENHYWFAR_VERSION_FULL_STRING "5.7.2stable-0"
+#define GWENHYWFAR_VERSION_STRING "5.7.2"
#define GWENHYWFAR_SO_EFFECTIVE 79
#define GWENHYWFAR_SO_EFFECTIVE_STR "79"
More information about the Neon-commits
mailing list