(Fix) programs/winecfg/winecfg.c regressions
Gerald Pfeifer
gerald at pfeifer.com
Tue Nov 30 07:38:40 CST 2004
The following change to programs/winecfg/winecfg.c
revision 1.25
date: 2004/11/23 13:50:23; author: julliard; state: Exp; lines: +23 -13
Mike Hearn <mike at navi.cx>
- More heapification.
- Split drive code into core, UI and autodetect.
- Implement drive autodetection.
- Slight redesign of drive tab.
- Code cleanup.
reverted Anish' previous change which fixed building on FreeBSD (and
possible other platforms with setkey() and getkey() in system headers):
revision 1.24
date: 2004/10/19 23:51:16; author: julliard; state: Exp; lines: +6 -6
Anish Mistry <mistry.7 at osu.edu>
Rename getkey and setkey for FreeBSD.
This is somewhat embarrassing because I had notified you of this problem
on 16 Oct 2004, it was originally addressed by Anish patch three days
later only to reappear now. :-(
Gerald
ChangeLog
Again name getkey() and setkey() for FreeBSD.
Index: winecfg.c
===================================================================
RCS file: /home/wine/wine/programs/winecfg/winecfg.c,v
retrieving revision 1.25
diff -u -p -r1.25 winecfg.c
--- winecfg.c 23 Nov 2004 13:50:23 -0000 1.25
+++ winecfg.c 30 Nov 2004 14:30:49 -0000
@@ -71,7 +71,7 @@ void set_window_title(HWND dialog)
/**
- * getkey: Retrieves a configuration value from the registry
+ * get_config_key: Retrieves a configuration value from the registry
*
* char *subkey : the name of the config section
* char *name : the name of the config value
@@ -81,7 +81,7 @@ void set_window_title(HWND dialog)
* not. Caller is responsible for releasing the result.
*
*/
-static char *getkey (char *subkey, char *name, char *def)
+static char *get_config_key (char *subkey, char *name, char *def)
{
LPBYTE buffer = NULL;
DWORD len;
@@ -129,7 +129,7 @@ end:
}
/**
- * setkey: convenience wrapper to set a key/value pair
+ * set_config_key: convenience wrapper to set a key/value pair
*
* const char *subKey : the name of the config section
* const char *valueName : the name of the config value
@@ -139,7 +139,7 @@ end:
*
* If valueName or value is NULL, an empty section will be created
*/
-int setkey(const char *subkey, const char *name, const char *value) {
+int set_config_key(const char *subkey, const char *name, const char *value) {
DWORD res = 1;
HKEY key = NULL;
@@ -258,7 +258,7 @@ char *get(char *path, char *name, char *
}
/* no, so get from the registry */
- val = getkey(path, name, def);
+ val = get_config_key(path, name, def);
WINE_TRACE("returning %s\n", val);
@@ -445,7 +445,7 @@ static void process_setting(struct setti
if (s->value)
{
WINE_TRACE("Setting %s:%s to '%s'\n", s->path, s->name, s->value);
- setkey(s->path, s->name, s->value);
+ set_config_key(s->path, s->name, s->value);
}
else
{
More information about the wine-patches
mailing list