Added to the x64 Project

This commit is contained in:
Jan Kevin Dick
2019-11-18 11:32:57 +01:00
parent 3917135a7f
commit 5be6be5228
3 changed files with 83 additions and 75 deletions

View File

@@ -332,7 +332,7 @@ void WinService::setFailureActions(FailureActionVector failureActions, const std
WinService::FailureActionTypeVector WinService::getFailureAction() const { WinService::FailureActionTypeVector WinService::getFailureAction() const {
open(); open();
int size = 4096; int size = 4096;
DWORD_PTR bytesNeeded; DWORD bytesNeeded;
POCO_LPSERVICE_FAILURE_ACTION pSvcFailureAction = (POCO_LPSERVICE_FAILURE_ACTION)LocalAlloc(LPTR, size); POCO_LPSERVICE_FAILURE_ACTION pSvcFailureAction = (POCO_LPSERVICE_FAILURE_ACTION)LocalAlloc(LPTR, size);
if (!pSvcFailureAction) throw OutOfMemoryException("cannot allocate service failure action buffer"); if (!pSvcFailureAction) throw OutOfMemoryException("cannot allocate service failure action buffer");
try { try {

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.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_shared|x64"> <ProjectConfiguration Include="debug_shared|x64">
@@ -32,7 +32,7 @@
<RootNamespace>TestSuite</RootNamespace> <RootNamespace>TestSuite</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"/> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion> <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
@@ -136,7 +136,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -167,9 +167,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -196,7 +196,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -227,9 +227,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -256,7 +256,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -287,9 +287,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -304,60 +304,62 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\AbstractConfigurationTest.h"/> <ClInclude Include="src\AbstractConfigurationTest.h" />
<ClInclude Include="src\ConfigurationMapperTest.h"/> <ClInclude Include="src\ConfigurationMapperTest.h" />
<ClInclude Include="src\ConfigurationTestSuite.h"/> <ClInclude Include="src\ConfigurationTestSuite.h" />
<ClInclude Include="src\ConfigurationViewTest.h"/> <ClInclude Include="src\ConfigurationViewTest.h" />
<ClInclude Include="src\FilesystemConfigurationTest.h"/> <ClInclude Include="src\FilesystemConfigurationTest.h" />
<ClInclude Include="src\HelpFormatterTest.h"/> <ClInclude Include="src\HelpFormatterTest.h" />
<ClInclude Include="src\IniFileConfigurationTest.h"/> <ClInclude Include="src\IniFileConfigurationTest.h" />
<ClInclude Include="src\JSONConfigurationTest.h"/> <ClInclude Include="src\JSONConfigurationTest.h" />
<ClInclude Include="src\LayeredConfigurationTest.h"/> <ClInclude Include="src\LayeredConfigurationTest.h" />
<ClInclude Include="src\LoggingConfiguratorTest.h"/> <ClInclude Include="src\LoggingConfiguratorTest.h" />
<ClInclude Include="src\MapConfigurationTest.h"/> <ClInclude Include="src\MapConfigurationTest.h" />
<ClInclude Include="src\OptionProcessorTest.h"/> <ClInclude Include="src\OptionProcessorTest.h" />
<ClInclude Include="src\OptionSetTest.h"/> <ClInclude Include="src\OptionSetTest.h" />
<ClInclude Include="src\OptionsTestSuite.h"/> <ClInclude Include="src\OptionsTestSuite.h" />
<ClInclude Include="src\OptionTest.h"/> <ClInclude Include="src\OptionTest.h" />
<ClInclude Include="src\PropertyFileConfigurationTest.h"/> <ClInclude Include="src\PropertyFileConfigurationTest.h" />
<ClInclude Include="src\SystemConfigurationTest.h"/> <ClInclude Include="src\SystemConfigurationTest.h" />
<ClInclude Include="src\TimerTest.h"/> <ClInclude Include="src\TimerTest.h" />
<ClInclude Include="src\TimerTestSuite.h"/> <ClInclude Include="src\TimerTestSuite.h" />
<ClInclude Include="src\UtilTestSuite.h"/> <ClInclude Include="src\UtilTestSuite.h" />
<ClInclude Include="src\ValidatorTest.h"/> <ClInclude Include="src\ValidatorTest.h" />
<ClInclude Include="src\WinConfigurationTest.h"/> <ClInclude Include="src\WinConfigurationTest.h" />
<ClInclude Include="src\WindowsTestSuite.h"/> <ClInclude Include="src\WindowsTestSuite.h" />
<ClInclude Include="src\WinRegistryTest.h"/> <ClInclude Include="src\WinRegistryTest.h" />
<ClInclude Include="src\XMLConfigurationTest.h"/> <ClInclude Include="src\WinServiceTest.h" />
<ClInclude Include="src\XMLConfigurationTest.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\AbstractConfigurationTest.cpp"/> <ClCompile Include="src\AbstractConfigurationTest.cpp" />
<ClCompile Include="src\ConfigurationMapperTest.cpp"/> <ClCompile Include="src\ConfigurationMapperTest.cpp" />
<ClCompile Include="src\ConfigurationTestSuite.cpp"/> <ClCompile Include="src\ConfigurationTestSuite.cpp" />
<ClCompile Include="src\ConfigurationViewTest.cpp"/> <ClCompile Include="src\ConfigurationViewTest.cpp" />
<ClCompile Include="src\Driver.cpp"/> <ClCompile Include="src\Driver.cpp" />
<ClCompile Include="src\FilesystemConfigurationTest.cpp"/> <ClCompile Include="src\FilesystemConfigurationTest.cpp" />
<ClCompile Include="src\HelpFormatterTest.cpp"/> <ClCompile Include="src\HelpFormatterTest.cpp" />
<ClCompile Include="src\IniFileConfigurationTest.cpp"/> <ClCompile Include="src\IniFileConfigurationTest.cpp" />
<ClCompile Include="src\JSONConfigurationTest.cpp"/> <ClCompile Include="src\JSONConfigurationTest.cpp" />
<ClCompile Include="src\LayeredConfigurationTest.cpp"/> <ClCompile Include="src\LayeredConfigurationTest.cpp" />
<ClCompile Include="src\LoggingConfiguratorTest.cpp"/> <ClCompile Include="src\LoggingConfiguratorTest.cpp" />
<ClCompile Include="src\MapConfigurationTest.cpp"/> <ClCompile Include="src\MapConfigurationTest.cpp" />
<ClCompile Include="src\OptionProcessorTest.cpp"/> <ClCompile Include="src\OptionProcessorTest.cpp" />
<ClCompile Include="src\OptionSetTest.cpp"/> <ClCompile Include="src\OptionSetTest.cpp" />
<ClCompile Include="src\OptionsTestSuite.cpp"/> <ClCompile Include="src\OptionsTestSuite.cpp" />
<ClCompile Include="src\OptionTest.cpp"/> <ClCompile Include="src\OptionTest.cpp" />
<ClCompile Include="src\PropertyFileConfigurationTest.cpp"/> <ClCompile Include="src\PropertyFileConfigurationTest.cpp" />
<ClCompile Include="src\SystemConfigurationTest.cpp"/> <ClCompile Include="src\SystemConfigurationTest.cpp" />
<ClCompile Include="src\TimerTest.cpp"/> <ClCompile Include="src\TimerTest.cpp" />
<ClCompile Include="src\TimerTestSuite.cpp"/> <ClCompile Include="src\TimerTestSuite.cpp" />
<ClCompile Include="src\UtilTestSuite.cpp"/> <ClCompile Include="src\UtilTestSuite.cpp" />
<ClCompile Include="src\ValidatorTest.cpp"/> <ClCompile Include="src\ValidatorTest.cpp" />
<ClCompile Include="src\WinConfigurationTest.cpp"/> <ClCompile Include="src\WinConfigurationTest.cpp" />
<ClCompile Include="src\WindowsTestSuite.cpp"/> <ClCompile Include="src\WindowsTestSuite.cpp" />
<ClCompile Include="src\WinRegistryTest.cpp"/> <ClCompile Include="src\WinRegistryTest.cpp" />
<ClCompile Include="src\XMLConfigurationTest.cpp"/> <ClCompile Include="src\WinServiceTest.cpp" />
<ClCompile Include="src\XMLConfigurationTest.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"/> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

View File

@@ -138,6 +138,9 @@
<ClInclude Include="src\TimerTestSuite.h"> <ClInclude Include="src\TimerTestSuite.h">
<Filter>Timer\Header Files</Filter> <Filter>Timer\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\WinServiceTest.h">
<Filter>Windows\Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\UtilTestSuite.cpp"> <ClCompile Include="src\UtilTestSuite.cpp">
@@ -218,5 +221,8 @@
<ClCompile Include="src\TimerTestSuite.cpp"> <ClCompile Include="src\TimerTestSuite.cpp">
<Filter>Timer\Source Files</Filter> <Filter>Timer\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\WinServiceTest.cpp">
<Filter>Windows\Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>