Skip to content

Commit f364f32

Browse files
hohonghohong
committed
port tfs changes to codeplex
1 parent ca64865 commit f364f32

File tree

150 files changed

+1690
-3438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1690
-3438
lines changed

‎Build/Config.Definitions.props

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|Win32">
9+
<Configuration>Debug</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
</ItemGroup>
29+
30+
31+
32+
</Project>

‎Build/Release.Product.settings

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4+
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
5+
<UseDebugLibraries>true</UseDebugLibraries>
6+
<WholeProgramOptimization>false</WholeProgramOptimization>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
10+
<UseDebugLibraries>false</UseDebugLibraries>
11+
<WholeProgramOptimization>true</WholeProgramOptimization>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Label="Configuration">
15+
<CharacterSet>Unicode</CharacterSet>
16+
</PropertyGroup>
17+
418
<!-- Ensures that if this file changes it forces a rebuild -->
5-
<PropertyGroup>
19+
<PropertyGroup>
620
<MSBuildAllProjects>
721
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
822
</MSBuildAllProjects>
9-
23+
1024
<!-- RunCodeAnalysis, false by default, is set true as necessary from the msbuild command line. -->
1125
<!-- This is normally done for the gated checkin build. -->
1226
<RunCodeAnalysis Condition="'$(RunCodeAnalysis)'==''">false</RunCodeAnalysis>
@@ -16,4 +30,38 @@
1630

1731
<Import Project="$(MSBuildThisFileDirectory)\Common.Build.settings" />
1832

33+
<PropertyGroup>
34+
<InternalIncludeDir>$(CasablancaIncludeDir)</InternalIncludeDir>
35+
<IntDir>$(BuildRoot)\Intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
36+
</PropertyGroup>
37+
38+
<ItemDefinitionGroup>
39+
<ClCompile>
40+
<MinimalRebuild>false</MinimalRebuild>
41+
</ClCompile>
42+
<Link>
43+
<SubSystem>Windows</SubSystem>
44+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
45+
<GenerateDebugInformation>true</GenerateDebugInformation>
46+
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
47+
<StripPrivateSymbols>$(OutDir)$(TargetName).pub.pdb</StripPrivateSymbols>
48+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/SAFESEH%(AdditionalOptions)</AdditionalOptions>
49+
</Link>
50+
</ItemDefinitionGroup>
51+
52+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
53+
<ClCompile>
54+
<Optimization>Disabled</Optimization>
55+
</ClCompile>
56+
</ItemDefinitionGroup>
57+
58+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
59+
<ClCompile>
60+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
61+
<Optimization>MaxSpeed</Optimization>
62+
<FunctionLevelLinking>true</FunctionLevelLinking>
63+
<IntrinsicFunctions>true</IntrinsicFunctions>
64+
</ClCompile>
65+
</ItemDefinitionGroup>
66+
1967
</Project>

