local changes - NOT TO BE PUSHED krista_local_windows
authorkrista
Tue, 26 Jul 2016 11:47:15 +0200
branchkrista_local_windows
changeset 1122bbd0d058f0e3
parent 921 2013f282d2f1
child 1123 65d39d3f13e6
local changes - NOT TO BE PUSHED
asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
pEpEngine.vcxproj
src/pgp_gpg.c
src/platform_windows.h
src/sync_send_actions.c
test/pEpEngineTest.vcxproj
     1.1 --- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Fri Jul 22 18:12:47 2016 +0200
     1.2 +++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Tue Jul 26 11:47:15 2016 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  <?xml version="1.0" encoding="utf-8"?>
     1.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.7    <ItemGroup Label="ProjectConfigurations">
     1.8      <ProjectConfiguration Include="Debug|Win32">
     1.9        <Configuration>Debug</Configuration>
    1.10 @@ -19,13 +19,13 @@
    1.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    1.12      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.13      <UseDebugLibraries>true</UseDebugLibraries>
    1.14 -    <PlatformToolset>v120</PlatformToolset>
    1.15 +    <PlatformToolset>v140</PlatformToolset>
    1.16      <CharacterSet>Unicode</CharacterSet>
    1.17    </PropertyGroup>
    1.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1.19      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.20      <UseDebugLibraries>false</UseDebugLibraries>
    1.21 -    <PlatformToolset>v120</PlatformToolset>
    1.22 +    <PlatformToolset>v140</PlatformToolset>
    1.23      <WholeProgramOptimization>true</WholeProgramOptimization>
    1.24      <CharacterSet>Unicode</CharacterSet>
    1.25    </PropertyGroup>
    1.26 @@ -40,8 +40,8 @@
    1.27    </ImportGroup>
    1.28    <PropertyGroup Label="UserMacros" />
    1.29    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    1.30 -    <ExecutablePath>C:\Users\vb\bin;$(ExecutablePath)</ExecutablePath>
    1.31 -    <IncludePath>C:\Users\vb\share\asn1c;$(IncludePath)</IncludePath>
    1.32 +    <ExecutablePath>C:\Program Files\asn1c;$(ExecutablePath)</ExecutablePath>
    1.33 +    <IncludePath>C:\Users\krista\Documents\src\pEpEngine\asn.1;$(IncludePath)</IncludePath>
    1.34    </PropertyGroup>
    1.35    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    1.36      <IncludePath>C:\Users\vb\share\asn1c;$(IncludePath)</IncludePath>
    1.37 @@ -54,6 +54,7 @@
    1.38        <WarningLevel>Level3</WarningLevel>
    1.39        <Optimization>Disabled</Optimization>
    1.40        <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.41 +      <CompileAs>Default</CompileAs>
    1.42      </ClCompile>
    1.43      <Link>
    1.44        <SubSystem>Windows</SubSystem>
     2.1 --- a/pEpEngine.vcxproj	Fri Jul 22 18:12:47 2016 +0200
     2.2 +++ b/pEpEngine.vcxproj	Tue Jul 26 11:47:15 2016 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  <?xml version="1.0" encoding="utf-8"?>
     2.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.7    <ItemGroup Label="ProjectConfigurations">
     2.8      <ProjectConfiguration Include="Debug|Win32">
     2.9        <Configuration>Debug</Configuration>
    2.10 @@ -14,18 +14,19 @@
    2.11      <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
    2.12      <Keyword>Win32Proj</Keyword>
    2.13      <RootNamespace>pEpEngine</RootNamespace>
    2.14 +    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    2.15    </PropertyGroup>
    2.16    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    2.17    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2.18 -    <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.19 +    <ConfigurationType>StaticLibrary</ConfigurationType>
    2.20      <UseDebugLibraries>true</UseDebugLibraries>
    2.21 -    <PlatformToolset>v120</PlatformToolset>
    2.22 +    <PlatformToolset>v140</PlatformToolset>
    2.23      <CharacterSet>Unicode</CharacterSet>
    2.24    </PropertyGroup>
    2.25    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2.26      <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.27      <UseDebugLibraries>false</UseDebugLibraries>
    2.28 -    <PlatformToolset>v120</PlatformToolset>
    2.29 +    <PlatformToolset>v140</PlatformToolset>
    2.30      <WholeProgramOptimization>true</WholeProgramOptimization>
    2.31      <CharacterSet>Unicode</CharacterSet>
    2.32    </PropertyGroup>
    2.33 @@ -41,7 +42,7 @@
    2.34    <PropertyGroup Label="UserMacros" />
    2.35    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    2.36      <LinkIncremental>true</LinkIncremental>
    2.37 -    <IncludePath>$(ProjectDir)\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
    2.38 +    <IncludePath>$(ProjectDir)\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;C:\Users\krista\Documents\src\pEpEngine\asn.1;$(IncludePath)</IncludePath>
    2.39      <RunCodeAnalysis>false</RunCodeAnalysis>
    2.40      <LibraryPath>$(ProjectDir)\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
    2.41    </PropertyGroup>
    2.42 @@ -58,6 +59,7 @@
    2.43        <SDLCheck>true</SDLCheck>
    2.44        <EnablePREfast>false</EnablePREfast>
    2.45        <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.46 +      <CompileAs>Default</CompileAs>
    2.47      </ClCompile>
    2.48      <Link>
    2.49        <SubSystem>Windows</SubSystem>
     3.1 --- a/src/pgp_gpg.c	Fri Jul 22 18:12:47 2016 +0200
     3.2 +++ b/src/pgp_gpg.c	Tue Jul 26 11:47:15 2016 +0200
     3.3 @@ -25,6 +25,7 @@
     3.4      if (f == NULL && errno == ENOMEM)
     3.5          return false;
     3.6  
     3.7 +    /* FIXME: extract as internal function */
     3.8      if (f != NULL) {
     3.9          int length = stringlist_length(keys);
    3.10          unsigned int n = (1 << length) - 1;
     4.1 --- a/src/platform_windows.h	Fri Jul 22 18:12:47 2016 +0200
     4.2 +++ b/src/platform_windows.h	Tue Jul 26 11:47:15 2016 +0200
     4.3 @@ -25,7 +25,9 @@
     4.4  #define strdup(A) _strdup((A))
     4.5  #endif
     4.6  #ifndef snprintf
     4.7 -#define snprintf(...) _snprintf(__VA_ARGS__)
     4.8 +	#if _MSC_VER<1900 // Includes undefined case. This is a check for VS 2015, which throws an error.
     4.9 +	#define snprintf(...) _snprintf(__VA_ARGS__)
    4.10 +	#endif
    4.11  #endif
    4.12  #ifndef strtok_r
    4.13  #define strtok_r(A, B, C) strtok_s((A), (B), (C))
     5.1 --- a/src/sync_send_actions.c	Fri Jul 22 18:12:47 2016 +0200
     5.2 +++ b/src/sync_send_actions.c	Tue Jul 26 11:47:15 2016 +0200
     5.3 @@ -52,9 +52,10 @@
     5.4      status = sequence_value(session, "DeviceGroup", &seq);
     5.5      if (status != PEP_STATUS_OK)
     5.6          goto error;
     5.7 -    msg->header.sequence = (long) seq;
     5.8 -
     5.9 -    msg->state = (long) state;
    5.10 +	asn_long2INTEGER(&(msg->header.sequence), (long)seq);
    5.11 +//    msg->header.sequence = (long) seq;
    5.12 +	asn_long2INTEGER(&(msg->state), (long)state);
    5.13 +//    msg->state = (long) state;
    5.14  
    5.15      me = new_identity(NULL, NULL, NULL, NULL);
    5.16      if (!me)
    5.17 @@ -143,10 +144,10 @@
    5.18      status = sequence_value(session, "DeviceGroup", &seq);
    5.19      if (status != PEP_STATUS_OK)
    5.20          goto error;
    5.21 -    msg->header.sequence = (long) seq;
    5.22 -
    5.23 -    msg->state = (long) state;
    5.24 -
    5.25 +//    msg->header.sequence = (long) seq;
    5.26 +	asn_long2INTEGER(&(msg->header.sequence), (long)seq);
    5.27 +//    msg->state = (long) state;
    5.28 +	asn_long2INTEGER(&(msg->state), (long)state);
    5.29      me = new_identity(NULL, NULL, NULL, NULL);
    5.30      if (!me)
    5.31          goto enomem;
    5.32 @@ -237,10 +238,10 @@
    5.33      status = sequence_value(session, "DeviceGroup", &seq);
    5.34      if (status != PEP_STATUS_OK)
    5.35          goto error;
    5.36 -    msg->header.sequence = (long) seq;
    5.37 -
    5.38 -    msg->state = (long) state;
    5.39 -
    5.40 +//    msg->header.sequence = (long) seq;
    5.41 +	asn_long2INTEGER(&(msg->header.sequence), (long)seq);
    5.42 +//    msg->state = (long) state;
    5.43 +	asn_long2INTEGER(&(msg->state), (long)state);
    5.44      me = new_identity(NULL, NULL, NULL, NULL);
    5.45      if (!me)
    5.46          goto enomem;
     6.1 --- a/test/pEpEngineTest.vcxproj	Fri Jul 22 18:12:47 2016 +0200
     6.2 +++ b/test/pEpEngineTest.vcxproj	Tue Jul 26 11:47:15 2016 +0200
     6.3 @@ -1,5 +1,5 @@
     6.4  <?xml version="1.0" encoding="utf-8"?>
     6.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     6.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     6.7    <ItemGroup Label="ProjectConfigurations">
     6.8      <ProjectConfiguration Include="Debug|Win32">
     6.9        <Configuration>Debug</Configuration>
    6.10 @@ -18,13 +18,13 @@
    6.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    6.12      <ConfigurationType>Application</ConfigurationType>
    6.13      <UseDebugLibraries>true</UseDebugLibraries>
    6.14 -    <PlatformToolset>v120</PlatformToolset>
    6.15 +    <PlatformToolset>v140</PlatformToolset>
    6.16      <CharacterSet>MultiByte</CharacterSet>
    6.17    </PropertyGroup>
    6.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    6.19      <ConfigurationType>Application</ConfigurationType>
    6.20      <UseDebugLibraries>false</UseDebugLibraries>
    6.21 -    <PlatformToolset>v120</PlatformToolset>
    6.22 +    <PlatformToolset>v140</PlatformToolset>
    6.23      <WholeProgramOptimization>true</WholeProgramOptimization>
    6.24      <CharacterSet>MultiByte</CharacterSet>
    6.25    </PropertyGroup>