From a8798da59a0a99f50d675d7034aa78887c9489bd Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 9 Feb 2017 10:27:57 +0900 Subject: [PATCH] [x86/Linux] Fix Calling Convertion Mismatch inside ilasm/ildasm (#9410) --- src/ilasm/assembler.h | 2 +- src/ildasm/dis.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ilasm/assembler.h b/src/ilasm/assembler.h index cbb591a..1c211bc 100644 --- a/src/ilasm/assembler.h +++ b/src/ilasm/assembler.h @@ -56,7 +56,7 @@ extern CoreCLRLoader *g_loader; extern char *g_pszExeFile; #endif -typedef int(*MetaDataGetDispenserFunc) ( +typedef int(STDAPICALLTYPE *MetaDataGetDispenserFunc) ( REFCLSID rclsid, // The class to desired. REFIID riid, // Interface wanted on class factory. LPVOID FAR *ppv); // Return interface pointer here. diff --git a/src/ildasm/dis.h b/src/ildasm/dis.h index 595e097..9a1af93 100644 --- a/src/ildasm/dis.h +++ b/src/ildasm/dis.h @@ -152,24 +152,24 @@ char *DumpGenericPars(__inout_ecount(SZSTRING_SIZE) char* szString, #define CHECK_REMAINING_SIZE if(ovadd_le((size_t)szString, SZSTRING_SIZE_M4, (size_t)szptr)) break; #define SZSTRING_REMAINING_SIZE(x) (ovadd_le((size_t)szString,SZSTRING_SIZE,(size_t)(x))?0:(SZSTRING_SIZE-((size_t)(x)-(size_t)szString))) -typedef int (*MetaDataGetDispenserFunc) ( +typedef int (STDAPICALLTYPE *MetaDataGetDispenserFunc) ( REFCLSID rclsid, // The class to desired. REFIID riid, // Interface wanted on class factory. LPVOID FAR *ppv); // Return interface pointer here. -typedef int (*GetMetaDataInternalInterfaceFunc) ( +typedef int (STDAPICALLTYPE *GetMetaDataInternalInterfaceFunc) ( LPVOID pData, // [IN] in memory metadata section ULONG cbData, // [IN] size of the metadata section DWORD flags, // [IN] CorOpenFlags REFIID riid, // [IN] desired interface void **ppv); // [OUT] returned interface -typedef int (*GetMetaDataInternalInterfaceFromPublicFunc) ( +typedef int (STDAPICALLTYPE *GetMetaDataInternalInterfaceFromPublicFunc) ( IUnknown *pv, // [IN] Given interface REFIID riid, // [IN] desired interface void **ppv); // [OUT] returned interface -typedef int (*GetMetaDataPublicInterfaceFromInternalFunc) ( +typedef int (STDAPICALLTYPE *GetMetaDataPublicInterfaceFromInternalFunc) ( void *pv, // [IN] Given interface REFIID riid, // [IN] desired interface void **ppv); // [OUT] returned interface -- 2.7.4