‎Release/casablanca110.sln

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110", "src\VS11\casablanca110.vcxproj", "{90D85FF4-F0AE-4816-923F-0EF2758F30AB}"
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110", "src\build\casablanca110.vcxproj", "{90D85FF4-F0AE-4816-923F-0EF2758F30AB}"
55
EndProject
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestRunner110", "tests\Common\TestRunner\VS11\TestRunner110.vcxproj", "{6490C580-DD4A-4F2D-A345-732C5148349F}"
77
EndProject
@@ -17,7 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HttpTestUtilities110", "tes
1717
EndProject
1818
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON110_test", "tests\Functional\json\VS11\JSON110_test.vcxproj", "{6F026328-4D10-4EF1-BD6C-8FD3CBE0F530}"
1919
EndProject
20-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "header_test110", "tests\Functional\misc\atl_headers\VS11\header_test110.vcxproj", "{32DB3115-2918-477F-B00A-DAC6277EEFAB}"
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atl_header110", "tests\Functional\misc\atl_headers\VS11\header_test110.vcxproj", "{32DB3115-2918-477F-B00A-DAC6277EEFAB}"
2121
EndProject
2222
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pplx110_test", "tests\Functional\pplx\pplx_test\VS11\pplx110_test.vcxproj", "{5115840E-A5A8-4044-B595-CDA05C2D65D0}"
2323
EndProject
@@ -27,76 +27,83 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uri110_test", "tests\Functi
2727
EndProject
2828
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlistener110", "tests\Functional\http\utilities\testlistener\VS11\testlistener110.vcxproj", "{5614BAFA-7605-41D3-945F-7EEB8116398F}"
2929
EndProject
30+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.winrt", "src\build\casablanca110.winrt.vcxproj", "{198ED804-2655-4D92-8104-C220E3EA9452}"
31+
EndProject
3032
Global
3133
GlobalSection(TeamFoundationVersionControl) = preSolution
32-
SccNumberOfProjects = 13
34+
SccNumberOfProjects = 14
3335
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
34-
SccTeamFoundationServer = http://vstfdevdiv:8080/devdiv2
35-
SccProjectUniqueName0 = src\\VS11\\casablanca110.vcxproj
36-
SccProjectName0 = src/VS11
37-
SccAuxPath0 = http://vstfdevdiv:8080/devdiv2
38-
SccLocalPath0 = src\\VS11
36+
SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2
37+
SccProjectUniqueName0 = src\\build\\casablanca110.vcxproj
38+
SccProjectName0 = src/build
39+
SccAuxPath0 = http://tkbgitvstfat01:8080/devdiv2
40+
SccLocalPath0 = src\\build
3941
SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
4042
SccProjectUniqueName1 = tests\\Common\\TestRunner\\VS11\\TestRunner110.vcxproj
4143
SccProjectName1 = tests/Common/TestRunner/VS11
42-
SccAuxPath1 = http://vstfdevdiv:8080/devdiv2
44+
SccAuxPath1 = http://tkbgitvstfat01:8080/devdiv2
4345
SccLocalPath1 = tests\\Common\\TestRunner\\VS11
4446
SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
4547
SccProjectUniqueName2 = tests\\Common\\UnitTestpp\\VS11\\TestUnitTestpp110.vcxproj
4648
SccProjectName2 = tests/Common/UnitTestpp/VS11
47-
SccAuxPath2 = http://vstfdevdiv:8080/devdiv2
49+
SccAuxPath2 = http://tkbgitvstfat01:8080/devdiv2
4850
SccLocalPath2 = tests\\Common\\UnitTestpp\\VS11
4951
SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
5052
SccProjectUniqueName3 = tests\\Common\\UnitTestpp\\VS11\\UnitTestpp110.vcxproj
5153
SccProjectName3 = tests/Common/UnitTestpp/VS11
52-
SccAuxPath3 = http://vstfdevdiv:8080/devdiv2
54+
SccAuxPath3 = http://tkbgitvstfat01:8080/devdiv2
5355
SccLocalPath3 = tests\\Common\\UnitTestpp\\VS11
5456
SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
5557
SccProjectUniqueName4 = tests\\Common\\utilities\\VS11\\CommonUtilities110.vcxproj
5658
SccProjectName4 = tests/Common/utilities/VS11
57-
SccAuxPath4 = http://vstfdevdiv:8080/devdiv2
59+
SccAuxPath4 = http://tkbgitvstfat01:8080/devdiv2
5860
SccLocalPath4 = tests\\Common\\utilities\\VS11
5961
SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
6062
SccProjectUniqueName5 = tests\\Functional\\http\\client\\VS11\\HttpClient110_test.vcxproj
6163
SccProjectName5 = tests/Functional/http/client/VS11
62-
SccAuxPath5 = http://vstfdevdiv:8080/devdiv2
64+
SccAuxPath5 = http://tkbgitvstfat01:8080/devdiv2
6365
SccLocalPath5 = tests\\Functional\\http\\client\\VS11
6466
SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
6567
SccProjectUniqueName6 = tests\\Functional\\http\\utilities\\VS11\\HttpTestUtilities110.vcxproj
6668
SccProjectName6 = tests/Functional/http/utilities/VS11
67-
SccAuxPath6 = http://vstfdevdiv:8080/devdiv2
69+
SccAuxPath6 = http://tkbgitvstfat01:8080/devdiv2
6870
SccLocalPath6 = tests\\Functional\\http\\utilities\\VS11
6971
SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
7072
SccProjectUniqueName7 = tests\\Functional\\json\\VS11\\JSON110_test.vcxproj
7173
SccProjectName7 = tests/Functional/json/VS11
72-
SccAuxPath7 = http://vstfdevdiv:8080/devdiv2
74+
SccAuxPath7 = http://tkbgitvstfat01:8080/devdiv2
7375
SccLocalPath7 = tests\\Functional\\json\\VS11
7476
SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
7577
SccProjectUniqueName8 = tests\\Functional\\misc\\atl_headers\\VS11\\header_test110.vcxproj
7678
SccProjectName8 = tests/Functional/misc/atl_headers/VS11
77-
SccAuxPath8 = http://vstfdevdiv:8080/devdiv2
79+
SccAuxPath8 = http://tkbgitvstfat01:8080/devdiv2
7880
SccLocalPath8 = tests\\Functional\\misc\\atl_headers\\VS11
7981
SccProvider8 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
8082
SccProjectUniqueName9 = tests\\Functional\\pplx\\pplx_test\\VS11\\pplx110_test.vcxproj
8183
SccProjectName9 = tests/Functional/pplx/pplx_test/VS11
82-
SccAuxPath9 = http://vstfdevdiv:8080/devdiv2
84+
SccAuxPath9 = http://tkbgitvstfat01:8080/devdiv2
8385
SccLocalPath9 = tests\\Functional\\pplx\\pplx_test\\VS11
8486
SccProvider9 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
8587
SccProjectUniqueName10 = tests\\Functional\\streams\\VS11\\streams110_test.vcxproj
8688
SccProjectName10 = tests/Functional/streams/VS11
87-
SccAuxPath10 = http://vstfdevdiv:8080/devdiv2
89+
SccAuxPath10 = http://tkbgitvstfat01:8080/devdiv2
8890
SccLocalPath10 = tests\\Functional\\streams\\VS11
8991
SccProvider10 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
9092
SccProjectUniqueName11 = tests\\Functional\\uri\\VS11\\Uri110_test.vcxproj
9193
SccProjectName11 = tests/Functional/uri/VS11
92-
SccAuxPath11 = http://vstfdevdiv:8080/devdiv2
94+
SccAuxPath11 = http://tkbgitvstfat01:8080/devdiv2
9395
SccLocalPath11 = tests\\Functional\\uri\\VS11
9496
SccProvider11 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
9597
SccProjectUniqueName12 = tests\\Functional\\http\\utilities\\testlistener\\VS11\\testlistener110.vcxproj
9698
SccProjectName12 = tests/Functional/http/utilities/testlistener/VS11
97-
SccAuxPath12 = http://vstfdevdiv:8080/devdiv2
99+
SccAuxPath12 = http://tkbgitvstfat01:8080/devdiv2
98100
SccLocalPath12 = tests\\Functional\\http\\utilities\\testlistener\\VS11
99101
SccProvider12 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
102+
SccProjectUniqueName13 = src\\build\\casablanca110.winrt.vcxproj
103+
SccProjectName13 = src/build
104+
SccAuxPath13 = http://tkbgitvstfat01:8080/devdiv2
105+
SccLocalPath13 = src\\build
106+
SccProvider13 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
100107
EndGlobalSection
101108
GlobalSection(SolutionConfigurationPlatforms) = preSolution
102109
Debug|ARM = Debug|ARM
@@ -261,6 +268,18 @@ Global
261268
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|Win32.Build.0 = Release|Win32
262269
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.ActiveCfg = Release|x64
263270
{5614BAFA-7605-41D3-945F-7EEB8116398F}.Release|x64.Build.0 = Release|x64
271+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.ActiveCfg = Debug|ARM
272+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|ARM.Build.0 = Debug|ARM
273+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|Win32.ActiveCfg = Debug|Win32
274+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|Win32.Build.0 = Debug|Win32
275+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|x64.ActiveCfg = Debug|x64
276+
{198ED804-2655-4D92-8104-C220E3EA9452}.Debug|x64.Build.0 = Debug|x64
277+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|ARM.ActiveCfg = Release|ARM
278+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|ARM.Build.0 = Release|ARM
279+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|Win32.ActiveCfg = Release|Win32
280+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|Win32.Build.0 = Release|Win32
281+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|x64.ActiveCfg = Release|x64
282+
{198ED804-2655-4D92-8104-C220E3EA9452}.Release|x64.Build.0 = Release|x64
264283
EndGlobalSection
265284
GlobalSection(SolutionProperties) = preSolution
266285
HideSolutionNode = FALSE

