[git] GpgOL - branch, master, updated. gpgol-1.2.0-104-gf620398
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Nov 13 15:17:01 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via f620398facc12abb8772e32c010e27658a0422ad (commit)
from e1070f0012acbb57b04d0babda3d76d9266a91ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f620398facc12abb8772e32c010e27658a0422ad
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 15:14:36 2015 +0100
Revert "Use libmapi32 from mingw"
This reverts commit 6533170a34d9e6f7191e41b31045ad0b4b4af1df.
--
With libmapi32.a from mingw we get unresolved symbol errors
on runtime.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f9a6c6..e5cb2c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ unused_sources = item-events.cpp
bin_PROGRAMS = gpgol
#treeview
EXTRA_DIST = \
- versioninfo.rc.in $(unused_sources) Outlook.gpl \
+ versioninfo.rc.in mapi32.def $(unused_sources) Outlook.gpl \
encrypt-16.bmp encrypt-16m.bmp \
sign-16.bmp sign-16m.bmp \
key-manager-16.bmp key-manager-16m.bmp \
@@ -86,11 +86,16 @@ gpgol_SOURCES = \
#treeview_SOURCES = treeview.c
-# We create our own virtual copies to the _static_
+# W32API 3.2 comes with an unusable libmapi32.a. We build our own
+# version. Note the omission of -k (--kill-at) from the DLLTOOL
+# command line. We also create our own virtual copies to the _static_
# versions of GPGME and gpg-error, because we want to link to them
# statically, and not dynamically (otherwise Outlook would not find
# them).
-gpgol_DEPENDENCIES = libgpg-error.a libgpgme.a libassuan.a
+gpgol_DEPENDENCIES = libmapi32.a libgpg-error.a libgpgme.a libassuan.a
+
+libmapi32.a: mapi32.def
+ $(DLLTOOL) --output-lib $@ --def $<
libgpg-error.a:
ln -s $$($(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a .
diff --git a/src/mapi32.def b/src/mapi32.def
new file mode 100644
index 0000000..2e4fe42
--- /dev/null
+++ b/src/mapi32.def
@@ -0,0 +1,164 @@
+LIBRARY MAPI32.DLL
+EXPORTS
+BuildDisplayTable at 40
+CbOfEncoded at 4
+CchOfEncoding at 4
+ChangeIdleRoutine at 28
+CloseIMsgSession at 4
+CreateIProp at 24
+CreateTable at 36
+DeinitMapiUtil at 0
+DeregisterIdleRoutine at 4
+EnableIdleRoutine at 8
+EncodeID at 12
+FBadColumnSet at 4
+FBadEntryList at 4
+FBadProp at 4
+FBadPropTag at 4
+FBadRestriction at 4
+FBadRglpNameID at 8
+FBadRglpszA at 8
+FBadRglpszW at 8
+FBadRow at 4
+FBadRowSet at 4
+FBadSortOrderSet at 4
+FBinFromHex at 8
+FDecodeID at 12
+FEqualNames at 8
+FPropCompareProp at 12
+FPropContainsProp at 12
+FPropExists at 8
+FreePadrlist at 4
+FreeProws at 4
+FtAdcFt at 20
+FtAddFt at 16
+FtDivFtBogus at 20
+FtMulDw at 12
+FtMulDwDw at 8
+FtNegFt at 8
+FtSubFt at 16
+FtgRegisterIdleRoutine at 20
+GetAttribIMsgOnIStg at 12
+GetTnefStreamCodepage
+GetTnefStreamCodepage at 12
+HexFromBin at 12
+HrAddColumns at 16
+HrAddColumnsEx at 20
+HrAllocAdviseSink at 12
+HrComposeEID at 28
+HrComposeMsgID at 24
+HrDecomposeEID at 28
+HrDecomposeMsgID at 24
+HrDispatchNotifications at 4
+HrEntryIDFromSz at 12
+HrGetOneProp at 12
+HrIStorageFromStream at 16
+HrQueryAllRows at 24
+HrSetOneProp at 8
+HrSzFromEntryID at 12
+HrThisThreadAdviseSink at 8
+HrValidateIPMSubtree at 20
+HrValidateParameters at 8
+InstallFilterHook at 4
+IsBadBoundedStringPtr at 8
+LAUNCHWIZARD
+LPropCompareProp at 8
+LaunchWizard at 20
+LpValFindProp at 12
+MAPI_NSCP_SynchronizeClient at 8
+MAPIAddress at 44
+MAPIAdminProfiles
+MAPIAdminProfiles at 8
+MAPIAllocateBuffer
+MAPIAllocateBuffer at 8
+MAPIAllocateMore
+MAPIAllocateMore at 12
+MAPIDeinitIdle at 0
+MAPIDeleteMail at 20
+MAPIDetails at 20
+MAPIFindNext at 28
+MAPIFreeBuffer
+MAPIFreeBuffer at 4
+MAPIGetDefaultMalloc at 0
+MAPIGetNetscapeVersion at 0
+MAPIInitIdle at 4
+MAPIInitialize
+MAPIInitialize at 4
+MAPILogoff at 16
+MAPILogon at 24
+MAPILogonEx
+MAPILogonEx at 20
+MAPIOpenFormMgr
+MAPIOpenFormMgr at 8
+MAPIOpenLocalFormContainer
+MAPIOpenLocalFormContainer at 4
+MAPIReadMail at 24
+MAPIResolveName at 24
+MAPISaveMail at 24
+MAPISendDocuments at 20
+MAPISendMail
+MAPISendMail at 20
+MAPIUninitialize
+MAPIUninitialize at 0
+MNLS_CompareStringW at 24
+MNLS_IsBadStringPtrW at 8
+MNLS_MultiByteToWideChar at 24
+MNLS_WideCharToMultiByte at 32
+MNLS_lstrcmpW at 8
+MNLS_lstrcpyW at 8
+MNLS_lstrlenW at 4
+MapStorageSCode at 4
+OpenIMsgOnIStg at 44
+OpenIMsgSession at 12
+OpenStreamOnFile
+OpenStreamOnFile at 24
+OpenTnefStream
+OpenTnefStream at 28
+OpenTnefStreamEx
+OpenTnefStreamEx at 32
+PRProviderInit
+PpropFindProp at 12
+PropCopyMore at 16
+RTFSync
+RTFSync at 12
+ScBinFromHexBounded at 12
+ScCopyNotifications at 16
+ScCopyProps at 16
+ScCountNotifications at 12
+ScCountProps at 12
+ScCreateConversationIndex at 16
+ScDupPropset at 16
+ScGenerateMuid at 4
+ScInitMapiUtil at 4
+ScLocalPathFromUNC at 12
+ScMAPIXFromCMC
+ScMAPIXFromSMAPI
+ScRelocNotifications at 20
+ScRelocProps at 20
+ScSplEntry
+ScUNCFromLocalPath at 12
+SetAttribIMsgOnIStg at 16
+SwapPlong at 8
+SwapPword at 8
+SzFindCh at 8
+SzFindLastCh at 8
+SzFindSz at 8
+UFromSz at 4
+UNKOBJ_COFree at 8
+UNKOBJ_Free at 8
+UNKOBJ_FreeRows at 8
+UNKOBJ_ScAllocate at 12
+UNKOBJ_ScAllocateMore at 16
+UNKOBJ_ScCOAllocate at 12
+UNKOBJ_ScCOReallocate at 12
+UNKOBJ_ScSzFromIdsAlloc at 20
+UlAddRef at 4
+UlFromSzHex at 4
+UlPropSize at 4
+UlRelease at 4
+WrapCompressedRTFStream
+WrapCompressedRTFStream at 12
+WrapProgress at 20
+WrapStoreEntryID at 24
+__CPPValidateParameters at 8
+__ValidateParameters at 8
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 11 ++--
src/mapi32.def | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 172 insertions(+), 3 deletions(-)
create mode 100644 src/mapi32.def
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list