/[winpt]/trunk/Src/wptKeyManagerDlg.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeyManagerDlg.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 300 by twoaday, Mon Mar 19 15:20:05 2007 UTC revision 328 by twoaday, Fri Sep 25 16:07:38 2009 UTC
# Line 1  Line 1 
1  /* wptKeyManagerDlg.cpp - WinPT Key Manager  /* wptKeyManagerDlg.cpp - WinPT Key Manager
2   *      Copyright (C) 2000-2006 Timo Schulz   *      Copyright (C) 2000-2006, 2008, 2009 Timo Schulz
3   *      Copyright (C) 2004 Andreas Jobs   *      Copyright (C) 2004 Andreas Jobs
4   *   *
5   * This file is part of WinPT.   * This file is part of WinPT.
# Line 13  Line 13 
13   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * but WITHOUT ANY WARRANTY; without even the implied warranty of
14   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15   * GNU General Public License for more details.   * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License  
  * along with WinPT; if not, write to the Free Software Foundation,  
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  
16   */   */
17  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
18  #include <config.h>  #include <config.h>
# Line 63  Line 59 
59    
60  static subclass_s keylist_proc;  static subclass_s keylist_proc;
61    
 /* Handle to the global image list. */  
 HIMAGELIST glob_imagelist;  
62    
63  struct km_info_s {  struct km_info_s {
64      /* Window positions */      /* Window positions */
# Line 77  struct km_info_s { Line 71  struct km_info_s {
71      HWND hwnd_sep;      HWND hwnd_sep;
72      HWND toolbar;      HWND toolbar;
73      HWND statbar;      HWND statbar;
74        
75        /* Handle to the icon imagelist. */
76        HIMAGELIST iconlist;
77    
78        keylist_ctrl_t  kl;
79      listview_ctrl_t lv;      listview_ctrl_t lv;
80      int             lv_idx;      int lv_idx;
81      int keylist_sortby;      int keylist_sortby;
82      int magic;      int magic;
83        int enable_redraw;
84    
85      unsigned int enable_groups:1;      //unsigned int enable_groups:1;
86  };  };
87  typedef struct km_info_s *km_info_t;  typedef struct km_info_s *km_info_t;
88    
# Line 96  struct tb_button_s { Line 95  struct tb_button_s {
95    
96  /* The buttons in the toolbar. */  /* The buttons in the toolbar. */
97  struct tb_button_s tbb[] = {  struct tb_button_s tbb[] = {
98      {IMI_KEY_DELETE, ID_KEYMISC_DELETE, "Delete"},      {IMI_KEY_DELETE, ID_KEYMISC_DELETE, (char*)"Delete"},
99      {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  "Properties"},      {IMI_KEY_PROPS,  ID_KEYMISC_PROPS,  (char*)"Properties"},
100      {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   "Sign"},      {IMI_KEY_SIGN,   ID_KEYMISC_SIGN,   (char*)"Sign"},
101      {IMI_KEY_IMPORT, ID_KEYMISC_IMPORT, "Import"},      {IMI_KEY_IMPORT, ID_KEYMISC_IMPORT, (char*)"Import"},
102      {IMI_KEY_EXPORT, ID_KEYMISC_EXPORT, "Export"},      {IMI_KEY_EXPORT, ID_KEYMISC_EXPORT, (char*)"Export"},
103  };  };
104    
105    
# Line 112  void key_get_clip_info (const char *keyi Line 111  void key_get_clip_info (const char *keyi
111  static BOOL CALLBACK  static BOOL CALLBACK
112  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
113  {  {
114        struct keylist_ctrl_s kl;
115      struct listview_ctrl_s lv;      struct listview_ctrl_s lv;
116      struct km_info_s *kmi;      struct km_info_s *kmi;
117    
# Line 148  keylist_subclass_proc (HWND dlg, UINT ms Line 148  keylist_subclass_proc (HWND dlg, UINT ms
148              break;              break;
149                            
150          case VK_C:          case VK_C:
151              if (GetAsyncKeyState (VK_CONTROL)) {              if (GetAsyncKeyState (VK_CONTROL)) {                
152                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);
153                  km_clip_export (keylist_proc.dlg, &lv);                  kl.lv = &lv;
154                    km_clip_export (keylist_proc.dlg, &kl);
155              }              }
156              break;              break;
157    
# Line 162  keylist_subclass_proc (HWND dlg, UINT ms Line 163  keylist_subclass_proc (HWND dlg, UINT ms
163          case VK_F:          case VK_F:
164              if (GetAsyncKeyState (VK_CONTROL)) {              if (GetAsyncKeyState (VK_CONTROL)) {
165                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);                  lv.ctrl = GetDlgItem (keylist_proc.dlg, IDC_KEYMISC_KEYLIST);
166                  km_find_key (dlg, &lv);                  kl.lv = &lv;
167                    km_find_key (dlg, &kl);
168              }              }
169              break;              break;
170          }          }
# Line 173  keylist_subclass_proc (HWND dlg, UINT ms Line 175  keylist_subclass_proc (HWND dlg, UINT ms
175  }  }
176    
177    
 #define ico2idx(ico) imagelist_getindex ((ico))  
178    
179    static void
180    redraw_keylist (km_info_t kmi)
181    {
182        kmi->enable_redraw = 1;
183        InvalidateRect(GetDlgItem (kmi->dlg, IDC_KEYMISC_KEYLIST), NULL, TRUE);
184    }
185    
186    
187    #define ico2idx(ico) imagelist_getindex (kmi->iconlist, (ico))
188  /* Create a new toolbar window with a pre-defined list of buttons. */  /* Create a new toolbar window with a pre-defined list of buttons. */
189  static HWND  static HWND
190  create_toolbar (HWND dlg, struct km_info_s *kmi)  create_toolbar (HWND dlg, struct km_info_s *kmi)
191  {      {    
192      HWND tbwnd;      HWND tbwnd;
193      TBSAVEPARAMS tbsp;      TBSAVEPARAMS tbsp;
194        
195      TBBUTTON tb_buttons[] = {      TBBUTTON tb_buttons[] = {
196          {ico2idx (IMI_KEY_NEW),    ID_KEYMISC_KEYWIZARD, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L},          {ico2idx (IMI_KEY_NEW),    ID_KEYMISC_KEYWIZARD, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L},
197          {ico2idx (IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_DELETE), ID_KEYMISC_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
# Line 196  create_toolbar (HWND dlg, struct km_info Line 207  create_toolbar (HWND dlg, struct km_info
207    
208      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
209                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,                              WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
210                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);                              0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB,
211      if (!tbwnd)                              glob_hinst, NULL);
212          BUG (0);      SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof (TBBUTTON), 0);
213      SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);      SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)kmi->iconlist);
     SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);  
214      SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);      SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
215      ShowWindow (tbwnd, SW_SHOW);      ShowWindow (tbwnd, SW_SHOW);
216    
# Line 212  create_toolbar (HWND dlg, struct km_info Line 222  create_toolbar (HWND dlg, struct km_info
222          SendMessage (tbwnd, TB_ADDBUTTONS,          SendMessage (tbwnd, TB_ADDBUTTONS,
223                       sizeof (tb_buttons) / sizeof (tb_buttons[0]),                       sizeof (tb_buttons) / sizeof (tb_buttons[0]),
224                       (LONG)&tb_buttons[0]);                       (LONG)&tb_buttons[0]);
   