‎Release/include/cpprest/containerstream.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ namespace Concurrency { namespace streams {
205205
/// If the end of the stream is reached, the function will return <c>true</c>, a null pointer, and a count of zero;
206206
/// a subsequent read will not succeed.
207207
/// </remarks>
208-
virtual bool acquire(_CharType*& ptr, size_t& count)
208+
virtual bool acquire(_Out_writes_(count) _CharType*& ptr, _Inout_ size_t& count)
209209
{
210210
if (!this->can_read()) return false;
211211

@@ -385,7 +385,7 @@ namespace Concurrency { namespace streams {
385385
}
386386

387387
private:
388-
template<typename _CollectionType1> friend class container_buffer;
388+
template<typename _CollectionType1> friend class streams::container_buffer;
389389

390390
/// <summary>
391391
/// Constructor
@@ -557,7 +557,7 @@ namespace Concurrency { namespace streams {
557557
/// <param name="mode">The I/O mode that the buffer should use (in / out)</param>
558558
container_buffer(_CollectionType data, std::ios_base::openmode mode = std::ios_base::in)
559559
: streambuf<typename _CollectionType::value_type>(
560-
std::shared_ptr<details::basic_container_buffer<_CollectionType>>(new details::basic_container_buffer<_CollectionType>(std::move(data), mode)))
560+
std::shared_ptr<details::basic_container_buffer<_CollectionType>>(new streams::details::basic_container_buffer<_CollectionType>(std::move(data), mode)))
561561
{
562562
}
563563

‎Release/include/cpprest/filelog.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@
3434

3535
#include "cpprest/log.h"
3636

37-
namespace utility { namespace logging
37+
namespace utility { namespace experimental {
38+
namespace logging
3839
{
39-
namespace _details
40-
{
4140
/// <summary>
4241
/// Silently swallow all messages.
4342
/// </summary>
44-
class SilentLog : public logging::_Log
43+
class SilentLog : public _Log
4544
{
4645
public:
4746
/// <summary>
@@ -64,7 +63,7 @@ namespace utility { namespace logging
6463
/// <summary>
6564
/// Log messages to stderr.
6665
/// </summary>
67-
class ConsoleLog : public logging::_Log
66+
class ConsoleLog : public _Log
6867
{
6968
public:
7069
/// <summary>
@@ -139,7 +138,7 @@ namespace utility { namespace logging
139138
/// <summary>
140139
/// Log messages to a file folder.
141140
/// </summary>
142-
class LocalFileLog : public logging::_Log
141+
class LocalFileLog : public _Log
143142
{
144143
public:
145144
/// <summary>

‎Release/src/http/client/http_client_impl.h renamed to ‎Release/include/cpprest/http_client_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ namespace web { namespace http { namespace client { namespace details
337337
virtual unsigned long open() = 0;
338338

339339
// HTTP client implementations must implement send_request.
340-
virtual void send_request(request_context *request) = 0;
340+
virtual void send_request(_In_ request_context *request) = 0;
341341

342342
// URI to connect to.
343343
const http::uri m_uri;

‎Release/include/cpprest/http_linux_server.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class hostport_listener
113113
friend class connection;
114114

115115
std::unique_ptr<tcp::acceptor> m_acceptor;
116-
std::map<std::string, http_listener_interface* > m_listeners;
116+
std::map<std::string, http_listener* > m_listeners;
117117
pplx::extensibility::reader_writer_lock_t m_listeners_lock;
118118

119119
pplx::extensibility::recursive_lock_t m_connections_lock;
@@ -150,8 +150,8 @@ class hostport_listener
150150
void start();
151151
void stop();
152152

153-
void add_listener(const std::string& path, http_listener_interface* listener);
154-
void remove_listener(const std::string& path, http_listener_interface* listener);
153+
void add_listener(const std::string& path, http_listener* listener);
154+
void remove_listener(const std::string& path, http_listener* listener);
155155

156156
private:
157157
void on_accept(ip::tcp::socket* socket, const boost::system::error_code& ec);
@@ -171,14 +171,14 @@ struct iequal_to
171171
}
172172
};
173173

174-
class http_linux_server : public http_server
174+
class http_linux_server : public web::http::experimental::details::http_server
175175
{
176176
private:
177177
friend class http::experimental::listener::details::connection;
178178

179179
pplx::extensibility::reader_writer_lock_t m_listeners_lock;
180180
std::map<std::string, std::unique_ptr<hostport_listener>, iequal_to> m_listeners;
181-
std::unordered_map<http_listener_interface*, std::unique_ptr<pplx::extensibility::reader_writer_lock_t>> m_registered_listeners;
181+
std::unordered_map<http_listener*, std::unique_ptr<pplx::extensibility::reader_writer_lock_t>> m_registered_listeners;
182182
bool m_started;
183183

184184
public:
@@ -193,11 +193,11 @@ class http_linux_server : public http_server
193193
stop();
194194
}
195195

196-
virtual unsigned long start();
197-
virtual unsigned long stop();
196+
virtual pplx::task<void> start();
197+
virtual pplx::task<void> stop();
198198

199-
virtual unsigned long register_listener(http_listener_interface* listener);
200-
virtual unsigned long unregister_listener(http_listener_interface* listener);
199+
virtual pplx::task<void> register_listener(http_listener* listener);
200+
virtual pplx::task<void> unregister_listener(http_listener* listener);
201201

202202
pplx::task<void> respond(http::http_response response);
203203
};

0 commit comments

Comments
 (0)