From 5d4e0d88ceba97ec2f6f5751b8ff10917f173459 Mon Sep 17 00:00:00 2001 From: Girish Pattabiraman Date: Sat, 21 Jan 2017 21:07:31 -0800 Subject: Resolve SAL annotations --- .../KeywordDetectorContosoAdapter.vcxproj | 18 ++++---- audio/sysvad/KeywordDetectorAdapter/dllmain.cpp | 6 ++- audio/sysvad/SwapAPO/APO/SwapAPODll.cpp | 6 ++- audio/sysvad/SwapAPO/APO/swapapomfx.cpp | 1 + audio/sysvad/SwapAPO/PropPageExtensions/CplExt.cpp | 6 ++- audio/sysvad/sysvad.VC.db | Bin 0 -> 89546752 bytes audio/sysvad/sysvad.sln | 47 ++++++++------------- 7 files changed, 41 insertions(+), 43 deletions(-) create mode 100644 audio/sysvad/sysvad.VC.db diff --git a/audio/sysvad/KeywordDetectorAdapter/KeywordDetectorContosoAdapter.vcxproj b/audio/sysvad/KeywordDetectorAdapter/KeywordDetectorContosoAdapter.vcxproj index 84595128..fdf37a5d 100644 --- a/audio/sysvad/KeywordDetectorAdapter/KeywordDetectorContosoAdapter.vcxproj +++ b/audio/sysvad/KeywordDetectorAdapter/KeywordDetectorContosoAdapter.vcxproj @@ -115,8 +115,8 @@ - MultiThreaded - MultiThreadedDebug + MultiThreadedDLL + MultiThreadedDebugDLL true Level4 %(PreprocessorDefinitions);_WINDLL;_USRDLL;UNICODE;_UNICODE @@ -139,8 +139,8 @@ - MultiThreaded - MultiThreadedDebug + MultiThreadedDLL + MultiThreadedDebugDLL true Level4 %(PreprocessorDefinitions);_WINDLL;_USRDLL;UNICODE;_UNICODE @@ -163,8 +163,8 @@ - MultiThreaded - MultiThreadedDebug + MultiThreadedDLL + MultiThreadedDebugDLL true Level4 %(PreprocessorDefinitions);_WINDLL;_USRDLL;UNICODE;_UNICODE @@ -187,8 +187,8 @@ - MultiThreaded - MultiThreadedDebug + MultiThreadedDLL + MultiThreadedDebugDLL true Level4 %(PreprocessorDefinitions);_WINDLL;_USRDLL;UNICODE;_UNICODE @@ -229,4 +229,4 @@ - \ No newline at end of file + diff --git a/audio/sysvad/KeywordDetectorAdapter/dllmain.cpp b/audio/sysvad/KeywordDetectorAdapter/dllmain.cpp index c29f4464..ac412859 100644 --- a/audio/sysvad/KeywordDetectorAdapter/dllmain.cpp +++ b/audio/sysvad/KeywordDetectorAdapter/dllmain.cpp @@ -12,18 +12,20 @@ STDAPI DllGetActivationFactory(_In_ HSTRING activatibleClassId, _COM_Outptr_ IAc #endif #if !defined(__WRL_WINRT_STRICT__) -STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, _COM_Outptr_ void** ppv) +_Check_return_ +STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID FAR* ppv) { return Module::GetModule().GetClassObject(rclsid, riid, ppv); } #endif +__control_entrypoint(DllExport) STDAPI DllCanUnloadNow() { return Module::GetModule().Terminate() ? S_OK : S_FALSE; } -STDAPI_(BOOL) DllMain(_In_opt_ HINSTANCE hinst, DWORD reason, _In_opt_ void*) +STDAPI_(BOOL) DllMain(_In_ HINSTANCE hinst, DWORD reason, _In_opt_ void*) { if (reason == DLL_PROCESS_ATTACH) { diff --git a/audio/sysvad/SwapAPO/APO/SwapAPODll.cpp b/audio/sysvad/SwapAPO/APO/SwapAPODll.cpp index 4792b344..e9a04889 100644 --- a/audio/sysvad/SwapAPO/APO/SwapAPODll.cpp +++ b/audio/sysvad/SwapAPO/APO/SwapAPODll.cpp @@ -118,6 +118,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE /* hInstance */, DWORD dwReason, LPVOID // {secret} +__control_entrypoint(DllExport) STDAPI DllCanUnloadNow(void) { return _AtlModule.DllCanUnloadNow(); @@ -125,13 +126,15 @@ STDAPI DllCanUnloadNow(void) // {secret} -STDAPI DllGetClassObject(_In_ REFCLSID rclsid,_In_ REFIID riid, _Outptr_ LPVOID* ppv) +_Check_return_ +STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID FAR* ppv) { return _AtlModule.DllGetClassObject(rclsid, riid, ppv); } // {secret} +__control_entrypoint(DllExport) STDAPI DllRegisterServer(void) { // registers object, typelib and all interfaces in typelib @@ -141,6 +144,7 @@ STDAPI DllRegisterServer(void) // {secret} +__control_entrypoint(DllExport) STDAPI DllUnregisterServer(void) { HRESULT hr = _AtlModule.DllUnregisterServer(); diff --git a/audio/sysvad/SwapAPO/APO/swapapomfx.cpp b/audio/sysvad/SwapAPO/APO/swapapomfx.cpp index 113e0aa4..99677425 100644 --- a/audio/sysvad/SwapAPO/APO/swapapomfx.cpp +++ b/audio/sysvad/SwapAPO/APO/swapapomfx.cpp @@ -881,6 +881,7 @@ HRESULT CSwapAPOMFX::ValidateAndCacheConnectionInfo(UINT32 u32NumInputConnection f32InverseChannelCount = 1.0f/m_u32SamplesPerFrame; for (UINT16 u16Index=0; u16Index