From 10bc4537a631514b691348448ae4a240a0d9d9ab Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Thu, 28 Feb 2013 20:30:40 +0000 Subject: Add calling convention to function pointers --- ...outlook_MsOutlookAddrBookContactSourceService.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/native/addrbook/msoutlook') diff --git a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx index cc5224a..779361e 100644 --- a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx +++ b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx @@ -149,16 +149,16 @@ static LPMAPIINITIALIZE MsOutlookAddrBookContactSourceService_mapiInitialize; static LPMAPILOGONEX MsOutlookAddrBookContactSourceService_mapiLogonEx; static LPMAPIUNINITIALIZE MsOutlookAddrBookContactSourceService_mapiUninitialize; -static void (*MsOutlookAddrBookContactSourceService_hexFromBin) +static void (STDAPICALLTYPE *MsOutlookAddrBookContactSourceService_hexFromBin) (LPBYTE, int, LPTSTR); -static void (*MsOutlookAddrBookContactSourceService_HrAllocAdviseSink) +static void (STDAPICALLTYPE *MsOutlookAddrBookContactSourceService_HrAllocAdviseSink) (LPNOTIFCALLBACK, LPVOID, LPMAPIADVISESINK*); -static WINBOOL (*MsOutlookAddrBookContactSourceService_FBinFromHex) +static WINBOOL (STDAPICALLTYPE *MsOutlookAddrBookContactSourceService_FBinFromHex) (LPTSTR, LPBYTE); -static HRESULT (*MsOutlookAddrBookContactSourceService_HrQueryAllRows) +static HRESULT (STDAPICALLTYPE *MsOutlookAddrBookContactSourceService_HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet*); -static void (*MsOutlookAddrBookContactSourceService_FreeProws) +static void (STDAPICALLTYPE *MsOutlookAddrBookContactSourceService_FreeProws) (LPSRowSet); @@ -437,21 +437,21 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac MsOutlookAddrBookContactSourceService_hexFromBin - = (void(*)(LPBYTE, int, LPTSTR)) + = (STDAPICALLTYPE void(*)(LPBYTE, int, LPTSTR)) GetProcAddress(lib, "HexFromBin@12"); MsOutlookAddrBookContactSourceService_HrAllocAdviseSink - = (void(*)(LPNOTIFCALLBACK, LPVOID, LPMAPIADVISESINK*)) + = (STDAPICALLTYPE void(*)(LPNOTIFCALLBACK, LPVOID, LPMAPIADVISESINK*)) GetProcAddress(lib, "HrAllocAdviseSink@12"); MsOutlookAddrBookContactSourceService_FBinFromHex - = (WINBOOL(*)(LPTSTR, LPBYTE)) + = (STDAPICALLTYPE WINBOOL(*)(LPTSTR, LPBYTE)) GetProcAddress(lib, "FBinFromHex@8"); MsOutlookAddrBookContactSourceService_HrQueryAllRows - = (HRESULT(*)(LPMAPITABLE, LPSPropTagArray, + = (STDAPICALLTYPE HRESULT(*)(LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet*)) GetProcAddress(lib, "HrQueryAllRows@24"); MsOutlookAddrBookContactSourceService_FreeProws - = (void(*)(LPSRowSet)) + = (STDAPICALLTYPE void(*)(LPSRowSet)) GetProcAddress(lib, "FreeProws@4"); InitializeCriticalSection( -- cgit v1.1