/[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 128 by twoaday, Mon Dec 19 13:05:59 2005 UTC revision 147 by twoaday, Fri Jan 13 14:21:16 2006 UTC
# Line 41  Line 41 
41  #include "wptKeyserver.h"  #include "wptKeyserver.h"
42  #include "wptKeyEdit.h"  #include "wptKeyEdit.h"
43  #include "wptRegistry.h"  #include "wptRegistry.h"
44    #include "wptUTF8.h"
45    
46  /* Name and ID of the separator window. */  /* Name and ID of the separator window. */
47  #define KM_SEPARATOR_ID                10000  #define KM_SEPARATOR_ID                 10000
48  #define WINDOWCLASS_SEPARATOR_CHILD "WINPT_SEP_CHILD"  #define WINDOWCLASS_SEPARATOR_CHILD     "WINPT_SEP_CHILD"
49    
50  /* Virtual key codes. */  /* Virtual key codes. */
51  #ifndef VK_F  #ifndef VK_F
# Line 64  static subclass_s keylist_proc; Line 65  static subclass_s keylist_proc;
65    
66  HIMAGELIST glob_imagelist;  HIMAGELIST glob_imagelist;
67    
68  struct km_info {  struct km_info_s {
69      /* Window positions */      /* Window positions */
70      int pos_x, pos_y;      int pos_x, pos_y;
71      int ypos_sep;      int ypos_sep;
# Line 154  keylist_subclass_proc (HWND dlg, UINT ms Line 155  keylist_subclass_proc (HWND dlg, UINT ms
155  }  }
156    
157    
158    #define ico2idx(ico) imagelist_getindex((ico))
159    
160  static HWND  static HWND
161  load_toolbar (HWND dlg, struct km_info *kmi)  load_toolbar (HWND dlg, struct km_info_s *kmi)
162  {  {
163      HWND tbwnd;      HWND tbwnd;
164      TBSAVEPARAMS tbsp;      TBSAVEPARAMS tbsp;
165      TBBUTTON tb_buttons[] = {      TBBUTTON tb_buttons[] = {
166          /*{imagelist_getindex(IMI_EXIT),       ID_KEYMISC_QUIT,   TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0L, 0},*/          {ico2idx (IMI_KEY_NEW),    ID_KEYMISC_KEYWIZARD, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L},
167          {imagelist_getindex(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},
168          {imagelist_getindex(IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_PROPS),  ID_KEYMISC_PROPS,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
169          {imagelist_getindex(IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_SIGN),   ID_KEYMISC_SIGN,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
170            {ico2idx (IMI_KEY_SEARCH), ID_KEYMISC_SENDRECV, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
171          {0,                                  0,                 0,               TBSTYLE_SEP,    {0}, 0L, 0},          {0,                                  0,                 0,               TBSTYLE_SEP,    {0}, 0L, 0},
172          {imagelist_getindex(IMI_KEY_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_FILE_IMPORT), ID_KEYMISC_IMPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
173          {imagelist_getindex(IMI_KEY_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},          {ico2idx (IMI_KEY_FILE_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
174            {ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
175            {ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
176       };       };
177            
178      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,      tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
# Line 193  load_toolbar (HWND dlg, struct km_info * Line 199  load_toolbar (HWND dlg, struct km_info *
199  /* Restore the width of the columns from the registry.  /* Restore the width of the columns from the registry.
200     If no bitstring was found, the default size is used. */     If no bitstring was found, the default size is used. */
201  int  int
202  restore_column_size (listview_ctrl_t hd)  restore_column_info (listview_ctrl_t hd)
203  {  {
204      WORD *buf;      WORD *buf;
205      HKEY root;      HKEY root;
# Line 219  restore_column_size (listview_ctrl_t hd) Line 225  restore_column_size (listview_ctrl_t hd)
225    
226      /* check for garbled values. */      /* check for garbled values. */
227      for (i=0; i < size/2; i++) {      for (i=0; i < size/2; i++) {
228          if (buf[i] > 512) {          if (buf[i] == 0 || buf[i] > 512) {
229              free_if_alloc (buf);              free_if_alloc (buf);
230              return -1;              return -1;
231          }          }
# Line 239  restore_column_size (listview_ctrl_t hd) Line 245  restore_column_size (listview_ctrl_t hd)
245    
246  /* Save the current column width to the registry. */  /* Save the current column width to the registry. */
247  int  int
248  save_column_size (listview_ctrl_t hd)  save_column_info (listview_ctrl_t hd)
249  {  {
250      WORD *buf;      WORD *buf;
251      HKEY root;      HKEY root;
# Line 275  save_column_size (listview_ctrl_t hd) Line 281  save_column_size (listview_ctrl_t hd)
281    
282  /* Center window @dlg. */  /* Center window @dlg. */
283  static void  static void
284  do_center_window (HWND dlg, struct km_info *kmi)  do_center_window (HWND dlg, struct km_info_s *kmi)
285  {  {
286      RECT rect;      RECT rect;
287      char *p;      char *p;
# Line 324  do_center_window (HWND dlg, struct km_in Line 330  do_center_window (HWND dlg, struct km_in
330    
331  /* Resize the key manager window with the information from @kmi. */  /* Resize the key manager window with the information from @kmi. */
332  static void  static void
333  do_resize_window (HWND dlg, struct km_info *kmi)  do_resize_window (HWND dlg, struct km_info_s *kmi)
334  {  {
335      HWND h;      HWND h;
336      RECT rclient, rect;      RECT rclient, rect;
# Line 438  do_create_minpopup (HWND dlg) Line 444  do_create_minpopup (HWND dlg)
444  }  }
445    
446    
447    /* Update the default key entry in the status bar for dialog @dlg. */
448    void
449    update_default_key_str (HWND dlg)
450    {
451        const char *fmt;
452        char *keyid;
453        char defkeyinf[128];
454        
455        /* XXX: also show the name? */
456        keyid = get_gnupg_default_key ();
457        if (!keyid)
458            return;
459        if ((keyid[0] >= 'A' && keyid[0] <= 'Z') ||
460            (keyid[0] >= 'a' && keyid[0] <= 'z') ||
461            (keyid[0] == '0' && keyid[1] == 'x'))
462            fmt = _("Default Key: %s");
463        else
464            fmt = _("Default Key: 0x%s");
465        _snprintf (defkeyinf, sizeof (defkeyinf) - 1, fmt, keyid);
466        SendMessage (dlg, SB_SETTEXT, 0, (LPARAM)defkeyinf);
467        free_if_alloc (keyid);
468    }
469    
470    
471    /* Count all keys and show from @lv results in the status bar @sb. */
472    void
473    update_status_bar (HWND sb, listview_ctrl_t lv)
474    {
475        char txt_sec[128], txt_pub[128];
476        int nkeys = 0, nsec = 0;
477        int i;
478    
479        nkeys = listview_count_items (lv, 0);
480        for (i = 0; i < nkeys; i++) {
481            if (km_check_for_seckey (lv, i, NULL))
482                nsec++;
483        }
484        _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
485        _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
486        SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
487        SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt_pub);
488    }
489    
490    
491    
492  /* Reload the key cache if requested. */  /* Reload the key cache if requested. */
493  static void  static void
494  do_check_cache (listview_ctrl_t lv, HWND dlg, HWND sb)  do_check_cache (listview_ctrl_t lv, HWND dlg, HWND sb)
# Line 451  do_check_cache (listview_ctrl_t lv, HWND Line 502  do_check_cache (listview_ctrl_t lv, HWND
502          if (!cache)          if (!cache)
503              BUG (dlg);              BUG (dlg);
504          keylist_reload (lv, cache, KEYLIST_LIST, KEY_SORT_USERID);          keylist_reload (lv, cache, KEYLIST_LIST, KEY_SORT_USERID);
505          km_update_status_bar (sb, lv);          update_status_bar (sb, lv);
506      }      }
507  }  }
508    
# Line 520  separator_wnd_proc (HWND hwnd, UINT msg, Line 571  separator_wnd_proc (HWND hwnd, UINT msg,
571    
572      case WM_MOUSEMOVE:      case WM_MOUSEMOVE:
573          if (wparam == MK_LBUTTON) {          if (wparam == MK_LBUTTON) {
574              struct km_info *kmi;              struct km_info_s *kmi;
575              POINT p;              POINT p;
576              RECT r;              RECT r;
577    
578              kmi = (struct km_info *)GetWindowLong (hwnd, GWL_USERDATA);              kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
579              if (kmi == NULL)              if (kmi == NULL)
580                  break;                  break;
581    
# Line 555  separator_wnd_proc (HWND hwnd, UINT msg, Line 606  separator_wnd_proc (HWND hwnd, UINT msg,
606    
607  /* Register the separator window with @dlg as the parent window. */  /* Register the separator window with @dlg as the parent window. */
608  static HWND  static HWND
609  regist_sep_wnd (HWND dlg, struct km_info * kmi)  regist_sep_wnd (HWND dlg, struct km_info_s *kmi)
610  {  {
611      WNDCLASS wndclass;      WNDCLASS wndclass;
612      HWND h;      HWND h;
# Line 580  regist_sep_wnd (HWND dlg, struct km_info Line 631  regist_sep_wnd (HWND dlg, struct km_info
631  }  }
632    
633    
634  #define enable_button(hwnd, cid) \  #define enable_button(hwnd, cid, item_selected) \
635      SendMessage ((hwnd), TB_ENABLEBUTTON, (cid), MAKELONG (key_selected, 0))      SendMessage ((hwnd), TB_ENABLEBUTTON, (cid), MAKELONG ((item_selected), 0))
636    
637    
638  /* Interactive modification of the dialog item which depend if an item  /* Interactive modification of the dialog item which depend if an item
# Line 590  regist_sep_wnd (HWND dlg, struct km_info Line 641  regist_sep_wnd (HWND dlg, struct km_info
641  void  void
642  update_ui_items (HWND hwnd, listview_ctrl_t lv)  update_ui_items (HWND hwnd, listview_ctrl_t lv)
643  {  {
644      HWND hwnd_child;      HWND tb_hwnd;
645      HMENU hmenu;      HMENU hmenu;
646        int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,
647                             ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};
648      int key_selected = 0;      int key_selected = 0;
649      int key_has_sec = 0;      int key_has_sec = 0;
650      int key_inv = 0;      int key_inv = 0;
     int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,  
                          ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};  
651      int i, state=0;      int i, state=0;
652        
653      /* Get some states */      /* Get some states */
654      key_selected = SendMessage (GetDlgItem (hwnd, IDC_KEYMISC_KEYLIST),      key_selected = SendMessage (GetDlgItem (hwnd, IDC_KEYMISC_KEYLIST),
655                                             LVM_GETSELECTEDCOUNT, 0, 0)                                             LVM_GETSELECTEDCOUNT, 0, 0)
# Line 612  update_ui_items (HWND hwnd, listview_ctr Line 663  update_ui_items (HWND hwnd, listview_ctr
663      }      }
664    
665      /* Enable / disable toolbar buttons */      /* Enable / disable toolbar buttons */
666      hwnd_child = GetDlgItem (hwnd, IDR_WINPT_KMTB);      tb_hwnd = GetDlgItem (hwnd, IDR_WINPT_KMTB);
667      enable_button (hwnd_child, ID_KEYMISC_DELETE);      enable_button (tb_hwnd, ID_KEYMISC_DELETE, key_selected);
668      enable_button (hwnd_child, ID_KEYMISC_PROPS);      enable_button (tb_hwnd, ID_KEYMISC_PROPS, key_selected);
669      enable_button (hwnd_child, ID_KEYMISC_SIGN);      enable_button (tb_hwnd, ID_KEYMISC_SIGN, key_selected && !key_inv);
670      enable_button (hwnd_child, ID_KEYMISC_EXPORT);      enable_button (tb_hwnd, ID_KEYMISC_EXPORT, key_selected);
671        enable_button (tb_hwnd, ID_KEYCTX_COPY, key_selected);
672    
673      /* Enable / disable menu items */      /* Enable / disable menu items */
674      state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;      state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;
675      hmenu = GetMenu (hwnd);      hmenu = GetMenu (hwnd);
676      set_menu_state (hmenu, ID_KEYMISC_EXPORT, state);      set_menu_state (hmenu, ID_KEYMISC_EXPORT, state);
     set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY, state);  
     set_menu_state (hmenu, ID_KEYMISC_REVCERT, state);  
677      set_menu_state (hmenu, ID_KEYMISC_DELETE, state);      set_menu_state (hmenu, ID_KEYMISC_DELETE, state);
678      set_menu_state (hmenu, ID_KEYMISC_PROPS, state);      set_menu_state (hmenu, ID_KEYMISC_PROPS, state);
679      set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);      set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);
680      set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);      set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);
681      set_menu_state (hmenu, ID_KEYMISC_SIGN, key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);      set_menu_state (hmenu, ID_KEYMISC_SIGN,
682                        key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
683        set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY,
684                        key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
685        set_menu_state (hmenu, ID_KEYMISC_REVCERT,
686                        key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
687    
688      /* Disable some menu items when multiple keys are selected. */      /* Disable some menu items when multiple keys are selected. */
689      if (listview_count_items (lv, 1) > 1) {      if (listview_count_items (lv, 1) > 1) {
690          for (i=0; mult_resids[i] != 0; i++)          for (i=0; mult_resids[i] != 0; i++)
691              set_menu_state (hmenu, mult_resids[i], MF_GRAYED);              set_menu_state (hmenu, mult_resids[i], MF_GRAYED);
692      }      }
693    
694        /* Disable all secret-key functions when no secret key is available. */
695        {
696            gpg_keycache_t sec = keycache_get_ctx (0);
697            if (gpg_keycache_get_size (sec) == 0) {
698                enable_button (tb_hwnd, ID_KEYMISC_SIGN, FALSE);
699                set_menu_state (hmenu, ID_KEYMISC_SIGN, MF_GRAYED);
700            }
701        }
702  }  }
703    
704    
# Line 753  change_key_menu (HMENU hm, int id) Line 817  change_key_menu (HMENU hm, int id)
817  }  }
818    
819    
 /* Return a user-friendly name for a key derrived from  
    name. If @is_secret is 1, a secret key name will be generated. */  
 static char*  
 gen_export_filename (const char *keyid, int is_secret)  
 {  
     gpgme_key_t key;  
     const char *s;  
     char *p;  
   
     if (get_pubkey (keyid, &key))  
         return m_strdup (keyid);  
     s = key->uids->name;  
     if (!s)  
         return m_strdup (keyid);  
     p = new char[strlen (s) + 8 + 16];  
     if (!p)  
         BUG (0);  
     sprintf (p, "%s%s.asc", s, is_secret? "_sec" : "");  
     for (size_t i=0; i < strlen (p); i++) {  
         if (p[i] == ' ' || p[i] == ':' || p[i] == '?' || p[i] == '|')  
             p[i] = '_';  
     }  
     return p;  
 }  
   
   
820  /* Reload a single key in the cache. */  /* Reload a single key in the cache. */
821  static void  static void
822  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)  update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)
# Line 814  setup_status_bar (HWND dlg, listview_ctr Line 852  setup_status_bar (HWND dlg, listview_ctr
852      ShowWindow (statbar, SW_SHOW);      ShowWindow (statbar, SW_SHOW);
853      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);      SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
854    
855      km_update_default_key_str (statbar);      update_default_key_str (statbar);
856      km_update_status_bar (statbar, lv);      update_status_bar (statbar, lv);
857    
858      return statbar;      return statbar;
859  }  }
860    
861    
862    /* Remove or add columns which depends on the state of @checked. */
863    void
864    modify_listview_columns (km_info_s *kmi, UINT m_uid, BOOL checked)
865    {
866        UINT resids[] = {
867            0,
868            ID_KEYMISC_VIEWKEYID,
869            ID_KEYMISC_VIEWTYPE,
870            0,
871            ID_KEYMISC_VIEWCIPHER,
872            0,
873            0,
874            ID_KEYMISC_VIEWCREAT,
875            -1
876        };
877        listview_column_s cols[] = {
878        {0, 240, (char *)_("User ID")},
879        {1, 78, (char *)_("Key ID")},
880        {2, 52, (char *)_("Type")},    
881        {3, 66, (char *)_("Size")},
882        {4, 60, (char *)_("Cipher")},
883        {5, 66, (char *)_("Validity")},
884        {6, 58, (char *)_("Trust")},
885        {7, 72, (char *)_("Creation")},
886        {0, 0, NULL}
887        };
888        UINT pos;
889    
890        for (pos=0; resids[pos] != -1; pos++) {
891            if (m_uid == resids[pos])
892                break;
893        }
894        if (!checked)
895            listview_del_column (kmi->lv, (int)pos);
896        else {      
897            listview_add_column (kmi->lv, &cols[pos]);
898            keylist_upd_col (kmi->lv, pos);
899        }
900    }
901    
902    
903    /* Helper to handle the help file. If @check is 1
904       the existence of the file is checked.
905       Otherwise the help file will be loaded. */
906    static bool
907    start_help (HWND dlg, int check)
908    {
909        DWORD n;
910        char path[MAX_PATH+1+32];
911    
912        n = GetModuleFileName (NULL, path, sizeof (path)-1-32);
913        if (!n)
914            return false;
915        path[n] = 0;
916        while (n-- && path[n] != '\\')
917            ;
918        path[n+1] = 0;
919        strcat (path, "winpt.chm");
920        if (!check)
921            ShellExecute (dlg, "open", path, NULL, NULL, SW_SHOW);
922        return file_exist_check (path) == 0? true : false;
923    }
924    
925  /* Translate all menu strings. */  /* Translate all menu strings. */
926  static void  static void
927  translate_menu_strings (HWND dlg)  translate_menu_strings (HWND dlg)
# Line 849  translate_menu_strings (HWND dlg) Line 950  translate_menu_strings (HWND dlg)
950      set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));      set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));
951      set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));      set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));
952      set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));      set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));
953      set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke"));      set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert"));
954      set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));      set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));
955      set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));      set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));
956      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));      set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
# Line 865  translate_menu_strings (HWND dlg) Line 966  translate_menu_strings (HWND dlg)
966      set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );      set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );
967      set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));      set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
968    
969      /* XXX: implement help code. */      set_menu_text (menu, ID_KEYMISC_VIEWKEYID, _("Key ID"));
970      set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);      set_menu_text (menu, ID_KEYMISC_VIEWCIPHER, _("Cipher"));
971        set_menu_text (menu, ID_KEYMISC_VIEWTYPE, _("Type"));
972        set_menu_text (menu, ID_KEYMISC_VIEWCREAT, _("Creation"));
973    
974        if (!start_help (NULL, 1))
975            set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
976    
977      SetMenu (dlg, menu);      SetMenu (dlg, menu);
978  }  }
# Line 888  translate_popupmenu_strings (HMENU popup Line 994  translate_popupmenu_strings (HMENU popup
994      set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));      set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));
995      set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));      set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));
996      set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));      set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
997      set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke"));      set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert"));
998      set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));      set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));
999      set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));      set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));
1000      set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));      set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));
# Line 909  translate_popupmenu_strings (HMENU popup Line 1015  translate_popupmenu_strings (HMENU popup
1015  }  }
1016    
1017    
1018    /* Add all recently updated keys in the cache to the list. */
1019    static void
1020    refresh_keylist (listview_ctrl_t lv)
1021    {
1022        struct keycache_s *ctx;
1023        gpg_keycache_t kc;
1024    
1025        kc = keycache_get_ctx (1);
1026        while (!gpg_keycache_next_updated_key (kc, &ctx)) {
1027            keylist_add_key (lv, KEYLIST_LIST, ctx->key);
1028            /*msg_box (NULL, ctx->key->uids->name, "debug", MB_OK);*/
1029        }
1030        keylist_sort (lv, KEY_SORT_USERID);
1031    }
1032    
1033    
1034  /* Dialog box procedure for the Key Manager. */  /* Dialog box procedure for the Key Manager. */
1035  BOOL CALLBACK  BOOL CALLBACK
1036  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
1037  {  {
1038      struct km_info *kmi;      struct km_info_s *kmi;
1039      static int refresh_keys = 0;          static int refresh_keys = 0;    
1040      INITCOMMONCONTROLSEX icex;      INITCOMMONCONTROLSEX icex;
1041      HWND kl;      HWND kl;
# Line 924  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1046  keymanager_dlg_proc (HWND dlg, UINT msg,
1046      struct winpt_key_s k = {0};      struct winpt_key_s k = {0};
1047      struct URL_ctx_s *url;      struct URL_ctx_s *url;
1048      refresh_cache_s rcs = {0};      refresh_cache_s rcs = {0};
1049      char keyid[48], uid[128], type[32], *name;      char type[32], *name;
1050      const char *t, *host;      const char *t, *host;
1051      u16 port = 0;      WORD port = 0;
1052      int l_idx = 0, i=0, rc;      int l_idx = 0, i=0, rc;
1053    
1054      if ((msg != WM_INITDIALOG)      if ((msg != WM_INITDIALOG)
1055          && ((kmi = (struct km_info*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))          && ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
1056          return FALSE;          return FALSE;
1057    
1058      switch (msg) {      switch (msg) {
1059      case WM_INITDIALOG:      case WM_INITDIALOG:
1060          kmi = new struct km_info;          kmi = new struct km_info_s;
1061          memset (kmi, 0, sizeof (struct km_info));          memset (kmi, 0, sizeof (struct km_info_s));
1062          kmi->lv_idx = -1;          kmi->lv_idx = -1;
1063          icex.dwSize = sizeof (INITCOMMONCONTROLSEX);          icex.dwSize = sizeof (INITCOMMONCONTROLSEX);
1064          icex.dwICC  = ICC_BAR_CLASSES;          icex.dwICC  = ICC_BAR_CLASSES;
# Line 961  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1083  keymanager_dlg_proc (HWND dlg, UINT msg,
1083          /* init subclassing for the listview */          /* init subclassing for the listview */
1084          keylist_proc.dlg = dlg;          keylist_proc.dlg = dlg;
1085          keylist_proc.current = (WNDPROC)keylist_subclass_proc;          keylist_proc.current = (WNDPROC)keylist_subclass_proc;
1086          keylist_proc.old = (WNDPROC)GetWindowLong( kl, GWL_WNDPROC );          keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);
1087          if (keylist_proc.old) {          if (keylist_proc.old) {
1088              if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {              if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {
1089                  msg_box (dlg, _("Could not set keylist window procedure."),                  msg_box (dlg, _("Could not set keylist window procedure."),
# Line 976  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1098  keymanager_dlg_proc (HWND dlg, UINT msg,
1098          do_center_window (dlg, kmi);          do_center_window (dlg, kmi);
1099          do_resize_window (dlg, kmi);          do_resize_window (dlg, kmi);
1100          update_ui_items (dlg, kmi->lv);          update_ui_items (dlg, kmi->lv);
1101          restore_column_size (kmi->lv);          restore_column_info (kmi->lv);
1102    
1103          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));          SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
1104          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,          SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
1105                        (LPCTSTR)IDI_WINPT));                        (LPCTSTR)IDI_WINPT));
1106          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
1107            force_foreground_window (dlg, 1000);
1108          return TRUE;          return TRUE;
1109                    
1110      case WM_DESTROY:      case WM_DESTROY:
1111          save_column_size (kmi->lv);          save_column_info (kmi->lv);
1112          if (kmi->lv) {          if (kmi->lv) {
1113              keylist_delete (kmi->lv);              keylist_delete (kmi->lv);
1114              kmi->lv = NULL;                    kmi->lv = NULL;      
# Line 1036  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1159  keymanager_dlg_proc (HWND dlg, UINT msg,
1159              LPTBNOTIFY lpTbNotify;              LPTBNOTIFY lpTbNotify;
1160              lpTbNotify = (LPTBNOTIFY)lparam;              lpTbNotify = (LPTBNOTIFY)lparam;
1161              if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {              if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {
1162                  lpTbNotify->tbButton.iBitmap = imagelist_getindex(myb[lpTbNotify->iItem].icon);                  lpTbNotify->tbButton.iBitmap = imagelist_getindex (myb[lpTbNotify->iItem].icon);
1163                  lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;                  lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;
1164                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;                  lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
1165                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;                  lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
# Line 1075  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1198  keymanager_dlg_proc (HWND dlg, UINT msg,
1198    
1199              lpttt->hinst = NULL;              lpttt->hinst = NULL;
1200              switch (lpttt->hdr.idFrom) {              switch (lpttt->hdr.idFrom) {
1201                case ID_KEYMISC_KEYWIZARD:
1202                    lpttt->lpszText = (char*)_("Generate new key pair");
1203                    break;
1204    
1205                case ID_KEYMISC_SENDRECV:
1206                    lpttt->lpszText = (char*)_("Search for a specific key");
1207                    break;
1208    
1209              case ID_KEYMISC_DELETE:              case ID_KEYMISC_DELETE:
1210                  lpttt->lpszText = (char *)_("Delete key from keyring");                  lpttt->lpszText = (char *)_("Delete key from keyring");
1211                  break;                  break;
# Line 1087  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1218  keymanager_dlg_proc (HWND dlg, UINT msg,
1218                  lpttt->lpszText = (char *)_("Sign key");                  lpttt->lpszText = (char *)_("Sign key");
1219                  break;                  break;
1220    
1221                case ID_KEYCTX_COPY:
1222                    lpttt->lpszText = (char *)_("Copy key to clipboard");
1223                    break;
1224    
1225                case ID_KEYCTX_PASTE:
1226                    lpttt->lpszText = (char*)_("Paste key from clipboard");
1227                    break;
1228    
1229              case ID_KEYMISC_IMPORT:              case ID_KEYMISC_IMPORT:
1230                  lpttt->lpszText = (char *)_("Import key to keyring");                  lpttt->lpszText = (char *)_("Import key to keyring");
1231                  break;                  break;
# Line 1120  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1259  keymanager_dlg_proc (HWND dlg, UINT msg,
1259                      set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);                      set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);
1260                  if (i == 0)                  if (i == 0)
1261                      set_menu_state (popup, ID_KEYCTX_MAXTRUST, MF_ENABLED);                      set_menu_state (popup, ID_KEYCTX_MAXTRUST, MF_ENABLED);
1262                  if (!km_check_for_seckey (kmi->lv, l_idx, NULL)) {                  if (!km_check_for_seckey (kmi->lv, l_idx, NULL) ||
1263                        (km_get_key_status (kmi->lv, l_idx) & KM_FLAG_REVOKED)) {
1264                      set_menu_state (popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_REV, MF_DISABLED|MF_GRAYED);
1265                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDKEY, MF_DISABLED|MF_GRAYED);
1266                      set_menu_state (popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED);                      set_menu_state (popup, ID_KEYCTX_ADDUID, MF_DISABLED|MF_GRAYED);
# Line 1241  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1381  keymanager_dlg_proc (HWND dlg, UINT msg,
1381          case ID_KEYMISC_DELETE:          case ID_KEYMISC_DELETE:
1382          case ID_KEYMISC_DELETE2:          case ID_KEYMISC_DELETE2:
1383              if (!km_delete_keys (kmi->lv, dlg))              if (!km_delete_keys (kmi->lv, dlg))
1384                  km_update_status_bar (kmi->statbar, kmi->lv);                  update_status_bar (kmi->statbar, kmi->lv);
1385              return TRUE;              return TRUE;
1386                            
1387          case ID_KEYMISC_SIGN:          case ID_KEYMISC_SIGN:
# Line 1268  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1408  keymanager_dlg_proc (HWND dlg, UINT msg,
1408                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1409                  return TRUE;                  return TRUE;
1410              }              }
1411              listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1412              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid-1);              if (!key)
1413              if ( !km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {                  BUG (NULL);
1414                if (!km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
1415                  msg_box (dlg, _("There is no secret key available!"),                  msg_box (dlg, _("There is no secret key available!"),
1416                          _("Key Manager"), MB_ERR);                          _("Key Manager"), MB_ERR);
1417                  return TRUE;                  return TRUE;
# Line 1280  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1421  keymanager_dlg_proc (HWND dlg, UINT msg,
1421                  char state[64];                  char state[64];
1422                  listview_get_item_text (kmi->lv, kmi->lv_idx, 5,                  listview_get_item_text (kmi->lv, kmi->lv_idx, 5,
1423                                          state, sizeof (state) -1);                                          state, sizeof (state) -1);
1424                  if( strchr (state, 'R' )) {                  if (strchr (state, 'R' )) {
1425                      msg_box (dlg, _("Key already revoked!"),                      msg_box (dlg, _("Key already revoked!"),
1426                               _("Key Manager"), MB_INFO);                               _("Key Manager"), MB_INFO);
1427                      return TRUE;                      return TRUE;
# Line 1289  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1430  keymanager_dlg_proc (HWND dlg, UINT msg,
1430                            
1431              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1432              k.key_pair = 1;              k.key_pair = 1;
1433              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1434              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1435              dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,              dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,
1436                               key_revoke_dlg_proc, (LPARAM)&k,                               key_revoke_dlg_proc, (LPARAM)&k,
1437                               _("Key Revocation"), IDS_WINPT_KEYREVOKE);                               _("Key Revocation Cert"), IDS_WINPT_KEYREVOKE);
1438              return TRUE;              return TRUE;
1439                            
1440          case ID_KEYMISC_TRUSTPATH:          case ID_KEYMISC_TRUSTPATH:
# Line 1301  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1442  keymanager_dlg_proc (HWND dlg, UINT msg,
1442                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1443                  return TRUE;                  return TRUE;
1444              }              }
1445              listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid -1 );              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1446              listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid -1 );              if (km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
1447              if( km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {                  msg_box (dlg, _("It does not make any sense with a key pair!"),
1448                  msg_box( dlg, _("It does not make any sense with a key pair!"), _("Key Manager"), MB_OK );                           _("Key Manager"), MB_ERR);
1449                  return TRUE;                  return TRUE;
1450              }              }
1451              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1452              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1453              k.uid = uid;              k.uid = key->uids->uid;
1454              dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
1455                                keytrust_dlg_proc, (LPARAM)&k,                                keytrust_dlg_proc, (LPARAM)&k,
1456                                _("List Trust Path"), IDS_WINPT_KEYTRUST );                                _("List Trust Path"), IDS_WINPT_KEYTRUST);
1457              return TRUE;              return TRUE;
1458                            
1459          case ID_KEYMISC_CHECKSIGS:                    case ID_KEYMISC_CHECKSIGS:          
# Line 1320  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1461  keymanager_dlg_proc (HWND dlg, UINT msg,
1461                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);                  msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
1462                  return TRUE;                  return TRUE;
1463              }              }
1464              listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, DIM (uid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1465              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              if (!key)
1466                    BUG (NULL);
1467              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1468              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1469              k.uid = uid;              k.uid = key->uids->uid;
1470              k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);              k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1471              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg,
1472                                keysig_dlg_proc, (LPARAM)&k,                                keysig_dlg_proc, (LPARAM)&k,
# Line 1336  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1478  keymanager_dlg_proc (HWND dlg, UINT msg,
1478                  msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );                  msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
1479                  return TRUE;                  return TRUE;
1480              }              }
1481              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1482              listview_get_item_text (kmi->lv, kmi->lv_idx, 2, type, DIM (type)-1);              if (!key)
1483                    BUG (NULL);
1484              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1485              k.key_pair = 0;              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)? 1 : 0;
1486              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
             if( !strcmp( type, "pub/sec" ) || !strcmp( type, "pub/crd" ) )  
                 k.key_pair = 1;  
