/[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 255 by twoaday, Tue Aug 1 16:37:23 2006 UTC revision 262 by twoaday, Sat Sep 30 10:24:34 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 286  check_crypto_engine (void) Line 287  check_crypto_engine (void)
287          return false;          return false;
288      }      }
289      /* We enable smartcard support for GPG: >= 2 or >= 1.4.3 */      /* We enable smartcard support for GPG: >= 2 or >= 1.4.3 */
290      if (ma > 1 || pa >= 3)      if ((ma > 1 || pa >= 4) && pcsc_available ())
291          scard_support = 1;          scard_support = 1;
292    
293      gpgver[0] = ma;      gpgver[0] = ma;
# Line 727  start: Line 728  start:
728              }              }
729              break;              break;
730    
731            case SETUP_CARDGEN:
732                rc = DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_CARD_KEYGEN,
733                                     h, card_keygen_dlg_proc, 0);
734                if (!rc)
735                    goto start;
736                break;
737    
738          case 0: /* Cancel/Abort. */          case 0: /* Cancel/Abort. */
739          default:          default:
740              DestroyWindow (hwnd);              DestroyWindow (hwnd);

Legend:
Removed from v.255  
changed lines
  Added in v.262

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26