From 8fb1bc18bad99b2de79783848b41d07da01315a7 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 01 九月 2021 17:04:05 +0800 Subject: [PATCH] 采用纯oc sdk解决版本适配问题;解决呼叫不能截屏问题 --- Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/mscommon.h | 61 ------------------------------ 1 files changed, 0 insertions(+), 61 deletions(-) diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/mscommon.h b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/mscommon.h index eda6e33..d2c15a3 100755 --- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/mscommon.h +++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/mscommon.h @@ -89,67 +89,6 @@ #define MS2_WINDOWS_DESKTOP 1 #endif #endif - -#ifdef ENABLE_MICROSOFT_STORE_APP -_Check_return_ WINOLEAPI -CoCreateInstanceFromApp( - _In_ REFCLSID Clsid, - _In_opt_ IUnknown* punkOuter, - _In_ DWORD dwClsCtx, - _In_opt_ PVOID reserved, - _In_ DWORD dwCount, - _Inout_updates_(dwCount) MULTI_QI* pResults - ); -#endif -__inline _Check_return_ HRESULT CoCreateInstanceBT( - _In_ REFCLSID rclsid, - _In_opt_ LPUNKNOWN pUnkOuter, - _In_ DWORD dwClsContext, - _In_ REFIID riid, - _COM_Outptr_ _At_(*ppv, _Post_readable_size_(_Inexpressible_(varies))) LPVOID FAR* ppv) -{ -#ifdef ENABLE_MICROSOFT_STORE_APP - MULTI_QI OneQI; - HRESULT hr; - - OneQI.pItf = NULL; - -#ifdef __cplusplus - OneQI.pIID = &riid; -#else - OneQI.pIID = riid; -#endif - - hr = CoCreateInstanceFromApp( rclsid, pUnkOuter, dwClsContext, NULL, 1, &OneQI ); - -#ifdef _PREFAST_ - if (SUCCEEDED(hr) && SUCCEEDED(OneQI.hr)) - _Analysis_assume_(OneQI.pItf != NULL); - else - _Analysis_assume_(OneQI.pItf == NULL); -#endif - - *ppv = OneQI.pItf; - return FAILED(hr) ? hr : OneQI.hr; -#else - return CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv ); -#endif //ENABLE_MICROSOFT_STORE_APP -} - -__inline _Check_return_ HRESULT CoCreateInstanceExBT( - _In_ REFCLSID Clsid, - _In_opt_ IUnknown * punkOuter, - _In_ DWORD dwClsCtx, - _In_opt_ COSERVERINFO * pServerInfo, - _In_ DWORD dwCount, - _Inout_updates_(dwCount) MULTI_QI *pResults ) -{ -#ifdef ENABLE_MICROSOFT_STORE_APP - return CoCreateInstanceFromApp(Clsid, punkOuter, dwClsCtx, pServerInfo, dwCount, pResults); -#else - return CoCreateInstanceEx(Clsid, punkOuter, dwClsCtx, pServerInfo, dwCount, pResults); -#endif //ENABLE_MICROSOFT_STORE_APP -} #endif #if defined(_MSC_VER) -- Gitblit v1.8.0