1487              k.callback.ctl = kmi->lv;              k.callback.ctl = kmi->lv;
1488              k.callback.idx = kmi->lv_idx;              k.callback.idx = kmi->lv_idx;
1489              k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);              k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
# Line 1356  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1497  keymanager_dlg_proc (HWND dlg, UINT msg,
1497              return TRUE;              return TRUE;
1498                            
1499          case ID_KEYMISC_RECACHE:          case ID_KEYMISC_RECACHE:
1500              /* If there is already a reload request, don't bother the user with a message. */              /* If there is already a reload request,
1501              if (keycache_get_reload() == 1)                  don't bother the user with a message. */
1502                if (keycache_get_reload () == 1)
1503                  l_idx = IDYES;                  l_idx = IDYES;
1504              else {              else {
1505                  char inf[256];                  char inf[256];
# Line 1428  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1570  keymanager_dlg_proc (HWND dlg, UINT msg,
1570              return TRUE;              return TRUE;
1571                            
1572          case ID_KEYMISC_SENDRECV:          case ID_KEYMISC_SENDRECV:
             memset (&genkey, 0, sizeof (genkey));  
1573              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSERVER, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSERVER, dlg,
1574                                keyserver_dlg_proc, (LPARAM)&genkey, _("Keyserver Access"),                                keyserver_dlg_proc, 0, _("Keyserver Access"),
1575                                IDS_WINPT_KEYSERVER);                                IDS_WINPT_KEYSERVER);
1576              if (genkey.newkey != NULL) {              refresh_keylist (kmi->lv);
                 keylist_add_key (kmi->lv, KEYLIST_LIST, genkey.newkey);  
                 keylist_sort (kmi->lv, KEY_SORT_USERID);  
             }  