225      return tbwnd;      return tbwnd;
226  }  }
227    
# Line 227  restore_column_info (struct km_info_s *k Line 236  restore_column_info (struct km_info_s *k
236      DWORD type, size, i;      DWORD type, size, i;
237      LONG ec;      LONG ec;
238    
239      size = kmi->lv->cols*sizeof (WORD);      listview_ctrl_t lv = kmi->kl->lv;
240        
241        size = lv->cols*sizeof (WORD);
242      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,      ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
243                         KEY_ALL_ACCESS, &root);                         KEY_ALL_ACCESS, &root);
244      if (ec != ERROR_SUCCESS)      if (ec != ERROR_SUCCESS)
# Line 252  restore_column_info (struct km_info_s *k Line 263  restore_column_info (struct km_info_s *k
263          }          }
264      }      }
265      for (i=0; i < size/2; i++)      for (i=0; i < size/2; i++)
266          listview_set_column_width (kmi->lv, i, buf[i]);          listview_set_column_width (lv, i, buf[i]);
267      free_if_alloc (buf);      free_if_alloc (buf);
268    
269      size = sizeof (kmi->keylist_sortby);      size = sizeof (kmi->keylist_sortby);
# Line 274  save_column_info (struct km_info_s *kmi) Line 285  save_column_info (struct km_info_s *kmi)
285      LONG ec;      LONG ec;
286      int i;      int i;
287    
288      buf = new WORD[kmi->lv->cols];      listview_ctrl_t lv = kmi->kl->lv;
289        buf = new WORD[lv->cols];
290      if (!buf)      if (!buf)
291          BUG (NULL);          BUG (NULL);
292      for (i=0; i < kmi->lv->cols; i++) {      for (i=0; i < lv->cols; i++) {
293          LVCOLUMN lvc;          LVCOLUMN lvc;
294    
295          memset (&lvc, 0, sizeof (lvc));          memset (&lvc, 0, sizeof (lvc));
296          lvc.mask = LVCF_WIDTH;          lvc.mask = LVCF_WIDTH;
297          ListView_GetColumn (kmi->lv->ctrl, i, &lvc);          ListView_GetColumn (lv->ctrl, i, &lvc);
298          buf[i] = lvc.cx;          buf[i] = lvc.cx;
299      }      }
300    
# Line 294  save_column_info (struct km_info_s *kmi) Line 306  save_column_info (struct km_info_s *kmi)
306      }      }
307    
308      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,      ec = RegSetValueEx (root, "KMColumnSize", 0, REG_BINARY,
309                          (const BYTE*)buf, 2*kmi->lv->cols);                          (const BYTE*)buf, 2*lv->cols);
310      if (ec == ERROR_SUCCESS) {      if (ec == ERROR_SUCCESS) {
311          ec = RegSetValueEx (root, "KMSortBy", 0, REG_DWORD_BIG_ENDIAN,          ec = RegSetValueEx (root, "KMSortBy", 0, REG_DWORD_BIG_ENDIAN,
312                              (const BYTE*)&kmi->keylist_sortby,                              (const BYTE*)&kmi->keylist_sortby,
# Line 436  do_resize_window (HWND dlg, struct km_in Line 448  do_resize_window (HWND dlg, struct km_in
448                  kmi->ypos_sep - rclient.top, bRepaint);                  kmi->ypos_sep - rclient.top, bRepaint);
449      rclient.top = kmi->ypos_sep + 5 + 8;      rclient.top = kmi->ypos_sep + 5 + 8;
450    
451    #if 0
452      if (kmi->enable_groups != 0) {      if (kmi->enable_groups != 0) {
453          /* Place the group text and the group box below the separator */          /* Place the group text and the group box below the separator */
454          h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);          h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
# Line 448  do_resize_window (HWND dlg, struct km_in Line 461  do_resize_window (HWND dlg, struct km_in
461                      (rclient.bottom < rclient.top) ?                      (rclient.bottom < rclient.top) ?
462                      0 : rclient.bottom - rclient.top, bRepaint);                      0 : rclient.bottom - rclient.top, bRepaint);
463      }      }
464    #endif
465            
466      /* Repaint the whole thing */      /* Repaint the whole thing */
467      InvalidateRect (dlg, NULL, TRUE);      InvalidateRect (dlg, NULL, TRUE);
# Line 459  static bool Line 473  static bool
473  clip_contains_pgpkey (void)  clip_contains_pgpkey (void)
474  {  {
475      char *ctxt;      char *ctxt;
476      bool val = false;      bool val;
477    
478        val = false;
479      ctxt = get_clip_text (NULL);      ctxt = get_clip_text (NULL);
480      if (!ctxt || strlen (ctxt) < 512)      if (!ctxt || strlen (ctxt) < 512)
481          val = false;          val = false;
# Line 482  do_create_minpopup (HWND dlg) Line 497  do_create_minpopup (HWND dlg)
497      if (gpg_read_only || !clip_contains_pgpkey ())      if (gpg_read_only || !clip_contains_pgpkey ())
498          return;          return;
499      hm = CreatePopupMenu ();      hm = CreatePopupMenu ();
500      if (!hm)      insert_menu_item (hm, 0, ID_KEYCTX_PASTE, _("Paste Key from Clipboard..."));
         BUG (0);  
     insert_menu_item (hm, 0, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));  
501      GetCursorPos (&p);      GetCursorPos (&p);
502      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);      TrackPopupMenu (hm, 0, p.x, p.y, 0, dlg, NULL);
503      DestroyMenu (hm);      DestroyMenu (hm);
# Line 519  update_default_key_str (HWND dlg) Line 532  update_default_key_str (HWND dlg)
532  void  void
533  update_status_bar (HWND sb, listview_ctrl_t lv)  update_status_bar (HWND sb, listview_ctrl_t lv)
534  {  {
535      char txt_sec[128];      char txt[256];
536      char txt_pub[128];      int nkeys, nsec;
     int nkeys = 0, nsec = 0;  
537    
538      nkeys = listview_count_items (lv, 0);      nkeys = listview_count_items (lv, 0);
539        _snprintf (txt, DIM (txt)-1, _("%d keys"), nkeys);
540        SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt);
541        
542      nsec = gpg_keycache_get_size (keycache_get_ctx (0));      nsec = gpg_keycache_get_size (keycache_get_ctx (0));
543        _snprintf (txt, DIM (txt)-1, _("%d secret keys"), nsec);    
544      _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);      SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt);    
     _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);  
     SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);  
     SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt_pub);  
545  }  }
546    
547    
# Line 577  separator_wnd_proc (HWND hwnd, UINT msg, Line 589  separator_wnd_proc (HWND hwnd, UINT msg,
589              DeleteObject (hpen);              DeleteObject (hpen);
590          }          }
591          MoveToEx (ps.hdc, 0, rect.bottom, NULL);          MoveToEx (ps.hdc, 0, rect.bottom, NULL);
592          hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));          hpen = CreatePen(PS_SOLID, 0, GetSysColor (COLOR_3DDKSHADOW));
593          if (hpen != NULL) {          if (hpen != NULL) {
594              SelectObject (ps.hdc, (LPVOID)hpen);              SelectObject (ps.hdc, (LPVOID)hpen);
595              LineTo (ps.hdc, rect.right, rect.bottom);              LineTo (ps.hdc, rect.right, rect.bottom);
# Line 634  separator_wnd_proc (HWND hwnd, UINT msg, Line 646  separator_wnd_proc (HWND hwnd, UINT msg,
646    
647  /* Register the separator window with @dlg as the parent window. */  /* Register the separator window with @dlg as the parent window. */
648  static HWND  static HWND
649  regist_sep_wnd (HWND dlg, struct km_info_s *kmi)  register_separator_window (HWND dlg, struct km_info_s *kmi)
650  {  {
651      WNDCLASS wndclass;      WNDCLASS wndclass;
652      HWND h;      HWND h;
# Line 655  regist_sep_wnd (HWND dlg, struct km_info Line 667  regist_sep_wnd (HWND dlg, struct km_info
667      h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,      h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,
668                          WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,                          WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,
669                          0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);                          0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
     if (!h)  
         BUG (NULL);  
670      ShowWindow (h, SW_SHOW);      ShowWindow (h, SW_SHOW);
671      return h;      return h;
672  }  }
# Line 670  regist_sep_wnd (HWND dlg, struct km_info Line 680  regist_sep_wnd (HWND dlg, struct km_info
680     is selected or not and what kind of item. @lv is the list view with     is selected or not and what kind of item. @lv is the list view with
681     the items. */     the items. */
682  void  void
683  update_ui_items (HWND hwnd, listview_ctrl_t lv)  update_ui_items (HWND hwnd, keylist_ctrl_t kl)
684  {  {
685      HWND tb_hwnd;      HWND tb_hwnd;
686      HMENU hmenu;      HMENU hmenu;
687        listview_ctrl_t lv = kl->lv;
688      int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,      int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,
689                           ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};                           ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};
690      int key_selected;      int key_selected;
# Line 688  update_ui_items (HWND hwnd, listview_ctr Line 699  update_ui_items (HWND hwnd, listview_ctr
699      key_has_sec = FALSE;      key_has_sec = FALSE;
700      if (key_selected) {      if (key_selected) {
701          i = listview_get_curr_pos (lv);          i = listview_get_curr_pos (lv);
702          key_has_sec = km_check_for_seckey (lv, i, NULL) ? TRUE : FALSE;          key_has_sec = km_check_for_seckey (kl, i, NULL) ? TRUE : FALSE;
703          key_inv = km_get_key_status (lv, i) & KM_FLAG_REVOKED ||          key_inv = km_get_key_status (kl, i) & KM_FLAG_REVOKED ||
704                    km_get_key_status (lv, i) & KM_FLAG_EXPIRED;                    km_get_key_status (kl, i) & KM_FLAG_EXPIRED;
705      }      }
706    
707      /* Enable / disable toolbar buttons */      /* Enable / disable toolbar buttons */
# Line 709  update_ui_items (HWND hwnd, listview_ctr Line 720  update_ui_items (HWND hwnd, listview_ctr
720      set_menu_state (hmenu, ID_KEYMISC_DELETE, state);      set_menu_state (hmenu, ID_KEYMISC_DELETE, state);
721      set_menu_state (hmenu, ID_KEYMISC_PROPS, state);      set_menu_state (hmenu, ID_KEYMISC_PROPS, state);
722      set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);      set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);
723      set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);      set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS,
724                        key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
725      set_menu_state (hmenu, ID_KEYMISC_SIGN,      set_menu_state (hmenu, ID_KEYMISC_SIGN,
726                      key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);                      key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
727      set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY,      set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY,
# Line 750  popup_multiple (HWND dlg, HMENU hm) Line 762  popup_multiple (HWND dlg, HMENU hm)
762          ID_KEYCTX_PROPS,          ID_KEYCTX_PROPS,
763          ID_KEYCTX_SENDMAIL,          ID_KEYCTX_SENDMAIL,
764          0};          0};
765      int i;      for (int i=0; resids[i] != 0; i++)
     for (i=0; i < resids[i] != 0; i++)  
766          set_menu_state (hm, resids[i], MF_GRAYED);          set_menu_state (hm, resids[i], MF_GRAYED);
767  }  }
768    
# Line 775  popup_gpg_readonly (HWND dlg, HMENU hm) Line 786  popup_gpg_readonly (HWND dlg, HMENU hm)
786          ID_KEYCTX_ADDREV,          ID_KEYCTX_ADDREV,
787          0          0
788      };      };
     int i;  
789    
790      if (gpg_read_only == 0)      if (gpg_read_only == 0)
791          return;          return;
792      for (i=0; resids[i] != 0; i++)      for (int i=0; resids[i] != 0; i++)
793          set_menu_state (hm, resids[i], MF_GRAYED);          set_menu_state (hm, resids[i], MF_GRAYED);
794  }  }
795    
# Line 829  change_key_menu (HMENU hm, int id) Line 839  change_key_menu (HMENU hm, int id)
839          0          0
840      };      };
841      int *resids;      int *resids;
     int i;  
