diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-04-29 21:37:57 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-04-29 21:37:57 +0000 |
| commit | 6571a527400a6b5efc787305f57f3052abd1e761 (patch) | |
| tree | 8d71858a96d17685d4465ae714e41c34cf4f50ed /protocols/MRA | |
| parent | 897e185e8b01f4798c685de0ea8226931400b2ec (diff) | |
unified project for MRA protocol
git-svn-id: http://svn.miranda-ng.org/main/trunk@13260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA')
30 files changed, 86 insertions, 941 deletions
diff --git a/protocols/MRA/Mra.vcxproj b/protocols/MRA/Mra.vcxproj new file mode 100644 index 0000000000..f67828c014 --- /dev/null +++ b/protocols/MRA/Mra.vcxproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}</ProjectGuid> + <ProjectName>MRA</ProjectName> + </PropertyGroup> + <ImportGroup Label="PropertySheets"> + <Import Project="$(ProjectDir)..\..\build\vc.common\common.props" /> + </ImportGroup> + <ItemGroup> + <ProjectReference Condition="'$(VisualStudioVersion)' == '10.0'" Include="..\..\plugins\zlib\zlib_10.vcxproj"> + <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Condition="'$(VisualStudioVersion)' == '12.0'" Include="..\..\plugins\zlib\zlib_12.vcxproj"> + <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/protocols/MRA/Mra.vcxproj.filters b/protocols/MRA/Mra.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/protocols/MRA/Mra.vcxproj.filters @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project>
\ No newline at end of file diff --git a/protocols/MRA/Mra_10.vcxproj b/protocols/MRA/Mra_10.vcxproj deleted file mode 100644 index ec7485b3d7..0000000000 --- a/protocols/MRA/Mra_10.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}</ProjectGuid> - <ProjectName>MRA</ProjectName> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <IgnoreImportLibrary>true</IgnoreImportLibrary> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <BufferSecurityCheck>false</BufferSecurityCheck> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories> - <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <BufferSecurityCheck>false</BufferSecurityCheck> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <ExceptionHandling>false</ExceptionHandling> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories> - <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\Mra_menus.cpp" /> - <ClCompile Include="src\stdafx.cpp"> - <PrecompiledHeader>Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="src\MraProto.cpp" /> - <ClCompile Include="src\Mra_functions.cpp" /> - <ClCompile Include="src\Mra_options.cpp" /> - <ClCompile Include="src\Mra_proto.cpp" /> - <ClCompile Include="src\Mra_svcs.cpp" /> - <ClCompile Include="src\MraAdvancedSearch.cpp" /> - <ClCompile Include="src\MraAvatars.cpp" /> - <ClCompile Include="src\MraChat.cpp" /> - <ClCompile Include="src\MraFilesQueue.cpp" /> - <ClCompile Include="src\MraIcons.cpp" /> - <ClCompile Include="src\MraMPop.cpp" /> - <ClCompile Include="src\MraMRIMProxy.cpp" /> - <ClCompile Include="src\MraOfflineMsg.cpp" /> - <ClCompile Include="src\MraPopup.cpp" /> - <ClCompile Include="src\MraRTFMsg.cpp" /> - <ClCompile Include="src\MraSelectEMail.cpp" /> - <ClCompile Include="src\MraSendCommand.cpp" /> - <ClCompile Include="src\MraSendQueue.cpp" /> - <ClCompile Include="src\Mra.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\Mra.h" /> - <ClInclude Include="src\MraAvatars.h" /> - <ClInclude Include="src\MraConstans.h" /> - <ClInclude Include="src\MraFilesQueue.h" /> - <ClInclude Include="src\MraIcons.h" /> - <ClInclude Include="src\MraMPop.h" /> - <ClInclude Include="src\MraMRIMProxy.h" /> - <ClInclude Include="src\MraOfflineMsg.h" /> - <ClInclude Include="src\MraPlaces.h" /> - <ClInclude Include="src\MraPopup.h" /> - <ClInclude Include="src\MraProto.h" /> - <ClInclude Include="src\MraRTFMsg.h" /> - <ClInclude Include="src\MraSelectEMail.h" /> - <ClInclude Include="src\MraSendQueue.h" /> - <ClInclude Include="src\proto.h" /> - <ClInclude Include="src\resource.h" /> - <ClInclude Include="src\Sdk\BuffToLowerCase.h" /> - <ClInclude Include="src\Sdk\FIFOMT.h" /> - <ClInclude Include="src\Sdk\InterlockedFunctions.h" /> - <ClInclude Include="src\Sdk\InternetTime.h" /> - <ClInclude Include="src\Sdk\ListMT.h" /> - <ClInclude Include="src\Sdk\MemoryFind.h" /> - <ClInclude Include="src\Sdk\MemoryFindByte.h" /> - <ClInclude Include="src\Sdk\RC4.h" /> - <ClInclude Include="src\Sdk\SHA1.h" /> - <ClInclude Include="src\Sdk\StrHexToNum.h" /> - <ClInclude Include="src\Sdk\StrToNum.h" /> - <ClInclude Include="src\Sdk\timefuncs.h" /> - <ClInclude Include="src\version.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="res\resource.rc" /> - <ResourceCompile Include="res\version.rc" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\plugins\Zlib\zlib_10.vcxproj"> - <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/protocols/MRA/Mra_10.vcxproj.filters b/protocols/MRA/Mra_10.vcxproj.filters deleted file mode 100644 index 78ea889321..0000000000 --- a/protocols/MRA/Mra_10.vcxproj.filters +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{28f9c5b1-e22e-47c3-9588-4f293878aa27}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{fb50d277-d7b3-44a3-9330-fa8332ee1975}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{482639cd-fb25-4cfb-9e55-4a299271787c}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Header Files\SDK">
- <UniqueIdentifier>{09f251ef-6cd8-48b3-a275-f10b210f5459}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\Mra.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_functions.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_proto.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_svcs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraAdvancedSearch.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraAvatars.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraChat.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraFilesQueue.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraIcons.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraMPop.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraMRIMProxy.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraOfflineMsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraPopup.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraRTFMsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSelectEMail.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSendCommand.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSendQueue.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraProto.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_menus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Mra.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraAvatars.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraConstans.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraFilesQueue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraIcons.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraMPop.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraMRIMProxy.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraOfflineMsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraPlaces.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraPopup.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraRTFMsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraSelectEMail.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraSendQueue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\proto.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraProto.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\BuffToLowerCase.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\FIFOMT.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\InterlockedFunctions.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\InternetTime.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\ListMT.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\MemoryFind.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\MemoryFindByte.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\RC4.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\SHA1.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\StrHexToNum.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\StrToNum.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\timefuncs.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\resource.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/protocols/MRA/Mra_12.vcxproj b/protocols/MRA/Mra_12.vcxproj deleted file mode 100644 index fc3a0d39ea..0000000000 --- a/protocols/MRA/Mra_12.vcxproj +++ /dev/null @@ -1,270 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}</ProjectGuid> - <ProjectName>MRA</ProjectName> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120_xp</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <IgnoreImportLibrary>true</IgnoreImportLibrary> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <UndefinePreprocessorDefinitions> - </UndefinePreprocessorDefinitions> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <UndefinePreprocessorDefinitions> - </UndefinePreprocessorDefinitions> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <BufferSecurityCheck>false</BufferSecurityCheck> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <UndefinePreprocessorDefinitions> - </UndefinePreprocessorDefinitions> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <BufferSecurityCheck>false</BufferSecurityCheck> - <FunctionLevelLinking>false</FunctionLevelLinking> - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile> - <ExceptionHandling>false</ExceptionHandling> - <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> - <UndefinePreprocessorDefinitions> - </UndefinePreprocessorDefinitions> - <DisableSpecificWarnings>4312;4267</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\Mra_menus.cpp" /> - <ClCompile Include="src\stdafx.cpp"> - <PrecompiledHeader>Create</PrecompiledHeader> - </ClCompile> - <ClCompile Include="src\MraProto.cpp" /> - <ClCompile Include="src\Mra_functions.cpp" /> - <ClCompile Include="src\Mra_options.cpp" /> - <ClCompile Include="src\Mra_proto.cpp" /> - <ClCompile Include="src\Mra_svcs.cpp" /> - <ClCompile Include="src\MraAdvancedSearch.cpp" /> - <ClCompile Include="src\MraAvatars.cpp" /> - <ClCompile Include="src\MraChat.cpp" /> - <ClCompile Include="src\MraFilesQueue.cpp" /> - <ClCompile Include="src\MraIcons.cpp" /> - <ClCompile Include="src\MraMPop.cpp" /> - <ClCompile Include="src\MraMRIMProxy.cpp" /> - <ClCompile Include="src\MraOfflineMsg.cpp" /> - <ClCompile Include="src\MraPopup.cpp" /> - <ClCompile Include="src\MraRTFMsg.cpp" /> - <ClCompile Include="src\MraSelectEMail.cpp" /> - <ClCompile Include="src\MraSendCommand.cpp" /> - <ClCompile Include="src\MraSendQueue.cpp" /> - <ClCompile Include="src\Mra.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\Mra.h" /> - <ClInclude Include="src\MraAvatars.h" /> - <ClInclude Include="src\MraConstans.h" /> - <ClInclude Include="src\MraFilesQueue.h" /> - <ClInclude Include="src\MraIcons.h" /> - <ClInclude Include="src\MraMPop.h" /> - <ClInclude Include="src\MraMRIMProxy.h" /> - <ClInclude Include="src\MraOfflineMsg.h" /> - <ClInclude Include="src\MraPlaces.h" /> - <ClInclude Include="src\MraPopup.h" /> - <ClInclude Include="src\MraProto.h" /> - <ClInclude Include="src\MraRTFMsg.h" /> - <ClInclude Include="src\MraSelectEMail.h" /> - <ClInclude Include="src\MraSendQueue.h" /> - <ClInclude Include="src\proto.h" /> - <ClInclude Include="src\resource.h" /> - <ClInclude Include="src\Sdk\BuffToLowerCase.h" /> - <ClInclude Include="src\Sdk\FIFOMT.h" /> - <ClInclude Include="src\Sdk\InterlockedFunctions.h" /> - <ClInclude Include="src\Sdk\InternetTime.h" /> - <ClInclude Include="src\Sdk\ListMT.h" /> - <ClInclude Include="src\Sdk\MemoryFind.h" /> - <ClInclude Include="src\Sdk\MemoryFindByte.h" /> - <ClInclude Include="src\Sdk\RC4.h" /> - <ClInclude Include="src\Sdk\SHA1.h" /> - <ClInclude Include="src\Sdk\StrHexToNum.h" /> - <ClInclude Include="src\Sdk\StrToNum.h" /> - <ClInclude Include="src\Sdk\timefuncs.h" /> - <ClInclude Include="src\version.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="res\resource.rc" /> - <ResourceCompile Include="res\version.rc" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\plugins\Zlib\zlib_12.vcxproj"> - <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/protocols/MRA/Mra_12.vcxproj.filters b/protocols/MRA/Mra_12.vcxproj.filters deleted file mode 100644 index 78ea889321..0000000000 --- a/protocols/MRA/Mra_12.vcxproj.filters +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{28f9c5b1-e22e-47c3-9588-4f293878aa27}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{fb50d277-d7b3-44a3-9330-fa8332ee1975}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{482639cd-fb25-4cfb-9e55-4a299271787c}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Header Files\SDK">
- <UniqueIdentifier>{09f251ef-6cd8-48b3-a275-f10b210f5459}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\Mra.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_functions.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_proto.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_svcs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraAdvancedSearch.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraAvatars.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraChat.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraFilesQueue.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraIcons.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraMPop.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraMRIMProxy.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraOfflineMsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraPopup.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraRTFMsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSelectEMail.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSendCommand.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraSendQueue.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\MraProto.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\Mra_menus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Mra.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraAvatars.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraConstans.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraFilesQueue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraIcons.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraMPop.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraMRIMProxy.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraOfflineMsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraPlaces.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraPopup.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraRTFMsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraSelectEMail.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraSendQueue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\proto.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\MraProto.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\BuffToLowerCase.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\FIFOMT.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\InterlockedFunctions.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\InternetTime.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\ListMT.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\MemoryFind.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\MemoryFindByte.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\RC4.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\SHA1.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\StrHexToNum.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\StrToNum.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- <ClInclude Include="src\Sdk\timefuncs.h">
- <Filter>Header Files\SDK</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\resource.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index e6c6cd3843..b86de54e6f 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
LIST<CMraProto> g_Instances(1, PtrKeySortT);
diff --git a/protocols/MRA/src/MraAdvancedSearch.cpp b/protocols/MRA/src/MraAdvancedSearch.cpp index f327fd4182..94d201356e 100644 --- a/protocols/MRA/src/MraAdvancedSearch.cpp +++ b/protocols/MRA/src/MraAdvancedSearch.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "proto.h"
#include "MraPlaces.h"
diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp index 33b10e5b32..63ecec27ec 100644 --- a/protocols/MRA/src/MraAvatars.cpp +++ b/protocols/MRA/src/MraAvatars.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraAvatars.h"
#define PA_FORMAT_MAX 7
diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp index 851fafe2e8..bf259339e1 100644 --- a/protocols/MRA/src/MraChat.cpp +++ b/protocols/MRA/src/MraChat.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "proto.h"
static LPWSTR lpwszStatuses[] = { L"Owners", L"Inviter", L"Visitors" };
diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp index 6d0a7642b5..1f06e03b45 100644 --- a/protocols/MRA/src/MraFilesQueue.cpp +++ b/protocols/MRA/src/MraFilesQueue.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraFilesQueue.h"
#include "proto.h"
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp index 22847daec3..a0d0261ec1 100644 --- a/protocols/MRA/src/MraIcons.cpp +++ b/protocols/MRA/src/MraIcons.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraIcons.h"
HANDLE hXStatusAdvancedStatusIcons[MRA_XSTATUS_COUNT+4];
diff --git a/protocols/MRA/src/MraMPop.cpp b/protocols/MRA/src/MraMPop.cpp index 55f485eae7..a1d4b1830b 100644 --- a/protocols/MRA/src/MraMPop.cpp +++ b/protocols/MRA/src/MraMPop.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraMPop.h"
// MPOP_SESSION
diff --git a/protocols/MRA/src/MraMRIMProxy.cpp b/protocols/MRA/src/MraMRIMProxy.cpp index a5757eca9d..d34282bbb3 100644 --- a/protocols/MRA/src/MraMRIMProxy.cpp +++ b/protocols/MRA/src/MraMRIMProxy.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraMRIMProxy.h"
#include "proto.h"
diff --git a/protocols/MRA/src/MraOfflineMsg.cpp b/protocols/MRA/src/MraOfflineMsg.cpp index 417b12d799..9c5f5269ec 100644 --- a/protocols/MRA/src/MraOfflineMsg.cpp +++ b/protocols/MRA/src/MraOfflineMsg.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraOfflineMsg.h"
#include "MraConstans.h"
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 1b1eb5a148..2f04793ffc 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraPopup.h"
#define POPUPS_TYPES_COUNT 7
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 89605d5631..887ca14491 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
static int MraExtraIconsApplyAll(WPARAM, LPARAM)
{
diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index 236f6fca80..1a4f5a6a06 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -101,7 +101,8 @@ struct CMraProto : public PROTO<CMraProto> return DB_SetStringExW(Contact, m_szModuleName, valueName, parValue); }
__forceinline bool mraWriteContactSettingBlob(MCONTACT hContact, const char *lpszValueName, LPVOID lpbValue, size_t dwValueSize) {
- return db_set_blob(hContact, m_szModuleName, lpszValueName, lpbValue, dwValueSize) != 0; }
+ return db_set_blob(hContact, m_szModuleName, lpszValueName, lpbValue, (unsigned int)dwValueSize) != 0;
+ }
__forceinline bool mraGetContactSettingBlob(MCONTACT hContact, const char *lpszValueName, LPVOID lpbRet, size_t dwRetBuffSize, size_t *pdwRetBuffSize) {
return DB_GetContactSettingBlob(hContact, m_szModuleName, lpszValueName, lpbRet, dwRetBuffSize, pdwRetBuffSize); }
diff --git a/protocols/MRA/src/MraRTFMsg.cpp b/protocols/MRA/src/MraRTFMsg.cpp index f77901a825..41473cfef3 100644 --- a/protocols/MRA/src/MraRTFMsg.cpp +++ b/protocols/MRA/src/MraRTFMsg.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraRTFMsg.h"
diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp index 0696b6e619..ad8b4f11a8 100644 --- a/protocols/MRA/src/MraSelectEMail.cpp +++ b/protocols/MRA/src/MraSelectEMail.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraSelectEMail.h"
struct MraSelectEMailDlgData
diff --git a/protocols/MRA/src/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp index 7dadd9cf3c..e3a5eae541 100644 --- a/protocols/MRA/src/MraSendCommand.cpp +++ b/protocols/MRA/src/MraSendCommand.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraRTFMsg.h"
#include "proto.h"
@@ -89,7 +89,7 @@ DWORD CMraProto::MraMessage(BOOL bAddToQueue, MCONTACT hContact, DWORD dwAckType buf.SetUL(2);
buf.SetLPSW(_T(""));//***deb possible nick here
buf.SetLPSW(lpwszMessage);
- lpszMessageConverted = mir_base64_encode(buf.Data(), buf.Len());
+ lpszMessageConverted = mir_base64_encode(buf.Data(), (int)buf.Len());
dwMessageConvertedSize = strlen(lpszMessageConverted);
}
// messages with Flash
@@ -107,8 +107,8 @@ DWORD CMraProto::MraMessage(BOOL bAddToQueue, MCONTACT hContact, DWORD dwAckType buf.SetLPS(lpbRTFData);// ñàì ìóëüò ANSI
buf.SetLPSW(lpwszMessage);// ñàì ìóëüò UNICODE
- DWORD dwRTFDataSize = buf.Len();
- if ( compress2((LPBYTE)lpbRTFData, &dwRTFDataSize, buf.Data(), buf.Len(), Z_BEST_COMPRESSION) == Z_OK) {
+ DWORD dwRTFDataSize = (DWORD)buf.Len();
+ if (compress2((LPBYTE)lpbRTFData, &dwRTFDataSize, buf.Data(), (int)buf.Len(), Z_BEST_COMPRESSION) == Z_OK) {
lpszMessageRTF = mir_base64_encode((LPBYTE)lpbRTFData, dwRTFDataSize);
dwMessageRTFSize = mir_strlen(lpszMessageRTF);
}
@@ -128,7 +128,7 @@ DWORD CMraProto::MraMessage(BOOL bAddToQueue, MCONTACT hContact, DWORD dwAckType buf.SetUL(dwBackColour);
DWORD dwRTFDataSize = lpbRTFData.GetLength();
- if ( compress2((LPBYTE)(LPCSTR)lpbRTFData, &dwRTFDataSize, buf.Data(), buf.Len(), Z_BEST_COMPRESSION) == Z_OK) {
+ if (compress2((LPBYTE)(LPCSTR)lpbRTFData, &dwRTFDataSize, buf.Data(), (int)buf.Len(), Z_BEST_COMPRESSION) == Z_OK) {
lpszMessageRTF = mir_base64_encode((LPBYTE)(LPCSTR)lpbRTFData, dwRTFDataSize);
dwMessageRTFSize = mir_strlen(lpszMessageRTF);
}
diff --git a/protocols/MRA/src/MraSendQueue.cpp b/protocols/MRA/src/MraSendQueue.cpp index bb6467dfaa..f35fea2fe6 100644 --- a/protocols/MRA/src/MraSendQueue.cpp +++ b/protocols/MRA/src/MraSendQueue.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraSendQueue.h"
struct MRA_SEND_QUEUE : public LIST_MT
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 6667a15608..26ccd72fe8 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#define MRA_PASS_CRYPT_VER 2
@@ -189,7 +189,7 @@ bool DB_GetStaticStringA(MCONTACT hContact, LPCSTR lpszModule, LPCSTR lpszValueN if (db_get_ws(hContact, lpszModule, lpszValueName, &dbv) == 0) {
size_t dwRetBuffSizeLocal, dwReadedStringLen = mir_wstrlen(dbv.pwszVal);
if (lpszRetBuff && (dwRetBuffSize > dwReadedStringLen)) {
- dwRetBuffSizeLocal = WideCharToMultiByte(MRA_CODE_PAGE, 0, dbv.pwszVal, dwReadedStringLen, lpszRetBuff, dwRetBuffSize, NULL, NULL);
+ dwRetBuffSizeLocal = WideCharToMultiByte(MRA_CODE_PAGE, 0, dbv.pwszVal, (int)dwReadedStringLen, lpszRetBuff, (int)dwRetBuffSize, NULL, NULL);
(*((CHAR*)(lpszRetBuff + dwRetBuffSizeLocal))) = 0;
bRet = true;
}
@@ -764,10 +764,10 @@ bool IsEMailMR(const CMStringA &szEmail) {
if (szEmail) {
for (int i = 0; lpcszMailRuDomains[i]; i++) {
- int dwDomainLen = mir_strlen(lpcszMailRuDomains[i]);
+ size_t dwDomainLen = mir_strlen(lpcszMailRuDomains[i]);
if (dwDomainLen < szEmail.GetLength())
if (!_stricmp(lpcszMailRuDomains[i], szEmail.c_str() + szEmail.GetLength() - dwDomainLen))
- if (szEmail[szEmail.GetLength() - dwDomainLen - 1] == '@')
+ if (szEmail[szEmail.GetLength() - (int)dwDomainLen - 1] == '@')
return true;
}
}
@@ -1052,7 +1052,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP dwBuffSize = GetDlgItemText(hWndDlg, IDC_XTITLE, szBuff, (STATUS_TITLE_MAX + 1));
if (dwBuffSize == 0) { // user delete all text
mir_tstrncpy(szBuff, TranslateTS(lpcszXStatusNameDef[dat->dwXStatus]), STATUS_TITLE_MAX + 1);
- dwBuffSize = mir_wstrlen(szBuff);
+ dwBuffSize = (DWORD)mir_wstrlen(szBuff);
}
mir_snprintf(szValueName, SIZEOF(szValueName), "XStatus%dName", dat->dwXStatus);
dat->ppro->mraSetStringExW(NULL, szValueName, szBuff);
@@ -1173,7 +1173,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w TCHAR tszBuff[MAX_PATH];
size_t dwMessageSize = GetWindowTextLength(GetDlgItem(hWndDlg, IDC_MSG_TO_SEND));
- EnableWindow(GetDlgItem(hWndDlg, IDOK), dwMessageSize);
+ EnableWindow(GetDlgItem(hWndDlg, IDOK), (int)dwMessageSize);
mir_sntprintf(tszBuff, SIZEOF(tszBuff), _T("%d/%d"), dwMessageSize, MICBLOG_STATUS_MAX);
SetDlgItemText(hWndDlg, IDC_STATIC_CHARS_COUNTER, tszBuff);
}
@@ -1234,8 +1234,8 @@ DWORD FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD DWORD dwPathLen, dwRecDeepAllocated, dwRecDeepCurPos, dwFilePathLen;
RECURSION_DATA_STACK_ITEM *prdsiItems;
- if (dwFolderLen == -1) dwFolderLen = mir_wstrlen(lpszFolder);
- if (dwFileNameLen == -1) dwFileNameLen = mir_wstrlen(lpszFileName);
+ if (dwFolderLen == -1) dwFolderLen = (int)mir_wstrlen(lpszFolder);
+ if (dwFileNameLen == -1) dwFileNameLen = (int)mir_wstrlen(lpszFileName);
dwRecDeepCurPos = 0;
dwRecDeepAllocated = RECURSION_DATA_STACK_ITEMS_MIN;
@@ -1261,7 +1261,7 @@ DWORD FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD if (prdsiItems[dwRecDeepCurPos].w32fdFindFileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) {// folder
if (CompareString(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName, -1, _T("."), 1) != CSTR_EQUAL)
if (CompareString(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName, -1, _T(".."), 2) != CSTR_EQUAL) {
- prdsiItems[dwRecDeepCurPos].dwFileNameLen = (mir_wstrlen(prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName) + 1);
+ prdsiItems[dwRecDeepCurPos].dwFileNameLen = (int)mir_wstrlen(prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName) + 1;
memcpy((szPath + dwPathLen), prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName, (prdsiItems[dwRecDeepCurPos].dwFileNameLen*sizeof(WCHAR)));
mir_tstrcat(szPath, _T("\\*.*"));
dwPathLen += prdsiItems[dwRecDeepCurPos].dwFileNameLen;
@@ -1281,7 +1281,7 @@ DWORD FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD }
else {// file
if (CompareString(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName, -1, lpszFileName, dwFileNameLen) == CSTR_EQUAL) {
- prdsiItems[dwRecDeepCurPos].dwFileNameLen = mir_wstrlen(prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName);
+ prdsiItems[dwRecDeepCurPos].dwFileNameLen = (int)mir_wstrlen(prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName);
memcpy((szPath + dwPathLen), prdsiItems[dwRecDeepCurPos].w32fdFindFileData.cFileName, ((prdsiItems[dwRecDeepCurPos].dwFileNameLen + 1)*sizeof(WCHAR)));
dwFilePathLen = (dwPathLen + prdsiItems[dwRecDeepCurPos].dwFileNameLen);
@@ -1340,7 +1340,7 @@ bool CMraProto::GetPassDB(CMStringA &res) if (0 != memcmp(&btCryptedPass[1], btRandomData, MIR_SHA1_HASH_SIZE))
return false;
- res = CMStringA((char*)&btCryptedPass[(1 + MIR_SHA1_HASH_SIZE)], dwPassSize);
+ res = CMStringA((char*)&btCryptedPass[(1 + MIR_SHA1_HASH_SIZE)], (int)dwPassSize);
}
else if (storageType == 1) {
RC4(btCryptedPass, sizeof(btCryptedPass), bthmacSHA1, MIR_SHA1_HASH_SIZE);
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 30c114b49b..4fcf9cbdd0 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "proto.h"
INT_PTR CMraProto::MraGotoInbox(WPARAM, LPARAM)
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index caba58dd7a..4bf263fb2c 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 7951ea777c..53fa0e572b 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "MraOfflineMsg.h"
#include "MraRTFMsg.h"
#include "MraPlaces.h"
@@ -156,7 +156,7 @@ DWORD CMraProto::MraGetNLBData(CMStringA &szHost, WORD *pwPort) bContinue = FALSE;
break;
case 1:
- dwBytesReceived = Netlib_Recv(nls.hReadConns[0], (LPSTR)(btBuff + dwRcvBuffSizeUsed), (SIZEOF(btBuff) - dwRcvBuffSizeUsed), 0);
+ dwBytesReceived = Netlib_Recv(nls.hReadConns[0], (LPSTR)(btBuff + dwRcvBuffSizeUsed), (int)(SIZEOF(btBuff) - dwRcvBuffSizeUsed), 0);
if (dwBytesReceived && dwBytesReceived != SOCKET_ERROR)
dwRcvBuffSizeUsed += dwBytesReceived;
else
@@ -270,7 +270,7 @@ DWORD CMraProto::MraNetworkDispatcher() lpbBufferRcv = (LPBYTE)mir_realloc(lpbBufferRcv, dwRcvBuffSize);
}
- DWORD dwBytesReceived = Netlib_Recv(nls.hReadConns[0], (LPSTR)(lpbBufferRcv + dwRcvBuffSizeUsed), (dwRcvBuffSize - dwRcvBuffSizeUsed), 0);
+ DWORD dwBytesReceived = Netlib_Recv(nls.hReadConns[0], (LPSTR)(lpbBufferRcv + dwRcvBuffSizeUsed), (int)(dwRcvBuffSize - dwRcvBuffSizeUsed), 0);
if ( !dwBytesReceived || dwBytesReceived == SOCKET_ERROR) { // disconnected
if (m_iStatus != ID_STATUS_OFFLINE) {
dwRetErrorCode = GetLastError();
@@ -281,8 +281,8 @@ DWORD CMraProto::MraNetworkDispatcher() dwRcvBuffSizeUsed += dwBytesReceived;
while (TRUE) {
- dwDataCurrentBuffSize = (dwRcvBuffSize - dwDataCurrentBuffOffset);
- dwDataCurrentBuffSizeUsed = (dwRcvBuffSizeUsed - dwDataCurrentBuffOffset);
+ dwDataCurrentBuffSize = (int)(dwRcvBuffSize - dwDataCurrentBuffOffset);
+ dwDataCurrentBuffSizeUsed = (int)(dwRcvBuffSizeUsed - dwDataCurrentBuffOffset);
pmaHeader = (mrim_packet_header_t*)(lpbBufferRcv + dwDataCurrentBuffOffset);
// packet header received
@@ -1604,7 +1604,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & if (lpbRTFData) {
unsigned dwCompressedSize;
mir_ptr<BYTE> lpbCompressed((LPBYTE)mir_base64_decode(plpsRFTText, &dwCompressedSize));
- DWORD dwRTFDataSize = dwRFTBuffSize;
+ DWORD dwRTFDataSize = (DWORD)dwRFTBuffSize;
if (uncompress(lpbRTFData, &dwRTFDataSize, lpbCompressed, dwCompressedSize) == Z_OK) {
BinBuffer buf(lpbRTFData, dwRTFDataSize);
@@ -1814,7 +1814,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & DWORD GetMraXStatusIDFromMraUriStatus(const char *szStatusUri)
{
if (szStatusUri)
- for (size_t i = 0; lpcszStatusUri[i]; i++)
+ for (DWORD i = 0; lpcszStatusUri[i]; i++)
if (!_stricmp(lpcszStatusUri[i], szStatusUri))
return i;
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index e27035996f..efeb16445a 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -1,4 +1,4 @@ -#include "Mra.h"
+#include "stdafx.h"
#include "proto.h"
LPCSTR lpcszStatusUri[] =
diff --git a/protocols/MRA/src/Sdk/SHA1.h b/protocols/MRA/src/Sdk/SHA1.h index 96449340bd..74e83edd8b 100644 --- a/protocols/MRA/src/Sdk/SHA1.h +++ b/protocols/MRA/src/Sdk/SHA1.h @@ -80,7 +80,7 @@ __inline void SHA1GetDigest(LPVOID lpBuff,size_t dwBuffSize,BYTE *digest) mir_sha1_ctx sha;
mir_sha1_init(&sha);
- mir_sha1_append(&sha,(BYTE*)lpBuff,dwBuffSize);
+ mir_sha1_append(&sha,(BYTE*)lpBuff,(int)dwBuffSize);
mir_sha1_finish(&sha,digest);
}
diff --git a/protocols/MRA/src/stdafx.cpp b/protocols/MRA/src/stdafx.cxx index 2d97a6a925..6fb37564b7 100644 --- a/protocols/MRA/src/stdafx.cpp +++ b/protocols/MRA/src/stdafx.cxx @@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "Mra.h"
\ No newline at end of file +#include "stdafx.h"
\ No newline at end of file diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/stdafx.h index 31ed1ac5f0..7b93e1b833 100644 --- a/protocols/MRA/src/Mra.h +++ b/protocols/MRA/src/stdafx.h @@ -1,13 +1,8 @@ #if !defined(AFX_MRA_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_)
#define AFX_MRA_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_
-
#pragma once
-#define _CRT_SECURE_NO_WARNINGS
-
-//#define CRTDLL
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
@@ -18,7 +13,6 @@ #include <mswsock.h>
#include <WS2tcpip.h>
-#pragma comment(lib,"Crypt32.lib")
#pragma comment(lib,"shlwapi.lib")
#pragma comment(lib,"ws2_32.lib")
#pragma comment(lib,"mswsock.lib")
|