luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

registrybackend: do convert values to UTF-16

Browse Source 
Perform conversion before writing a value out of the cache into the registry,
and convert back when reading a value into the cache out of the registry.
The registry holds UTF-8 strings.
This commit is contained in:
Руслан Ижбулатов 2016-02-05 09:40:30 +01:00 committed by Ignacio Casal Quinteiro
parent c4d943186e
commit 604ca89176
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gio/gregistrysettingsbackend.c
View File

@ -816,6 +816,13 @@ registry_read (HKEY hpath,
return FALSE; return FALSE;
} }
if (p_value->type == REG_SZ)
{
gchar *valueu8 = g_utf16_to_utf8 (p_value->ptr, -1, NULL, NULL, NULL);
g_free (p_value->ptr);
p_value->ptr = valueu8;
}
return TRUE; return TRUE;
} }
@ -926,6 +933,7 @@ g_registry_backend_write_one (const char *key_name,
gunichar2 *value_namew; gunichar2 *value_namew;
DWORD value_data_size; DWORD value_data_size;
LPVOID value_data; LPVOID value_data;
gunichar2 *value_dataw;
LONG result; LONG result;
GNode *node; GNode *node;
gboolean changed; gboolean changed;
@ -1023,7 +1031,28 @@ g_registry_backend_write_one (const char *key_name,
value_namew = g_utf8_to_utf16 (value_name, -1, NULL, NULL, NULL); value_namew = g_utf8_to_utf16 (value_name, -1, NULL, NULL, NULL);
value_dataw = NULL;
switch (type_string[0])
{
case 'b':
case 'y':
case 'n':
case 'q':
case 'i':
case 'u':
case 'x':
case 't':
break;
default:
value_dataw = g_utf8_to_utf16 (value_data, -1, NULL, NULL, NULL);
value_data = value_dataw;
value_data_size = (DWORD)((wcslen (value_data) + 1) * sizeof (gunichar2));
break;
}
result = RegSetValueExW (hpath, value_namew, 0, value.type, value_data, value_data_size); result = RegSetValueExW (hpath, value_namew, 0, value.type, value_data, value_data_size);
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
g_message_win32_error (result, "gregistrybackend: setting value %s\\%s\\%s failed.\n", g_message_win32_error (result, "gregistrybackend: setting value %s\\%s\\%s failed.\n",
self->base_path, path_name, value_name); self->base_path, path_name, value_name);
@ -1036,6 +1065,7 @@ g_registry_backend_write_one (const char *key_name,
RegCloseKey (hpath); RegCloseKey (hpath);
g_free (path_name); g_free (path_name);
g_free (value_namew); g_free (value_namew);
g_free (value_dataw);
return FALSE; return FALSE;
} }