842    
843            
844      if (gpg_read_only == 0)      if (gpg_read_only == 0)
# Line 841  change_key_menu (HMENU hm, int id) Line 850  change_key_menu (HMENU hm, int id)
850      default:resids = edit_resids; break;      default:resids = edit_resids; break;
851      }      }
852    
853      for (i=0; resids[i] != 0; i++)      for (int i=0; resids[i] != 0; i++)
854          set_menu_state (hm, resids[i], MF_GRAYED);          set_menu_state (hm, resids[i], MF_GRAYED);
855  }  }
856    
857    
858  /* Reload a single key in the cache. */  /* Reload a single key in the cache. */
859  static void  static void
860  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)  update_key (keylist_ctrl_t kl, int pos, const char *keyid, int keypair)
861  {  {
862      struct winpt_key_s key;      struct winpt_key_s key;
863    
# Line 856  update_key (listview_ctrl_t lv, int pos, Line 865  update_key (listview_ctrl_t lv, int pos,
865      if (keypair)      if (keypair)
866          keycache_update (1, keyid);          keycache_update (1, keyid);
867    
     /* because we replaced the key item, we need to update the  
        address of the pointer in the ListView control. */  
868      memset (&key, 0, sizeof (key));      memset (&key, 0, sizeof (key));
869      winpt_get_pubkey (keyid, &key);      if (winpt_get_pubkey (keyid, &key))
870      keylist_upd_key (lv, pos, key.ext, key.ctx);          BUG (0);
871        keylist_upd_key (kl, pos, key.ext, key.ctx);
872      keyring_check_last_access ();      keyring_check_last_access ();
873  }  }
874    
# Line 903  modify_listview_columns (km_info_s *kmi, Line 911  modify_listview_columns (km_info_s *kmi,
911          0,          0,
912          0,          0,
913          ID_KEYMISC_VIEWCREAT,          ID_KEYMISC_VIEWCREAT,
914          ID_KEYMISC_VIEWDESC,          ID_KEYMISC_VIEWUID,
915          -1          0xFFFFFF
916      };      };
917        listview_ctrl_t lv = kmi->kl->lv;
918      listview_column_s cols[] = {      listview_column_s cols[] = {
919      {0, 240, (char *)_("User ID")},      {0, 240, (char *)_("User ID")},
920      {1, 78, (char *)_("Key ID")},      {1, 78, (char *)_("Key ID")},
# Line 920  modify_listview_columns (km_info_s *kmi, Line 929  modify_listview_columns (km_info_s *kmi,
929      };      };
930      UINT pos;      UINT pos;
931    
932      for (pos=0; resids[pos] != -1; pos++) {      for (pos=0; resids[pos] != 0xFFFFFF; pos++) {
933          if (m_uid == resids[pos])          if (m_uid == resids[pos])
934              break;              break;
935      }      }
936      if (!checked)      if (!checked)
937          listview_del_column (kmi->lv, (int)pos);          listview_del_column (lv, (int)pos);
938      else {            else {      
939          listview_add_column (kmi->lv, &cols[pos]);          listview_add_column (lv, &cols[pos]);
940          keylist_upd_col (kmi->lv, pos);          keylist_upd_col (kmi->kl, pos);
941      }      }
942  }  }
943    
# Line 967  translate_menu_strings (HWND dlg) Line 976  translate_menu_strings (HWND dlg)
976      set_menu_text_bypos (menu, 1, _("Edit"));      set_menu_text_bypos (menu, 1, _("Edit"));
977      set_menu_text_bypos (menu, 2, _("View"));      set_menu_text_bypos (menu, 2, _("View"));
978      set_menu_text_bypos (menu, 3, _("Key"));      set_menu_text_bypos (menu, 3, _("Key"));
     set_menu_text_bypos (menu, 4, _("Groups"));  
