68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
diff --git a/com/win32comext/mapi/src/MAPIStubLibrary/include/EdkMdb.h b/com/win32comext/mapi/src/MAPIStubLibrary/include/EdkMdb.h
|
|
index 3f7d164..3390d9d 100644
|
|
--- a/com/win32comext/mapi/src/MAPIStubLibrary/include/EdkMdb.h
|
|
+++ b/com/win32comext/mapi/src/MAPIStubLibrary/include/EdkMdb.h
|
|
@@ -87,7 +87,7 @@
|
|
#define PR_PROFILE_RECONNECT_INTERVAL PROP_TAG( PT_LONG, pidProfileMin+0x1a) // dup tag of PR_USER_NAME 0x661a
|
|
#define PR_PROFILE_SERVER_VERSION PROP_TAG( PT_LONG, pidProfileMin+0x1b)
|
|
|
|
-/* SE 233155 - MarkH: EMSABP DCR /*
|
|
+/* SE 233155 - MarkH: EMSABP DCR */
|
|
/* Properties in the abp section - I got these values from AlecDun (Outlook team) */
|
|
#define PR_PROFILE_SERVER_FULL_VERSION PROP_TAG( PT_BINARY, pidProfileMin+0x3b)
|
|
|
|
diff --git a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPI.h b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPI.h
|
|
index 09b2e4b..181cdd7 100644
|
|
--- a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPI.h
|
|
+++ b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPI.h
|
|
@@ -20,6 +20,13 @@
|
|
#pragma once
|
|
#endif
|
|
|
|
+#ifndef _MSC_VER
|
|
+#define __in
|
|
+#define __in_opt
|
|
+#define __out
|
|
+#define __deref_out_ecount_full(x)
|
|
+#endif
|
|
+
|
|
/*
|
|
* Types.
|
|
*/
|
|
@@ -170,7 +177,7 @@ typedef struct
|
|
|
|
/* #define MAPI_LOGON_UI 0x00000001 Display logon UI */
|
|
/* #define MAPI_NEW_SESSION 0x00000002 Don't use shared session */
|
|
-/* #define MAPI_LONG_MSGID 0x00004000 /* allow 512 char returned ID */
|
|
+/* #define MAPI_LONG_MSGID 0x00004000 allow 512 char returned ID */
|
|
|
|
/* MAPIAddress() flags. */
|
|
|
|
diff --git a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIDefS.h b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIDefS.h
|
|
index 9e83e2d..85791b2 100644
|
|
--- a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIDefS.h
|
|
+++ b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIDefS.h
|
|
@@ -51,6 +51,12 @@
|
|
#include <stddef.h>
|
|
#endif
|
|
|
|
+#ifndef _MSC_VER
|
|
+#define __in
|
|
+#define __out
|
|
+#define __deref_out_ecount_full(x)
|
|
+#endif
|
|
+
|
|
/* Array dimension for structures with variable-sized arrays at the end. */
|
|
|
|
#pragma warning(push)
|
|
diff --git a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIWin.h b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIWin.h
|
|
index cbf9c93..23f3bbc 100644
|
|
--- a/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIWin.h
|
|
+++ b/com/win32comext/mapi/src/MAPIStubLibrary/include/MAPIWin.h
|
|
@@ -272,5 +272,4 @@ BOOL WINAPI IsBadBoundedStringPtr(const void FAR* lpsz, UINT cchMax);
|
|
#endif
|
|
|
|
#endif /* __MAPIWIN_H__ */
|
|
-
|
|
|