Fix winecfg app removal

[Mike Hearn]

Hi Crestez,

This patch should fix the remove button. It looks like I intended to
finish that bit off but never did (I stopped after a certain date passed
rather than at a certain level of maturity of the app unfortunately). 

It should not conflict much with your other patch, but you should apply
this (or wait for Alexandre to commit it) then resubmit your patch with
the on_remove_app_click message removed, and with the other C99 fixes I
mentioned included.

If you want to manage patches more easily I'd recommend SVK:
http://svk.elixus.org/, it'll let you branch CVS and commit to a local
copy which makes it much easier to produce clean patches when you are
producing them faster than Alexandre commits them.

thanks -mike


Mike Hearn <mike at navi.cx>
- Finish off the "Remove Application" button
- Allow removal of keys from the overlay
- One or two whitespace fixes


-------------- next part --------------
--- programs/winecfg/appdefaults.c  (revision 61)
+++ programs/winecfg/appdefaults.c  (local)
@@ -220,11 +220,13 @@ static void on_selection_change(HWND dia
 {
   LVITEM item;
   char *oldapp = current_app;
-    
+
   WINE_TRACE("()\n");
-  
+
   item.iItem = get_listview_selection(listview);
   item.mask = LVIF_PARAM;
+
+  WINE_TRACE("item.iItem=%d\n", item.iItem);
   
   if (item.iItem == -1) return;
   
@@ -303,8 +305,11 @@ static void on_remove_app_click(HWND dia
     section[strlen(section)] = '\0'; /* remove last backslash  */
     set(section, NULL, NULL); /* delete the section  */
     ListView_DeleteItem(listview, selection);
+    ListView_SetItemState(listview, selection - 1, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
 
     SetFocus(listview);
+    
+    SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0);        
 }
 
 static void on_winver_change(HWND dialog)
--- programs/winecfg/winecfg.c  (revision 61)
+++ programs/winecfg/winecfg.c  (local)
@@ -206,8 +206,8 @@ struct setting
 {
     struct list entry;
     char *path;   /* path in the registry rooted at the config key  */
-    char *name;   /* name of the registry value  */
-    char *value;  /* contents of the registry value. if null, this means a deletion  */
+    char *name;   /* name of the registry value. if null, this means delete the key  */
+    char *value;  /* contents of the registry value. if null, this means delete the value  */
 };
 
 struct list *settings;
@@ -215,11 +215,10 @@ struct list *settings;
 static void free_setting(struct setting *setting)
 {
     assert( setting != NULL );
+    assert( setting->path );
 
-    WINE_TRACE("destroying %p\n", setting);
-
-    assert( setting->path && setting->name );
-
+    WINE_TRACE("destroying %p: %s\n", setting, setting->path);
+    
     HeapFree(GetProcessHeap(), 0, setting->path);
     HeapFree(GetProcessHeap(), 0, setting->name);
     HeapFree(GetProcessHeap(), 0, setting->value);
@@ -272,8 +271,7 @@ char *get(char *path, char *name, char *
  * "AppDefaults\\fooapp.exe\\Version". You can use keypath()
  * to get such a string.
  *
- * name is the value name, it must not be null (you cannot create
- * empty groups, sorry ...)
+ * name is the value name, or NULL to delete the path.
  *
  * value is what to set the value to, or NULL to delete it.
  *
@@ -285,7 +283,6 @@ void set(char *path, char *name, char *v
     struct setting *s;
 
     assert( path != NULL );
-    assert( name != NULL );
 
     WINE_TRACE("path=%s, name=%s, value=%s\n", path, name, value);
 
@@ -295,19 +292,35 @@ void set(char *path, char *name, char *v
         struct setting *s = LIST_ENTRY(cursor, struct setting, entry);
 
         if (strcasecmp(s->path, path) != 0) continue;
-        if (strcasecmp(s->name, name) != 0) continue;
+        if ((s->name && name) && strcasecmp(s->name, name) != 0) continue;
+
+        /* are we attempting a double delete? */
+        if (!s->name && !name) return;
+
+        /* do we want to undelete this key? */
+        if (!s->name && name) s->name = strdupA(name);
 
         /* yes, we have already set it, so just replace the content and return  */
         HeapFree(GetProcessHeap(), 0, s->value);
         s->value = value ? strdupA(value) : NULL;
 
+        /* are we deleting this key? this won't remove any of the
+         * children from the overlay so if the user adds it again in
+         * that session it will appear to undelete the settings, but
+         * in reality only the settings actually modified by the user
+         * in that session will be restored. we might want to fix this
+         * corner case in future by actually deleting all the children
+         * here so that once it's gone, it's gone.
+         */
+        if (!name) s->name = NULL;
+
         return;
     }
 
     /* otherwise add a new setting for it  */
     s = HeapAlloc(GetProcessHeap(), 0, sizeof(struct setting));
-    s->path = strdupA(path);
-    s->name = strdupA(name);
+    s->path  = strdupA(path);
+    s->name  = name  ? strdupA(name)  : NULL;
     s->value = value ? strdupA(value) : NULL;
 
     list_add_tail(settings, &s->entry);