Corrigindo tratamento do registry em windows

perry.werneck@gmail.com
1 parent 73683f2e
Showing 3 changed files with 52 additions and 40 deletions Show diff stats
src/gtk/actions.c
src/gtk/common/config.c
src/gtk/uiparser/parsefile.c
@@ -284,6 +284,32 @@ static int id_from_array(const gchar *key, const gchar **array, GError **error)
 	return -1;
 }
+static int get_attribute_id(const gchar *name, const gchar *key, gchar **nm, const gchar **src, const gchar **names, const gchar **values, GError **error)
+{
+ 	const gchar *attr = ui_get_attribute(key,names,values);
+ 	int			 id;
+
+ 	if(!attr)
+	{
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_("Attribute \"%s\" is invalid or undefined" ), key);
+		return -1;
+	}
+
+	id = id_from_array(attr,src,error);
+	if(id >= 0)
+	{
+		if(*nm)
+			g_free(*nm);
+		*nm = g_strconcat(name,attr,NULL);
+		return id;
+	}
+
+	if(!*error)
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_("Unexpected or invalid %s attribute: \"%s\"" ), key, attr);
+
+	return -1;
+}
+
 static int setup_block_action(const gchar *name, const gchar *attr, GError **error)
 {
 	int id = -1;
@@ -392,30 +418,20 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 	}
 	else if(!g_strcasecmp(name,"paste"))
 	{
+		static const GCallback cbk[] = {	G_CALLBACK(paste_clipboard_action),
+											G_CALLBACK(paste_next_action),
+											G_CALLBACK(paste_file_action)
+										};
+		static const gchar 		* src[] = { "clipboard", "next", "file", NULL };
+
+		callback	= cbk;
 		action_type	= ACTION_TYPE_TABLE;
-		attr		= ui_get_attribute("src",names,values);
-		if(!attr)
-		{
-			*error = g_error_new(ERROR_DOMAIN,EINVAL,_("%s action needs src attribute" ), name);
+		trace("%s",__FUNCTION__);
+		id = get_attribute_id(name,"src",&nm,src,names,values,error);
+		trace("%s",__FUNCTION__);
+		if(id < 0)
 			return NULL;
-		}
-		else
-		{
-			static const GCallback cbk[] = {	G_CALLBACK(paste_clipboard_action),
-												G_CALLBACK(paste_next_action),
-												G_CALLBACK(paste_file_action)
-											};
-			static const gchar 		* src[] = { "clipboard", "next", "file", NULL };
-
-			id = id_from_array(attr,src,error);
-			if(id < 0)
-				return NULL;
-
-			callback = cbk;
-		}
-
-		nm = g_strconcat(name,attr, NULL);
 	}
 	else if(!g_strcasecmp(name,"copy"))
@@ -434,16 +450,9 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 											};
 		callback	= cbk;
 		action_type	= ACTION_TYPE_TABLE;
-		attr 		= ui_get_attribute("mode",names,values);
-
-		id = id_from_array(attr,src,error);
+		id = get_attribute_id(name,"mode",&nm,src,names,values,error);
 		if(id < 0)
-		{
-			*error = g_error_new(ERROR_DOMAIN,EINVAL,_("Unexpected or invalid mode attribute: \"%s\"" ), attr);
 			return NULL;
-		}
-
-		nm = g_strconcat(name,attr,NULL);
 	}
 	else if(!g_strcasecmp(name,"save"))
 	{
@@ -84,11 +84,11 @@ gchar * get_last_error_msg(void)
 #endif // WIN32
 #ifdef WIN_REGISTRY_ENABLED
- static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
+ static BOOL registry_open_key(const gchar *group, REGSAM samDesired, HKEY *hKey)
  {
  	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_USERS, HKEY_LOCAL_MACHINE };
  	int			  f;
-	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,group,key);
+	gchar		* path = g_strdup_printf("%s\\%s",registry_path,group);
 	for(f=0;f<G_N_ELEMENTS(predefined);f++)
 	{
@@ -99,7 +99,9 @@ gchar * get_last_error_msg(void)
 		}
 	}
+	trace("Cant open \"%s\"",path);
 	g_free(path);
+
 	return FALSE;
  }
 #else
@@ -164,14 +166,14 @@ gchar * get_last_error_msg(void)
 	HKEY key_handle;
-	if(registry_open_key(group,key,KEY_READ,&key_handle))
+	if(registry_open_key(group,KEY_READ,&key_handle))
 	{
 		DWORD			  data;
 		gboolean		  ret 		= def;
 		unsigned long	  datalen	= sizeof(data);
 		unsigned long	  datatype;
-		if(RegQueryValueExA(key_handle,NULL,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		if(RegQueryValueExA(key_handle,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
 		{
 			if(datatype == REG_DWORD)
 				ret = data ? TRUE : FALSE;
@@ -207,14 +209,14 @@ gchar * get_last_error_msg(void)
 	HKEY key_handle;
-	if(registry_open_key(group,key,KEY_READ,&key_handle))
+	if(registry_open_key(group,KEY_READ,&key_handle))
 	{
 		DWORD			data;
 		gint			ret = def;
 		unsigned long	datalen	= sizeof(data);
 		unsigned long	datatype;
-		if(RegQueryValueExA(key_handle,NULL,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		if(RegQueryValueExA(key_handle,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
 		{
 			if(datatype == REG_DWORD)
 				ret = (gint) data;
@@ -255,14 +257,16 @@ gchar * get_last_error_msg(void)
 	unsigned long datalen 	= sizeof(data);
 	gchar *ret				= NULL;
-	if(!registry_open_key(group,key,KEY_READ,&key_handle))
+	if(!registry_open_key(group,KEY_READ,&key_handle))
 		return g_strdup(def);
-	if(RegQueryValueExA(key_handle,NULL,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
+	if(RegQueryValueExA(key_handle,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
 	{
 		ret = (char *) malloc(datalen+1);
+
 		memcpy(ret,data,datalen);
 		ret[datalen+1] = 0;
+		trace("%s\\%s=\"%s\"",group,key,ret);
 	}
 	else if(def)
 	{
@@ -353,13 +357,13 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
  	HKEY	hKey;
  	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,group,key);
+	gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
 	trace("Creating key %s",path);
 	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
 	{
 		DWORD	value = val ? 1 : 0;
-		LONG	rc = RegSetValueEx(hKey, NULL, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
+		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
 		SetLastError(rc);
@@ -115,7 +115,6 @@
 	const gchar * name = NULL;
 	gchar		* key;
-trace("%s ----",__FUNCTION__);
 	if(action)
 		name = gtk_action_get_name(action);
	@@ -115,7 +115,6 @@		@@ -115,7 +115,6 @@
115	const gchar * name = NULL;	115	const gchar * name = NULL;
116	gchar * key;	116	gchar * key;
117		117
118	-trace("%s ----",__FUNCTION__);
119	if(action)	118	if(action)
120	name = gtk_action_get_name(action);	119	name = gtk_action_get_name(action);
121		120