[svn] GpgOL - r292 - in trunk: . src
svn author wk
cvs at cvs.gnupg.org
Fri Jan 16 18:50:09 CET 2009
Author: wk
Date: 2009-01-16 18:50:09 +0100 (Fri, 16 Jan 2009)
New Revision: 292
Modified:
trunk/AUTHORS
trunk/NEWS
trunk/README
trunk/src/ChangeLog
trunk/src/engine-assuan.c
trunk/src/mapihelp.cpp
trunk/src/olflange-dlgs.cpp
trunk/src/versioninfo.rc.in
Log:
* engine-assuan.c (attach_thread_input_wndw_proc)
(attach_thread_input): Enable code.
(async_worker_thread): Replace WFMO by MsgWaitForMultipleObjects
and add message dispatcher loops.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/src/ChangeLog 2009-01-16 17:50:09 UTC (rev 292)
@@ -1,3 +1,14 @@
+2009-01-16 Werner Koch <wk at g10code.com>
+
+ * engine-assuan.c (attach_thread_input_wndw_proc)
+ (attach_thread_input): Enable code.
+ (async_worker_thread): Replace WFMO by MsgWaitForMultipleObjects
+ and add message dispatcher loops.
+
+2008-11-27 Werner Koch <wk at g10code.com>
+
+ * mapihelp.cpp (mapi_get_sender): Extract the CN name if available.
+
2008-11-26 Werner Koch <wk at g10code.com>
* ext-commands.cpp (InstallCommands): Don't show status icon for
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/AUTHORS 2009-01-16 17:50:09 UTC (rev 292)
@@ -17,3 +17,4 @@
Some files may still contain code from the orginal plugin:
Copyright (C) 2001 G Data Software AG, http://www.gdata.de
+
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/NEWS 2009-01-16 17:50:09 UTC (rev 292)
@@ -1,3 +1,7 @@
+Noteworthy changes for version 0.10.18 (unreleased)
+===================================================
+
+
Noteworthy changes for version 0.10.17 (2008-11-14)
===================================================
Modified: trunk/README
===================================================================
--- trunk/README 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/README 2009-01-16 17:50:09 UTC (rev 292)
@@ -1,6 +1,11 @@
+ GpgOL Version 0.10.x
+ =======================
+ Copyright (C) 2004, 2005, 2007, 2008, 2009 g10 Code GmbH
+
+
GpgOL is a GnuPG plugin for MS Outlook.
-WARNING: This version requires the latest Kleopatra software.
+WARNING: This version requires the latest Kleopatra or GPA software.
. Top directory with build scripts and information files.
Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/src/engine-assuan.c 2009-01-16 17:50:09 UTC (rev 292)
@@ -1,5 +1,5 @@
/* engine-assuan.c - Crypto engine using an Assuan server
- * Copyright (C) 2007, 2008 g10 Code GmbH
+ * Copyright (C) 2007, 2008, 2009 g10 Code GmbH
*
* This file is part of GpgOL.
*
@@ -613,7 +613,7 @@
return 0;
}
-#if 0 /* Not used. */
+
/* Dummy window procedure. */
static LRESULT CALLBACK
attach_thread_input_wndw_proc (HWND hwnd, UINT msg,
@@ -657,10 +657,8 @@
log_debug ("%s:%s: attached thread %lu to %lu", SRCNAME, __func__,
GetCurrentThreadId (), other_tid);
}
-#endif /* not used. */
-
/* Helper to write to the callback. */
static void
@@ -875,7 +873,7 @@
HANDLE hdarray[MAXIMUM_WAIT_OBJECTS];
int count, addit, any_ready, hdarraylen;
-/* attach_thread_input ( (DWORD)dummy ); */
+ attach_thread_input ( (DWORD)dummy );
(void)dummy;
for (;;)
@@ -975,19 +973,19 @@
after the wait because we will only get to here if there
is actual ui-server work to be done but some messages
might still be in the queue. */
-/* { */
-/* MSG msg; */
+ {
+ MSG msg;
-/* while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) */
-/* { */
-/* TranslateMessage (&msg); */
-/* DispatchMessage (&msg); */
-/* } */
-/* } */
+ while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+ {
+ TranslateMessage (&msg);
+ DispatchMessage (&msg);
+ }
+ }
- n = WaitForMultipleObjects (hdarraylen, hdarray, FALSE, INFINITE);
-/* n = MsgWaitForMultipleObjects (hdarraylen, hdarray, FALSE, */
-/* INFINITE, QS_ALLEVENTS); */
+/* n = WaitForMultipleObjects (hdarraylen, hdarray, FALSE, INFINITE); */
+ n = MsgWaitForMultipleObjects (hdarraylen, hdarray, FALSE,
+ INFINITE, QS_ALLEVENTS);
if (n == WAIT_FAILED)
{
/* The WFMO failed. This is an error; to help debugging
@@ -1030,15 +1028,15 @@
/* [Currently not used]
Try to process the message queue. */
-/* { */
-/* MSG msg; */
+ {
+ MSG msg;
-/* while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) */
-/* { */
-/* TranslateMessage (&msg); */
-/* DispatchMessage (&msg); */
-/* } */
-/* } */
+ while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+ {
+ TranslateMessage (&msg);
+ DispatchMessage (&msg);
+ }
+ }
}
/*
Modified: trunk/src/mapihelp.cpp
===================================================================
--- trunk/src/mapihelp.cpp 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/src/mapihelp.cpp 2009-01-16 17:50:09 UTC (rev 292)
@@ -1404,6 +1404,18 @@
for (p0=buf, p++; *p && *p != '\x01';)
*p0++ = *p++;
*p0 = 0;
+
+ /* When using an Exchange account this is an X.509 address and not
+ an SMTP address. We try to detect this here and extract only the
+ CN RDN. Note that there are two CNs. This is just a simple
+ approach and not a real parser. A better way to do this would be
+ to ask MAPI to resolve the X.500 name to an SMTP name. */
+ if (strstr (buf, "/o=") && strstr (buf, "/ou=") &&
+ (p = strstr (buf, "/cn=Recipients")) && (p = strstr (p+1, "/cn=")))
+ {
+ log_debug ("%s:%s: orig address is `%s'\n", SRCNAME, __func__, buf);
+ memmove (buf, p+4, strlen (p+4)+1);
+ }
log_debug ("%s:%s: address is `%s'\n", SRCNAME, __func__, buf);
return buf;
}
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/src/olflange-dlgs.cpp 2009-01-16 17:50:09 UTC (rev 292)
@@ -248,7 +248,7 @@
case PSN_HELP:
{
- const char cpynotice[] = "Copyright (C) 2008 g10 Code GmbH";
+ const char cpynotice[] = "Copyright (C) 2009 g10 Code GmbH";
const char en_notice[] =
"GpgOL is a plugin for Outlook to allow encryption and\n"
"signing of messages using the OpenPGP and S/MIME standard.\n"
Modified: trunk/src/versioninfo.rc.in
===================================================================
--- trunk/src/versioninfo.rc.in 2008-12-02 18:22:54 UTC (rev 291)
+++ trunk/src/versioninfo.rc.in 2009-01-16 17:50:09 UTC (rev 292)
@@ -39,7 +39,7 @@
VALUE "FileDescription", "GpgOL - GnuPG plugin for Outlook\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "gpgol\0"
- VALUE "LegalCopyright", "Copyright © 2005 g10 Code GmbH\0"
+ VALUE "LegalCopyright", "Copyright © 2009 g10 Code GmbH\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gpgol.dll\0"
VALUE "PrivateBuild", "\0"
More information about the Gnupg-commits
mailing list