979    
980      set_menu_text (menu, ID_KEYMISC_EDITKEY, _("Edit"));      set_menu_text (menu, ID_KEYMISC_EDITKEY, _("Edit..."));
981      set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));      set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));
982      set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust")); /* XXX */      set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust...")); /* XXX */
983      set_menu_text (menu, ID_KEYMISC_COPY, _("&Copy\tCtrl+C"));      set_menu_text (menu, ID_KEYMISC_COPY, _("&Copy\tCtrl+C"));
984      set_menu_text (menu, ID_KEYMISC_PASTE, _("&Paste\tCtrl+V"));      set_menu_text (menu, ID_KEYMISC_PASTE, _("&Paste\tCtrl+V"));
985      set_menu_text (menu, ID_KEYMISC_FIND, _("Search...\tCtrl+F"));      set_menu_text (menu, ID_KEYMISC_FIND, _("Search...\tCtrl+F"));
986      set_menu_text (menu, ID_KEYMISC_SELALL, _("Select All\tCtrl+A"));      set_menu_text (menu, ID_KEYMISC_SELALL, _("Select All\tCtrl+A"));
987      set_menu_text (menu, ID_KEYMISC_QUIT, _("&Quit"));      set_menu_text (menu, ID_KEYMISC_QUIT, _("&Quit"));
988      set_menu_text (menu, ID_KEYMISC_UID, _("User ID"));      set_menu_text (menu, ID_KEYMISC_UID, _("User ID"));
989      set_menu_text (menu, ID_KEYMISC_NEWKEY, _("&Expert"));      set_menu_text (menu, ID_KEYMISC_NEWKEY, _("&Expert..."));
990      set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal"));      set_menu_text (menu, ID_KEYMISC_KEYWIZARD, _("&Normal..."));
991      set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit"));      set_menu_text (menu, ID_KEYMISC_EDIT, _("Edit..."));
992      set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));      set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign..."));
993      set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));      set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));
994      set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));      set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));
995      set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert"));      set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert..."));
996      set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));      set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures..."));
997      set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));      set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path..."));
998      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
999      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));      set_menu_text (menu, ID_KEYMISC_IMPORT, _("&Import..."));
1000      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties"));      set_menu_text (menu, ID_KEYMISC_PROPS, _("&Properties..."));
1001      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("GPG &Options"));      set_menu_text (menu, ID_KEYMISC_GPGOPT, _("GPG &Options..."));
1002      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("&GPG Preferences"));      set_menu_text (menu, ID_KEYMISC_GPGPREFS, _("&GPG Preferences..."));
1003      set_menu_text (menu, ID_KEYMISC_WINPTPREFS, _("&WinPT Preferences"));      set_menu_text (menu, ID_KEYMISC_WINPTPREFS, _("&WinPT Preferences..."));
1004      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );      set_menu_text (menu, ID_KEYMISC_SENDRECV, _("Keyserver") );
1005      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));      set_menu_text (menu, ID_KEYMISC_EXPORT_PRIVKEY, _("E&xport Secret Key"));
1006      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));      set_menu_text (menu, ID_KEYMISC_RECACHE, _("Re&load Key Cache"));
1007      set_menu_text (menu, ID_KEYMISC_REBUILD, _("R&everify Signatures"));      set_menu_text (menu, ID_KEYMISC_REBUILD, _("R&everify Signatures"));
1008      set_menu_text (menu, ID_KEYMISC_REFRESH_KEYS, _("Refresh &Keys (Keyserver)"));      set_menu_text (menu, ID_KEYMISC_REFRESH_KEYS, _("Refresh &Keys (Keyserver)"));
1009      set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );      set_menu_text (menu, ID_KEYMISC_INFO, _("Info"));
1010      set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));      set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
1011        set_menu_text (menu, ID_KEYMISC_DEVWWW, _("&Developer Website"));
1012        set_menu_text (menu, ID_KEYMISC_WEBSITE, _("WinPT &Website"));
1013    
1014      set_menu_text (menu, ID_KEYMISC_VIEWKEYID, _("Key ID"));      set_menu_text (menu, ID_KEYMISC_VIEWKEYID, _("Key ID"));
1015      set_menu_text (menu, ID_KEYMISC_VIEWCIPHER, _("Cipher"));      set_menu_text (menu, ID_KEYMISC_VIEWCIPHER, _("Cipher"));
1016      set_menu_text (menu, ID_KEYMISC_VIEWTYPE, _("Type"));      set_menu_text (menu, ID_KEYMISC_VIEWTYPE, _("Type"));
1017      set_menu_text (menu, ID_KEYMISC_VIEWCREAT, _("Creation"));      set_menu_text (menu, ID_KEYMISC_VIEWCREAT, _("Creation"));
1018        set_menu_text (menu, ID_KEYMISC_VIEWUID, _("User ID"));
1019    
1020      if (!start_help (NULL, 1))      if (!start_help (NULL, 1))
1021          set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);          set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
# Line 1023  translate_popupmenu_strings (HMENU popup Line 1034  translate_popupmenu_strings (HMENU popup
1034      set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));      set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));
1035      set_menu_text (popup, ID_KEYCTX_EMAIL_COPY, _("Copy E-Mail to Clipboard"));      set_menu_text (popup, ID_KEYCTX_EMAIL_COPY, _("Copy E-Mail to Clipboard"));
1036      set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));      set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));
1037      set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));      set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard..."));
1038      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));
1039      set_menu_text (popup, ID_KEYCTX_MAXTRUST, _("Set Implicit &Trust"));      set_menu_text (popup, ID_KEYCTX_MAXTRUST, _("Set Implicit &Trust"));
1040      set_menu_text (popup, ID_KEYCTX_LISTSIGS, _("&List Signatures"));      set_menu_text (popup, ID_KEYCTX_LISTSIGS, _("&List Signatures..."));
1041      set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));      set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties..."));
1042      set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));      set_menu_text (popup, ID_KEYCTX_EDIT, _("Edit..."));
1043      set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));      set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
1044      set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert"));      set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert..."));
1045      set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));      set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign..."));
1046      set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));      set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));
1047      set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));      set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));
1048      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Re&fresh from Keyserver"));      set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Re&fresh from Keyserver"));
1049      set_menu_text (popup, ID_KEYCTX_SETPREFKS, _("Set preferred Keyserver URL"));      set_menu_text (popup, ID_KEYCTX_SETPREFKS, _("Set preferred Keyserver..."));
1050      set_menu_text (popup, ID_KEYCTX_SENDMAIL, _("Send Key to Mail Recipient"));      set_menu_text (popup, ID_KEYCTX_SENDMAIL, _("Send Key to Mail Recipient..."));
1051      set_menu_text (popup, ID_KEYCTX_SETDEFKEY, _("Set as Default Key"));      set_menu_text (popup, ID_KEYCTX_SETDEFKEY, _("Set as Default Signing Key"));
1052    
1053      set_menu_text (popup, ID_KEYCTX_ADDKEY, _("Key..."));      set_menu_text (popup, ID_KEYCTX_ADDKEY, _("Key..."));
1054      set_menu_text (popup, ID_KEYCTX_ADDUID, _("User ID..."));      set_menu_text (popup, ID_KEYCTX_ADDUID, _("User ID..."));
# Line 1045  translate_popupmenu_strings (HMENU popup Line 1056  translate_popupmenu_strings (HMENU popup
1056      set_menu_text (popup, ID_KEYCTX_ADDREV, _("Revoker..."));      set_menu_text (popup, ID_KEYCTX_ADDREV, _("Revoker..."));
1057    
1058      /* change popup texts */      /* change popup texts */
1059      set_menu_text_bypos (popup, 0, _("Key Attributes"));      set_menu_text_bypos (popup, 0, _("Attributes"));
1060      set_menu_text_bypos (popup, 6, _("Add"));      set_menu_text_bypos (popup, 7, _("Add"));
1061      set_menu_text_bypos (popup, 19, _("Send to Keyserver"));      set_menu_text_bypos (popup, 15, _("Send to Keyserver"));
1062  }  }
1063    
1064    
1065  static int  static int
1066  km_gui_adjust_column_images (listview_ctrl_t ctx, int sortby)  km_gui_adjust_column_images (struct km_info_s *kmi, int sortby)
1067  {  {
1068      HWND hheader;      HWND hheader;
1069      HDITEM hdi;      HDITEM hdi;
1070        listview_ctrl_t ctx = kmi->kl->lv;
1071      int idx, sort_desc = 0;        int idx, sort_desc = 0;  
1072    
1073      hheader = ListView_GetHeader (ctx->ctrl);      hheader = ListView_GetHeader (ctx->ctrl);
# Line 1091  km_gui_adjust_column_images (listview_ct Line 1103  km_gui_adjust_column_images (listview_ct
1103      Header_GetItem (hheader, idx, &hdi);        Header_GetItem (hheader, idx, &hdi);  
1104      hdi.fmt |= HDF_IMAGE | HDF_BITMAP_ON_RIGHT;      hdi.fmt |= HDF_IMAGE | HDF_BITMAP_ON_RIGHT;
1105      if (!ctx->ext_chkbox)      if (!ctx->ext_chkbox)
1106          hdi.iImage = imagelist_getindex (sort_desc? IMI_SORT_DOWNARROW :          hdi.iImage = imagelist_getindex (kmi->iconlist,
1107                                                      IMI_SORT_UPARROW);                                           sort_desc? IMI_SORT_DOWNARROW :
1108                                                        IMI_SORT_UPARROW);
1109      else      else
1110          hdi.iImage = sort_desc? KEY_IMG_SORT_DOWN : KEY_IMG_SORT_UP;          hdi.iImage = sort_desc? KEY_IMG_SORT_DOWN : KEY_IMG_SORT_UP;
1111      Header_SetItem (hheader, idx, &hdi);      Header_SetItem (hheader, idx, &hdi);
# Line 1120  static int Line 1133  static int
1133  find_keypos (listview_ctrl_t lv, gpgme_key_t key)  find_keypos (listview_ctrl_t lv, gpgme_key_t key)
1134  {  {
1135      char keyid[32+1];      char keyid[32+1];
     int i;  
1136    
1137      for (i=0; i < listview_count_items (lv, 0); i++) {      for (int i=0; i < listview_count_items (lv, 0); i++) {
1138          listview_get_item_text (lv, i, KM_COL_KEYID, keyid, sizeof (keyid)-1);          listview_get_item_text (lv, i, KM_COL_KEYID, keyid, sizeof (keyid)-1);
1139          if (!strcmp (key->subkeys->keyid+8, keyid+2))          if (!strcmp (key->subkeys->keyid+8, keyid+2))
1140              return i;              return i;
# Line 1138  refresh_keylist (struct km_info_s *kmi) Line 1150  refresh_keylist (struct km_info_s *kmi)
1150  {  {
1151      struct keycache_s *ctx;      struct keycache_s *ctx;
1152      gpg_keycache_t kc;      gpg_keycache_t kc;
1153        int nadded = 0;
1154      int status=0, pos;      int status=0, pos;
1155    
1156      kc = keycache_get_ctx (1);      kc = keycache_get_ctx (1);
1157      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {      while (!gpg_keycache_next_updated_key (kc, &ctx, &status)) {
1158          if (status == KC_FLAG_ADD)          if (status == KC_FLAG_ADD) {
1159              keylist_add_key (kmi->lv, KEYLIST_LIST, ctx, ctx->key);              keylist_add_key (kmi->kl, KEYLIST_LIST, ctx, ctx->key);
1160                nadded++;
1161            }
1162          else {          else {
1163              pos = find_keypos (kmi->lv, ctx->key);              pos = find_keypos (kmi->kl->lv, ctx->key);
1164              if (pos != -1)              if (pos != -1)
1165                  keylist_upd_key (kmi->lv, pos, ctx, ctx->key);                  keylist_upd_key (kmi->kl, pos, ctx, ctx->key);
1166          }          }
1167      }      }
1168      keylist_sort (kmi->lv, kmi->keylist_sortby);      /* if keys were added, we need to sync the key array. */
1169      km_gui_adjust_column_images (kmi->lv, kmi->keylist_sortby);      
1170      update_status_bar (kmi->statbar, kmi->lv);      kmi->enable_redraw = 0;
1171        if (nadded > 0)
1172            keylist_sync (kmi->kl);
1173        keylist_sort (kmi->kl, kmi->keylist_sortby);
1174        km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
1175        update_status_bar (kmi->statbar, kmi->kl->lv);
1176      keyring_check_last_access ();      keyring_check_last_access ();
1177      SetForegroundWindow (kmi->dlg);      SetForegroundWindow (kmi->dlg);
1178        if (nadded > 0)
1179            redraw_keylist (kmi);
1180  }  }
1181    
1182    
# Line 1166  keycache_reload (HWND dlg) Line 1188  keycache_reload (HWND dlg)
1188    
1189      memset (&rcs, 0, sizeof rcs);      memset (&rcs, 0, sizeof rcs);
1190      rcs.kring_update = 1;      rcs.kring_update = 1;
1191      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,                                              DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, dlg,
1192                      keycache_dlg_proc, (LPARAM)&rcs);                      keycache_dlg_proc, (LPARAM)&rcs);
1193  }  }
1194    
# Line 1199  check_ultimate_trusted_key (gpg_keycache Line 1221  check_ultimate_trusted_key (gpg_keycache
1221  static void  static void
1222  reload_keycache (struct km_info_s *kmi)  reload_keycache (struct km_info_s *kmi)
1223  {  {
1224      gpg_keycache_t c;      gpg_keycache_t cache;
1225    
1226        kmi->enable_redraw = 0;
1227      keycache_reload (kmi->dlg);      keycache_reload (kmi->dlg);
1228      c = keycache_get_ctx (1);      cache = keycache_get_ctx (KEYCACHE_PUB);
1229      keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);      keylist_reload (kmi->kl, cache, KEYLIST_LIST, kmi->keylist_sortby);
1230      update_status_bar (kmi->statbar, kmi->lv);      update_status_bar (kmi->statbar, kmi->kl->lv);
     SetForegroundWindow (kmi->dlg);  
1231      keyring_check_last_access ();      keyring_check_last_access ();
1232        redraw_keylist (kmi);
1233        SetForegroundWindow (kmi->dlg);    
1234  }  }
1235    
1236    
# Line 1255  copy_key_info (int what, struct km_info_ Line 1279  copy_key_info (int what, struct km_info_
1279      struct keycache_s *kci = NULL;      struct keycache_s *kci = NULL;
1280      size_t n=0;      size_t n=0;
1281      char *p, tmp[256];      char *p, tmp[256];
1282      int i=0, end = listview_count_items (kmi->lv, 0);      int i=0, end = listview_count_items (kmi->kl->lv, 0);
1283      bool single = false;      bool single = false;
1284    
1285      /* Do not iterate over the entire list if just one item is selected. */      /* Do not iterate over the entire list if just one item is selected. */
1286      n = listview_count_items (kmi->lv, 1);      n = listview_count_items (kmi->kl->lv, 1);
1287      if (n == 1) {      if (n == 1) {
1288          i = kmi->lv_idx;          i = kmi->lv_idx;
1289          end = i+1;          end = i+1;
# Line 1268  copy_key_info (int what, struct km_info_ Line 1292  copy_key_info (int what, struct km_info_
1292    
1293      gpgme_data_new (&out);      gpgme_data_new (&out);
1294      for (; i < end; i++) {      for (; i < end; i++) {
1295          if (!listview_get_item_state (kmi->lv, i))          if (!listview_get_item_state (kmi->kl->lv, i))
1296              continue;              continue;
1297          switch (what) {          switch (what) {
1298    
1299          case ID_KEYCTX_EMAIL_COPY:          case ID_KEYCTX_EMAIL_COPY:
1300              key = km_get_key_ptr (kmi->lv, i, NULL);              key = km_get_key_ptr (kmi->kl, i, NULL);
1301              gpgme_data_write (out, key->uids->email, strlen (key->uids->email));              gpgme_data_write (out, key->uids->email, strlen (key->uids->email));
1302              if (!single) gpgme_data_write (out, "\r\n", 2);              if (!single) gpgme_data_write (out, "\r\n", 2);
1303              break;              break;
1304    
1305          case ID_KEYCTX_UID_COPY:          case ID_KEYCTX_UID_COPY:
1306              key = km_get_key_ptr (kmi->lv, i, &kci);              key = km_get_key_ptr (kmi->kl, i, &kci);
1307              gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));              gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
1308              if (!single) gpgme_data_write (out, "\r\n", 2);              if (!single) gpgme_data_write (out, "\r\n", 2);
1309              break;              break;
1310    
1311          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
1312              key = km_get_key_ptr (kmi->lv, i, NULL);              key = km_get_key_ptr (kmi->kl, i, NULL);
1313              gpgme_data_write (out, "0x", 2);              gpgme_data_write (out, "0x", 2);
1314              gpgme_data_write (out, key->subkeys->keyid+8, 8);              gpgme_data_write (out, key->subkeys->keyid+8, 8);
1315              if (!single) gpgme_data_write (out, "\r\n", 2);              if (!single) gpgme_data_write (out, "\r\n", 2);
1316              break;              break;
1317    
1318          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
1319              key = km_get_key_ptr (kmi->lv, i, NULL);              key = km_get_key_ptr (kmi->kl, i, NULL);
1320              gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));              gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));
1321              if (!single) gpgme_data_write (out, "\r\n", 2);              if (!single) gpgme_data_write (out, "\r\n", 2);
1322              break;              break;
1323    
1324          case ID_KEYCTX_KINFO_COPY:          case ID_KEYCTX_KINFO_COPY:
1325              key = km_get_key_ptr (kmi->lv, i, NULL);              key = km_get_key_ptr (kmi->kl, i, NULL);
1326              key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);              key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);
1327              gpgme_data_write (out, tmp, strlen (tmp));              gpgme_data_write (out, tmp, strlen (tmp));
1328              if (!single) gpgme_data_write (out, "\r\n", 2);              if (!single) gpgme_data_write (out, "\r\n", 2);
# Line 1311  copy_key_info (int what, struct km_info_ Line 1335  copy_key_info (int what, struct km_info_
1335      gpgme_free (p);      gpgme_free (p);
1336  }  }
1337    
   
