commit 4db07ab496844eea76f693b4e5c21e3ed2ac8c44
author Francois Gouget <fgouget@free.fr> Wed Feb 22 12:02:46 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 22 12:02:46 2006 +0100
tree 383481595d7ba6fb36c43a7aabc6653a080dc470
parent 805dc748097d0a7a79fdd31d46e3cd10296ee612

mapi: Add some missing MAPI prototypes.
Add some missing MAPI prototypes to mapi.h (spotted by winapi_check)
and include it where they are implemented.
Make mapi.h and mapix.h compatible. gcc does not like macros and
prototypes to be redefined so this involved protecting against
multiple definitions.
Fix the MAPISendMail() implementation prototype.

include/mapix.h

diff --git a/include/mapix.h b/include/mapix.h
index 5300b3b..99cbd75 100644
--- a/include/mapix.h
+++ b/include/mapix.h
@@ -42,20 +42,33 @@
 typedef IMsgServiceAdmin *LPSERVICEADMIN;
 typedef struct IMAPISession *LPMAPISESSION;
 
-typedef unsigned long FLAGS;
+#ifndef WINE_FLAGS_DEFINED
+#define WINE_FLAGS_DEFINED
+typedef unsigned long           FLAGS;
+#endif
 
 /* Flags for MAPILogon and MAPILogonEx */
-#define MAPI_LOGON_UI          0x000001
-#define MAPI_NEW_SESSION       0x000002
-#define MAPI_EXTENDED          0x000020
-#define MAPI_FORCE_DOWNLOAD    0x001000
-#define MAPI_PASSWORD_UI       0x020000
-#define MAPI_ALLOW_OTHERS      0x000008
-#define MAPI_EXPLICIT_PROFILE  0x000010
-#define MAPI_SERVICE_UI_ALWAYS 0x002000
-#define MAPI_NO_MAIL           0x008000
-#define MAPI_NT_SERVICE        0x010000
-#define MAPI_TIMEOUT_SHORT     0x100000
+#ifndef MAPI_LOGON_UI
+#define MAPI_LOGON_UI           0x00000001
+#endif
+#ifndef MAPI_NEW_SESSION
+#define MAPI_NEW_SESSION        0x00000002
+#endif
+#define MAPI_ALLOW_OTHERS       0x00000008
+#define MAPI_EXPLICIT_PROFILE   0x00000010
+#ifndef MAPI_EXTENDED
+#define MAPI_EXTENDED           0x00000020
+#endif
+#ifndef MAPI_FORCE_DOWNLOAD
+#define MAPI_FORCE_DOWNLOAD     0x00001000
+#endif
+#ifndef MAPI_PASSWORD_UI
+#define MAPI_PASSWORD_UI        0x00020000
+#endif
+#define MAPI_SERVICE_UI_ALWAYS  0x00002000
+#define MAPI_NO_MAIL            0x00008000
+#define MAPI_NT_SERVICE         0x00010000
+#define MAPI_TIMEOUT_SHORT      0x00100000
 
 #define MAPI_SIMPLE_DEFAULT  (MAPI_LOGON_UI|MAPI_ALLOW_OTHERS|MAPI_FORCE_DOWNLOAD)
 #define MAPI_SIMPLE_EXPLICIT (MAPI_NEW_SESSION|MAPI_EXPLICIT_PROFILE|MAPI_FORCE_DOWNLOAD)
@@ -94,9 +107,12 @@
 typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE;
 MAPIALLOCATEMORE MAPIAllocateMore;
 
+#ifndef MAPIFREEBUFFER_DEFINED
+#define MAPIFREEBUFFER_DEFINED
 typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID);
 typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER;
 MAPIFREEBUFFER MAPIFreeBuffer;
+#endif
 
 /*****************************************************************************
  * IMAPISession interface