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

Diff of /trunk/Src/WinPT.cpp

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

revision 23 by twoaday, Fri Sep 30 10:10:16 2005 UTC revision 28 by twoaday, Thu Oct 20 12:35:59 2005 UTC
# Line 35  Line 35 
35  #include "wptContext.h"  #include "wptContext.h"
36  #include "wptCardEdit.h"  #include "wptCardEdit.h"
37    
38  HINSTANCE glob_hinst; /* global instance for the dialogs */  #define MIN_GPG_VER "1.4.3"
39  HWND glob_hwnd; /* global window handle for the dialogs */  
40    HINSTANCE glob_hinst;   /* global instance for the dialogs */
41    HWND glob_hwnd;         /* global window handle for the dialogs */
42  HWND activ_hwnd;  HWND activ_hwnd;
43  LOCK mo_file;  LOCK mo_file;
44  int scard_support = 0;  int scard_support = 0;
# Line 45  int mobile = 0; Line 47  int mobile = 0;
47  int gpg_read_only = 0;  int gpg_read_only = 0;
48  char gpgver[3];  char gpgver[3];
49    
 /* Internal IPC */  
 int start_keymanager = 0;  
50    
51    /* Load the key cache and rebuild the signature cache. */
52  static void  static void
53  update_keycache (HWND hwnd)  update_keycache (HWND hwnd)
54  {  {
# Line 57  update_keycache (HWND hwnd) Line 58  update_keycache (HWND hwnd)
58      rcs.tr_update = 1;      rcs.tr_update = 1;
59      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, hwnd,      DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, hwnd,
60                      keycache_dlg_proc, (LPARAM)&rcs);                      keycache_dlg_proc, (LPARAM)&rcs);
61  } /* update_keycache */  }
62    
63    
64    /* Set GPGME debug mode. If @val is 0, the debug mode is disabled. */
65    void
66    gpg_set_debug_mode (int val)
67    {      
68        if (val)
69            putenv ("GPGME_DEBUG=5:gpgme.dbg");
70        else
71            putenv ("GPGME_DEBUG=");
72    }
73    
74  static char *  static char *
75  get_gettext_lang (void)  get_gettext_lang (void)
76  {      {    
# Line 74  get_gettext_lang (void) Line 85  get_gettext_lang (void)
85  static void  static void
86  load_gettext (void)  load_gettext (void)
87  {  {
88      char * nls = NULL;      char *nls = NULL;
89      char * file = NULL;      char *file = NULL;
90    
91      nls = get_gettext_lang ();      nls = get_gettext_lang ();
92      if (nls) {      if (nls) {
# Line 95  load_gettext (void) Line 106  load_gettext (void)
106  /* check if the default key from the gpg.conf file is available in the  /* check if the default key from the gpg.conf file is available in the
107     keyring. if not, bail out because encryption won't work properly then. */     keyring. if not, bail out because encryption won't work properly then. */
108  static int  static int
109  check_default_key (gpgme_keycache_t kc)  check_default_key (gpg_keycache_t kc)
110  {  {
111      gpgme_key_t key;      gpgme_key_t key;
112      gpgme_error_t err = GPG_ERR_NO_ERROR;      gpgme_error_t err = GPG_ERR_NO_ERROR;
# Line 103  check_default_key (gpgme_keycache_t kc) Line 114  check_default_key (gpgme_keycache_t kc)
114    
115      defkey = get_gnupg_default_key ();      defkey = get_gnupg_default_key ();
116      if (defkey)      if (defkey)
117          err = gpgme_keycache_find_key (kc, defkey, 0, &key);          err = gpg_keycache_find_key (kc, defkey, 0, &key);
118      free_if_alloc (defkey);      free_if_alloc (defkey);
119      return err? -1 : 0;      return err? -1 : 0;
120  } /* check_default_key */  } /* check_default_key */
# Line 144  get_prog_part (const char * fname, int u Line 155  get_prog_part (const char * fname, int u
155  static int  static int
156  check_crypto_engine (void)  check_crypto_engine (void)
157  {  {
158      int ma=1, mi=4, pa=0; /* GPG 1.4.0 */      int ma=1, mi=4, pa=3; /* GPG 1.4.3 */
159      int rc;      int rc;
160    
161      rc = check_gnupg_engine (&ma, &mi, &pa);      rc = check_gnupg_engine (&ma, &mi, &pa);
# Line 155  check_crypto_engine (void) Line 166  check_crypto_engine (void)
166      else if (rc) {      else if (rc) {
167          log_box (_("WinPT Error"), MB_ERR,          log_box (_("WinPT Error"), MB_ERR,
168                   _("Sorry, you need a newer GPG version.\n"                   _("Sorry, you need a newer GPG version.\n"
169                     "GPG version %d.%d.%d required GPG version 1.4.0"),                     "GPG version %d.%d.%d required GPG version "MIN_GPG_VER),
170                     ma, mi, pa);                     ma, mi, pa);
171          return rc;          return rc;
172      }      }
# Line 207  enable_mobile_mode (void) Line 218  enable_mobile_mode (void)
218    
219  char* get_subkey_fingerprint (gpgme_ctx_t ctx, const char *keyid);  char* get_subkey_fingerprint (gpgme_ctx_t ctx, const char *keyid);
220    
221    
222  int WINAPI  int WINAPI
 #ifndef WINPT_IPC  
223  WinMain (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)  WinMain (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)
 #else  
 win_main (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)  
 #endif  
224  {  {
225      WNDCLASS wc = {0, winpt_main_proc, 0, 0, hinst, 0, 0, 0, 0, PGM_NAME};      WNDCLASS wc = {0, winpt_main_proc, 0, 0, hinst, 0, 0, 0, 0, PGM_NAME};
226      HACCEL accel_tab;      HACCEL accel_tab;
# Line 223  win_main (HINSTANCE hinst, HINSTANCE hpr Line 231  win_main (HINSTANCE hinst, HINSTANCE hpr
231      HWND hwnd = NULL;      HWND hwnd = NULL;
232    
233      glob_hinst = hinst;      glob_hinst = hinst;
234        
235      #ifdef _DEBUG      #ifdef _DEBUG
236      gpgme_set_debug_mode (1);      gpg_set_debug_mode (1);
237        debug = 1;
238      #endif      #endif
239    
240      s = PTD_get_version ();      s = PTD_get_version ();
# Line 242  win_main (HINSTANCE hinst, HINSTANCE hpr Line 251  win_main (HINSTANCE hinst, HINSTANCE hpr
251          return 0;          return 0;
252      }      }
253    
254        s = gpgme_check_version ("1.1.0");
255        if (!s || !*s) {
256            msg_box (NULL, _("A newer GPGME version is needed."), "WinPT Error", MB_ERR);
257            return 0;
258        }
259    
260      if (cmdline && stristr (cmdline, "--mobile")) {      if (cmdline && stristr (cmdline, "--mobile")) {
261          msg_box (NULL, "WARNING: mobile modus is not fully implemented yet!",          msg_box (NULL, "WARNING: mobile modus is not fully implemented yet!",
262                   "WinPT", MB_INFO);                   "WinPT", MB_INFO);
# Line 275  win_main (HINSTANCE hinst, HINSTANCE hpr Line 290  win_main (HINSTANCE hinst, HINSTANCE hpr
290                   _("GPG home directory is not set correctly.\n"                   _("GPG home directory is not set correctly.\n"
291                     "Please check the GPG registry settings:\n%s."),                     "Please check the GPG registry settings:\n%s."),
292                   winpt_strerror (rc));                   winpt_strerror (rc));
293          const char * s = get_filename_dlg (GetActiveWindow (), FILE_OPEN,          const char * s = get_fileopen_dlg (GetActiveWindow (),
294                                             _("Select GPG Public Keyring"),                                             _("Select GPG Public Keyring"),
295                                             _("GPG Keyrings (*.gpg)\0*.gpg\0\0"),                                             _("GPG Keyrings (*.gpg)\0*.gpg\0\0"),
296                                             NULL);                                             NULL);
# Line 364  win_main (HINSTANCE hinst, HINSTANCE hpr Line 379  win_main (HINSTANCE hinst, HINSTANCE hpr
379      }      }
380    
381      load_keyserver_conf (cmdline? 1 : 0);      load_keyserver_conf (cmdline? 1 : 0);
     if (start_keymanager) {  
         dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,  
                             GetDesktopWindow(), keymanager_dlg_proc, NULL,  
                             _("Key Manager"), IDS_WINPT_KEYMISC);  
         keycache_release ();  
         free_gnupg_table ();  
         return 0;  
     }  
382    
383      if (cmdline && (stristr (cmdline, "--keymanager")      if (cmdline && (stristr (cmdline, "--keymanager")
384                  || stristr (cmdline, "--cardmanager"))) {                  || stristr (cmdline, "--cardmanager"))) {
# Line 381  win_main (HINSTANCE hinst, HINSTANCE hpr Line 388  win_main (HINSTANCE hinst, HINSTANCE hpr
388                              GetDesktopWindow(), keymanager_dlg_proc, NULL,                              GetDesktopWindow(), keymanager_dlg_proc, NULL,
389                              _("Key Manager"), IDS_WINPT_KEYMISC);                                _("Key Manager"), IDS_WINPT_KEYMISC);  
390          else {          else {
391              gpg_card_t crd = smartcard_init ();              gpg_card_t crd = gpg_card_load ();
392              if (crd)              if (crd)
393                  dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_CARD_EDIT,                  dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_CARD_EDIT,
394                                    GetDesktopWindow(), card_edit_dlg_proc,                                    GetDesktopWindow(), card_edit_dlg_proc,
# Line 389  win_main (HINSTANCE hinst, HINSTANCE hpr Line 396  win_main (HINSTANCE hinst, HINSTANCE hpr
396                                    IDS_WINPT_CARD_EDIT);                                    IDS_WINPT_CARD_EDIT);
397              gpg_card_release (crd);              gpg_card_release (crd);
398          }          }
399          keycache_release ();          keycache_release (0);
400          free_gnupg_table ();          free_gnupg_table ();
401          return 0;          return 0;
402      }      }
# Line 489  start: Line 496  start:
496          check_crypto_engine ();          check_crypto_engine ();
497      }      }
498      else {      else {
499          gpgme_keycache_t c;          gpg_keycache_t c;
500          update_keycache (hwnd);          update_keycache (hwnd);
501          c = keycache_get_ctx (1);          c = keycache_get_ctx (1);
502          if (!c || !gpgme_keycache_count (c)) {          if (!c || !gpg_keycache_get_size (c)) {
503              gnupg_display_error ();              gnupg_display_error ();
504              msg_box (hwnd, _("The keycache was not initialized or is empty.\n"              msg_box (hwnd, _("The keycache was not initialized or is empty.\n"
505                               "Please check your GPG config (keyrings, pathes...)"),                               "Please check your GPG config (keyrings, pathes...)"),
Legend:
Removed from v.23  
changed lines
  Added in v.28
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26