pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

merge default into branch

sync
Roker 6 years ago
parent
859527e249 5a56066f02
commit
62ef512232
2 changed files with 10 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libpEpAdapter/libpEpAdapter.vcxproj
  2. 4
      status_to_string.cc

12
libpEpAdapter/libpEpAdapter.vcxproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@ -22,32 +22,32 @@
<ProjectGuid>{EC44FEC9-2F3A-4A0C-B60E-0F22AA43EF58}</ProjectGuid> <ProjectGuid>{EC44FEC9-2F3A-4A0C-B60E-0F22AA43EF58}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>libpEpAdapter</RootNamespace> <RootNamespace>libpEpAdapter</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>

4
status_to_string.cc
View File

@ -36,6 +36,10 @@ std::string status_to_string(PEP_STATUS status)
case PEP_MALFORMED_KEY_RESET_MSG : status_string = "PEP_MALFORMED_KEY_RESET_MSG"; break; case PEP_MALFORMED_KEY_RESET_MSG : status_string = "PEP_MALFORMED_KEY_RESET_MSG"; break;
case PEP_KEY_NOT_RESET : status_string = "PEP_KEY_NOT_RESET"; break; case PEP_KEY_NOT_RESET : status_string = "PEP_KEY_NOT_RESET"; break;
case PEP_KEY_IMPORTED : status_string = "PEP_KEY_IMPORTED"; break;
case PEP_NO_KEY_IMPORTED : status_string = "PEP_NO_KEY_IMPORTED"; break;
case PEP_KEY_IMPORT_STATUS_UNKNOWN : status_string = "PEP_KEY_IMPORT_STATUS_UNKNOWN"; break;
case PEP_CANNOT_FIND_IDENTITY : status_string = "PEP_CANNOT_FIND_IDENTITY"; break; case PEP_CANNOT_FIND_IDENTITY : status_string = "PEP_CANNOT_FIND_IDENTITY"; break;
case PEP_CANNOT_SET_PERSON : status_string = "PEP_CANNOT_SET_PERSON"; break; case PEP_CANNOT_SET_PERSON : status_string = "PEP_CANNOT_SET_PERSON"; break;
case PEP_CANNOT_SET_PGP_KEYPAIR : status_string = "PEP_CANNOT_SET_PGP_KEYPAIR"; break; case PEP_CANNOT_SET_PGP_KEYPAIR : status_string = "PEP_CANNOT_SET_PGP_KEYPAIR"; break;

Write Preview
Loading…
Cancel
Save