X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/0d9f702fd085bc8ad560a3e1f08d5e93054a5d33..3f13130005dfc51fa4982659aa289cb8753cfd26:/src/w32reg.c
diff --git a/src/w32reg.c b/src/w32reg.c
index 99fca62fbd..5068f42a49 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,6 @@
/* Emulate the X Resource Manager through the registry.
- Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1993-1994, 2001-2014 Free Software Foundation,
+ Inc.
This file is part of GNU Emacs.
@@ -20,7 +20,6 @@ along with GNU Emacs. If not, see . */
/* Written by Kevin Gallo */
#include
-#include
#include "lisp.h"
#include "w32term.h"
#include "blockinput.h"
@@ -57,7 +56,7 @@ along with GNU Emacs. If not, see . */
*/
static char *
-w32_get_rdb_resource (char *rdb, char *resource)
+w32_get_rdb_resource (char *rdb, const char *resource)
{
char *value = rdb;
int len = strlen (resource);
@@ -75,7 +74,7 @@ w32_get_rdb_resource (char *rdb, char *resource)
}
static LPBYTE
-w32_get_string_resource (char *name, char *class, DWORD dwexptype)
+w32_get_string_resource (const char *name, const char *class, DWORD dwexptype)
{
LPBYTE lpvalue = NULL;
HKEY hrootkey = NULL;
@@ -86,14 +85,14 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
trykey:
- BLOCK_INPUT;
+ block_input ();
/* Check both the current user and the local machine to see if we have
any resources */
if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS)
{
- char *keyname;
+ const char *keyname;
if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS
&& dwType == dwexptype)
@@ -111,13 +110,13 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
}
ok = (keyname
- && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL
+ && (lpvalue = xmalloc (cbData)) != NULL
&& RegQueryValueEx (hrootkey, keyname, NULL, NULL, lpvalue, &cbData) == ERROR_SUCCESS);
RegCloseKey (hrootkey);
}
- UNBLOCK_INPUT;
+ unblock_input ();
if (!ok)
{
@@ -142,15 +141,15 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
database RDB. */
char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
{
if (rdb)
{
char *resource;
- if (resource = w32_get_rdb_resource (rdb, name))
+ if ((resource = w32_get_rdb_resource (rdb, name)))
return resource;
- if (resource = w32_get_rdb_resource (rdb, class))
+ if ((resource = w32_get_rdb_resource (rdb, class)))
return resource;
}
@@ -158,6 +157,5 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
/* --quick was passed, so this is a no-op. */
return NULL;
- return (w32_get_string_resource (name, class, REG_SZ));
+ return w32_get_string_resource (name, class, REG_SZ);
}
-