Skip to content

Commit fa448d7

Browse files
mahendya1002mahendya1002
authored
Merge pull request #21 from CyberSource/future
Made compatible with visual studio 2017.
2 parents c085fa3 + b9f2729 commit fa448d7

18 files changed

+50
-40
lines changed

‎BaseClient/BaseClient.vcxproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
2222
<ProjectGuid>{E5D6E166-C770-4B63-9501-4274E29D56E2}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>BaseClient</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>DynamicLibrary</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v110</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3132
<CharacterSet>Unicode</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>DynamicLibrary</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v110</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3738
<CharacterSet>Unicode</CharacterSet>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>DynamicLibrary</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v110</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>Unicode</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>DynamicLibrary</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v110</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>Unicode</CharacterSet>
5253
</PropertyGroup>
@@ -73,7 +74,7 @@
7374
</PropertyGroup>
7475
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7576
<LinkIncremental>true</LinkIncremental>
76-
<OutDir>.\Debug\win64\</OutDir>
77+
<OutDir>.\Debug\win64\</OutDir>
7778
<IntDir>.\Debug\win64\</IntDir>
7879
</PropertyGroup>
7980
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,7 +84,7 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<LinkIncremental>false</LinkIncremental>
86-
<OutDir>.\Release\win64\</OutDir>
87+
<OutDir>.\Release\win64\</OutDir>
8788
<IntDir>.\Release\win64\</IntDir>
8889
</PropertyGroup>
8990
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎BaseClient/BaseClient.vcxproj.filters

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
<ClCompile Include="stdafx.cpp">
3333
<Filter>Source Files</Filter>
3434
</ClCompile>
35-
<ClCompile Include="BaseClient.cpp">
36-
<Filter>Source Files</Filter>
37-
</ClCompile>
3835
<ClCompile Include="dllmain.cpp">
3936
<Filter>Source Files</Filter>
4037
</ClCompile>

‎BaseClient/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const char CYBS_C_USE_AKAMAI[] = "sendToAkamai";
6868

6969

7070
/* Please do not modify these values */
71-
static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.2";
71+
static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.3";
7272
static const wchar_t CLIENT_LIBRARY_VALUE[] = L"C SOAP";
7373
static const wchar_t CLIENT_APPLICATION_VALUE[] = L"Simple Order API";
7474

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
API_VERSION = 6.0.2
1+
API_VERSION = 6.0.3
22
PROD_NAME = simapi-c
33
ZIP_NAME = $(PROD_NAME)-linux
44
DIST_BASE = builds

‎NVPClient/NVPClient.cpp

