/[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 190 by twoaday, Mon Mar 27 10:05:14 2006 UTC revision 193 by twoaday, Sat Apr 1 12:36:35 2006 UTC
# Line 86  gpg_set_debug_mode (int val) Line 86  gpg_set_debug_mode (int val)
86  }  }
87    
88    
 /* Return the name of the gettext language file. */  
 static char*  
 get_gettext_lang (void)  
 {      
     char *fname;  
     fname = get_reg_entry_mo ();  
     if (!fname)  
         return NULL;  
     return fname;  
 }  
   
   
89  /* Initialize the gettext sub system. */  /* Initialize the gettext sub system. */
90  static void  static void
91  load_gettext (int prev_inst)  load_gettext (void)
92  {  {
93      char *nls = NULL;      char *nls = NULL;
94    
95      nls = get_gettext_lang ();      /* Return the name of the gettext language file. */
96        nls = get_reg_entry_mo ();
97      if (nls != NULL) {      if (nls != NULL) {
98          set_gettext_file ("winpt", nls);          set_gettext_file ("winpt", nls);
99          free_if_alloc (nls);          free_if_alloc (nls);
# Line 216  static int Line 205  static int
205  check_default_key (gpg_keycache_t kc)  check_default_key (gpg_keycache_t kc)
206  {  {
207      gpgme_key_t key;      gpgme_key_t key;
208      gpgme_error_t err = GPG_ERR_NO_ERROR;      gpgme_error_t err = gpg_error (GPG_ERR_NO_ERROR);
209      char *defkey;      char *defkey;
210    
211      defkey = get_gnupg_default_key ();      defkey = get_gnupg_default_key ();
# Line 268  get_prog_part (const char * fname, int u Line 257  get_prog_part (const char * fname, int u
257  static bool  static bool
258  check_crypto_engine (void)  check_crypto_engine (void)
259  {  {
260      int ma=0, mi=0, pa=0;      int ma = 0, mi = 0, pa = 0;
261      int rc;      int rc;
262    
263      rc = check_gnupg_engine (NEED_GPG_VERSION, &ma, &mi, &pa);      rc = check_gnupg_engine (NEED_GPG_VERSION, &ma, &mi, &pa);
# Line 285  check_crypto_engine (void) Line 274  check_crypto_engine (void)
274          return false;          return false;
275      }      }
276      /* We enable smartcard support for GPG: >= 2 or >= 1.4.3 */      /* We enable smartcard support for GPG: >= 2 or >= 1.4.3 */
277      if (ma > 1 || pa >= 3)          if (ma > 1 || pa >= 3)
278          scard_support = 1;          scard_support = 1;
279    
280      gpgver[0] = ma;      gpgver[0] = ma;
# Line 301  static int Line 290  static int
290  load_keyserver_conf (int quiet)  load_keyserver_conf (int quiet)
291  {  {
292      char *buf;      char *buf;
293      const char *t;      const char *t, *conf;
294      int rc;      int rc;
295    
296      /* Create $APPDATA\winpt if needed. */      /* Create $APPDATA\winpt if needed. */
# Line 317  load_keyserver_conf (int quiet) Line 306  load_keyserver_conf (int quiet)
306      /* Check for $APPDATA\winpt\keyserver.conf */      /* Check for $APPDATA\winpt\keyserver.conf */
307      buf = make_special_filename (CSIDL_APPDATA, "winpt\\keyserver.conf", NULL);      buf = make_special_filename (CSIDL_APPDATA, "winpt\\keyserver.conf", NULL);
308    
309      if (!file_exist_check (get_prog_part ("keyserver.conf", 0)))      conf = get_prog_part ("keyserver.conf", 0);
310          t = get_prog_part ("keyserver.conf", 0);      if (!file_exist_check (conf))
311            t = conf;
312      else      else
313          t = "keyserver.conf";          t = "keyserver.conf";
314      if (file_exist_check (t) == 0 && file_exist_check (buf) != 0) {      if (file_exist_check (t) == 0 && file_exist_check (buf) != 0) {
         //log_box (_("Keyserver"), MB_INFO,  
         //       _("keyserver.conf will be copied to \"%s\"\r\n"), buf);  
315          if (!CopyFile (t, buf, FALSE)) {          if (!CopyFile (t, buf, FALSE)) {
316              MessageBox (NULL, _("Failed to copy the keyserver.conf"),              MessageBox (NULL, _("Failed to copy the keyserver.conf"),
317                          _("Keyserver"), MB_ERR);                          _("Keyserver"), MB_ERR);
# Line 437  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 425  WinMain (HINSTANCE hinst, HINSTANCE hpre
425      HACCEL accel_tab;      HACCEL accel_tab;
426      MSG msg;      MSG msg;
427      HWND hwnd = NULL;      HWND hwnd = NULL;
428      WORD ver[3], ptdver[4];      /*WORD ver[3], ptdver[4];*/
429      int rc, ec, created = 0;      int rc, ec, created = 0;
430      int first_start = 0, start_gpgprefs = 0;      int first_start = 0, start_gpgprefs = 0;
431      int winpt_inst_found = 0;      int winpt_inst_found = 0;
432      int start_manager = 0;      int start_manager = 0;
433      const char *s;      const char *s;
434    
435      glob_hinst = hinst;      glob_hinst = hinst;
436      if (cmdline && stristr (cmdline, "--stop")) {      if (cmdline && stristr (cmdline, "--stop")) {
# Line 452  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 440  WinMain (HINSTANCE hinst, HINSTANCE hpre
440          return 0;          return 0;
441      }      }
442    
     /*  
     OSVERSIONINFO osinf;  
     memset (&osinf, 0, sizeof (osinf));  
     if (GetVersionEx (&osinf) &&  
         osinf.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS &&  
         osinf.dwMinorVersion == 0) {  
         msg_box (NULL, "WinPT propably does not work on Windows 95 without restrictions",  
                  "WinPT Warning", MB_INFO);  
     }  
     */  
   
443      #ifdef _DEBUG      #ifdef _DEBUG
444      gpg_set_debug_mode (1);      gpg_set_debug_mode (1);
445      debug = 1;      debug = 1;
446      #endif      #endif
447    
448        /* XXX
449      get_file_version ("WinPT.exe", &ver[0], &ver[1], &ver[2], &ver[3]);      get_file_version ("WinPT.exe", &ver[0], &ver[1], &ver[2], &ver[3]);
450      get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],      get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],
451                                   &ptdver[2], &ptdver[3]);                                   &ptdver[2], &ptdver[3]);
452      /* XXX      
453      if (ptdver[0] != ver[0] || ptdver[1] != ver[1]|| ptdver[2] != ver[2]) {      if (ptdver[0] != ver[0] || ptdver[1] != ver[1]|| ptdver[2] != ver[2]) {
454          log_box (_("WinPT Error"), MB_ERR,          log_box (_("WinPT Error"), MB_ERR,
455                   _("The PTD.dll file has a different version than WinPT.exe\n"                   _("The PTD.dll file has a different version than WinPT.exe\n"
# Line 505  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 483  WinMain (HINSTANCE hinst, HINSTANCE hpre
483      }      }
484            
485      set_default_keyserver ();      set_default_keyserver ();
486      load_gettext (winpt_inst_found);      load_gettext ();
487    
488      if (!mobile_mode_active) {      if (!mobile_mode_active) {
489          regist_inst_gnupg (1);          regist_inst_gnupg (1);
# Line 733  start: Line 711  start:
711              free_gnupg_table ();              free_gnupg_table ();
712              return 0;              return 0;
713          }          }
714            if (!is_gpg4win_installed ()) {
715                select_language ();
716                load_gettext ();
717            }
718      }      }
719      else {      else {
720          gpg_keycache_t c, sec_c;          gpg_keycache_t c, sec_c;
Legend:
Removed from v.190  
changed lines
  Added in v.193
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26