1338  /* Dialog box procedure for the Key Manager. */  /* Dialog box procedure for the Key Manager. */
1339  BOOL CALLBACK  BOOL CALLBACK
1340  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
# Line 1325  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1348  keymanager_dlg_proc (HWND dlg, UINT msg,
1348      struct genkey_s genkey;      struct genkey_s genkey;
1349      struct winpt_key_s k = {0};      struct winpt_key_s k = {0};
1350      struct URL_ctx_s *url;      struct URL_ctx_s *url;
1351      char type[32], *name;      char type[32];
1352        char *name;
1353      const char *t, *host;      const char *t, *host;
1354      WORD port = 0;      WORD port = 0;
1355      int l_idx = 0, i=0, rc;      int l_idx = 0, i=0, rc;
1356    
1357      if ((msg != WM_INITDIALOG)      if ((msg != WM_INITDIALOG)
1358          && ((kmi = (km_info_t)GetWindowLong (dlg, GWL_USERDATA)) == NULL))          && ((kmi = (km_info_t)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
1359          return FALSE;          return FALSE;
1360            
# Line 1342  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1366  keymanager_dlg_proc (HWND dlg, UINT msg,
1366              return TRUE;              return TRUE;
1367          host = kserver_get_hostname (l_idx, 0, &port);          host = kserver_get_hostname (l_idx, 0, &port);
1368          if (host != NULL)          if (host != NULL)
1369              km_send_to_keyserver (kmi->lv, dlg, host, port);              km_send_to_keyserver (kmi->kl, dlg, host, port);
1370          return TRUE;          return TRUE;
1371      }      }
1372    
1373      switch (msg) {      switch (msg) {    
1374        case WM_HELP:        
1375            if (GetForegroundWindow () != dlg) {
1376                char buf[258];
1377                GetWindowText (GetForegroundWindow (), buf, 255);
1378                if (strstr (buf, _("Key Generation Wizard")))
1379                    html_help_show (28);
1380                else
1381                    html_help_show (32);
1382            }
1383            else {
1384                name = get_locale_name("winpt.chm");
1385                ShellExecute (dlg, "open", name, NULL, NULL, SW_SHOW);
1386                free_if_alloc (name);
1387            }
1388            break;
1389            
1390      case WM_INITDIALOG:      case WM_INITDIALOG:
1391          kmi = new struct km_info_s;          kmi = new struct km_info_s;
1392          memset (kmi, 0, sizeof (struct km_info_s));          memset (kmi, 0, sizeof (struct km_info_s));
1393          kmi->lv_idx = -1;          kmi->lv_idx = -1;
1394          kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);          kmi->hwnd_sep = register_separator_window (dlg, kmi);
1395          imagelist_load (dlg);          imagelist_load (dlg, &kmi->iconlist);
1396          translate_menu_strings (dlg);          translate_menu_strings (dlg);
1397          SetWindowText (dlg, _("Key Manager"));          SetWindowText (dlg, _("Key Manager"));
1398    
1399          c = keycache_get_ctx (KEYCACHE_PUB);          c = keycache_get_ctx (KEYCACHE_PUB);
1400          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);          kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
1401          kmi->keylist_sortby = KEY_SORT_USERID;          kmi->keylist_sortby = KEY_SORT_USERID;
1402          Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);          (void)Header_SetImageList(ListView_GetHeader (kl), kmi->iconlist);
1403          kmi->lv = keylist_load (GetDlgItem (dlg, IDC_KEYMISC_KEYLIST), c,          kmi->kl = keylist_load (kl, c, NULL, KEYLIST_LIST,
1404                                  NULL, KEYLIST_LIST, kmi->keylist_sortby);                                  kmi->keylist_sortby);
1405          if (check_ultimate_trusted_key (keycache_get_ctx (0))) {          kmi->lv = kmi->kl->lv;
1406            if (check_ultimate_trusted_key (keycache_get_ctx (0))) {            
1407              msg_box (dlg, _("No ultimately trusted key found.\n"              msg_box (dlg, _("No ultimately trusted key found.\n"
1408                              "Please set at least one secret key to ultimate trust."),                              "Please set at least one secret key to ultimate trust."),
1409                              _("Key Manager"), MB_WARN);                              _("Key Manager"), MB_WARN);
# Line 1382  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1423  keymanager_dlg_proc (HWND dlg, UINT msg,
1423          kmi->statbar = setup_status_bar (dlg, kmi->lv);          kmi->statbar = setup_status_bar (dlg, kmi->lv);
1424          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);          SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
1425          kmi->toolbar = create_toolbar (dlg, kmi);          kmi->toolbar = create_toolbar (dlg, kmi);
1426          kmi->dlg = dlg;          kmi->dlg = dlg;
1427            
1428          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1429          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1430          restore_window_size (dlg, kmi);          restore_window_size (dlg, kmi);
1431          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->kl);
1432          restore_column_info (kmi);          restore_column_info (kmi);
1433          keylist_sort (kmi->lv, kmi->keylist_sortby);          keylist_sort (kmi->kl, kmi->keylist_sortby);
1434          km_gui_adjust_column_images (kmi->lv, kmi->keylist_sortby);          km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
1435    
1436            // force a redraw of the keylist view
1437            redraw_keylist (kmi);
1438    
1439          SendMessage (dlg, WM_SETICON, (WPARAM)ICON_SMALL,          SendMessage (dlg, WM_SETICON, (WPARAM)ICON_SMALL,
1440                       (LPARAM)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));                       (LPARAM)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
         SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));  
         SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));  
         SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));  
1441          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1442          kmi->magic = SetTimer (dlg, 1, 1000, NULL);          kmi->magic = SetTimer (dlg, 1, 1000, NULL);
1443          return TRUE;          return TRUE;  
     
1444    
1445      case WM_TIMER:      case WM_TIMER:
1446          KillTimer (dlg, kmi->magic);          KillTimer (dlg, kmi->magic);
# Line 1409  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1449  keymanager_dlg_proc (HWND dlg, UINT msg,
1449                    
1450      case WM_DESTROY:      case WM_DESTROY:
1451          save_column_info (kmi);          save_column_info (kmi);
1452          if (kmi->lv) {          imagelist_destroy (kmi->iconlist);
1453              keylist_delete (kmi->lv);          if (kmi->kl) {
1454              kmi->lv = NULL;                    keylist_delete (kmi->kl);
1455                kmi->kl = NULL;      
1456          }          }
         imagelist_destroy ();  
1457    
1458          ltoa (kmi->pos_x, type, 10);          ltoa (kmi->pos_x, type, 10);
1459          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);          set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
# Line 1447  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1487  keymanager_dlg_proc (HWND dlg, UINT msg,
1487          break;          break;
1488    
1489      case WM_NOTIFY:                  case WM_NOTIFY:            
1490          NMHDR *notify;          NMHDR *notify;        
         POINT p;  
         HMENU popup;  
