[svn] GPGol - r120 - trunk/src

Thu Oct 20 15:15:59 CEST 2005

Author: marcus
Date: 2005-10-20 15:15:59 +0200 (Thu, 20 Oct 2005)
New Revision: 120

Added:
   trunk/src/mapi32.def
Modified:
   trunk/src/ChangeLog
   trunk/src/Makefile.am
Log:
2005-10-20  Marcus Brinkmann  <marcus at g10code.de>

	* mapi32.def: New file.
	* Makefile.am (gpgol_DEPENDENCIES): New variable.
	(libmapi32.a): New target.
	(gpgol_LDADD): Replace mapi32.dll with "-L . -lmapi32".
	(clean-local): New target.


Modified: trunk/src/ChangeLog
===================================================================

--- trunk/src/ChangeLog	2005-10-06 13:51:54 UTC (rev 119)
+++ trunk/src/ChangeLog	2005-10-20 13:15:59 UTC (rev 120)
@@ -1,3 +1,11 @@
+2005-10-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* mapi32.def: New file.
+	* Makefile.am (gpgol_DEPENDENCIES): New variable.
+	(libmapi32.a): New target.
+	(gpgol_LDADD): Replace mapi32.dll with "-L . -lmapi32".
+	(clean-local): New target.
+
 2005-10-06  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (gpgol_LDADD): Prefix gpgol.def and mapi32.dll with

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-10-06 13:51:54 UTC (rev 119)
+++ trunk/src/Makefile.am	2005-10-20 13:15:59 UTC (rev 120)
@@ -13,7 +13,8 @@
 
 bin_PROGRAMS = gpgol 
 EXTRA_DIST = versioninfo.rc.in gpgol-rsrcs.rc olflange-rsrcs.rc \
-	     logo.bmp decrypt.bmp encrypt.bmp sign.bmp key_mana.bmp    
+	     logo.bmp decrypt.bmp encrypt.bmp sign.bmp key_mana.bmp \
+	     mapi32.def
 EXEEXT = .dll
 
 AM_CFLAGS = $(GPGME_CFLAGS) -shared
@@ -45,17 +46,21 @@
 	watcher.cpp \
 	attach.cpp attach.h
 
+# 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.
+gpgol_DEPENDENCIES = libmapi32.a
+
+libmapi32.a: mapi32.def
+	$(DLLTOOL) --output-lib $@ --def $<
+
+clean-local:
+	rm -f libmapi32.a
+
 gpgol_LDADD = $(srcdir)/gpgol.def  \
-		$(GPGME_LIBS) $(srcdir)/mapi32.dll -lshell32 -lgdi32 -lcomdlg32
+	$(GPGME_LIBS) -L . -lmapi32 -lshell32 -lgdi32 -lcomdlg32
 
 resource.o: resource.rc versioninfo.rc gpgol-rsrcs.rc olflange-rsrcs.rc
 
 .rc.o:
 	$(WINDRES) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
-
-
-
-
-
-
-

Added: trunk/src/mapi32.def
===================================================================
--- trunk/src/mapi32.def	2005-10-06 13:51:54 UTC (rev 119)
+++ trunk/src/mapi32.def	2005-10-20 13:15:59 UTC (rev 120)
@@ -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


