Skip to content

Commit dcd7565

Browse files
arturlarturl
committed
The latest set of bugfixes:
- Extension SDK rename problem - http_listener crash on shutdown - std::numeric_limits<uint16_t>::max work-around - WACK setup issue
1 parent f47342e commit dcd7565

File tree

16 files changed

+61
-41
lines changed

16 files changed

+61
-41
lines changed

‎Release/collateral/Samples/BingRequest/VC10/BingRequest.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|x64 = Debug|x64
9+
Debug|Win32 = Debug|Win32
910
Release|x64 = Release|x64
11+
Release|Win32 = Release|Win32
1012
EndGlobalSection
1113
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1214
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|x64.ActiveCfg = Debug|x64
1315
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|x64.Build.0 = Debug|x64
1416
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|x64.ActiveCfg = Release|x64
1517
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|x64.Build.0 = Release|x64
18+
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|Win32.Build.0 = Debug|Win32
20+
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|Win32.ActiveCfg = Release|Win32
21+
{BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|Win32.Build.0 = Release|Win32
1622
EndGlobalSection
1723
GlobalSection(SolutionProperties) = preSolution
1824
HideSolutionNode = FALSE

‎Release/collateral/Samples/BingRequest/VC11/BingRequest.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|x64 = Debug|x64
9+
Debug|Win32 = Debug|Win32
910
Release|x64 = Release|x64
11+
Release|Win32 = Release|Win32
1012
EndGlobalSection
1113
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1214
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.ActiveCfg = Debug|x64
1315
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.Build.0 = Debug|x64
1416
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.ActiveCfg = Release|x64
1517
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.Build.0 = Release|x64
18+
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.Build.0 = Debug|Win32
20+
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.ActiveCfg = Release|Win32
21+
{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.Build.0 = Release|Win32
1622
EndGlobalSection
1723
GlobalSection(SolutionProperties) = preSolution
1824
HideSolutionNode = FALSE

‎Release/collateral/Samples/SearchFile/VC11/SearchFile.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|x64 = Debug|x64
9+
Debug|Win32 = Debug|Win32
910
Release|x64 = Release|x64
11+
Release|Win32 = Release|Win32
1012
EndGlobalSection
1113
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1214
{99F16455-0590-430A-9CAD-DA29AB519348}.Debug|x64.ActiveCfg = Debug|x64
1315
{99F16455-0590-430A-9CAD-DA29AB519348}.Debug|x64.Build.0 = Debug|x64
1416
{99F16455-0590-430A-9CAD-DA29AB519348}.Release|x64.ActiveCfg = Release|x64
1517
{99F16455-0590-430A-9CAD-DA29AB519348}.Release|x64.Build.0 = Release|x64
18+
{99F16455-0590-430A-9CAD-DA29AB519348}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{99F16455-0590-430A-9CAD-DA29AB519348}.Debug|Win32.Build.0 = Debug|Win32
20+
{99F16455-0590-430A-9CAD-DA29AB519348}.Release|Win32.ActiveCfg = Release|Win32
21+
{99F16455-0590-430A-9CAD-DA29AB519348}.Release|Win32.Build.0 = Release|Win32
1622
EndGlobalSection
1723
GlobalSection(SolutionProperties) = preSolution
1824
HideSolutionNode = FALSE

‎Release/collateral/Samples/SearchFile/VC11/SearchFile.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
</PropertyGroup>
8383
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8484
<ClCompile>
85+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
8586
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8687
<Optimization>Disabled</Optimization>
8788
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
@@ -100,6 +101,7 @@
100101
</ItemDefinitionGroup>
101102
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
102103
<ClCompile>
104+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
103105
<PrecompiledHeader>NotUsing</PrecompiledHeader>
104106
<Optimization>Disabled</Optimization>
105107
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
@@ -119,6 +121,7 @@
119121
</ItemDefinitionGroup>
120122
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
121123
<ClCompile>
124+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
122125
<PrecompiledHeader>NotUsing</PrecompiledHeader>
123126
<Optimization>MaxSpeed</Optimization>
124127
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -141,6 +144,7 @@
141144
</ItemDefinitionGroup>
142145
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
143146
<ClCompile>
147+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
144148
<PrecompiledHeader>NotUsing</PrecompiledHeader>
145149
<Optimization>MaxSpeed</Optimization>
146150
<FunctionLevelLinking>true</FunctionLevelLinking>

‎Release/collateral/Samples/SearchFile/searchfile.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,22 @@ static pplx::task<void> find_matches_in_file(const string_t &fileName, const std
108108
auto lineNumber = std::make_shared<int>(1);
109109
return ::do_while([=]()
110110
{
111-
container_buffer<std::string> line;
112-
return inFile.read_line(line).then([=](size_t bytesRead)
111+
container_buffer<std::string> inLine;
112+
return inFile.read_line(inLine).then([=](size_t bytesRead)
113113
{
114114
if(bytesRead == 0 && inFile.is_eof())
115115
{
116116
return pplx::task_from_result(false);
117117
}
118118

119-
else if(line.collection().find(searchString) != std::string::npos)
119+
else if(inLine.collection().find(searchString) != std::string::npos)
120120
{
121121
results.print("line ");
122122
results.print((*lineNumber)++);
123123
return results.print(":").then([=](size_t)
124124
{
125-
return results.write(line, line.collection().size());
125+
container_buffer<std::string> outLine(std::move(inLine.collection()));
126+
return results.write(outLine, outLine.collection().size());
126127
}).then([=](size_t)
127128
{
128129
return results.print("\r\n");

‎Release/dirs.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<ItemGroup>
66
<ProjectFile Include="src\dirs.proj"/>
7-
<ProjectFile Include="samples\dirs.proj"/>
8-
<ProjectFile Include="tests\dirs.proj"/>
7+
<ProjectFile Include="samples\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
8+
<ProjectFile Include="tests\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
99
</ItemGroup>
1010

1111
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

‎Release/include/http_msg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class _http_server_context
600600
class _http_response : public http::details::http_msg_base
601601
{
602602
public:
603-
_http_response() : m_status_code(std::numeric_limits<uint16_t>::max()) { }
603+
_http_response() : m_status_code((std::numeric_limits<uint16_t>::max)()) { }
604604

605605
_http_response(http::status_code code) : m_status_code(code) {}
606606

‎Release/include/streams.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ namespace Concurrency { namespace streams
350350
_UINT_TRAIT(unsigned short,UINT16_MIN,UINT16_MAX)
351351
_UINT_TRAIT(unsigned int,UINT32_MIN,UINT32_MAX)
352352
#else
353-
#define _INT_TRAIT(_t) template<> struct _type_parser_integral_traits<_t>{typedef std::true_type _is_integral;typedef std::false_type _is_unsigned;static const int64_t _min = std::numeric_limits<_t>::min();static const int64_t _max = std::numeric_limits<_t>::max();};
354-
#define _UINT_TRAIT(_t) template<> struct _type_parser_integral_traits<_t>{typedef std::true_type _is_integral;typedef std::true_type _is_unsigned;static const uint64_t _max = std::numeric_limits<_t>::max();};
353+
#define _INT_TRAIT(_t) template<> struct _type_parser_integral_traits<_t>{typedef std::true_type _is_integral;typedef std::false_type _is_unsigned;static const int64_t _min = std::numeric_limits<_t>::min();static const int64_t _max = (std::numeric_limits<_t>::max)();};
354+
#define _UINT_TRAIT(_t) template<> struct _type_parser_integral_traits<_t>{typedef std::true_type _is_integral;typedef std::true_type _is_unsigned;static const uint64_t _max = (std::numeric_limits<_t>::max)();};
355355

356356
_INT_TRAIT(char)
357357
_INT_TRAIT(signed char)

0 commit comments

Comments
 (0)