1491                    
1492          notify = (NMHDR *)lparam;          notify = (NMHDR *)lparam;
1493          if (!notify)          if (!notify)
1494              break;              break;
1495            
1496            if (kmi->enable_redraw) {
1497                int n;
1498                n = keylist_listview_notify (dlg, kmi->kl->keys, IDC_KEYMISC_KEYLIST,
1499                                             lparam);
1500                if (n != 0) {
1501                    SetWindowLong (dlg, DWL_MSGRESULT, n);
1502                    return TRUE;
1503                }
1504            }
1505            
1506          switch (notify->code) {          switch (notify->code) {
1507          case TBN_QUERYDELETE:          case TBN_QUERYDELETE:
1508              SetWindowLong (dlg, DWL_MSGRESULT, TRUE);              SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
# Line 1466  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1515  keymanager_dlg_proc (HWND dlg, UINT msg,
1515          case TBN_GETBUTTONINFO:          case TBN_GETBUTTONINFO:
1516              LPTBNOTIFY lpTbNotify;              LPTBNOTIFY lpTbNotify;
1517              lpTbNotify = (LPTBNOTIFY)lparam;              lpTbNotify = (LPTBNOTIFY)lparam;
1518              if (lpTbNotify->iItem < (sizeof(tbb) / sizeof(tb_button_s))) {              if (lpTbNotify->iItem < (sizeof (tbb) / sizeof (tb_button_s))) {
1519                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (tbb[lpTbNotify->iItem].icon);                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (kmi->iconlist,
1520                                                                       tbb[lpTbNotify->iItem].icon);
1521                  lpTbNotify->tbButton.idCommand = tbb[lpTbNotify->iItem].command;                  lpTbNotify->tbButton.idCommand = tbb[lpTbNotify->iItem].command;
1522                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
1523                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
1524                  lpTbNotify->tbButton.iString = 0;                  lpTbNotify->tbButton.iString = 0;
1525                  strncpy (lpTbNotify->pszText, tbb[lpTbNotify->iItem].text, lpTbNotify->cchText);                  strncpy (lpTbNotify->pszText, tbb[lpTbNotify->iItem].text,
1526                  SetWindowLong(dlg, DWL_MSGRESULT, TRUE);                           lpTbNotify->cchText);
1527                    SetWindowLong (dlg, DWL_MSGRESULT, TRUE);
1528              }              }
1529              return TRUE;              return TRUE;
1530    
# Line 1547  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1598  keymanager_dlg_proc (HWND dlg, UINT msg,
1598          case LVN_ITEMCHANGED:          case LVN_ITEMCHANGED:
1599              if (((LPNMLISTVIEW)lparam)->uNewState) { /* item selected? */              if (((LPNMLISTVIEW)lparam)->uNewState) { /* item selected? */
1600                  kmi->lv_idx = listview_get_curr_pos (kmi->lv);                  kmi->lv_idx = listview_get_curr_pos (kmi->lv);
1601                  update_ui_items (dlg, kmi->lv);                  update_ui_items (dlg, kmi->kl);
1602                  return TRUE;                  return TRUE;
1603              }              }
1604              break;              break;
# Line 1556  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1607  keymanager_dlg_proc (HWND dlg, UINT msg,
1607              if (!wait_for_progress_cb (0))              if (!wait_for_progress_cb (0))
1608                  break;                  break;
1609              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {              if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
1610                  l_idx =listview_get_curr_pos (kmi->lv);                  POINT p;
1611                    HMENU popup;
1612    
1613                    l_idx = listview_get_curr_pos (kmi->lv);
1614                  if (l_idx == -1)                  if (l_idx == -1)
1615                      return TRUE; /* Popup only when a item was selected */                                    return TRUE; /* Popup only when a item was selected */              
1616                  GetCursorPos (&p);                  GetCursorPos (&p);
# Line 1564  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1618  keymanager_dlg_proc (HWND dlg, UINT msg,
1618                  popup = GetSubMenu (hm, 0);                  popup = GetSubMenu (hm, 0);
1619                  translate_popupmenu_strings (popup);                  translate_popupmenu_strings (popup);
1620    
1621                  if (km_check_for_seckey (kmi->lv, l_idx, &i) &&                  if (km_check_for_seckey (kmi->kl, l_idx, &i) &&
1622                      !(km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED))                      !(km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED))
1623                      set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);                      set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);
1624                  if (i == 0)                  if (i == 0)
1625                      set_menu_state (popup, ID_KEYCTX_MAXTRUST, MF_ENABLED);                      set_menu_state (popup, ID_KEYCTX_MAXTRUST, MF_ENABLED);
1626                  if (!km_check_for_seckey (kmi->lv, l_idx, NULL) ||                  if (!km_check_for_seckey (kmi->kl, l_idx, NULL) ||
1627                      (km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED)) {                      (km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED)) {
1628                      set_menu_state (popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED);
1629                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);
1630                      set_menu_state (popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED);
# Line 1578  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1632  keymanager_dlg_proc (HWND dlg, UINT msg,
1632                      set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED );                      set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED );
1633                      set_menu_state (popup, ID_KEYCTX_SETPREFKS, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SETPREFKS, MF_DISABLED|MF_GRAYED);
1634                  }                  }
1635                  else if (km_check_for_seckey (kmi->lv, l_idx, NULL) &&                  else if (km_check_for_seckey (kmi->kl, l_idx, NULL) &&
1636                           km_key_is_v3 (kmi->lv, l_idx)) {                           km_key_is_v3 (kmi->kl, l_idx)) {
1637                      /* PGP 2 keys, version 3 have no no support for photo-id's,                      /* PGP 2 keys, version 3 have no no support for photo-id's,
1638                         designated revokers and secondary keys. */                         designated revokers and secondary keys. */
1639                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);
1640                      set_menu_state (popup, ID_KEYCTX_ADDREV, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDREV, MF_DISABLED|MF_GRAYED);
1641                      set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDPHOTO, MF_DISABLED|MF_GRAYED);
1642                  }                  }
1643                  if (km_get_key_status( kmi->lv, l_idx ) & KM_FLAG_DISABLED)                  if (km_get_key_status (kmi->kl, l_idx ) & KM_FLAG_DISABLED)
1644                      set_menu_state (popup, ID_KEYCTX_DISABLE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_DISABLE, MF_DISABLED|MF_GRAYED);
1645                  else                  else
1646                      set_menu_state (popup, ID_KEYCTX_ENABLE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ENABLE, MF_DISABLED|MF_GRAYED);
1647                  if (km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED ||                  if (km_get_key_status (kmi->kl, l_idx) & KM_FLAG_REVOKED ||
1648                      km_get_key_status (kmi->lv, l_idx) & KM_FLAG_EXPIRED)                      km_get_key_status (kmi->kl, l_idx) & KM_FLAG_EXPIRED)
1649                      set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_SIGN, MF_DISABLED|MF_GRAYED);
1650                  if (!clip_contains_pgpkey ())                  if (!clip_contains_pgpkey ())
1651                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_PASTE, MF_DISABLED|MF_GRAYED);
# Line 1607  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1661  keymanager_dlg_proc (HWND dlg, UINT msg,
1661                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);                  set_menu_text (popup, ID_KEYCTX_KS_DEFAULT, host);
1662                  {                  {
1663                      HMENU ks = GetSubMenu (popup, 19);                      HMENU ks = GetSubMenu (popup, 19);
1664                      for (i=0; server[i].name != NULL; i++)                                            for (i=0; server[i].name != NULL && server[i].used; i++)                    
1665                          insert_menu_item (ks, i+2, WM_APP+i, server[i].name);                          insert_menu_item (ks, i+2, WM_APP+i, server[i].name);
1666                  }                  }
1667                  popup_gpg_readonly (dlg, popup);                  popup_gpg_readonly (dlg, popup);
# Line 1643  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1697  keymanager_dlg_proc (HWND dlg, UINT msg,
1697                      kmi->keylist_sortby ^= KEYLIST_SORT_DESC;                      kmi->keylist_sortby ^= KEYLIST_SORT_DESC;
1698                  else                  else
1699                      kmi->keylist_sortby = sortby;                      kmi->keylist_sortby = sortby;
1700                  keylist_sort (kmi->lv, kmi->keylist_sortby);                  keylist_sort (kmi->kl, kmi->keylist_sortby);
1701                  km_gui_adjust_column_images (kmi->lv, kmi->keylist_sortby);                  km_gui_adjust_column_images (kmi, kmi->keylist_sortby);
   
1702                  return TRUE;                  return TRUE;
1703              }              }
1704              break;              break;
# Line 1663  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1716  keymanager_dlg_proc (HWND dlg, UINT msg,
1716          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1717          return TRUE;          return TRUE;
1718                    
     case WM_SYSCOMMAND:  
         if (LOWORD (wparam) == SC_CLOSE)  
             EndDialog (dlg, TRUE);  
         return FALSE;  
           
1719      case WM_MENUSELECT:      case WM_MENUSELECT:
1720          change_edit_menu (kmi->lv, (HMENU)lparam, LOWORD (wparam));          change_edit_menu (kmi->lv, (HMENU)lparam, LOWORD (wparam));
1721          change_key_menu ((HMENU)lparam, LOWORD (wparam));          change_key_menu ((HMENU)lparam, LOWORD (wparam));
# Line 1678  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1726  keymanager_dlg_proc (HWND dlg, UINT msg,
1726          if ((UINT)LOWORD (lparam) == 3)          if ((UINT)LOWORD (lparam) == 3)
1727              set_menu_text_bypos (hm, 0, _("New"));              set_menu_text_bypos (hm, 0, _("New"));
1728          else if ((UINT)LOWORD (lparam) == 1)          else if ((UINT)LOWORD (lparam) == 1)
1729              set_menu_text_bypos (hm, 8, _("Preferences..."));              set_menu_text_bypos (hm, 8, _("Preferences"));
1730          return FALSE;          return FALSE;
1731    
1732      case WM_COMMAND:      case WM_COMMAND:
# Line 1688  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1736  keymanager_dlg_proc (HWND dlg, UINT msg,
1736                       _("Key Manager"), MB_ERR);                       _("Key Manager"), MB_ERR);
1737              return FALSE;              return FALSE;
1738          }          }
1739            
         /*wait_for_progress_cb ();*/  