+11-3
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,14 @@ std::map <std::wstring, std::wstring> convertStringtoMap (wchar_t *res) {
245245
wchar_t *token;
246246
wchar_t *buf;
247247

248+
/*
248249
#ifdef WIN32
249250
temp1 = wcstok(res1, L"\n");
250251
#else
251252
temp1 = wcstok(res1, L"\n", &buf);
252253
#endif
254+
*/
255+
temp1 = wcstok(res1, L"\n", &buf);
253256

254257
while(temp1 != NULL)
255258
{
@@ -259,11 +262,14 @@ std::map <std::wstring, std::wstring> convertStringtoMap (wchar_t *res) {
259262
std::wstring temp2(token+1);
260263
resmap.insert(std::pair<std::wstring, std::wstring>(ws,temp2));
261264

265+
/*
262266
#ifdef WIN32
263267
temp1 = wcstok(NULL, L"\n");
264268
#else
265269
temp1 = wcstok(NULL, L"\n", &buf);
266270
#endif
271+
*/
272+
temp1 = wcstok(NULL, L"\n", &buf);
267273
}
268274
return resmap;
269275
}
@@ -654,10 +660,12 @@ int runTransaction(INVPTransactionProcessorProxy *proxy, CybsMap *configMap, std
654660
char *responseMsg = "\0";
655661
responseMsg = proxy->soap->msgbuf;
656662

657-
wstring repCopy(rep);
658-
663+
if (rep != NULL) {
664+
wstring repCopy(rep);
665+
}
666+
659667
if (status == SOAP_OK) {
660-
if(rep != NULL && repCopy.size() > 0)
668+
if(rep != NULL)
661669
resMap = convertStringtoMap(rep);
662670

663671
if (cfg.isLogEnabled)

‎NVPClient/NVPClient.vcxproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
2222
<ProjectGuid>{050FDA60-057C-4D81-B3AB-46BB6450E1EB}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>NVPClient</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>DynamicLibrary</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v110</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3132
<CharacterSet>Unicode</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>DynamicLibrary</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v110</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3738
<CharacterSet>Unicode</CharacterSet>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>DynamicLibrary</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v110</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>Unicode</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>DynamicLibrary</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v110</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>Unicode</CharacterSet>
5253
</PropertyGroup>
@@ -73,7 +74,7 @@
7374
</PropertyGroup>
7475
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7576
<LinkIncremental>true</LinkIncremental>
76-
<OutDir>.\Debug\win64\</OutDir>
77+
<OutDir>.\Debug\win64\</OutDir>
7778
<IntDir>.\Debug\win64\</IntDir>
7879
</PropertyGroup>
7980
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,7 +84,7 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<LinkIncremental>false</LinkIncremental>
86-
<OutDir>.\Release\win64\</OutDir>
87+
<OutDir>.\Release\win64\</OutDir>
8788
<IntDir>.\Release\win64\</IntDir>
8889
</PropertyGroup>
8990
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎NVPTest/NVPTest.vcxproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
2222
<ProjectGuid>{309F0215-8BC6-4AAF-82BD-3AA799C78C0E}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>NVPTest</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>Application</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v110</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3132
<CharacterSet>Unicode</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>Application</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v110</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3738
<CharacterSet>Unicode</CharacterSet>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>Application</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v110</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>Unicode</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>Application</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v110</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>Unicode</CharacterSet>
5253
</PropertyGroup>

‎XMLClient/XMLClient.vcxproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
2222
<ProjectGuid>{71E43B52-86C8-4959-9A93-8D4B9739E59A}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>XMLClient</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>DynamicLibrary</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v110</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3132
<CharacterSet>Unicode</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>DynamicLibrary</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v110</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3738
<CharacterSet>Unicode</CharacterSet>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>DynamicLibrary</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v110</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>Unicode</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>DynamicLibrary</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v110</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>Unicode</CharacterSet>
5253
</PropertyGroup>
@@ -73,7 +74,7 @@
7374
</PropertyGroup>
7475
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7576
<LinkIncremental>true</LinkIncremental>
76-
<OutDir>.\Debug\win64\</OutDir>
77+
<OutDir>.\Debug\win64\</OutDir>
7778
<IntDir>.\Debug\win64\</IntDir>
7879
</PropertyGroup>
7980
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,7 +84,7 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<LinkIncremental>false</LinkIncremental>
86-
<OutDir>.\Release\win64\</OutDir>
87+
<OutDir>.\Release\win64\</OutDir>
8788
<IntDir>.\Release\win64\</IntDir>
8889
</PropertyGroup>
8990
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎lib/openssl-1.0.1t/win32/lib/libeay32.lib

-1.74 MB
Binary file not shown.

‎lib/openssl-1.0.1t/win32/lib/libeay32x.lib

13.6 MB
Binary file not shown.

‎lib/openssl-1.0.1t/win32/lib/ssleay32.lib

-3.45 KB
Binary file not shown.

‎lib/openssl-1.0.1t/win32/lib/ssleay32x.lib

1.96 MB
Binary file not shown.

‎lib/openssl-1.0.1t/win64/lib/libeay64.lib

-1.62 MB
Binary file not shown.

‎lib/openssl-1.0.1t/win64/lib/libeay64x.lib

14.2 MB
Binary file not shown.

‎lib/openssl-1.0.1t/win64/lib/ssleay64.lib

-7.87 KB
Binary file not shown.

‎lib/openssl-1.0.1t/win64/lib/ssleay64x.lib

1.92 MB
Binary file not shown.

‎mkinstall.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rem This is the packaging batch file for Windows.
55
rem For Linux, run "make" in the client subdirectory.
66
rem *************************************************
77
set platform=%1
8-
set CLIENT_LIBRARY_VERSION_VALUE=6.0.2
8+
set CLIENT_LIBRARY_VERSION_VALUE=6.0.3
99

1010
set BUILD_DIR=builds
1111
if "%platform%"=="win32" (

‎xml/xml.vcxproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -23,31 +23,32 @@
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>xml</RootNamespace>
2525
<ProjectName>XMLTest</ProjectName>
26+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
2627
</PropertyGroup>
2728
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2829
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2930
<ConfigurationType>Application</ConfigurationType>
3031
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v110</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3233
<CharacterSet>Unicode</CharacterSet>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3536
<ConfigurationType>Application</ConfigurationType>
3637
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v110</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3839
<CharacterSet>Unicode</CharacterSet>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4142
<ConfigurationType>Application</ConfigurationType>
4243
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v110</PlatformToolset>
44+
<PlatformToolset>v141</PlatformToolset>
4445
<WholeProgramOptimization>true</WholeProgramOptimization>
4546
<CharacterSet>Unicode</CharacterSet>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4849
<ConfigurationType>Application</ConfigurationType>
4950
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v110</PlatformToolset>
51+
<PlatformToolset>v141</PlatformToolset>
5152
<WholeProgramOptimization>true</WholeProgramOptimization>
5253
<CharacterSet>Unicode</CharacterSet>
5354
</PropertyGroup>

0 commit comments

Comments
 (0)