1577              return TRUE;              return TRUE;
1578                            
1579          case ID_KEYMISC_GPGPREFS:          case ID_KEYMISC_GPGPREFS:
1580              dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
1581                                gpgprefs_dlg_proc, 0, _("GnuPG Preferences"),                                gpgprefs_dlg_proc, 0, _("GnuPG Preferences"),
1582                                IDS_WINPT_GPGPREFS );                                IDS_WINPT_GPGPREFS);
1583              return TRUE;              return TRUE;
1584                            
1585          case ID_KEYMISC_GPGOPT:          case ID_KEYMISC_GPGOPT:
1586              dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,              dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,
1587                                gpgopt_dlg_proc, 0, _("GnuPG Options" ),                                gpgopt_dlg_proc, 0, _("GnuPG Options"),
1588                                IDS_WINPT_GPGOPT );                                IDS_WINPT_GPGOPT);
1589              return TRUE;              return TRUE;
1590                            
1591          case ID_KEYMISC_IMPORT:          case ID_KEYMISC_IMPORT:
1592              t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"), NULL, NULL);              t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"),
1593                                      NULL, NULL);
1594              if (t)              if (t)
1595                  km_file_import (dlg, t);                  km_file_import (dlg, t);
1596              return TRUE;              return TRUE;
# Line 1465  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1604  keymanager_dlg_proc (HWND dlg, UINT msg,
1604                            
1605          case ID_KEYMISC_EXPORT:          case ID_KEYMISC_EXPORT:
1606              if (kmi->lv_idx == -1) {              if (kmi->lv_idx == -1) {
1607                  msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );                  msg_box (dlg, _("Please select a key."),
1608                             _("Key Manager"), MB_ERR);
1609                  return TRUE;                  return TRUE;
1610              }              }
1611              if (listview_count_items (kmi->lv, 1) > 1)              if (listview_count_items (kmi->lv, 1) > 1)
1612                  name = m_strdup ("Exported_GPG_Keys.asc");                  name = m_strdup ("Exported_GPG_Keys.asc");
1613              else {              else {
1614                  listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);          
1615                  name = gen_export_filename (keyid, 0);                  name = km_gen_export_filename (key->subkeys->keyid+8, 0);
1616              }              }
1617              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);              t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1618              free_if_alloc (name);              free_if_alloc (name);
# Line 1503  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1643  keymanager_dlg_proc (HWND dlg, UINT msg,
1643                              "to copy the key to a safe place.\n\n"                              "to copy the key to a safe place.\n\n"
1644                              "Do you really want to export the key?"),                              "Do you really want to export the key?"),
1645                            _("WARNING"), MB_INFO|MB_YESNO);                            _("WARNING"), MB_INFO|MB_YESNO);
1646              if( i == IDYES ) {              if (i == IDYES) {
1647                  listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-8 );                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1648                  name = gen_export_filename (keyid, 1);                  if (!key)
1649                        BUG (NULL);
1650                    name = km_gen_export_filename (key->subkeys->keyid+8, 1);
1651                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);                  t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
1652                  if (t != NULL)                            if (t != NULL)          
1653                      km_privkey_export (dlg, kmi->lv, t);                      km_privkey_export (dlg, kmi->lv, t);
# Line 1518  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1660  keymanager_dlg_proc (HWND dlg, UINT msg,
1660                                IDS_WINPT_ABOUT);                                IDS_WINPT_ABOUT);
1661              break;              break;
1662    
1663            case ID_KEYMISC_WEBSITE:
1664                ShellExecute (dlg, "open", "http://www.winpt.org",
1665                              NULL, NULL, SW_SHOW);
1666                break;
1667    
1668          case ID_KEYMISC_HELP:          case ID_KEYMISC_HELP:
1669              ShellExecute (dlg, "open", "winpt.chm", NULL, NULL, SW_SHOW);              start_help (dlg, 0);
1670              break;              break;
1671    
1672          case ID_KEYMISC_OT:          case ID_KEYMISC_OT:
1673              dialog_box_param( glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST, glob_hwnd,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST,
1674                                ownertrust_dlg_proc, 0,                                glob_hwnd, ownertrust_dlg_proc, 0,
1675                                _("Ownertrust"), IDS_WINPT_OWNERTRUST );                                _("Ownertrust"), IDS_WINPT_OWNERTRUST);
1676              break;              break;
1677    
1678          case ID_KEYMISC_EDITKEY:                    case ID_KEYMISC_EDITKEY:
1679              if (kmi->lv_idx == -1)              if (kmi->lv_idx == -1)
1680                  break;                  break;
1681              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1682                if (!key)
1683                    BUG (NULL);
1684              /* XXX: pub/crd = secret key does not work */              /* XXX: pub/crd = secret key does not work */
1685              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1686              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1687              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
1688              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1689              k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);              k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
1690              k.flags = km_get_key_status (kmi->lv, kmi->lv_idx);              k.flags = km_get_key_status (kmi->lv, kmi->lv_idx);
1691              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,
1692                                keyedit_main_dlg_proc, (LPARAM)&k,                                keyedit_main_dlg_proc, (LPARAM)&k,
1693                                _("Key Edit"), IDS_KEYCTX_EDIT);                                _("Key Edit"), IDS_KEYCTX_EDIT);
1694              if (k.update)              if (k.update)
1695                  update_key (kmi->lv,  kmi->lv_idx, keyid, 1);                  update_key (kmi->lv,  kmi->lv_idx, k.keyid, 1);
1696              break;              break;
1697                            
1698          case ID_KEYMISC_COPY:          case ID_KEYMISC_COPY:
# Line 1559  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1708  keymanager_dlg_proc (HWND dlg, UINT msg,
1708              break;              break;
1709                            
1710          case ID_KEYCTX_SETPREFKS:          case ID_KEYCTX_SETPREFKS:
1711              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM(keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1712                if (!key)
1713                    BUG (NULL);
1714              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1715              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1716              keyedit_set_pref_keyserver (&k, dlg);              keyedit_set_pref_keyserver (&k, dlg);
1717              break;              break;
1718    
# Line 1609  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1760  keymanager_dlg_proc (HWND dlg, UINT msg,
1760              break;              break;
1761    
1762          case ID_KEYCTX_ADDKEY:          case ID_KEYCTX_ADDKEY:
1763              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1764                if (!key)
1765                    BUG (NULL);
1766              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1767              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
1768              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1769              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1770              keyedit_add_subkey (&k, dlg, NULL);              keyedit_add_subkey (&k, dlg, NULL);
1771              if (k.update)              if (k.update)
1772                  update_key (kmi->lv, kmi->lv_idx, keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
1773              break;              break;
1774    
1775          case ID_KEYCTX_ADDUID:          case ID_KEYCTX_ADDUID:
1776              listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1777                if (!key)
1778                    BUG (NULL);
1779              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1780              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
1781              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1782              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1783              keyedit_add_userid (&k, dlg, NULL);              keyedit_add_userid (&k, dlg, NULL);
1784              if (k.update)              if (k.update)
1785                  update_key (kmi->lv, kmi->lv_idx, keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
1786              break;              break;
1787    
1788          case ID_KEYCTX_ADDREV:          case ID_KEYCTX_ADDREV:
1789              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1790                if (!key)
1791                    BUG (NULL);
1792              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1793              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1794              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1795              k.key_pair = km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL );              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
1796              keyedit_add_revoker (&k, dlg);              keyedit_add_revoker (&k, dlg);
1797              if (k.update)              if (k.update)
1798                  update_key (kmi->lv, kmi->lv_idx, keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
1799              break;              break;
1800    
1801          case ID_KEYCTX_ADDPHOTO:          case ID_KEYCTX_ADDPHOTO:
1802              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1803                if (!key)
1804                    BUG (NULL);
1805              memset (&k, 0, sizeof (k));              memset (&k, 0, sizeof (k));
1806              k.keyid = keyid;              k.keyid = key->subkeys->keyid+8;
1807              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);              k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
1808              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);              k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
1809              keyedit_add_photo (&k, dlg);              keyedit_add_photo (&k, dlg);
1810              if (k.update)              if (k.update)
1811                  update_key (kmi->lv, kmi->lv_idx, keyid, 1);                  update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
1812              break;              break;
1813    
1814          case ID_KEYCTX_KS_NL:          case ID_KEYCTX_KS_NL:
# Line 1664  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1823  keymanager_dlg_proc (HWND dlg, UINT msg,
1823              km_send_to_keyserver (kmi->lv, dlg, host, port);              km_send_to_keyserver (kmi->lv, dlg, host, port);
1824              break;              break;
1825    
1826          case ID_KEYCTX_RECVFROM:          case ID_KEYCTX_RECVFROM:
1827              km_refresh_from_keyserver (kmi->lv, dlg);              km_refresh_from_keyserver (kmi->lv, dlg);
1828              break;              break;
1829    
1830          case ID_KEYCTX_UID_COPY:          case ID_KEYCTX_UID_COPY:
1831              /* XXX: add generic function to support multiple selection              /* XXX: add generic function to support multiple selection
1832                      with a callback */                      with a callback */
1833              listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1 );              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1834              set_clip_text( NULL, uid, strlen( uid ) );              name = utf8_to_wincp2 (key->uids->uid);
1835                set_clip_text (NULL, name, strlen (name));
1836                safe_free (name);
1837              break;              break;
1838    
1839          case ID_KEYCTX_KEYID_COPY:          case ID_KEYCTX_KEYID_COPY:
1840              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1841              set_clip_text (NULL, uid, strlen (uid));              set_clip_text (NULL, key->subkeys->keyid+8,
1842                               strlen (key->subkeys->keyid+8));
1843              break;              break;
1844    
1845          case ID_KEYCTX_FPR_COPY:          case ID_KEYCTX_FPR_COPY:
1846              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);                      key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
1847              if (key) {              t = key->subkeys->fpr;
1848                  t = get_key_fpr (key);              set_clip_text (NULL, t? t : "", t? strlen (t): 0);
                 set_clip_text (NULL, t? t : "", t? strlen (t): 0);  
             }  
