luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 00:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

GWin32AppInfo: Drop read_resource_string(), use GWin32RegistryKey

Browse Source 
Now GWin32RegistryKey can internally do the same thing that
read_resource_string() does, and more.
This commit is contained in:
Руслан Ижбулатов
2020-01-26 23:42:31 +00:00
parent a22a15dc5a
commit f77a6a1626
2 changed files with 28 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gio/gwin32registrykey.c
View File

@@ -1934,6 +1934,8 @@ g_win32_registry_get_os_dirs (void)
-1, NULL, NULL, NULL);
if (new_mui_os_dirs[new_array_index] != NULL)
new_array_index += 1;
else
g_critical ("Failed to convert to a system directory #%zu to UTF-8", array_index);
}
g_once_init_leave (&mui_os_dirs, new_mui_os_dirs);
@@ -2026,23 +2028,32 @@ g_win32_registry_key_get_value (GWin32RegistryKey *key,
if (mui_dll_dirs != NULL &&
mui_dll_dirs != mui_os_dirs)
{
gsize mui_dll_dirs_index;
gsize i;
mui_dll_dirs_count = g_strv_length ((gchar **) mui_dll_dirs);
mui_dll_dirs_utf16 = g_new0 (gunichar2 *, mui_dll_dirs_count + 1);
if (mui_dll_dirs_count > 0)
for (i = 0; mui_dll_dirs[i] != NULL; i++)
{
mui_dll_dirs_utf16 = g_new0 (gunichar2 *, mui_dll_dirs_count + 1);
mui_dll_dirs_utf16[i] = g_utf8_to_utf16 (mui_dll_dirs[i], -1, NULL, NULL, error);
for (mui_dll_dirs_count = 0, mui_dll_dirs_index = 0;
mui_dll_dirs[mui_dll_dirs_index] != NULL;
mui_dll_dirs_index++)
{
mui_dll_dirs_utf16[mui_dll_dirs_count] = g_utf8_to_utf16 (mui_dll_dirs[mui_dll_dirs_index],
-1, NULL, NULL, NULL);
if (mui_dll_dirs_utf16[mui_dll_dirs_count] != NULL)
mui_dll_dirs_count += 1;
}
if (mui_dll_dirs_utf16[i] == NULL)
break;
}
if (mui_dll_dirs[i] != NULL)
{
g_prefix_error (error,
"A mui_dll_dirs string #%zu `%s' failed to convert: ",
i, mui_dll_dirs[i]);
for (i = 0; i < mui_dll_dirs_count; i++)
g_free (mui_dll_dirs_utf16[i]);
g_free (mui_dll_dirs_utf16);
g_free (value_name_w);
return FALSE;
}
}
else if (mui_dll_dirs != NULL &&