[Winpt-commits] r283 - in trunk: . Doc/website PTD Po
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sat Feb 3 19:28:39 CET 2007
Author: twoaday
Date: 2007-02-03 19:28:38 +0100 (Sat, 03 Feb 2007)
New Revision: 283
Removed:
trunk/PTD/wptFileDisk.cpp
Modified:
trunk/AUTHORS
trunk/ChangeLog
trunk/Doc/website/index.html
trunk/PTD/ChangeLog
trunk/PTD/Makefile.am
trunk/Po/POTFILES.in
trunk/Po/de.po
trunk/configure.ac
Log:
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/AUTHORS 2007-02-03 18:28:38 UTC (rev 283)
@@ -22,7 +22,10 @@
wptTrayPop.cpp - Prasenjeet Dutta
wptNLS.cpp - Ulrich Drepper <ulrich at cygnus.com>
-rmd160.c - Free Software Foundation <fsf at gnu.org>,
+
+Free Software Foundation <fsf at gnu.org>
+(rmd160.c, sha1.c, sha512.c, md5.c)
+
sunlink.c - Matt Gauthier <elleron at yahoo.com>
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/ChangeLog 2007-02-03 18:28:38 UTC (rev 283)
@@ -1,3 +1,7 @@
+2007-01-16 Timo Schulz <twoaday at gmx.net>
+
+ * configure.ac: Remove unused stuff.
+
2006-10-27 Timo Schulz <twoaday at freakmail.de>
* configure.ac: Change all winpt.org entries to wald URL.
Modified: trunk/Doc/website/index.html
===================================================================
--- trunk/Doc/website/index.html 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/Doc/website/index.html 2007-02-03 18:28:38 UTC (rev 283)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="keywords" content="WinPT Privacy PGP GPG GnuPG Crypto Tray Taskbar OpenPGP Frontend Shell">
+<meta name="keywords" content="WinPT Encryption Public-Key Privacy PGP GPG GnuPG Crypto Tray Taskbar OpenPGP Frontend Shell">
<!-- original author: Shane M. Coughlan -->
@@ -41,12 +41,18 @@
<body>
<table width="750" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
- <td align="left" valign="middle" bgcolor="#FFFFCC"><span class="style1"><img src="images/winpt-logo-3.png" alt="GnuPG Logo" width="120" height="115" border="0" align="middle" /> WinPT - A Free Graphical Front-End for GnuPG</span></td>
+ <td align="left" valign="middle" bgcolor="#FFFFCC">
+ <span class="style1">
+ <img src="images/winpt-logo-3.png" alt="GnuPG Logo" width="120" height="115" border="0" align="middle" /> WinPT - A Free Graphical Front-End for GnuPG</span>
+ </td>
</tr>
<tr>
<td><table width="870" border="0" cellspacing="0" cellpadding="3">
<tr>
- <td width="150" align="left" valign="top" bgcolor="#FFFFCC"><p><span class="style2"><a href="index.html">Home and News</a><br />
+ <td width="150" align="left" valign="top" bgcolor="#FFFFCC">
+ <p>
+ <span class="style2"><a href="index.html">Home and News</a>
+ <br />
<a href="screenshots.html">Screenshots</a><br />
<a href="download.html">Download</a><br />
<a href="mailinglist.html">Mailing Lists</a><br />
@@ -54,8 +60,8 @@
<a href="bugs.html">Bug Reports</a><br />
<a href="contact.html">Contact</a><br />
<a href="related.html">Related Projects</a></span><br />
- </p>
- </td>
+ </p>
+ </td>
<td width="710" align="left" valign="top">
<p class="style2">
WinPT is a taskbar front-end for GnuPG which includes key
@@ -63,11 +69,15 @@
encryption and support for OpenPGP smartcards.
</p>
<p class="style2">
- WinPT is designed to make life easier for people who want encryption, and to make security less
- daunting for people who are new to securing data. </p>
- <p class="style4">The latest version of WinPT is 1.2.0. You can download it from <a href="download.html">here</a>.</p>
+ WinPT is designed to make life easier for people who want encryption,
+ and to make security less daunting for people who are new to securing
+ data. </p>
+ <p class="style4">
+ The latest version of WinPT is 1.2.0. You can download it
+ from <a href="download.html">here</a>.</p>
<p class="style3">
- WinPT is licensed under the GNU GPL, and can be freely used, redistributed or modified.
+ WinPT is licensed under the GNU GPL, and can be freely used,
+ redistributed or modified.
It is is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -84,7 +94,10 @@
The Windows Privacy Tools project at SourceForge is no longer active.
</p>
-<p align="center" class="style3"><a rel="license" href="http://creativecommons.org/licenses/by/2.5/"><img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights20.png"/></a><br/>
+<p align="center" class="style3">
+<a rel="license" href="http://creativecommons.org/licenses/by/2.5/">
+<img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights20.png"/></a>
+<br/>
The text of this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.<br />
</p>
</body>
Modified: trunk/PTD/ChangeLog
===================================================================
--- trunk/PTD/ChangeLog 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/PTD/ChangeLog 2007-02-03 18:28:38 UTC (rev 283)
@@ -1,3 +1,7 @@
+2007-01-16 Timo Schulz <twoaday at gmx.net>
+
+ * wptFileDisk.cpp: Removed.
+
2006-08-30 Timo Schulz <twoaday at freakmail.de>
* wptJPG.cpp (load): Improved error checking.
Modified: trunk/PTD/Makefile.am
===================================================================
--- trunk/PTD/Makefile.am 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/PTD/Makefile.am 2007-02-03 18:28:38 UTC (rev 283)
@@ -27,7 +27,6 @@
resource.rc \
resource.h \
PTD.cpp \
- wptFileDisk.cpp \
wptZIP.cpp wptZIP.h \
wptJPG.cpp wptJPG.h \
wptWipeFile.cpp \
Deleted: trunk/PTD/wptFileDisk.cpp
===================================================================
--- trunk/PTD/wptFileDisk.cpp 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/PTD/wptFileDisk.cpp 2007-02-03 18:28:38 UTC (rev 283)
@@ -1,380 +0,0 @@
-#if 0
- filedisk_init_info @600
- filedisk_free_info @601
- filedisk_mount @602
- filedisk_unmount @603
- filedisk_status @604
-
-/* wptFileDisk.c - Control program for a virtual disk driver for WinNT/2000/XP.
-
- Copyright (C) 1999, 2000, 2001, 2002 Bo Brantén.
-
- Heavily modified for the use with Cryptdisk by Timo Schulz
- (C) 2004 Timo Schulz
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <windows.h>
-#include <windows.h>
-#include <winioctl.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "openpgp.h"
-#include "../Include/wptCryptdisk.h"
-
-/* remember to change the values in wptErrors.h also */
-#define CDISK_ERR_LOCK 201
-#define CDISK_ERR_MOUNT 202
-#define CDISK_ERR_UMOUNT 203
-#define CDISK_ERR_OPEN 204
-#define CDISK_ERR_BUSY 205
-#define CDISK_ERR_QUERY 206
-
-static void
-print_lasterr (char * prefix)
-{
- LPVOID msg;
-
- FormatMessage(
- FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- GetLastError(),
- 0,
- (LPTSTR) &msg,
- 0,
- NULL
- );
- MessageBox (NULL, (LPTSTR)msg, prefix, MB_ICONERROR|MB_OK);
- LocalFree (msg);
-}
-
-#if 0
-static int
-add_key (OPEN_FILE_INFORMATION *ka, const char * key, size_t len)
-{
- gpg_md_t md=NULL;
-
- if (ka->KeyNum >= MAX_KEYS)
- return -1;
-
- switch (ka->KeyType) {
- case 1: /* 2fish */
- md = gpg_md_open (MD_RMD160);
- ka->KeyLength=20;
- break;
- case 2: /* AES256 */
- md = gpg_md_open (MD_SHA512);
- ka->KeyLength=32;
- break;
- case 3: /* AES128 */
- md = gpg_md_open (MD_SHA256);
- ka->KeyLength=16;
- break;
- case 4: /* AES192 */
- ka->KeyLength=24;
- md = gpg_md_open (MD_SHA384);
- break;
- }
- if (!md)
- return -1;
- gpg_md_write (md, (char *)key, len);
- gpg_md_final (md);
- memcpy (ka->Key[ka->KeyNum++], gpg_md_read (md), ka->KeyLength);
- gpg_md_close (md);
- return 0;
-}
-#endif
-
-
-int
-filedisk_mount (int DeviceNumber,
- OPEN_FILE_INFORMATION *ofi,
- char drivelet,
- BOOLEAN CdImage)
-{
- char VolumeName[] = "\\\\.\\ :";
- char DeviceName[255];
- HANDLE Device;
- DWORD BytesReturned;
-
- VolumeName[4] = drivelet;
-
- Device = CreateFile (VolumeName,
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_NO_BUFFERING,
- NULL);
- if (Device != INVALID_HANDLE_VALUE) {
- SetLastError (ERROR_BUSY);
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_BUSY;
- }
-
- if (CdImage)
- sprintf (DeviceName, DEVICE_NAME_PREFIX "Cd" "%u", DeviceNumber);
- else
- sprintf (DeviceName, DEVICE_NAME_PREFIX "%u", DeviceNumber);
-
- if (!DefineDosDevice (DDD_RAW_TARGET_PATH,
- &VolumeName[4],
- DeviceName)) {
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_OPEN;
- }
-
- Device = CreateFile (VolumeName,
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_NO_BUFFERING,
- NULL);
-
- if (Device == INVALID_HANDLE_VALUE) {
- print_lasterr (&VolumeName[4]);
- DefineDosDevice (DDD_REMOVE_DEFINITION, &VolumeName[4], NULL);
- return CDISK_ERR_OPEN;
- }
-
- if (!DeviceIoControl (Device,
- IOCTL_FILE_DISK_OPEN_FILE,
- ofi,
- sizeof(OPEN_FILE_INFORMATION) + ofi->FileNameLength - 1,
- NULL, 0, &BytesReturned, NULL)) {
- print_lasterr ("Cryptdisk Error");
- DefineDosDevice (DDD_REMOVE_DEFINITION, &VolumeName[4], NULL);
- return CDISK_ERR_MOUNT;
- }
-
- return 0;
-}
-
-
-static int
-filedisk_unmount2 (char drivelet, int flags, int forced)
-{
- char VolumeName[60] = "\\\\.\\ :";
- HANDLE Device;
- DWORD BytesReturned;
-
- if (!flags)
- VolumeName[4] = drivelet;
- else if (flags & 1)
- sprintf(VolumeName,"\\\\.\\FileDisk%d", drivelet);
- else if (flags & 2)
- sprintf(VolumeName,"\\\\.\\FileDiskCd%d",drivelet);
-
- Device = CreateFile (VolumeName,
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_NO_BUFFERING,
- NULL);
- if (Device == INVALID_HANDLE_VALUE) {
- if (forced)
- print_lasterr(&VolumeName[4]);
- return CDISK_ERR_OPEN;
- }
-
- if (!DeviceIoControl (Device,
- FSCTL_LOCK_VOLUME,
- NULL, 0, NULL, 0,
- &BytesReturned, NULL)) {
- if (forced) {
- print_lasterr(&VolumeName[4]);
- return CDISK_ERR_LOCK;
- }
- }
-
- if (!DeviceIoControl (Device,
- IOCTL_FILE_DISK_CLOSE_FILE,
- NULL, 0, NULL, 0,
- &BytesReturned, NULL )) {
- if (forced)
- print_lasterr ("Cryptdisk Error");
- return CDISK_ERR_UMOUNT;
- }
-
- if (!DeviceIoControl (
- Device, FSCTL_DISMOUNT_VOLUME,
- NULL, 0, NULL, 0,
- &BytesReturned, NULL)) {
- if (forced)
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_UMOUNT;
- }
-
- if (!DeviceIoControl (Device,
- FSCTL_UNLOCK_VOLUME,
- NULL, 0, NULL, 0,
- &BytesReturned, NULL)) {
- if (forced) {
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_LOCK;
- }
- }
-
- CloseHandle (Device);
-
- if (!DefineDosDevice (
- DDD_REMOVE_DEFINITION,
- &VolumeName[4], NULL)) {
- if (forced)
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_UMOUNT;
- }
-
- return 0;
-}
-
-int
-filedisk_unmount (char drivelet, int forced)
-{
- char i;
-
- if (drivelet) {
- int rc = filedisk_unmount2 (drivelet, 0, forced);
- if (rc)
- print_lasterr ("Unmount´");
- return rc;
- }
- for (i=0; i<20;i++) {
- if (filedisk_unmount2 (i, 1, 0) == CDISK_ERR_OPEN)
- break;
- }
- for (i=0; i<20;i++) {
- if (filedisk_unmount2 (i, 2, 0) == CDISK_ERR_OPEN)
- break;
- }
- return 0;
-}
-
-
-int
-filedisk_status (char drivelet, LARGE_INTEGER * size, int * rdonly)
-{
- char VolumeName[] = "\\\\.\\ :";
- HANDLE Device;
- POPEN_FILE_INFORMATION ofi;
- DWORD BytesReturned;
-
- VolumeName[4] = drivelet;
-
- Device = CreateFile (VolumeName,
- GENERIC_READ,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_NO_BUFFERING,
- NULL);
-
- if (Device == INVALID_HANDLE_VALUE) {
- print_lasterr(&VolumeName[4]);
- return CDISK_ERR_OPEN;
- }
-
- ofi = malloc (sizeof(OPEN_FILE_INFORMATION) + MAX_PATH);
-
- if (!DeviceIoControl (Device,
- IOCTL_FILE_DISK_QUERY_FILE,
- NULL,
- 0,
- ofi,
- sizeof(OPEN_FILE_INFORMATION) + MAX_PATH,
- &BytesReturned, NULL)) {
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_QUERY;
- }
-
- if (BytesReturned < sizeof(OPEN_FILE_INFORMATION)) {
- SetLastError (ERROR_INSUFFICIENT_BUFFER);
- print_lasterr (&VolumeName[4]);
- return CDISK_ERR_QUERY;
- }
-
- if (size)
- *size = ofi->FileSize;
- if (rdonly)
- *rdonly = ofi->ReadOnly;
-
- return 0;
-}
-
-
-POPEN_FILE_INFORMATION
-filedisk_init_info (int devnum, char drivelet, const char * file,
- int ro, int cd_img, unsigned long size, const char * key,
- int keyalgo)
-{
- POPEN_FILE_INFORMATION pfi;
-
- pfi = calloc (1, sizeof(OPEN_FILE_INFORMATION) + strlen (file) + 7);
- if (!pfi)
- return NULL;
-
- /*pfi->version = CCVERSION;*/
- if (file[0] == '\\') {
- if (file[1] == '\\' && file[2] != '.') {
- /* \\server\share\path\filedisk.img */
- strcpy(pfi->FileName, "\\??\\UNC");
- strcat(pfi->FileName, file + 1);
- }
- else /* \Device\Harddisk0\Partition1\path\filedisk.img */
- strcpy(pfi->FileName, file);
- }
- else { // c:\path\filedisk.img
- strcpy (pfi->FileName, "\\??\\");
- strcat (pfi->FileName, file);
- }
-
- pfi->FileNameLength = (USHORT) strlen (pfi->FileName);
- pfi->ReadOnly = ro? TRUE : FALSE;
- if (cd_img)
- pfi->ReadOnly = TRUE;
- if (size)
- pfi->FileSize.QuadPart = size * 1024;
- if (key) {
- /*
- if (keyalgo < 1 || keyalgo > 4)
- pfi->KeyType = 1;
- else
- pfi->KeyType = keyalgo;
- add_key (pfi, key, strlen (key));
- */
- }
-
- return pfi;
-}
-
-
-void
-filedisk_free_info (POPEN_FILE_INFORMATION pfi)
-{
- if (!pfi)
- return;
- /*memset (pfi->Key, 0, sizeof pfi->Key);*/
- free (pfi);
-}
-#endif
-
Modified: trunk/Po/POTFILES.in
===================================================================
--- trunk/Po/POTFILES.in 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/Po/POTFILES.in 2007-02-03 18:28:38 UTC (rev 283)
@@ -25,6 +25,7 @@
Src/wptFileManagerDlg.cpp
Src/wptFileSaveDlg.cpp
Src/wptFileStatDlg.cpp
+Src/wptFilePrefsDlg.cpp
Src/wptFileVerifyDlg.cpp
Src/wptFirstRunDlg.cpp
Src/wptGPG.cpp
@@ -85,3 +86,5 @@
Src/wptUtil.cpp
Src/wptVerifyList.cpp
Src/wptW32API.cpp
+Src/wptRegistryMobile.cpp
+Src/wptSafeEditCtrl.cpp
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/Po/de.po 2007-02-03 18:28:38 UTC (rev 283)
@@ -1,6 +1,6 @@
# WinPT - German translation file
# Copyright (C)
-# Timo Schulz <twoaday at freakmail.de>, 2002, 2004, 2005, 2006
+# Timo Schulz <twoaday at freakmail.de>, 2002, 2004, 2005, 2006, 2007
# g10 Code GmbH <twoaday at g10code.de>, 2005, 2006
#
# These authors are retired and should not be contacted for questions
@@ -14,7 +14,7 @@
# BUG: GetOpenFileName needs \0\0. gettext does not support it.
msgid ""
msgstr ""
-"Project-Id-Version: WinPT 1.1.1\n"
+"Project-Id-Version: WinPT 1.2.1\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
"POT-Creation-Date: 2007-01-15 22:58+0100\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-01-15 22:11:52 UTC (rev 282)
+++ trunk/configure.ac 2007-02-03 18:28:38 UTC (rev 283)
@@ -1,6 +1,6 @@
# configure.ac - for WinPT
# Copyright (C) 2005, 2006 g10 Code GmbH
-# Copyright (C) 2006 Timo Schulz
+# Copyright (C) 2006, 2007 Timo Schulz
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -75,8 +75,7 @@
/* Some global constants. */
/* We need to include this header to be able to include specific parts
- of the header files. For now we require at least Internet Exploder
- 4.01 to be installed. */
+ of the common controls header file. */
#include <w32api.h>
#define _WIN32_IE IE55
])
@@ -109,16 +108,10 @@
have_w32_system=no
case "${host}" in
*-mingw32*)
- # special stuff for Windoze NT
+ # special stuff for Windoze NT/XP
ac_cv_have_dev_random=no
- AC_DEFINE(USE_ONLY_8DOT3,1,
- [set this to limit filenames to the 8.3 format])
- AC_DEFINE(HAVE_DRIVE_LETTERS,1,
- [defined if we must run on a stupid file system])
AC_DEFINE(USE_SIMPLE_GETTEXT,1,
- [because the Unix gettext has too much overhead on
- MingW32 systems and these systems lack Posix functions,
- we use a simplified version of gettext])
+ [Use a lightweight gettext version for cross-compiling])
have_dosish_system=yes
have_w32_system=yes
try_gettext="no"
@@ -150,9 +143,8 @@
if test "$have_dosish_system" = yes; then
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
- [Defined if we run on some of the PCDOS like systems
- (DOS, Windoze. OS/2) with special properties like
- no file modes])
+ [Define this to indicate the binary is build for a system
+ with special properties like no posix file modes])
fi
AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
@@ -162,12 +154,10 @@
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
-
#
# Checks for libraries.
#
-
AM_PATH_GPGME("$NEED_GPGME_API:$NEED_GPGME_VERSION",
have_gpgme=yes,have_gpgme=no)
AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
@@ -175,7 +165,7 @@
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h unistd.h langinfo.h termio.h locale.h)
+AC_CHECK_HEADERS(string.h unistd.h)
AC_CHECK_FUNCS(stpcpy)
@@ -183,7 +173,6 @@
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
@@ -207,7 +196,6 @@
AC_SUBST(W32LIBS)
-
#
# Print errors here so that they are visible all
# together and the user can acquire them all together.
More information about the Winpt-commits
mailing list