1740          switch (LOWORD (wparam)) {          switch (LOWORD (wparam)) {
1741                
1742          case ID_KEYMISC_QUIT:          case ID_KEYMISC_QUIT:
1743            case IDCANCEL:
1744              EndDialog (dlg, TRUE);              EndDialog (dlg, TRUE);
1745              return TRUE;              return TRUE;
1746                    
1747          case ID_KEYMISC_FIND:          case ID_KEYMISC_FIND:
1748              km_find_key (dlg, kmi->lv);              km_find_key (dlg, kmi->kl);
1749              break;              break;
1750    
1751          case ID_KEYMISC_DELETE:          case ID_KEYMISC_DELETE:
1752          case ID_KEYMISC_DELETE2:          case ID_KEYMISC_DELETE2:
1753              if (!km_delete_keys (kmi->lv, dlg))              if (!km_delete_keys (kmi->kl, dlg)) {
1754                  update_status_bar (kmi->statbar, kmi->lv);                  update_status_bar (kmi->statbar, kmi->lv);
1755                    keylist_sync (kmi->kl);
1756                }
1757              return TRUE;              return TRUE;
1758                            
1759          case ID_KEYMISC_SIGN:          case ID_KEYMISC_SIGN:
# Line 1711  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1762  keymanager_dlg_proc (HWND dlg, UINT msg,
1762                           _("Key Manager"), MB_ERR);                           _("Key Manager"), MB_ERR);
1763                  return TRUE;                  return TRUE;
1764              }              }
1765              if (km_check_key_status (kmi->lv, kmi->lv_idx))              if (km_check_key_status (kmi->kl, kmi->lv_idx))
1766                  return TRUE;                  return TRUE;
1767              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
1768              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIGN, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIGN, dlg,
1769                                keysign_dlg_proc, (LPARAM)&k,                                keysign_dlg_proc, (LPARAM)&k,
1770                                _("Key Signing"), IDS_WINPT_KEYSIGN);                                _("Key Signing"), IDS_WINPT_KEYSIGN);
1771              if (k.update)              if (k.update)
1772                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
1773              return TRUE;              return TRUE;
1774                            
1775          case ID_KEYMISC_REVCERT:          case ID_KEYMISC_REVCERT:
# Line 1738  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1789  keymanager_dlg_proc (HWND dlg, UINT msg,
1789                  }                  }
1790              }              }
1791    
1792              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
1793              if (!k.key_pair) {              if (!k.key_pair) {
1794                  msg_box (dlg, _("There is no secret key available!"),                  msg_box (dlg, _("There is no secret key available!"),
1795                          _("Key Manager"), MB_ERR);                          _("Key Manager"), MB_ERR);
# Line 1754  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1805  keymanager_dlg_proc (HWND dlg, UINT msg,
1805                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1806                  return TRUE;                  return TRUE;
1807              }              }
1808              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
1809              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
1810                                keytrust_dlg_proc, (LPARAM)&k,                                keytrust_dlg_proc, (LPARAM)&k,
1811                                _("List Trust Path"), IDS_WINPT_KEYTRUST);                                _("List Trust Path"), IDS_WINPT_KEYTRUST);
# Line 1765  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1816  keymanager_dlg_proc (HWND dlg, UINT msg,
1816                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1817                  return TRUE;                  return TRUE;
1818              }              }
1819              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
1820              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG_TREE, dlg,
1821                                sigtree_dlg_proc, (LPARAM)&k,                                sigtree_dlg_proc, (LPARAM)&k,
1822                                _("Key Signature List"), IDS_WINPT_KEYSIG);                                _("Key Signature List"), IDS_WINPT_KEYSIG);
1823              if (k.update)              if (k.update)
1824                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
1825              if (updated_keys_avail ())              if (updated_keys_avail ())
1826                  refresh_keylist (kmi);                  refresh_keylist (kmi);
1827              return TRUE;              return TRUE;
# Line 1780  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1831  keymanager_dlg_proc (HWND dlg, UINT msg,
1831                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1832                  return TRUE;                  return TRUE;
1833              }              }
1834              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
1835              k.callback.ctl = kmi->lv;              k.callback.ctl = kmi->lv;
1836              k.callback.idx = kmi->lv_idx;              k.callback.idx = kmi->lv_idx;
1837              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYPROPS, dlg,
1838                                keyprops_dlg_proc, (LPARAM)&k,                                keyprops_dlg_proc, (LPARAM)&k,
1839                                _("Key Properties"), IDS_WINPT_KEYPROPS);                                _("Key Properties"), IDS_WINPT_KEYPROPS);
1840              if (k.update)              if (k.update)
1841                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, k.key_pair);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, k.key_pair);
1842              return TRUE;              return TRUE;
1843                            
1844          case ID_KEYMISC_RECACHE:          case ID_KEYMISC_RECACHE:
# Line 1807  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1858  keymanager_dlg_proc (HWND dlg, UINT msg,
1858              name = NULL;              name = NULL;
1859              gpg_rebuild_cache (&name);              gpg_rebuild_cache (&name);
1860              if (name != NULL) {              if (name != NULL) {
1861                  char *line = strchr (name, '\n');                  int a = strchr (name, '(') - name + 1;
1862                  show_msg (dlg, 2000, line? name + (line-name)+1 : name);                  int b = strchr (name+a, ' ') - name;
1863                    if (a > 0 && b > 0) {
1864                        char *inf = substr(name, a, b);
1865                        char buf[256];
1866                        _snprintf (buf, DIM (buf)-1, _("GPG Output: %d keys, %s signatures"),
1867                                   listview_count_items (kmi->lv, 0), inf);
1868                        show_msg (dlg, 2000, buf);
1869                        free_if_alloc (inf);
1870                    }
1871                  safe_free (name);                  safe_free (name);
1872              }              }
1873              SetForegroundWindow (dlg);              SetForegroundWindow (dlg);
# Line 1817  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1876  keymanager_dlg_proc (HWND dlg, UINT msg,
1876          case ID_KEYMISC_NEWKEY:          case ID_KEYMISC_NEWKEY:
1877              memset (&genkey, 0, sizeof (genkey));              memset (&genkey, 0, sizeof (genkey));
1878              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYGEN, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYGEN, dlg,
1879                                keygen_dlg_proc, (LPARAM)&genkey, _("Key Generation"),                                keygen_dlg_proc, (LPARAM)&genkey,
1880                                  _("Key Generation"),
1881                                IDS_WINPT_KEYGEN);                                IDS_WINPT_KEYGEN);
1882              if (genkey.cancel == 0)              if (genkey.cancel == 0)
1883                  refresh_keylist (kmi);                  refresh_keylist (kmi);
# Line 1897  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1957  keymanager_dlg_proc (HWND dlg, UINT msg,
1957              if (listview_count_items (kmi->lv, 1) > 1)              if (listview_count_items (kmi->lv, 1) > 1)
1958                  name = m_strdup ("Exported_GPG_Keys.asc");                  name = m_strdup ("Exported_GPG_Keys.asc");
1959              else {              else {
1960                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);                  key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
1961                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);
1962              }              }
1963              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1964              free_if_alloc (name);              free_if_alloc (name);
1965              if (t == NULL)              if (t == NULL)
1966                  return TRUE;                  return TRUE;
1967              km_file_export (dlg, kmi->lv, t);              km_file_export (dlg, kmi->kl, t);
1968              return TRUE;              return TRUE;
1969                            
1970          case ID_KEYMISC_EXPORT_PRIVKEY:          case ID_KEYMISC_EXPORT_PRIVKEY:
# Line 1912  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1972  keymanager_dlg_proc (HWND dlg, UINT msg,
1972                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1973                  return TRUE;                  return TRUE;
1974              }              }
1975              if( !km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {              if( !km_check_for_seckey (kmi->kl, kmi->lv_idx, NULL)) {
1976                  msg_box (dlg, _("There is no corresponding secret key for this key."),                  msg_box (dlg, _("There is no corresponding secret key for this key."),
1977                           _("Key Manager"), MB_ERR);                           _("Key Manager"), MB_ERR);
1978                  return TRUE;                  return TRUE;
# Line 1930  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1990  keymanager_dlg_proc (HWND dlg, UINT msg,
1990                              "Do you really want to export the key?"),                              "Do you really want to export the key?"),
1991                            _("WARNING"), MB_INFO|MB_YESNO);                            _("WARNING"), MB_INFO|MB_YESNO);
1992              if (i == IDYES) {              if (i == IDYES) {
1993                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);                  key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
1994                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);                  name = km_gen_export_filename (key->subkeys->keyid+8, 1);
1995                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1996                  if (t != NULL)                            if (t != NULL)          
1997                      km_privkey_export (dlg, kmi->lv, t);                      km_privkey_export (dlg, kmi->kl, t);
1998              }              }
1999              return TRUE;              return TRUE;
2000    
# Line 1944  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2004  keymanager_dlg_proc (HWND dlg, UINT msg,
2004                                IDS_WINPT_ABOUT);                                IDS_WINPT_ABOUT);
2005              break;              break;
2006    
2007            case ID_KEYMISC_FAQWWW:
2008                ShellExecute (dlg, "open", "http://winpt.gnupt.de/faq.php",
2009                              NULL, NULL, SW_SHOW);
2010                break;
2011                
2012          case ID_KEYMISC_DEVWWW:          case ID_KEYMISC_DEVWWW:
2013              ShellExecute (dlg, "open", "http://wald.intevation.org/projects/winpt",              ShellExecute (dlg, "open", "http://wald.intevation.org/projects/winpt",
2014                            NULL, NULL, SW_SHOW);                            NULL, NULL, SW_SHOW);
2015              break;              break;
2016    
2017          case ID_KEYMISC_WEBSITE:          case ID_KEYMISC_WEBSITE:
2018              ShellExecute (dlg, "open", "http://www.stud.uni-hannover.de/~twoaday/winpt.html",              ShellExecute (dlg, "open", "http://winpt.gnupt.de",
2019                            NULL, NULL, SW_SHOW);                            NULL, NULL, SW_SHOW);
2020              break;              break;
2021    
# Line 1965  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2030  keymanager_dlg_proc (HWND dlg, UINT msg,
2030              break;              break;
2031    
2032          case ID_KEYMISC_EDITKEY:          case ID_KEYMISC_EDITKEY:
2033              if (km_get_key (kmi->lv, kmi->lv_idx, &k))              if (km_get_key (kmi->kl, kmi->lv_idx, &k))
2034                  break;                  break;
2035              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,
2036                                keyedit_main_dlg_proc, (LPARAM)&k,                                keyedit_main_dlg_proc, (LPARAM)&k,
2037                                _("Key Edit"), IDS_KEYCTX_EDIT);                                _("Key Edit"), IDS_KEYCTX_EDIT);
2038              if (k.update)              if (k.update)
2039                  update_key (kmi->lv,  kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->kl,  kmi->lv_idx, k.tmp_keyid, 1);
2040              break;              break;
2041                            
2042          case ID_KEYMISC_COPY:          case ID_KEYMISC_COPY:
2043              km_clip_export (dlg, kmi->lv);              km_clip_export (dlg, kmi->kl);
2044              break;              break;
2045                            
2046          case ID_KEYMISC_SELALL:          case ID_KEYMISC_SELALL:
# Line 1987  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2052  keymanager_dlg_proc (HWND dlg, UINT msg,
2052              break;              break;
2053                            
2054          case ID_KEYCTX_SETPREFKS:          case ID_KEYCTX_SETPREFKS:
2055              if (km_get_key (kmi->lv, kmi->lv_idx, &k))              if (km_get_key (kmi->kl, kmi->lv_idx, &k))
2056                  break;                  break;
2057              keyedit_set_pref_keyserver (&k, dlg);              keyedit_set_pref_keyserver (&k, dlg);
2058              break;              break;
# Line 1998  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2063  keymanager_dlg_proc (HWND dlg, UINT msg,
2063                           _("Key Manager"), MB_INFO);                           _("Key Manager"), MB_INFO);
2064                  listview_select_all (kmi->lv);                  listview_select_all (kmi->lv);
2065              }              }
2066              if (!km_refresh_from_keyserver (kmi->lv, dlg))              if (!km_refresh_from_keyserver (kmi->kl, dlg))
2067                  msg_box (dlg, _("Keyserver refresh finished."),                  msg_box (dlg, _("Keyserver refresh finished."),
2068                           _("Key Manager"), MB_OK);                           _("Key Manager"), MB_OK);
2069              break;              break;
# Line 2017  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2082  keymanager_dlg_proc (HWND dlg, UINT msg,
2082              break;              break;
2083    
2084          case ID_KEYCTX_SIGN:          case ID_KEYCTX_SIGN:
2085              send_cmd_id( dlg, ID_KEYMISC_SIGN );              send_cmd_id (dlg, ID_KEYMISC_SIGN);
2086              break;              break;
2087    
2088          case ID_KEYCTX_DEL:          case ID_KEYCTX_DEL:
# Line 2025  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2090  keymanager_dlg_proc (HWND dlg, UINT msg,
2090              break;              break;
2091    
2092          case ID_KEYCTX_REV:          case ID_KEYCTX_REV:
2093              send_cmd_id( dlg, ID_KEYMISC_REVCERT );              send_cmd_id (dlg, ID_KEYMISC_REVCERT);
2094              break;              break;
2095    
2096          case ID_KEYCTX_SENDMAIL:          case ID_KEYCTX_SENDMAIL:
2097              km_send_to_mail_recipient (kmi->lv, dlg);              km_send_to_mail_recipient (kmi->kl, dlg);
2098              break;              break;
2099    
2100          case ID_KEYCTX_KS_DEFAULT:          case ID_KEYCTX_KS_DEFAULT:
2101              host = kserver_get_hostname (0, -1, &port);              host = kserver_get_hostname (0, -1, &port);
2102              km_send_to_keyserver (kmi->lv, dlg, host, port);              km_send_to_keyserver (kmi->kl, dlg, host, port);
2103              break;              break;
2104    
2105          case ID_KEYCTX_ADDKEY:          case ID_KEYCTX_ADDKEY:
2106              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
2107              keyedit_add_subkey (&k, dlg, NULL);              keyedit_add_subkey (&k, dlg, NULL);
2108              if (k.update)              if (k.update)
2109                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
2110              break;              break;
2111    
2112          case ID_KEYCTX_ADDUID:          case ID_KEYCTX_ADDUID:
2113              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
2114              keyedit_add_userid (&k, dlg, NULL);              keyedit_add_userid (&k, dlg, NULL);
2115              if (k.update)              if (k.update)
2116                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
2117              break;              break;
2118    
2119          case ID_KEYCTX_ADDREV:          case ID_KEYCTX_ADDREV:
2120              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
2121              keyedit_add_revoker (&k, dlg);              keyedit_add_revoker (&k, dlg);
2122              if (k.update)              if (k.update)
2123                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
2124              break;              break;
2125    
2126          case ID_KEYCTX_ADDPHOTO:          case ID_KEYCTX_ADDPHOTO:
2127              km_get_key (kmi->lv, kmi->lv_idx, &k);              km_get_key (kmi->kl, kmi->lv_idx, &k);
2128              keyedit_add_photo (&k, dlg);              keyedit_add_photo (&k, dlg);
2129              if (k.update)              if (k.update)
2130                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 1);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 1);
2131              break;              break;
2132    
2133          case ID_KEYCTX_RECVFROM:          case ID_KEYCTX_RECVFROM:
2134              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->kl, dlg);
2135              if (updated_keys_avail ())              if (updated_keys_avail ())
2136                  refresh_keylist (kmi);                  refresh_keylist (kmi);
2137              break;              break;
# Line 2090  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2155  keymanager_dlg_proc (HWND dlg, UINT msg,
2155          case ID_KEYCTX_DISABLE:          case ID_KEYCTX_DISABLE:
2156          case ID_KEYCTX_ENABLE:          case ID_KEYCTX_ENABLE:
2157              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
2158              if (km_get_key (kmi->lv, kmi->lv_idx, &k))              if (km_get_key (kmi->kl, kmi->lv_idx, &k))
2159                  break;                  break;
2160              rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);              rc = km_enable_disable_key (kmi->kl, dlg, kmi->lv_idx, i);
2161              if (!rc)              if (!rc)
2162                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
2163              break;              break;
2164    
2165          case ID_KEYCTX_LISTSIGS:          case ID_KEYCTX_LISTSIGS:
# Line 2102  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2167  keymanager_dlg_proc (HWND dlg, UINT msg,
2167              break;              break;
2168    
2169          case ID_KEYCTX_MAXTRUST:          case ID_KEYCTX_MAXTRUST:
2170              if (km_get_key (kmi->lv, kmi->lv_idx, &k))              if (km_get_key (kmi->kl, kmi->lv_idx, &k))
2171                  break;                  break;
2172              rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);              rc = km_set_implicit_trust (dlg, kmi->kl, kmi->lv_idx);
2173              if (!rc)              if (!rc)
2174                  update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);                  update_key (kmi->kl, kmi->lv_idx, k.tmp_keyid, 0);
2175              break;              break;
2176    
2177          case ID_KEYCTX_SETDEFKEY:          case ID_KEYCTX_SETDEFKEY:
2178              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {              if (!km_check_key_status (kmi->kl, kmi->lv_idx)) {
2179                  key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);                  key = km_get_key_ptr (kmi->kl, kmi->lv_idx, NULL);
2180                  rc = set_gnupg_default_key (key->subkeys->keyid+8);                  rc = set_gnupg_default_key (key->subkeys->keyid+8);
2181                  if (rc)                  if (rc)
2182                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
# Line 2123  keymanager_dlg_proc (HWND dlg, UINT msg, Line 2188  keymanager_dlg_proc (HWND dlg, UINT msg,
2188          case ID_KEYMISC_VIEWCIPHER:          case ID_KEYMISC_VIEWCIPHER:
2189          case ID_KEYMISC_VIEWTYPE:          case ID_KEYMISC_VIEWTYPE:
2190          case ID_KEYMISC_VIEWCREAT:          case ID_KEYMISC_VIEWCREAT:
2191          case ID_KEYMISC_VIEWDESC:          case ID_KEYMISC_VIEWUID:
2192              hm = GetMenu (dlg);              hm = GetMenu (dlg);
2193              i = get_menu_state (hm, LOWORD (wparam));              i = get_menu_state (hm, LOWORD (wparam));
2194              set_menu_state (hm, LOWORD (wparam),              set_menu_state (hm, LOWORD (wparam),
Legend:
Removed from v.300  
changed lines
  Added in v.328
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26