Add gpg_err_deinitlibgpg-error-1.9

Prepare a new release.

4 files changed, 62 insertions, 5 deletions

diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 01a0d2a..8b40861 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -211,7 +211,9 @@
 179	GPG_ERR_NOT_ENABLED		Not enabled
 180	GPG_ERR_NO_ENGINE		No crypto engine
 181	GPG_ERR_MISSING_KEY		Missing key
-# 182 to 198 are free to be used.
+182	GPG_ERR_TOO_MANY		Too many objects
+183	GPG_ERR_LIMIT_REACHED		Limit reached
+# 184 to 198 are free to be used.
 
 199	GPG_ERR_UNFINISHED		Operation not yet finished
 200	GPG_ERR_BUFFER_TOO_SHORT	Buffer too short
diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in
index c563339..cbabd57 100644
--- a/src/gpg-error.def.in
+++ b/src/gpg-error.def.in
@@ -26,3 +26,4 @@ EXPORTS
    _gpg_w32_gettext_localename @16
    _gpg_w32_gettext_use_utf8   @17
 #endif
+ gpg_err_deinit		      @18
diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index 8f70ac9..ae1be21 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -152,6 +152,10 @@ gpg_error_t gpg_err_init (void) _GPG_ERR_CONSTRUCTOR;
 #define GPG_ERR_INITIALIZED	1
 #endif
 
+/* See the source on how to use the deinit function; it is usually not
+   required.  */
+void gpg_err_deinit (int mode);
+
 
 /* Constructor and accessor functions.  */
 
diff --git a/src/init.c b/src/init.c
index 63c20de..d30435a 100644
--- a/src/init.c
+++ b/src/init.c
@@ -40,7 +40,9 @@
 
 #if HAVE_W32_SYSTEM
 
-static int tls_index;  /* Index for the TLS functions.  */ 
+#include <windows.h>
+
+static int tls_index = TLS_OUT_OF_INDEXES;  /* Index for the TLS functions.  */ 
 
 static char *get_locale_dir (void);
 static void drop_locale_dir (char *locale_dir);
@@ -74,12 +76,29 @@ gpg_error_t
 gpg_err_init (void)
 {
 #ifdef HAVE_W32_SYSTEM
+# ifdef DLL_EXPORT
   /* We always have a constructor and thus this function is called
      automatically.  Due to the way the C init code of mingw works,
      the constructors are called before our DllMain function is
      called.  The problem with that is that the TLS has not been setup
      and w32-gettext.c requires TLS.  To solve this we do nothing here
      but call the actual init code from our DllMain.  */
+# else /*!DLL_EXPORT*/
+  /* Note that if the TLS is actually used, we can't release the TLS
+     as there is no way to know when a thread terminates (i.e. no
+     thread-specific-atexit).  You are really better off to use the
+     DLL! */
+  if (tls_index == TLS_OUT_OF_INDEXES)
+    {
+      tls_index = TlsAlloc ();
+      if (tls_index == TLS_OUT_OF_INDEXES)
+        {
+          /* No way to continue - commit suicide.  */
+          abort ();
+        }
+      real_init ();
+    }
+# endif /*!DLL_EXPORT*/
 #else
   real_init ();
 #endif
@@ -87,11 +106,41 @@ gpg_err_init (void)
 }
 
 
+/* Deinitialize libgpg-error.  This function is only used in special
+   circumstances.  No gpg-error function should be used after this
+   function has been called.  A value of 0 passed for MODE
+   deinitializes the entire libgpg-error, a value of 1 releases
+   resources allocated for the current thread and only that thread may
+   not anymore access libgpg-error after such a call.  Under Windows
+   this function may be called from the DllMain function of a DLL
+   which statically links to libgpg-error.  */
+void
+gpg_err_deinit (int mode)
+{
+#if defined (HAVE_W32_SYSTEM) && !defined(DLL_EXPORT)
+  struct tls_space_s *tls;
+  
+  tls = TlsGetValue (tls_index);
+  if (tls)
+    {
+      TlsSetValue (tls_index, NULL);
+      LocalFree (tls);
+    }
+
+  if (mode == 0)
+    {
+      TlsFree (tls_index);
+      tls_index = TLS_OUT_OF_INDEXES;
+    }
+#else
+  (void)mode;
+#endif
+}
+
+
 
 #ifdef HAVE_W32_SYSTEM
 
-#include <windows.h>
-
 /* Return a malloced string encoded in UTF-8 from the wide char input
    string STRING.  Caller must free this value.  Returns NULL on
    failure.  Caller may use GetLastError to get the actual error
@@ -292,6 +341,7 @@ gpg_err_set_errno (int err)
 
 
 /* Entry point called by the DLL loader.  */
+#ifdef DLL_EXPORT
 int WINAPI
 DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
 {
@@ -336,7 +386,7 @@ DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
   
   return TRUE;
 }
-
+#endif /*DLL_EXPORT*/
 
 #else /*!HAVE_W32_SYSTEM*/