/[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 260 by twoaday, Wed Aug 16 10:01:30 2006 UTC revision 270 by twoaday, Sat Oct 21 18:08:57 2006 UTC
# Line 44  Line 44 
44    
45  void remove_crit_file_attrs (const char *fname, int force);  void remove_crit_file_attrs (const char *fname, int force);
46  BOOL user_is_admin (void);  BOOL user_is_admin (void);
47    extern "C" int  pcsc_available (void);
48    
49  /* Global variables. */  /* Global variables. */
50  HINSTANCE glob_hinst;   /* global instance for the dialogs */  HINSTANCE glob_hinst;   /* global instance for the dialogs */
# Line 70  update_keycache (HWND hwnd) Line 71  update_keycache (HWND hwnd)
71      err = DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, hwnd,      err = DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, hwnd,
72                      keycache_dlg_proc, (LPARAM)&rcs);                      keycache_dlg_proc, (LPARAM)&rcs);
73      if (err) {      if (err) {
74          char *cfg = get_gnupg_config ();          char *cfgf = get_gnupg_config ();
75          if (cfg && check_gnupg_options (cfg, 0) == WPTERR_FILE_EXIST)          if (cfgf && check_gnupg_options (cfgf, 0) == WPTERR_FILE_EXIST)
76              msg_box (NULL, _("The gpg.conf contains at least one argument which points to a non-existing file."), "WinPT", MB_ERR);              msg_box (NULL, _("The gpg.conf contains at least one argument which points to a non-existing file."), "WinPT", MB_ERR);
77          free_if_alloc (cfg);          free_if_alloc (cfgf);
78          return -1;          return -1;
79      }      }
80      return 0;      return 0;
# Line 102  gpg_set_debug_mode (int val) Line 103  gpg_set_debug_mode (int val)
103  static void  static void
104  load_gettext (void)  load_gettext (void)
105  {  {
106      char *nls = NULL;      char *nls;
107    
108      /* Return the name of the gettext language file. */      /* Return the name of the gettext language file. */
109      nls = get_reg_entry_mo ();      nls = get_reg_entry_mo ();
# Line 130  gpg_prefs_ok (void) Line 131  gpg_prefs_ok (void)
131          }          }
132      }      }
133      free_if_alloc (p);      free_if_alloc (p);
134      p = get_reg_entry_gpg4win (NULL);          p = get_reg_entry_gpg4win (NULL);
135      if (!p || dir_exist_check (p) != 0) {      if (!p || dir_exist_check (p) != 0) {
136          free_if_alloc (p);          free_if_alloc (p);
137          p = get_reg_entry_gpg ("HomeDir");          p = get_reg_entry_gpg ("HomeDir");
# Line 173  load_gpg_env (void) Line 174  load_gpg_env (void)
174      SECURITY_ATTRIBUTES sec_attr;      SECURITY_ATTRIBUTES sec_attr;
175      char *p;      char *p;
176      char *pkr;      char *pkr;
177        int err = 0;
178    
179      p = get_reg_entry_gpg4win ("gpg.exe");      p = get_reg_entry_gpg4win ("gpg.exe");
180      if (!p)      if (!p)
# Line 201  load_gpg_env (void) Line 203  load_gpg_env (void)
203      check_readonly_attr (p);      check_readonly_attr (p);
204      pkr = make_filename (p, "pubring", "gpg");      pkr = make_filename (p, "pubring", "gpg");
205      free_if_alloc (p);      free_if_alloc (p);
206      if (!pkr)      if (get_file_size (pkr) == 0)
207          return -1;          err = -1;
208      if (get_file_size (pkr) == 0) {      free_if_alloc (pkr);
209          free_if_alloc (pkr);      return err;
         return -1;  
     }  
     return 0;  
210  }  }
211    
212    
# Line 235  check_default_key (gpg_keycache_t kc) Line 234  check_default_key (gpg_keycache_t kc)
234  static const char*  static const char*
235  get_prog_part (const char * fname, int use_cwd)  get_prog_part (const char * fname, int use_cwd)
236  {  {
237      static char program[512];      static char program[2*MAX_PATH+1];
238      char currdir[256];      char currdir[MAX_PATH+1];
239      char *cmd = NULL;      char *cmd = NULL;
240      int j;      int j;
241                    
# Line 249  get_prog_part (const char * fname, int u Line 248  get_prog_part (const char * fname, int u
248      }      }
249      else {      else {
250          cmd = GetCommandLine ();          cmd = GetCommandLine ();
251          if (cmd == NULL)          if (!cmd)
252              return NULL;              return NULL;
253          strncpy (currdir, cmd, sizeof (currdir)-1);          strncpy (currdir, cmd, sizeof (currdir)-1);
254          j = strlen (currdir);          j = strlen (currdir);
# Line 285  check_crypto_engine (void) Line 284  check_crypto_engine (void)
284                     ma, mi, pa);                     ma, mi, pa);
285          return false;          return false;
286      }      }
287      /* We enable smartcard support for GPG: >= 2 or >= 1.4.3 */      /* Enable smart card support for GPG 2 or >= 1.4 */
288      if (ma > 1 || pa >= 3)      if ((ma > 1 || pa >= 4) && pcsc_available ())
289          scard_support = 1;          scard_support = 1;
290    
291      gpgver[0] = ma;      gpgver[0] = ma;
# Line 479  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 478  WinMain (HINSTANCE hinst, HINSTANCE hpre
478      ec = get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],      ec = get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],
479                                   &ptdver[2], &ptdver[3]);                                   &ptdver[2], &ptdver[3]);
480            
481      if (!ec && (ptdver[0] != ver[0] || ptdver[1] != ver[1]|| ptdver[2] != ver[2])) {      if (!ec && (ptdver[0] != ver[0] ||
482                    ptdver[1] != ver[1] ||
483                    ptdver[2] != ver[2])) {
484          log_box (_("WinPT Error"), MB_ERR,          log_box (_("WinPT Error"), MB_ERR,
485                   _("The PTD.dll file has a different version than WinPT.exe\n"                   _("The PTD.dll file has a different version than WinPT.exe\n"
486                     "Please update the PTD.dll to version %d.%d.%d"),                     "Please update the PTD.dll to version %d.%d.%d"),
# Line 550  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 551  WinMain (HINSTANCE hinst, HINSTANCE hpre
551              if (!p)              if (!p)
552                  BUG (0);                  BUG (0);
553              n = p - s;              n = p - s;
554              if (n) {              if (n > 0) {
555                  char *file = new char[n+1];                  char *file = new char[n+1];
556                  if (!file)                  if (!file)
557                      BUG (NULL);                      BUG (NULL);
# Line 629  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 630  WinMain (HINSTANCE hinst, HINSTANCE hpre
630      if (cmdline && (stristr (cmdline, "--keymanager")      if (cmdline && (stristr (cmdline, "--keymanager")
631                  || stristr (cmdline, "--cardmanager"))) {                  || stristr (cmdline, "--cardmanager"))) {
632          /* If an instance of WinPT is running, just send the command          /* If an instance of WinPT is running, just send the command
633             to open the key manager. Otherwise start a new instance.             to open the key manager. Otherwise start a new instance. */
          */  
634          HWND tray = FindWindow ("WinPT", "WinPT");          HWND tray = FindWindow ("WinPT", "WinPT");
635          if (stristr (cmdline, "keymanager"))          if (stristr (cmdline, "keymanager"))
636              start_manager = ID_WINPT_KEY;              start_manager = ID_WINPT_KEY;
Legend:
Removed from v.260  
changed lines
  Added in v.270
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26