Download as
Browse Code »

Commit 9ca78548abb324356bd8adf048f513dd8d788726

Authored by perry.werneck@gmail.com
1 parent 0b0a0fb0
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Tentando otimizar o funcionamento do acesso ao registry

Showing 1 changed file with 5 additions and 6 deletions   Show diff stats
src/pw3270/common/config.c
  Diff comments   View file @9ca7854
@@ -96,9 +96,9 @@ gchar * get_last_error_msg(void) @@ -96,9 +96,9 @@ gchar * get_last_error_msg(void)
96 96
97 #ifdef HAVE_WIN_REGISTRY 97 #ifdef HAVE_WIN_REGISTRY
98 98
99 - static BOOL registry_open_key(const gchar *group, REGSAM samDesired, HKEY *hKey) 99 + static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
100 { 100 {
101 - static HKEY predefined[] = { HKEY_CURRENT_USER, HKEY_USERS, HKEY_LOCAL_MACHINE }; 101 + static HKEY predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
102 int f; 102 int f;
103 gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group); 103 gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
104 104
@@ -111,7 +111,6 @@ gchar * get_last_error_msg(void) @@ -111,7 +111,6 @@ gchar * get_last_error_msg(void)
111 } 111 }
112 } 112 }
113 113
114 -// trace("Cant open \"%s\"",path);  
115 g_free(path); 114 g_free(path);
116 115
117 return FALSE; 116 return FALSE;
@@ -244,7 +243,7 @@ gchar * get_last_error_msg(void) @@ -244,7 +243,7 @@ gchar * get_last_error_msg(void)
244 243
245 HKEY key_handle; 244 HKEY key_handle;
246 245
247 - if(registry_open_key(group,KEY_READ,&key_handle)) 246 + if(registry_open_key(group,key,KEY_READ,&key_handle))
248 { 247 {
249 DWORD data; 248 DWORD data;
250 gboolean ret = def; 249 gboolean ret = def;
@@ -287,7 +286,7 @@ gchar * get_last_error_msg(void) @@ -287,7 +286,7 @@ gchar * get_last_error_msg(void)
287 286
288 HKEY key_handle; 287 HKEY key_handle;
289 288
290 - if(registry_open_key(group,KEY_READ,&key_handle)) 289 + if(registry_open_key(group,key,KEY_READ,&key_handle))
291 { 290 {
292 DWORD data; 291 DWORD data;
293 gint ret = def; 292 gint ret = def;
@@ -335,7 +334,7 @@ gchar * get_last_error_msg(void) @@ -335,7 +334,7 @@ gchar * get_last_error_msg(void)
335 gchar * ret = NULL; 334 gchar * ret = NULL;
336 BYTE * data; 335 BYTE * data;
337 336
338 - if(!registry_open_key(group,KEY_READ,&key_handle)) 337 + if(!registry_open_key(group,key,KEY_READ,&key_handle))
339 { 338 {
340 if(def) 339 if(def)
341 return g_strdup(def); 340 return g_strdup(def);