First steps towards supporting W32.

This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.

1 files changed, 184 insertions, 0 deletions

diff --git a/jnlib/w32-reg.c b/jnlib/w32-reg.c
new file mode 100644
index 000000000..b7a383e3f
--- /dev/null
+++ b/jnlib/w32-reg.c
@@ -0,0 +1,184 @@
+/* w32-reg.c -  MS-Windows Registry access
+ * Copyright (C) 1999, 2002, 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of JNLIB.
+ *
+ * JNLIB is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * JNLIB is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <config.h>
+#ifdef HAVE_W32_SYSTEM
+ /* This module is only used in this environment */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <windows.h>
+
+#include "libjnlib-config.h"
+#include "w32help.h"
+
+static HKEY
+get_root_key(const char *root)
+{
+  HKEY root_key;
+  
+  if (!root)
+    root_key = HKEY_CURRENT_USER;
+  else if (!strcmp( root, "HKEY_CLASSES_ROOT" ) )
+    root_key = HKEY_CLASSES_ROOT;
+  else if (!strcmp( root, "HKEY_CURRENT_USER" ) )
+    root_key = HKEY_CURRENT_USER;
+  else if (!strcmp( root, "HKEY_LOCAL_MACHINE" ) )
+    root_key = HKEY_LOCAL_MACHINE;
+  else if (!strcmp( root, "HKEY_USERS" ) )
+    root_key = HKEY_USERS;
+  else if (!strcmp( root, "HKEY_PERFORMANCE_DATA" ) )
+    root_key = HKEY_PERFORMANCE_DATA;
+  else if (!strcmp( root, "HKEY_CURRENT_CONFIG" ) )
+    root_key = HKEY_CURRENT_CONFIG;
+  else
+    return NULL;
+  
+  return root_key;
+}
+
+
+/* Return a string from the Win32 Registry or NULL in case of error.
+   Caller must release the return value.  A NULL for root is an alias
+   for HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE in turn.  */
+char *
+read_w32_registry_string (const char *root, const char *dir, const char *name)
+{
+  HKEY root_key, key_handle;
+  DWORD n1, nbytes, type;
+  char *result = NULL;
+  
+  if ( !(root_key = get_root_key(root) ) )
+    return NULL;
+  
+  if ( RegOpenKeyEx( root_key, dir, 0, KEY_READ, &key_handle ) )
+    {
+      if (root)
+        return NULL; /* No need for a RegClose, so return immediately. */
+      /* It seems to be common practise to fall back to HKLM. */
+      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
+        return NULL; /* Still no need for a RegClose. */
+    }
+
+  nbytes = 1;
+  if (RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) )
+    goto leave;
+  result = jnlib_malloc ((n1=nbytes+1));
+  if (!result)
+    goto leave;
+  if (RegQueryValueEx( key_handle, name, 0, &type, result, &n1 ))
+    {
+      jnlib_free (result);
+      result = NULL;
+      goto leave;
+    }
+  result[nbytes] = 0; /* Make sure it is a string.  */
+  if (type == REG_EXPAND_SZ && strchr (result, '%'))
+    {
+      char *tmp;
+      
+      n1 += 1000;
+      tmp = jnlib_malloc (n1+1);
+      if (!tmp)
+        goto leave;
+      nbytes = ExpandEnvironmentStrings (result, tmp, n1);
+      if (nbytes && nbytes > n1)
+        {
+          jnlib_free (tmp);
+          n1 = nbytes;
+          tmp = jnlib_malloc (n1 + 1);
+          if (!tmp)
+            goto leave;
+          nbytes = ExpandEnvironmentStrings (result, tmp, n1);
+          if (nbytes && nbytes > n1)
+            {
+              /* Oops - truncated, better don't expand at all.  */
+              jnlib_free (tmp); 
+              goto leave;
+            }
+          tmp[nbytes] = 0;
+          jnlib_free (result);
+          result = tmp;
+        }
+      else if (nbytes)
+        {
+          /* Okay, reduce the length.  */
+          tmp[nbytes] = 0;
+          jnlib_free (result);
+          result = jnlib_malloc (strlen (tmp)+1);
+          if (!result)
+            result = tmp;
+            else 
+              {
+                strcpy (result, tmp);
+                jnlib_free (tmp);
+              }
+        }
+      else 
+        {  
+          /* Error - don't expand.  */
+          jnlib_free (tmp);
+        }
+    }
+
+ leave:
+  RegCloseKey (key_handle);
+  return result;
+}
+
+
+int
+write_w32_registry_string (const char *root, const char *dir, 
+                           const char *name, const char *value)
+{
+  HKEY root_key, reg_key;
+  
+  if ( !(root_key = get_root_key(root) ) )
+    return -1;
+  
+  if ( RegOpenKeyEx( root_key, dir, 0, KEY_WRITE, &reg_key ) 
+       != ERROR_SUCCESS )
+    return -1;
+  
+  if ( RegSetValueEx (reg_key, name, 0, REG_SZ, (BYTE *)value, 
+                      strlen( value ) ) != ERROR_SUCCESS )
+    {
+      if ( RegCreateKey( root_key, name, &reg_key ) != ERROR_SUCCESS ) 
+        {
+          RegCloseKey(reg_key);
+          return -1;
+        }
+      if ( RegSetValueEx (reg_key, name, 0, REG_SZ, (BYTE *)value,
+                          strlen( value ) ) != ERROR_SUCCESS )
+        {
+          RegCloseKey(reg_key);
+          return -1;
+        }
+    }
+  
+  RegCloseKey (reg_key);
+  
+  return 0;
+}
+
+#endif /*HAVE_W32_SYSTEM*/