Fixed comext build

ader1990 · Oct 1, 2020 · f6795ff · f6795ff
1 parent e7864cd
commit f6795ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/com/win32comext/mapi/src/mapi_headers/MAPIUtil.h b/com/win32comext/mapi/src/mapi_headers/MAPIUtil.h
@@ -860,23 +860,23 @@ STDAPI_(VOID)			DeinitMapiUtil(VOID);
  *	it easier to write code which uses them optionally.
  */
 
-#if defined (_WIN64) && defined(_AMD64_)
+#if defined (_WIN64) && (defined (_AMD64_) || defined(_ARM64_))
 #define szHrDispatchNotifications "HrDispatchNotifications"
 #elif defined (_WIN32) && defined (_X86_)
 #define szHrDispatchNotifications "_HrDispatchNotifications@4"
 #else
-#error	"Unknown Platform: MAPI is currently supported on Win32/X86 and Win64/AMD64"
+#error	"Unknown Platform: MAPI is currently supported on Win32/X86, Win64/AMD64 and Win64/ARM64"
 #endif
 
 typedef HRESULT (STDAPICALLTYPE DISPATCHNOTIFICATIONS)(ULONG ulFlags);
 typedef DISPATCHNOTIFICATIONS FAR * LPDISPATCHNOTIFICATIONS;
 
-#if defined (_WIN64) && defined (_AMD64_)
+#if defined (_WIN64) && (defined (_AMD64_) || defined(_ARM64_))
 #define szScCreateConversationIndex "ScCreateConversationIndex"
 #elif defined (_WIN32) && defined (_X86_)
 #define szScCreateConversationIndex "_ScCreateConversationIndex@16"
 #else
-#error	"Unknown Platform: MAPI is currently supported on Win32/X86 and Win64/AMD64"
+#error	"Unknown Platform: MAPI is currently supported on Win32/X86, Win64/AMD64 and Win64/ARM64"
 #endif
 
 typedef SCODE (STDAPICALLTYPE CREATECONVERSATIONINDEX)(ULONG cbParent,

diff --git a/com/win32comext/mapi/src/mapi_headers/MAPIVal.h b/com/win32comext/mapi/src/mapi_headers/MAPIVal.h
@@ -1957,13 +1957,13 @@ __ValidateParameters(METHODS eMethod, LPVOID ppThis);
 #define CheckParameters_IMAPIAdviseSink_OnNotify( a1, a2, a3 ) \
 			 CheckParameters3( IMAPIAdviseSink_OnNotify, a1, a2, a3 )
 
-#if defined (_AMD64_) || defined(_X86_)
+#if defined(_AMD64_) || defined(_ARM64_)|| defined(_X86_)
 STDAPI	HrValidateParameters( METHODS eMethod, LPVOID FAR *ppFirstArg );
 #elif defined(DOS) || defined(_MAC) 
 STDAPIV	HrValidateParametersV( METHODS eMethod, ... );
 STDAPIV HrValidateParametersValist( METHODS eMethod, va_list arglist );
 #else
-#error	"Unknown Platform: MAPI is currently supported on Win32 and Win64"
+#error	"Unknown Platform: MAPI is currently supported on Win32, Win64 and WinArm64"
 #endif
 
 #ifdef __cplusplus

diff --git a/com/win32comext/mapi/src/mapi_stub_library/MapiStubLibrary.cpp b/com/win32comext/mapi/src/mapi_stub_library/MapiStubLibrary.cpp
@@ -25,7 +25,7 @@
 #error Outlook 2010 MAPI headers or higher must be installed
 #endif
 
-#if defined(_M_X64) || defined(_M_ARM)
+#if defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)
 #define ExpandFunction(fn, c) #fn
 #elif defined(_M_IX86)
 #define ExpandFunction(fn, c) #fn "@" #c