[glib/wip/nacho/registry-writable: 2/2] registrybackend: handle writability notifications
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/nacho/registry-writable: 2/2] registrybackend: handle writability notifications
- Date: Fri, 5 Feb 2016 09:45:42 +0000 (UTC)
commit 1180e55863801fa105ce2ec17ecb92b3f32e2113
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Feb 2 10:24:10 2016 +0100
registrybackend: handle writability notifications
gio/gregistrysettingsbackend.c | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c
index d40cc94..aff7548 100644
--- a/gio/gregistrysettingsbackend.c
+++ b/gio/gregistrysettingsbackend.c
@@ -377,12 +377,15 @@ typedef struct
gint32 readable : 1;
RegistryValue value;
+
+ gint32 writable : 1;
} RegistryCacheItem;
static GNode *
registry_cache_add_item (GNode *parent,
gchar *name,
RegistryValue value,
+ gboolean writable,
gint ref_count)
{
RegistryCacheItem *item;
@@ -401,6 +404,7 @@ registry_cache_add_item (GNode *parent,
item->subscription_count = 0;
item->block_count = 0;
item->readable = FALSE;
+ item->writable = writable;
trace ("\treg cache: adding %s to %s\n",
name, ((RegistryCacheItem *)parent->data)->name);
@@ -1283,6 +1287,7 @@ typedef struct
GRegistryBackend *self;
gchar *prefix; /* prefix is a gsettings path, all items are subkeys of this. */
GPtrArray *items; /* each item is a subkey below prefix that has changed. */
+ gboolean writability_changed; /* whether the writability of any of the items from prefix changed */
} RegistryEvent;
typedef struct
@@ -1390,12 +1395,22 @@ registry_cache_update (GRegistryBackend *self,
{
DWORD bufferw_size = MAX_KEY_NAME_LENGTH + 1;
HKEY hsubpath;
+ gboolean writable = TRUE;
result = RegEnumKeyExW (hpath, i++, bufferw, &bufferw_size, NULL, NULL, NULL, NULL);
if (result != ERROR_SUCCESS)
break;
- result = RegOpenKeyExW (hpath, bufferw, 0, KEY_READ, &hsubpath);
+ /* First try to open the key for writing so we can understand if the path
+ * is writable, if not we fallback to just read from it.
+ */
+ result = RegOpenKeyExW (hpath, bufferw, 0, KEY_READ | KEY_WRITE, &hsubpath);
+ if (result == ERROR_ACCESS_DENIED)
+ {
+ result = RegOpenKeyExW (hpath, bufferw, 0, KEY_READ, &hsubpath);
+ writable = FALSE;
+ }
+
if (result == ERROR_SUCCESS)
{
GNode *subkey_node;
@@ -1411,7 +1426,8 @@ registry_cache_update (GRegistryBackend *self,
{
RegistryValue null_value = {REG_NONE, {0}};
subkey_node = registry_cache_add_item (cache_node, buffer,
- null_value, n_watches);
+ null_value, writable,
+ n_watches);
}
new_partial_key_name = g_build_path ("/", partial_key_name, buffer, NULL);
@@ -1421,6 +1437,11 @@ registry_cache_update (GRegistryBackend *self,
child_item = subkey_node->data;
child_item->readable = TRUE;
+ child_item->writable = writable;
+
+ if (event != NULL)
+ event->writability_changed = event->writability_changed ||
+ child_item->writable != writable;
g_free (buffer);
RegCloseKey (hsubpath);
@@ -1468,7 +1489,7 @@ registry_cache_update (GRegistryBackend *self,
{
/* This is a new value */
cache_child_node = registry_cache_add_item (cache_node, buffer, value,
- n_watches);
+ item->writable, n_watches);
changed = TRUE;
}
else
@@ -1522,7 +1543,9 @@ registry_watch_key (HKEY hpath,
HANDLE event)
{
return RegNotifyChangeKeyValue (hpath, TRUE,
- REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET,
+ REG_NOTIFY_CHANGE_NAME |
+ REG_NOTIFY_CHANGE_LAST_SET |
+ REG_NOTIFY_CHANGE_SECURITY,
event, TRUE);
}
@@ -1537,7 +1560,11 @@ watch_handler (RegistryEvent *event)
/* GSettings requires us to NULL-terminate the array. */
g_ptr_array_add (event->items, NULL);
g_settings_backend_keys_changed (G_SETTINGS_BACKEND (event->self), event->prefix,
- (gchar const **)event->items->pdata, NULL);
+ (gchar const * const *)event->items->pdata, NULL);
+
+ if (event->writability_changed)
+ g_settings_backend_path_writable_changed (G_SETTINGS_BACKEND (event->self),
+ event->prefix);
g_ptr_array_free (event->items, TRUE);
g_free (event->prefix);
@@ -1797,6 +1824,7 @@ watch_thread_function (LPVOID parameter)
event->self = g_object_ref (self->owner);
event->prefix = g_strdup (prefix);
event->items = g_ptr_array_new_with_free_func (g_free);
+ event->writability_changed = FALSE;
EnterCriticalSection (G_REGISTRY_BACKEND (self->owner)->cache_lock);
registry_cache_update (G_REGISTRY_BACKEND (self->owner), hpath,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]