1849              break;              break;
1850    
1851          case ID_KEYCTX_KINFO_COPY:          case ID_KEYCTX_KINFO_COPY:
1852              listview_get_item_text( kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1 );              key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
1853              km_set_clip_info( uid );                      if (!key)
1854                    BUG (NULL);
1855                km_set_clip_info (key->subkeys->keyid+8);
1856              break;              break;
1857    
1858          case ID_KEYCTX_COPY:          case ID_KEYCTX_COPY:
# Line 1704  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1866  keymanager_dlg_proc (HWND dlg, UINT msg,
1866          case ID_KEYCTX_DISABLE:          case ID_KEYCTX_DISABLE:
1867          case ID_KEYCTX_ENABLE:          case ID_KEYCTX_ENABLE:
1868              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;              i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
1869              listview_get_item_text (kmi->lv, kmi->lv_idx, KM_COL_KEYID,              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1870                                      keyid, DIM (keyid)-1);              if (!key)
1871                    BUG (NULL);
1872              rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);              rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
1873              if (!rc)              if (!rc)
1874                  update_key (kmi->lv, kmi->lv_idx, keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
1875              /* XXX: switching a key from disabled -> enabled. does not              /* XXX: switching a key from disabled -> enabled. does not
1876                 change the validity field in the KM. */                 change the validity field in the KM. */
1877              break;              break;
# Line 1718  keymanager_dlg_proc (HWND dlg, UINT msg, Line 1881  keymanager_dlg_proc (HWND dlg, UINT msg,
1881              break;              break;
1882    
1883          case ID_KEYCTX_MAXTRUST:          case ID_KEYCTX_MAXTRUST:
1884              listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);              key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1885                if (!key)
1886                    BUG (NULL);
1887              rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);              rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
1888              if (!rc)              if (!rc)
1889                  update_key (kmi->lv, kmi->lv_idx, keyid, 0);                  update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
1890              break;              break;
1891    
1892          case ID_KEYCTX_SETDEFKEY:          case ID_KEYCTX_SETDEFKEY:
1893              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {              if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
1894                  listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);                  key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
1895                  rc = set_gnupg_default_key (keyid);                  rc = set_gnupg_default_key (key->subkeys->keyid+8);
1896                  if (rc)                  if (rc)
1897                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);                      msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
1898                  km_update_default_key_str (kmi->statbar);                  update_default_key_str (kmi->statbar);
1899              }              }
1900              break;              break;
1901    
1902            case ID_KEYMISC_VIEWKEYID:
1903            case ID_KEYMISC_VIEWCIPHER:
1904            case ID_KEYMISC_VIEWTYPE:
1905            case ID_KEYMISC_VIEWCREAT:
1906                DWORD n;
1907    
1908                hm = GetMenu (dlg);
1909                n = get_menu_state (hm, LOWORD (wparam));
1910                set_menu_state (hm, LOWORD (wparam),
1911                                n & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);
1912                modify_listview_columns (kmi, LOWORD (wparam), !(n & MFS_CHECKED));
1913                break;
1914    
1915          case ID_GROUP_NEW:          case ID_GROUP_NEW:
1916          case ID_GROUP_PASTE:          case ID_GROUP_PASTE:
1917          case ID_GROUP_DELETE:          case ID_GROUP_DELETE:
1918              /* XXX: Implement group manager. */              /* XXX: Implement group manager. */
1919              return TRUE;              return TRUE;
1920    
1921            case IDCANCEL:
1922                EndDialog (dlg, TRUE);
1923                return TRUE;
1924          }          }
1925                    
1926          break;          break;
Legend:
Removed from v.128  
changed lines
  Added in v.147
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26