From 1814447e666da0be0f2ae9c3e6606e0dacd44e3e Mon Sep 17 00:00:00 2001 From: George Hazan <george.hazan@gmail.com> Date: Thu, 3 Sep 2015 20:01:03 +0000 Subject: warning fix git-svn-id: http://svn.miranda-ng.org/main/trunk@15176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Toaster/Toaster.vcxproj | 16 +++++----------- plugins/Toaster/src/toast_notification.cpp | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'plugins') diff --git a/plugins/Toaster/Toaster.vcxproj b/plugins/Toaster/Toaster.vcxproj index 8784acd268..32718b8da4 100644 --- a/plugins/Toaster/Toaster.vcxproj +++ b/plugins/Toaster/Toaster.vcxproj @@ -26,23 +26,18 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <PropertyGroup Condition="'$(Platform)'=='Win32'"> <IncludePath>$(VC_IncludePath);$(WindowsSdk_IncludePath);</IncludePath> <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86);</LibraryPath> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <PropertyGroup Condition="'$(Platform)'=='x64'"> <IncludePath>$(VC_IncludePath);$(WindowsSdk_IncludePath);</IncludePath> <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64);</LibraryPath> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IncludePath>$(VC_IncludePath);$(WindowsSdk_IncludePath);</IncludePath> - <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64);</LibraryPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IncludePath>$(VC_IncludePath);$(WindowsSdk_IncludePath);</IncludePath> - <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86);</LibraryPath> - </PropertyGroup> <ItemDefinitionGroup> + <ClCompile> + <ExceptionHandling>Sync</ExceptionHandling> + </ClCompile> <Link> <AdditionalDependencies>delayimp.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies> <DelayLoadDLLs>API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL;API-MS-WIN-CORE-WINRT-L1-1-0.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -51,7 +46,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'"> <ClCompile> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <ExceptionHandling>Sync</ExceptionHandling> </ClCompile> <Link> <AdditionalOptions Condition="'$(VisualStudioVersion)' == '12.0'">/PDBALTPATH:%_PDB%</AdditionalOptions> diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp index 70bd8865ca..4eb83adca4 100644 --- a/plugins/Toaster/src/toast_notification.cpp +++ b/plugins/Toaster/src/toast_notification.cpp @@ -56,7 +56,7 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml xmlDestroyNode(xmlToast); - CHECKHR(xmlDocument->LoadXml(StringReferenceWrapper(xtmp, xlen).Get())); + CHECKHR(xmlDocument->LoadXml(StringReferenceWrapper(xtmp, (UINT32)xlen).Get())); return xmlDocument.CopyTo(xml); } -- cgit v1.2.3