[Winpt-commits] r57 - in trunk: . PTD Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Nov 2 12:29:45 CET 2005
Author: werner
Date: 2005-11-02 12:29:44 +0100 (Wed, 02 Nov 2005)
New Revision: 57
Modified:
trunk/ChangeLog
trunk/PTD/PTD.cpp
trunk/Src/ChangeLog
trunk/Src/Makefile.am
trunk/Src/WinPT.cpp
trunk/Src/wptCurrWnd.cpp
trunk/Src/wptErrors.cpp
trunk/configure.ac
Log:
Builds but we need to check the SetWindowsHookEx semantics to make it run.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/ChangeLog 2005-11-02 11:29:44 UTC (rev 57)
@@ -1,213 +1,217 @@
-2005-10-31 Werner Koch <wk at g10code.com>
-
- * w32gpgme/Makefile.am: Add a real Makefile.
-
-2005-10-28 Werner Koch <wk at g10code.com>
-
- * Makefile.am (AUTOMAKE_OPTIONS): Remove zip target and use bzip2.
-
-2005-10-27 Werner Koch <wk at g10code.com>
-
- * w32gpgme/w32gpgme.h [WINPT_MODERN_BUILD]: Include gpgme.h from
- standard place.
- (gpg_pgptype_t): Make in terms of pgp_type_t.
-
- * SmartCard.txt: Removed cuase the information is outdated.
-
- * autogen.sh, configure.ac: New.
- * m4/: New.
- * Makefile.am: New.
- * winpt-de.rc, WinPT-en.rc: Include Src/versioninfo.rc. We don't
- use a translated version for -de right now; however it will be
- easy to add.
- * KeyManagerExe.cpp: Moved to Src/.
-
-2001-01-28 Timo Schulz <twoaday at freakmail.de>
-
- * Add a hotkey section to the README
-
-2001-01-30 Timo Schulz <twoaday at freakmail.de>
-
- * Add new GPGME update
-
-2001-02-01 Timo Schulz <twoaday at freakmail.de>
-
- * AUTHORS: Add author for the NLS code
- * README: Add OE5 hotkey
-
-2001-02-04 Timo Schulz <twoaday at freakmail.de>
-
- * NLS: remove and put the text into README
- * README: add NLS section
-
-2001-02-20 Timo Schulz <ts at winpt.org>
-
- * Add new GPGME update 0.1.4b
-
-2001-02-21 Timo Schulz <ts at winpt.org>
-
- * INSTALL: Remove and put the entries into README
- * VERSION: update
- * README: Rewrite the parts for the use with 0.1.2pre
- * WinPT.rc: IDD_WINPT_IMPORT: Add static fields to the NLS suite
-
-2001-02-25 Timo Schulz <ts at winpt.org>
-
- * WinPT.rc: IDD_WINPT_KEYGEN: Add static fields to the NLS suite
-
-2001-02-28 Timo Schulz <ts at winpt.org>
-
- * Add new GPGME update 0.2.0
-
-2001-03-10 Timo Schulz <ts at winpt.org>
-
- * Kludge WinPG and GPGME together. The next step should be
- to put all gpgme extensions into the 'MyGPGME' libarary
-
-2001-04-02 Timo Schulz <ts at winpt.org>
-
- * Add new GPGME update 0.2.1
-
-2001-04-09 Timo Schulz <ts at winpt.org>
-
- * Modify README for the new menu layout.
-
-2001-04-12 Timo Schulz <ts at winpt.org>
-
- * Hook: New. Little project to let the current window stuff work.
-
-2001-04-14 Timo Schulz <ts at winpt.org>
-
- * WinPT.rc: Change all dialog languages to English/USA.
- Add menu entry for the current window stuff.
-
-2001-04-21 Timo Schulz <ts at winpt.org>
-
- * Update GPGME code.
-
-2001-05-05 Timo Schulz <ts at winpt.org>
-
- * WinPT.rc: Modify some dialogs for the new keyedit feature.
-
-2001-05-09 Timo Schulz <ts at winpt.org>
-
- * New project started. WinPT GPG Agent.
-
-2001-05-10 Timo Schulz <ts at winpt.org>
-
- * WinPT.rc: Add new resource for the preferences.
-
-2001-05-11 Timo Schulz <ts at winpt.org>
-
- * MyGPGME/tests: Removed. It's not really useful so I decided to
- remove it from the package.
-
-2001-05-12 Timo Schulz <ts at winpt.org>
-
- * README: Apply some spelling corrections from Joshua.
-
-2001-05-19 Timo Schulz <ts at winpt.org>
-
- * README: Corrected the filename to verify the signature.
-
-2001-05-27 Timo Schulz <ts at winpt.org>
-
- * README: Add a paragraph for the word wrap feature.
-
-2001-06-01 Timo Schulz <ts at winpt.org>
-
- * README: Add a paragraph for multiple recipients.
-
-2001-06-05 Timo Schulz <ts at winpt.org>
-
- * README: Remove Outlook Express hotkey, because we don't include
- this until it works.
-
-2001-06-07 Timo Schulz <ts at winpt.org>
-
- * README: Commited spelling fixes.
-
-2001-06-17 Timo Schulz <ts at winpt.org>
-
- * README: Add a notice for the current window mode.
-
-2001-06-22 Timo Schulz <ts at winpt.org>
-
- * Begin to audit the code basically, because of the passphrase
- logging by Dr. Watson...
-
-2001-06-24 Timo Schulz <ts at winpt.org>
-
- * Add the default keyid section to the README.
-
-2001-06-29 Timo Schulz <ts at winpt.org>
-
- * Add keyserver.conf as a default config file.
- * Add an index to the README file and a paragraph for the
- keserver config.
-
-2001-07-05 Timo Schulz <ts at winpt.org>
-
- * README: Add the text from the HACKING file.
-
-2001-07-11 Timo Schulz <ts at winpt.org>
-
- * Release 0.3.0
-
-2001-07-19 Timo Schulz <ts at winpt.org>
-
- * Release 0.3.1
-
-2001-07-23 Timo Schulz <ts at winpt.org>
-
- * Added the FAQ.
-
-2001-08-26 Timo Schulz <ts at winpt.org>
-
- * Added new icon.
-
-2001-08-30 Timo Schulz <ts at winpt.org>
-
- * README: Add proxy paragraph.
-
-2001-09-23 Timo Schulz <ts at winpt.org>
-
- * Release 0.4.0
-
-2001-10-28 Timo Schulz <ts at winpt.org>
-
- * Release 0.5.0
-
-2001-11-01 Timo Schulz <ts at winpt.org>
-
- * Release 0.5.1: This is a bugfix release becuase the new libmygpgme
- is too buggy to use it yet :-(.
-
-2001-12-02 Timo Schulz <ts at winpt.org>
-
- * README: Modify proxy paragraph.
-
-2002-01-27 Timo Schulz <ts at winpt.org>
-
- * Release 0.5.5
-
-2002-06-16 Timo Schulz <ts at winpt.org>
-
- * Skip 0.6.0 because of all the changes in the code and in
- the structure. We continue to test the 0.7.0 version and the
- next stable version will be 0.8.0.
-
-2002-08-28 Timo Schulz <ts at winpt.org>
-
- * Opened 0.7.0 development branch.
-
-2002-09-10 Timo Schulz <ts at winpt.org>
-
- * Skipped the 0.6.0 branch and bumped the version number to
- 0.7.90 to make clear we are close to 0.8.0.
-
-
-2002-12-21 Timo Schulz <ts at winpt.org>
-
- * Removed all things from all TODO files which have already done.
-
+2005-11-01 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Use Src/WinPt.cpp and not src/WinPt.cpp
+
+2005-10-31 Werner Koch <wk at g10code.com>
+
+ * w32gpgme/Makefile.am: Add a real Makefile.
+
+2005-10-28 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AUTOMAKE_OPTIONS): Remove zip target and use bzip2.
+
+2005-10-27 Werner Koch <wk at g10code.com>
+
+ * w32gpgme/w32gpgme.h [WINPT_MODERN_BUILD]: Include gpgme.h from
+ standard place.
+ (gpg_pgptype_t): Make in terms of pgp_type_t.
+
+ * SmartCard.txt: Removed cuase the information is outdated.
+
+ * autogen.sh, configure.ac: New.
+ * m4/: New.
+ * Makefile.am: New.
+ * winpt-de.rc, WinPT-en.rc: Include Src/versioninfo.rc. We don't
+ use a translated version for -de right now; however it will be
+ easy to add.
+ * KeyManagerExe.cpp: Moved to Src/.
+
+2001-01-28 Timo Schulz <twoaday at freakmail.de>
+
+ * Add a hotkey section to the README
+
+2001-01-30 Timo Schulz <twoaday at freakmail.de>
+
+ * Add new GPGME update
+
+2001-02-01 Timo Schulz <twoaday at freakmail.de>
+
+ * AUTHORS: Add author for the NLS code
+ * README: Add OE5 hotkey
+
+2001-02-04 Timo Schulz <twoaday at freakmail.de>
+
+ * NLS: remove and put the text into README
+ * README: add NLS section
+
+2001-02-20 Timo Schulz <ts at winpt.org>
+
+ * Add new GPGME update 0.1.4b
+
+2001-02-21 Timo Schulz <ts at winpt.org>
+
+ * INSTALL: Remove and put the entries into README
+ * VERSION: update
+ * README: Rewrite the parts for the use with 0.1.2pre
+ * WinPT.rc: IDD_WINPT_IMPORT: Add static fields to the NLS suite
+
+2001-02-25 Timo Schulz <ts at winpt.org>
+
+ * WinPT.rc: IDD_WINPT_KEYGEN: Add static fields to the NLS suite
+
+2001-02-28 Timo Schulz <ts at winpt.org>
+
+ * Add new GPGME update 0.2.0
+
+2001-03-10 Timo Schulz <ts at winpt.org>
+
+ * Kludge WinPG and GPGME together. The next step should be
+ to put all gpgme extensions into the 'MyGPGME' libarary
+
+2001-04-02 Timo Schulz <ts at winpt.org>
+
+ * Add new GPGME update 0.2.1
+
+2001-04-09 Timo Schulz <ts at winpt.org>
+
+ * Modify README for the new menu layout.
+
+2001-04-12 Timo Schulz <ts at winpt.org>
+
+ * Hook: New. Little project to let the current window stuff work.
+
+2001-04-14 Timo Schulz <ts at winpt.org>
+
+ * WinPT.rc: Change all dialog languages to English/USA.
+ Add menu entry for the current window stuff.
+
+2001-04-21 Timo Schulz <ts at winpt.org>
+
+ * Update GPGME code.
+
+2001-05-05 Timo Schulz <ts at winpt.org>
+
+ * WinPT.rc: Modify some dialogs for the new keyedit feature.
+
+2001-05-09 Timo Schulz <ts at winpt.org>
+
+ * New project started. WinPT GPG Agent.
+
+2001-05-10 Timo Schulz <ts at winpt.org>
+
+ * WinPT.rc: Add new resource for the preferences.
+
+2001-05-11 Timo Schulz <ts at winpt.org>
+
+ * MyGPGME/tests: Removed. It's not really useful so I decided to
+ remove it from the package.
+
+2001-05-12 Timo Schulz <ts at winpt.org>
+
+ * README: Apply some spelling corrections from Joshua.
+
+2001-05-19 Timo Schulz <ts at winpt.org>
+
+ * README: Corrected the filename to verify the signature.
+
+2001-05-27 Timo Schulz <ts at winpt.org>
+
+ * README: Add a paragraph for the word wrap feature.
+
+2001-06-01 Timo Schulz <ts at winpt.org>
+
+ * README: Add a paragraph for multiple recipients.
+
+2001-06-05 Timo Schulz <ts at winpt.org>
+
+ * README: Remove Outlook Express hotkey, because we don't include
+ this until it works.
+
+2001-06-07 Timo Schulz <ts at winpt.org>
+
+ * README: Commited spelling fixes.
+
+2001-06-17 Timo Schulz <ts at winpt.org>
+
+ * README: Add a notice for the current window mode.
+
+2001-06-22 Timo Schulz <ts at winpt.org>
+
+ * Begin to audit the code basically, because of the passphrase
+ logging by Dr. Watson...
+
+2001-06-24 Timo Schulz <ts at winpt.org>
+
+ * Add the default keyid section to the README.
+
+2001-06-29 Timo Schulz <ts at winpt.org>
+
+ * Add keyserver.conf as a default config file.
+ * Add an index to the README file and a paragraph for the
+ keserver config.
+
+2001-07-05 Timo Schulz <ts at winpt.org>
+
+ * README: Add the text from the HACKING file.
+
+2001-07-11 Timo Schulz <ts at winpt.org>
+
+ * Release 0.3.0
+
+2001-07-19 Timo Schulz <ts at winpt.org>
+
+ * Release 0.3.1
+
+2001-07-23 Timo Schulz <ts at winpt.org>
+
+ * Added the FAQ.
+
+2001-08-26 Timo Schulz <ts at winpt.org>
+
+ * Added new icon.
+
+2001-08-30 Timo Schulz <ts at winpt.org>
+
+ * README: Add proxy paragraph.
+
+2001-09-23 Timo Schulz <ts at winpt.org>
+
+ * Release 0.4.0
+
+2001-10-28 Timo Schulz <ts at winpt.org>
+
+ * Release 0.5.0
+
+2001-11-01 Timo Schulz <ts at winpt.org>
+
+ * Release 0.5.1: This is a bugfix release becuase the new libmygpgme
+ is too buggy to use it yet :-(.
+
+2001-12-02 Timo Schulz <ts at winpt.org>
+
+ * README: Modify proxy paragraph.
+
+2002-01-27 Timo Schulz <ts at winpt.org>
+
+ * Release 0.5.5
+
+2002-06-16 Timo Schulz <ts at winpt.org>
+
+ * Skip 0.6.0 because of all the changes in the code and in
+ the structure. We continue to test the 0.7.0 version and the
+ next stable version will be 0.8.0.
+
+2002-08-28 Timo Schulz <ts at winpt.org>
+
+ * Opened 0.7.0 development branch.
+
+2002-09-10 Timo Schulz <ts at winpt.org>
+
+ * Skipped the 0.6.0 branch and bumped the version number to
+ 0.7.90 to make clear we are close to 0.8.0.
+
+
+2002-12-21 Timo Schulz <ts at winpt.org>
+
+ * Removed all things from all TODO files which have already done.
+
Property changes on: trunk/ChangeLog
___________________________________________________________________
Name: avn:eol-style
+ native
Modified: trunk/PTD/PTD.cpp
===================================================================
--- trunk/PTD/PTD.cpp 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/PTD/PTD.cpp 2005-11-02 11:29:44 UTC (rev 57)
@@ -93,8 +93,17 @@
tray_proc_id = GetCurrentProcessId ();
cbt_hook = SetWindowsHookEx (WH_CBT, PTD_CBT_proc, glob_hinst, 0);
if (cbt_hook == NULL)
+ {
+ char buf[500];
+
+ FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError (),
+ MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+ buf, sizeof buf -1, NULL);
+ MessageBox (NULL, buf, "Error", MB_OK|MB_ICONSTOP);
return FALSE;
+ }
+
/* Okay, what are we doing here:
* In the past I used the Spy++ application to find out why the old current
* window doesn't work on so much systems. Now we try to use the computer
@@ -271,7 +280,7 @@
{
switch (reason) {
case DLL_PROCESS_ATTACH:
- glob_hinst = hinst;
+ glob_hinst = hinst;
break;
case DLL_THREAD_ATTACH:
break;
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/Src/ChangeLog 2005-11-02 11:29:44 UTC (rev 57)
@@ -1,6 +1,16 @@
+2005-11-02 Werner Koch <wk at g10code.com>
+
+ * WinPT.cpp (WinMain): Disabled PTD version tests.
+
+ * wptErrors.cpp (debug_end): Add dummy function.
+
+ * Makefile.am (code_files): Added wptCardEditCB.cpp and
+ wptKeyEditCB.cpp.
+
2005-10-31 Werner Koch <wk at g10code.com>
- * wptCurrWnd.cpp: Include wptVersion.h to get prototypes of PTD functions.
+ * wptCurrWnd.cpp: Include wptVersion.h to get prototypes of PTD
+ functions.
* wptKeyEditDlgs.cpp: Include oleauto.h
* wptKeyEdit.cpp: Include time.h.
Modified: trunk/Src/Makefile.am
===================================================================
--- trunk/Src/Makefile.am 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/Src/Makefile.am 2005-11-02 11:29:44 UTC (rev 57)
@@ -105,8 +105,12 @@
wptW32API.cpp \
wptGPGUtil.cpp \
wptCardEdit.cpp \
+ wptCardEditCB.cpp \
wptKeyEdit.cpp \
- wptKeyCache.cpp
+ wptKeyEditCB.cpp \
+ wptFileCBS.cpp \
+ wptKeyCache.cpp \
+ wptUtil.cpp
WinPT_SOURCES = $(resource_files) $(dialog_files) $(code_files)
Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/Src/WinPT.cpp 2005-11-02 11:29:44 UTC (rev 57)
@@ -260,12 +260,13 @@
#endif
s = PTD_get_version ();
- if (strcmp (s, MIN_PTD_VER)) {
- log_box (_("Privacy Tray Dynamic (PTD)"), MB_ERR,
- _("Please update your PTD.dll to the newest version, "
- "the version (%s) you use is too old."), s);
- return 0;
- }
+ // FIXME: Using strcmp here is wrong
+// if (strcmp (s, MIN_PTD_VER)) {
+// log_box (_("Privacy Tray Dynamic (PTD)"), MB_ERR,
+// _("Please update your PTD.dll to the newest version, "
+// "the version (%s) you use is too old."), s);
+// return 0;
+// }
if (gpg_md_selftest ()) {
msg_box (NULL, _("Cryptographic selftest failed."),
Modified: trunk/Src/wptCurrWnd.cpp
===================================================================
--- trunk/Src/wptCurrWnd.cpp 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/Src/wptCurrWnd.cpp 2005-11-02 11:29:44 UTC (rev 57)
@@ -26,6 +26,7 @@
#include "wptW32API.h"
#include "wptErrors.h"
+#include "wptVersion.h"
#define KEYDOWN( vcode, scode ) keybd_event( (vcode), (scode), 0, 0 )
#define KEYUP( vcode, scode) keybd_event( (vcode), (scode), KEYEVENTF_KEYUP, 0 )
Modified: trunk/Src/wptErrors.cpp
===================================================================
--- trunk/Src/wptErrors.cpp 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/Src/wptErrors.cpp 2005-11-02 11:29:44 UTC (rev 57)
@@ -148,6 +148,7 @@
} /* winpt_errmsg */
+
void
winpt_debug_msg( void )
{
@@ -161,7 +162,17 @@
} /* winpt_debug_msg */
+/* Dummy function. Not sure for what it is used. */
void
+debug_end (void)
+{
+
+
+}
+
+
+
+void
debug_box( const char *msg, const char *file, int line )
{
#if _DEBUG
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-11-02 09:36:52 UTC (rev 56)
+++ trunk/configure.ac 2005-11-02 11:29:44 UTC (rev 57)
@@ -25,7 +25,7 @@
PACKAGE_GT=${PACKAGE_NAME}
VERSION=$PACKAGE_VERSION
-AC_CONFIG_SRCDIR(src/WinPT.cpp)
+AC_CONFIG_SRCDIR(Src/WinPT.cpp)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_TARGET()
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
More information about the Winpt-commits
mailing list