Commit 9ca78548abb324356bd8adf048f513dd8d788726
1 parent
0b0a0fb0
Exists in
master
and in
5 other branches
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
... | ... | @@ -96,9 +96,9 @@ gchar * get_last_error_msg(void) |
96 | 96 | |
97 | 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 | 102 | int f; |
103 | 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 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | -// trace("Cant open \"%s\"",path); | |
115 | 114 | g_free(path); |
116 | 115 | |
117 | 116 | return FALSE; |
... | ... | @@ -244,7 +243,7 @@ gchar * get_last_error_msg(void) |
244 | 243 | |
245 | 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 | 248 | DWORD data; |
250 | 249 | gboolean ret = def; |
... | ... | @@ -287,7 +286,7 @@ gchar * get_last_error_msg(void) |
287 | 286 | |
288 | 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 | 291 | DWORD data; |
293 | 292 | gint ret = def; |
... | ... | @@ -335,7 +334,7 @@ gchar * get_last_error_msg(void) |
335 | 334 | gchar * ret = NULL; |
336 | 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 | 339 | if(def) |
341 | 340 | return g_strdup(def); | ... | ... |