- SF# 3559325: Util Windows broken in non-Unicode

- port of rev. 1918 from 1.4.4 branch (fixed SF# 3519474)
- update VS 2010 Util projects with JSON

CHANGELOG

@@ -64,6 +64,7 @@ Release 1.4.4 (2012-08-??)
   response to a HEAD request, or in case of a 204 No Content or 304 Not Modified
   response status.
 - fixed a DOM parser performance bug (patch by Peter Klotz)
+- fixed SF# 3559325: Util Windows broken in non-Unicode
 
 Release 1.4.3p1 (2012-01-23)
 ============================

JSON/JSON_vs100.sln

@@ -1,58 +1,58 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{A63135B8-0DFC-428C-AF90-BC020BE83D0C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741}
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C} = {A63135B8-0DFC-428C-AF90-BC020BE83D0C}
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
-		release_shared|Win32 = release_shared|Win32
-		debug_static_mt|Win32 = debug_static_mt|Win32
-		release_static_mt|Win32 = release_static_mt|Win32
 		debug_static_md|Win32 = debug_static_md|Win32
+		debug_static_mt|Win32 = debug_static_mt|Win32
+		release_shared|Win32 = release_shared|Win32
 		release_static_md|Win32 = release_static_md|Win32
+		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Build.0 = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Build.0 = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ProGen/progen.properties

@@ -6,7 +6,7 @@ progen.libsuffix.release_shared = .lib
 progen.libsuffix.release_static_md = md.lib
 progen.libsuffix.release_static_mt = mt.lib
 progen.project.guidFromName.namespaceUUID = F4193868-E4EB-4090-9A01-344E7233004B
-progen.postprocess.upgrade2008to2010.tool = C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\Common7\\IDE\\DevEnv.exe
+progen.postprocess.upgrade2008to2010.tool =  C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\DevEnv.exe
 progen.postprocess.upgrade2008to2010.args = %;/Upgrade
 progen.postprocess.upgrade2008to2010.deleteOriginalFile = true
 progen.postprocess.upgrade2008to2010.deleteFiles = Backup;_UpgradeReport_Files;UpgradeLog.XML

Util/Util_vs100.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -32,79 +32,79 @@
     <RootNamespace>Util</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
+  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
+    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoUtild</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoUtilmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoUtilmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoUtil</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoUtilmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoUtilmt</TargetName>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">..\bin\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">..\bin\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">..\lib\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">..\lib\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">..\lib\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">..\lib\</OutDir>
+    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">PocoUtild</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">PocoUtilmdd</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">PocoUtilmtd</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">PocoUtil</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">PocoUtilmd</TargetName>
+    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">PocoUtilmt</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -114,7 +114,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -132,14 +132,14 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -147,9 +147,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -166,10 +166,10 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -179,7 +179,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <ProgramDataBaseFileName>..\lib\PocoUtilmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -190,14 +190,14 @@
       <OutputFile>..\lib\PocoUtilmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -205,9 +205,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -215,10 +215,10 @@
       <OutputFile>..\lib\PocoUtilmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -228,7 +228,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <ProgramDataBaseFileName>..\lib\PocoUtilmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -239,14 +239,14 @@
       <OutputFile>..\lib\PocoUtilmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -254,10 +254,10 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <ProgramDataBaseFileName>..\lib\PocoUtilmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -267,78 +267,79 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Util\Application.h" />
-    <ClInclude Include="include\Poco\Util\LoggingSubsystem.h" />
-    <ClInclude Include="include\Poco\Util\ServerApplication.h" />
-    <ClInclude Include="include\Poco\Util\Subsystem.h" />
-    <ClInclude Include="include\Poco\Util\AbstractConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\ConfigurationMapper.h" />
-    <ClInclude Include="include\Poco\Util\ConfigurationView.h" />
-    <ClInclude Include="include\Poco\Util\FilesystemConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\IniFileConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\LayeredConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\LoggingConfigurator.h" />
-    <ClInclude Include="include\Poco\Util\MapConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\PropertyFileConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\SystemConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\Units.h" />
-    <ClInclude Include="include\Poco\Util\XMLConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\HelpFormatter.h" />
-    <ClInclude Include="include\Poco\Util\IntValidator.h" />
-    <ClInclude Include="include\Poco\Util\Option.h" />
-    <ClInclude Include="include\Poco\Util\OptionCallback.h" />
-    <ClInclude Include="include\Poco\Util\OptionException.h" />
-    <ClInclude Include="include\Poco\Util\OptionProcessor.h" />
-    <ClInclude Include="include\Poco\Util\OptionSet.h" />
-    <ClInclude Include="include\Poco\Util\RegExpValidator.h" />
-    <ClInclude Include="include\Poco\Util\Validator.h" />
-    <ClInclude Include="include\Poco\Util\WinRegistryConfiguration.h" />
-    <ClInclude Include="include\Poco\Util\WinRegistryKey.h" />
-    <ClInclude Include="include\Poco\Util\WinService.h" />
-    <ClInclude Include="include\Poco\Util\Util.h" />
-    <ClInclude Include="include\Poco\Util\Timer.h" />
-    <ClInclude Include="include\Poco\Util\TimerTask.h" />
-    <ClInclude Include="include\Poco\Util\TimerTaskAdapter.h" />
+    <ClInclude Include="include\Poco\Util\Application.h"/>
+    <ClInclude Include="include\Poco\Util\LoggingSubsystem.h"/>
+    <ClInclude Include="include\Poco\Util\ServerApplication.h"/>
+    <ClInclude Include="include\Poco\Util\Subsystem.h"/>
+    <ClInclude Include="include\Poco\Util\AbstractConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\ConfigurationMapper.h"/>
+    <ClInclude Include="include\Poco\Util\ConfigurationView.h"/>
+    <ClInclude Include="include\Poco\Util\FilesystemConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\IniFileConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\JSONConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\LayeredConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\LoggingConfigurator.h"/>
+    <ClInclude Include="include\Poco\Util\MapConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\PropertyFileConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\SystemConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\XMLConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\HelpFormatter.h"/>
+    <ClInclude Include="include\Poco\Util\IntValidator.h"/>
+    <ClInclude Include="include\Poco\Util\Option.h"/>
+    <ClInclude Include="include\Poco\Util\OptionCallback.h"/>
+    <ClInclude Include="include\Poco\Util\OptionException.h"/>
+    <ClInclude Include="include\Poco\Util\OptionProcessor.h"/>
+    <ClInclude Include="include\Poco\Util\OptionSet.h"/>
+    <ClInclude Include="include\Poco\Util\RegExpValidator.h"/>
+    <ClInclude Include="include\Poco\Util\Validator.h"/>
+    <ClInclude Include="include\Poco\Util\WinRegistryConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\WinRegistryKey.h"/>
+    <ClInclude Include="include\Poco\Util\WinService.h"/>
+    <ClInclude Include="include\Poco\Util\Util.h"/>
+    <ClInclude Include="include\Poco\Util\Timer.h"/>
+    <ClInclude Include="include\Poco\Util\TimerTask.h"/>
+    <ClInclude Include="include\Poco\Util\TimerTaskAdapter.h"/>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Application.cpp" />
-    <ClCompile Include="src\LoggingSubsystem.cpp" />
-    <ClCompile Include="src\ServerApplication.cpp" />
-    <ClCompile Include="src\Subsystem.cpp" />
-    <ClCompile Include="src\AbstractConfiguration.cpp" />
-    <ClCompile Include="src\ConfigurationMapper.cpp" />
-    <ClCompile Include="src\ConfigurationView.cpp" />
-    <ClCompile Include="src\FilesystemConfiguration.cpp" />
-    <ClCompile Include="src\IniFileConfiguration.cpp" />
-    <ClCompile Include="src\LayeredConfiguration.cpp" />
-    <ClCompile Include="src\LoggingConfigurator.cpp" />
-    <ClCompile Include="src\MapConfiguration.cpp" />
-    <ClCompile Include="src\PropertyFileConfiguration.cpp" />
-    <ClCompile Include="src\SystemConfiguration.cpp" />
-    <ClCompile Include="src\XMLConfiguration.cpp" />
-    <ClCompile Include="src\HelpFormatter.cpp" />
-    <ClCompile Include="src\IntValidator.cpp" />
-    <ClCompile Include="src\Option.cpp" />
-    <ClCompile Include="src\OptionCallback.cpp" />
-    <ClCompile Include="src\OptionException.cpp" />
-    <ClCompile Include="src\OptionProcessor.cpp" />
-    <ClCompile Include="src\OptionSet.cpp" />
-    <ClCompile Include="src\RegExpValidator.cpp" />
-    <ClCompile Include="src\Validator.cpp" />
-    <ClCompile Include="src\WinRegistryConfiguration.cpp" />
-    <ClCompile Include="src\WinRegistryKey.cpp" />
-    <ClCompile Include="src\WinService.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\TimerTask.cpp" />
+    <ClCompile Include="src\Application.cpp"/>
+    <ClCompile Include="src\LoggingSubsystem.cpp"/>
+    <ClCompile Include="src\ServerApplication.cpp"/>
+    <ClCompile Include="src\Subsystem.cpp"/>
+    <ClCompile Include="src\AbstractConfiguration.cpp"/>
+    <ClCompile Include="src\ConfigurationMapper.cpp"/>
+    <ClCompile Include="src\ConfigurationView.cpp"/>
+    <ClCompile Include="src\FilesystemConfiguration.cpp"/>
+    <ClCompile Include="src\IniFileConfiguration.cpp"/>
+    <ClCompile Include="src\JSONConfiguration.cpp"/>
+    <ClCompile Include="src\LayeredConfiguration.cpp"/>
+    <ClCompile Include="src\LoggingConfigurator.cpp"/>
+    <ClCompile Include="src\MapConfiguration.cpp"/>
+    <ClCompile Include="src\PropertyFileConfiguration.cpp"/>
+    <ClCompile Include="src\SystemConfiguration.cpp"/>
+    <ClCompile Include="src\XMLConfiguration.cpp"/>
+    <ClCompile Include="src\HelpFormatter.cpp"/>
+    <ClCompile Include="src\IntValidator.cpp"/>
+    <ClCompile Include="src\Option.cpp"/>
+    <ClCompile Include="src\OptionCallback.cpp"/>
+    <ClCompile Include="src\OptionException.cpp"/>
+    <ClCompile Include="src\OptionProcessor.cpp"/>
+    <ClCompile Include="src\OptionSet.cpp"/>
+    <ClCompile Include="src\RegExpValidator.cpp"/>
+    <ClCompile Include="src\Validator.cpp"/>
+    <ClCompile Include="src\WinRegistryConfiguration.cpp"/>
+    <ClCompile Include="src\WinRegistryKey.cpp"/>
+    <ClCompile Include="src\WinService.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\TimerTask.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>

Util/Util_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Application">
-      <UniqueIdentifier>{311ebb1d-a38c-4b6c-8b7c-5cf891dadedd}</UniqueIdentifier>
+      <UniqueIdentifier>{0c875a14-ecd8-4fb8-b481-9aa8391d0844}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Header Files">
-      <UniqueIdentifier>{803db29c-e14d-45a2-8d2c-fc88b4f147d5}</UniqueIdentifier>
+      <UniqueIdentifier>{6839a004-99f8-4f70-b2ca-b88ca434be6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Source Files">
-      <UniqueIdentifier>{e5b46937-b892-4a78-98e1-d7a35c85d4ba}</UniqueIdentifier>
+      <UniqueIdentifier>{54e14cc4-00f2-404e-89b4-09ee86486467}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration">
-      <UniqueIdentifier>{8de9ea3e-1dab-462a-b941-ea1bcf46821c}</UniqueIdentifier>
+      <UniqueIdentifier>{c6f7ba89-5194-4849-a723-afbab67f4968}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Header Files">
-      <UniqueIdentifier>{f4dfb157-d175-4785-aaca-a0762242282d}</UniqueIdentifier>
+      <UniqueIdentifier>{295f15e3-bdaa-4ee8-b514-5dea02fe9195}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Source Files">
-      <UniqueIdentifier>{3581238b-ef6d-4c70-a8d9-d62bc153f364}</UniqueIdentifier>
+      <UniqueIdentifier>{57d81e33-7df2-4cfb-9ee5-d94213798ee7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options">
-      <UniqueIdentifier>{211ddb87-e230-4ceb-9d6a-83b21feb366c}</UniqueIdentifier>
+      <UniqueIdentifier>{d8edc170-be83-42ae-9a5d-5733154f0702}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Header Files">
-      <UniqueIdentifier>{40e62094-457c-47c7-89f7-48bce6e32432}</UniqueIdentifier>
+      <UniqueIdentifier>{861a3e82-076f-41a4-b0c4-dd3542ff3b20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Source Files">
-      <UniqueIdentifier>{85f5d041-592e-4bb7-b476-4bcc357fdf40}</UniqueIdentifier>
+      <UniqueIdentifier>{8d33bd73-22e9-4977-b75a-bb975cc2864e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows">
-      <UniqueIdentifier>{2fb39a29-c9bf-4406-98b5-fa050b663d28}</UniqueIdentifier>
+      <UniqueIdentifier>{fdcf99bb-5e70-47ef-a06f-dae4e8c094e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Header Files">
-      <UniqueIdentifier>{9ba248d9-6cd8-4cd0-8e37-76e25e07a638}</UniqueIdentifier>
+      <UniqueIdentifier>{ee751d87-991d-4f86-921a-64ae891ddef8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Source Files">
-      <UniqueIdentifier>{6f421fe8-68c5-46a9-b019-f47fed5ffb28}</UniqueIdentifier>
+      <UniqueIdentifier>{ee5fa5ef-0278-48f0-9fe3-b63a36214b53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util">
-      <UniqueIdentifier>{5c87a96d-f783-4e37-adc2-fc431c9f0f1b}</UniqueIdentifier>
+      <UniqueIdentifier>{ca582c15-1ffe-4f68-acbc-0d84d8001fc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util\Header Files">
-      <UniqueIdentifier>{93caf66a-e9ca-4c96-aa60-41ffb337bf4f}</UniqueIdentifier>
+      <UniqueIdentifier>{b889e55c-1379-4205-9a86-fd3bd0ce8d79}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util\Source Files">
-      <UniqueIdentifier>{970de29d-9d9b-4a47-abf1-9537774d5404}</UniqueIdentifier>
+      <UniqueIdentifier>{78ecfc54-3cfc-4690-8ca6-4c393e25b19d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer">
-      <UniqueIdentifier>{23e87ff8-e3a5-41d4-bda3-daf85b4e4ce9}</UniqueIdentifier>
+      <UniqueIdentifier>{a8413194-8672-4e39-8297-9bed1c0b8c68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Header Files">
-      <UniqueIdentifier>{297d8e2b-aa53-40ed-b54a-c9b4c2ceff08}</UniqueIdentifier>
+      <UniqueIdentifier>{10a86d08-f3e5-4db9-bf5b-98b853b18d3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Source Files">
-      <UniqueIdentifier>{dfb7284e-c0b3-48eb-ae67-f662edf0fb7a}</UniqueIdentifier>
+      <UniqueIdentifier>{cf1299d0-3caf-433d-a96e-13deb4b55578}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -84,6 +84,9 @@
     <ClInclude Include="include\Poco\Util\IniFileConfiguration.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Util\JSONConfiguration.h">
+      <Filter>Configuration\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Util\LayeredConfiguration.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
@@ -150,9 +153,6 @@
     <ClInclude Include="include\Poco\Util\TimerTaskAdapter.h">
       <Filter>Timer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Util\Units.h">
-      <Filter>Util\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Application.cpp">
@@ -182,6 +182,9 @@
     <ClCompile Include="src\IniFileConfiguration.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONConfiguration.cpp">
+      <Filter>Configuration\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\LayeredConfiguration.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>

Util/Util_x64_vs100.vcxproj

@@ -104,7 +104,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -139,7 +139,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -169,7 +169,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -197,7 +197,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -218,7 +218,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -246,7 +246,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -274,6 +274,7 @@
     <ClInclude Include="include\Poco\Util\ConfigurationView.h"/>
     <ClInclude Include="include\Poco\Util\FilesystemConfiguration.h"/>
     <ClInclude Include="include\Poco\Util\IniFileConfiguration.h"/>
+    <ClInclude Include="include\Poco\Util\JSONConfiguration.h"/>
     <ClInclude Include="include\Poco\Util\LayeredConfiguration.h"/>
     <ClInclude Include="include\Poco\Util\LoggingConfigurator.h"/>
     <ClInclude Include="include\Poco\Util\MapConfiguration.h"/>
@@ -307,6 +308,7 @@
     <ClCompile Include="src\ConfigurationView.cpp"/>
     <ClCompile Include="src\FilesystemConfiguration.cpp"/>
     <ClCompile Include="src\IniFileConfiguration.cpp"/>
+    <ClCompile Include="src\JSONConfiguration.cpp"/>
     <ClCompile Include="src\LayeredConfiguration.cpp"/>
     <ClCompile Include="src\LoggingConfigurator.cpp"/>
     <ClCompile Include="src\MapConfiguration.cpp"/>

Util/Util_x64_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Application">
-      <UniqueIdentifier>{68ac26c5-46d4-4451-9b9d-b7c6518bc9b7}</UniqueIdentifier>
+      <UniqueIdentifier>{6b023ad6-eff0-42a6-87c2-2ae17ac4a2d1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Header Files">
-      <UniqueIdentifier>{7afd201b-08b5-45fd-bb3d-6a7bf1eb6254}</UniqueIdentifier>
+      <UniqueIdentifier>{f4ab6dd2-c4a7-4dc5-8c9b-6a972b90a65d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Source Files">
-      <UniqueIdentifier>{9a387a11-5f52-42fa-a494-8f59bd6840d1}</UniqueIdentifier>
+      <UniqueIdentifier>{ff8531a3-23c8-403b-aa10-c9a5bef65a24}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration">
-      <UniqueIdentifier>{7cc1ee12-5e7e-400b-b66d-40ed892bccdb}</UniqueIdentifier>
+      <UniqueIdentifier>{4e614de4-8711-47c9-9ba7-a098f453030c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Header Files">
-      <UniqueIdentifier>{03bf139b-1f18-40de-8909-0565f63e5aee}</UniqueIdentifier>
+      <UniqueIdentifier>{4549e18b-9cae-4dc0-b69d-a68b61343312}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Source Files">
-      <UniqueIdentifier>{6b0434e1-ff38-4528-a62d-fc342bc731f5}</UniqueIdentifier>
+      <UniqueIdentifier>{f2351900-8afd-47ad-8527-2b3723ea4779}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options">
-      <UniqueIdentifier>{08473007-5833-4552-b822-0b7179331bfe}</UniqueIdentifier>
+      <UniqueIdentifier>{7a0de132-5874-424d-b1fb-b988d82530bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Header Files">
-      <UniqueIdentifier>{b1324147-6c03-401c-91ac-26e4a5d5e9d3}</UniqueIdentifier>
+      <UniqueIdentifier>{ce01c24b-f6b9-43fc-8c2f-e85119f664f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Source Files">
-      <UniqueIdentifier>{5bc40e01-475c-4a4b-a38e-44edea26d597}</UniqueIdentifier>
+      <UniqueIdentifier>{b078972e-b6b6-454e-9972-7689510ff4f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows">
-      <UniqueIdentifier>{2ef0640c-be2e-455b-a3b6-033467b6f718}</UniqueIdentifier>
+      <UniqueIdentifier>{4b1fc310-c77f-4010-bf05-b333efc1133a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Header Files">
-      <UniqueIdentifier>{1acbc36e-05a7-4561-b02d-3470e9e3159d}</UniqueIdentifier>
+      <UniqueIdentifier>{ffb070d7-8c44-4178-89ce-465f108ecfc2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Source Files">
-      <UniqueIdentifier>{584b54df-702a-4f91-9d0b-58b229c43890}</UniqueIdentifier>
+      <UniqueIdentifier>{a3eb2d1a-7e3c-4830-997a-f64e358cd137}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util">
-      <UniqueIdentifier>{be85d665-b15b-4533-bb38-fbf35318f838}</UniqueIdentifier>
+      <UniqueIdentifier>{e0a82fbf-eddf-4c43-a917-3ae8963bf6f2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util\Header Files">
-      <UniqueIdentifier>{250ff99a-429c-41ae-8d69-60effec521aa}</UniqueIdentifier>
+      <UniqueIdentifier>{6b9993c1-425f-4ce9-a360-65a8a3677814}</UniqueIdentifier>
     </Filter>
     <Filter Include="Util\Source Files">
-      <UniqueIdentifier>{c28e1954-8a46-4981-b5ee-c999af31718b}</UniqueIdentifier>
+      <UniqueIdentifier>{5b6116cd-1974-43ef-ae41-abf5cba45908}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer">
-      <UniqueIdentifier>{ab287fc5-b8b3-488b-9084-f056981e5cac}</UniqueIdentifier>
+      <UniqueIdentifier>{23729e57-f3f8-456a-80f6-81965aa2dfac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Header Files">
-      <UniqueIdentifier>{d1e8fb29-a0e0-41a8-8e1f-5e43930eb7a7}</UniqueIdentifier>
+      <UniqueIdentifier>{d6f5326e-5810-4b54-a025-5920c3aa6d85}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Source Files">
-      <UniqueIdentifier>{7e71b7c1-8819-4187-8859-b3aac5724d59}</UniqueIdentifier>
+      <UniqueIdentifier>{6d4d2bc8-c96d-4e62-a4f5-44651194ec05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -84,6 +84,9 @@
     <ClInclude Include="include\Poco\Util\IniFileConfiguration.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Util\JSONConfiguration.h">
+      <Filter>Configuration\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Util\LayeredConfiguration.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
@@ -179,6 +182,9 @@
     <ClCompile Include="src\IniFileConfiguration.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONConfiguration.cpp">
+      <Filter>Configuration\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\LayeredConfiguration.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>

Util/src/AbstractConfiguration.cpp

@@ -339,7 +339,6 @@ void AbstractConfiguration::remove(const std::string& key)
 	}
 	{
 		FastMutex::ScopedLock lock(_mutex);
-
 		removeRaw(key);
 	}
 	if (_eventsEnabled)
@@ -451,7 +450,6 @@ void AbstractConfiguration::setRawWithEvent(const std::string& key, std::string
 	}
 	{
 		FastMutex::ScopedLock lock(_mutex);
-
 		setRaw(key, value);
 	}
 	if (_eventsEnabled)

Util/src/ServerApplication.cpp

@@ -181,7 +181,7 @@ void ServerApplication::ServiceMain(DWORD argc, LPTSTR* argv)
 #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	_serviceStatusHandle = RegisterServiceCtrlHandlerW(L"", ServiceControlHandler);
 #else
-	_serviceStatusHandle = RegisterServiceCtrlHandler("", ServiceControlHandler);
+	_serviceStatusHandle = RegisterServiceCtrlHandlerA("", ServiceControlHandler);
 #endif
 	if (!_serviceStatusHandle)
 		throw SystemException("cannot register service control handler");
@@ -365,7 +365,7 @@ bool ServerApplication::isService()
 	svcDispatchTable[0].lpServiceProc = ServiceMain;
 	svcDispatchTable[1].lpServiceName = NULL;
 	svcDispatchTable[1].lpServiceProc = NULL; 
-	return StartServiceCtrlDispatcher(svcDispatchTable) != 0; 
+	return StartServiceCtrlDispatcherA(svcDispatchTable) != 0; 
 #endif
 }
 

Util/src/WinRegistryConfiguration.cpp

@@ -51,9 +51,11 @@ namespace Util {
 WinRegistryConfiguration::WinRegistryConfiguration(const std::string& rootPath, REGSAM extraSam): _rootPath(rootPath), _extraSam(extraSam)
 {
 	// rootPath must end with backslash
-	std::string::iterator it = _rootPath.end();
-	if (*(--it) != '\\')
-		_rootPath.append("\\");
+	if (!_rootPath.empty())
+	{
+		if (_rootPath[_rootPath.length() - 1] != '\\')
+			_rootPath += '\\';
+	}
 }
 
 
@@ -102,7 +104,9 @@ void WinRegistryConfiguration::setRaw(const std::string& key, const std::string&
 
 void WinRegistryConfiguration::enumerate(const std::string& key, Keys& range) const
 {
-	if (key.empty())
+	std::string keyName;
+	std::string fullPath = _rootPath + convertToRegFormat(key, keyName);
+	if (fullPath.empty())
 	{
 		// return all root level keys
 		range.push_back("HKEY_CLASSES_ROOT");
@@ -114,8 +118,8 @@ void WinRegistryConfiguration::enumerate(const std::string& key, Keys& range) co
 	}
 	else
 	{
-		std::string keyName;
-		std::string fullPath = _rootPath + convertToRegFormat(key, keyName);
+		fullPath += '\\';
+		fullPath += keyName;
 		WinRegistryKey aKey(fullPath, true, _extraSam);
 		aKey.values(range);
 		aKey.subKeys(range);
@@ -138,7 +142,7 @@ std::string WinRegistryConfiguration::convertToRegFormat(const std::string& key,
 		return std::string();
 	}
 	std::string prefix(key.substr(0,pos));
-	value = key.substr(pos+1);
+	value = key.substr(pos + 1);
 	Poco::translateInPlace(prefix, ".", "\\");
 	return prefix;
 }

Util/src/WinRegistryKey.cpp

@@ -122,7 +122,7 @@ void WinRegistryKey::setString(const std::string& name, const std::string& value
 	if (RegSetValueExW(_hKey, uname.c_str(), 0, REG_SZ, (CONST BYTE*) uvalue.c_str(), (DWORD) (uvalue.size() + 1)*sizeof(wchar_t)) != ERROR_SUCCESS)
 		handleSetError(name); 
 #else
-	if (RegSetValueEx(_hKey, name.c_str(), 0, REG_SZ, (CONST BYTE*) value.c_str(), (DWORD) value.size() + 1) != ERROR_SUCCESS)
+	if (RegSetValueExA(_hKey, name.c_str(), 0, REG_SZ, (CONST BYTE*) value.c_str(), (DWORD) value.size() + 1) != ERROR_SUCCESS)
 		handleSetError(name); 
 #endif
 }
@@ -151,12 +151,12 @@ std::string WinRegistryKey::getString(const std::string& name)
 		return result;
 	}
 #else
-	if (RegQueryValueEx(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS || type != REG_SZ && type != REG_EXPAND_SZ)
+	if (RegQueryValueExA(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS || type != REG_SZ && type != REG_EXPAND_SZ)
 		throw NotFoundException(key(name));
 	if (size > 0)
 	{
 		char* buffer = new char[size + 1];
-		RegQueryValueEx(_hKey, name.c_str(), NULL, NULL, (BYTE*) buffer, &size);
+		RegQueryValueExA(_hKey, name.c_str(), NULL, NULL, (BYTE*) buffer, &size);
 		buffer[size] = 0;
 		std::string result(buffer);
 		delete [] buffer;
@@ -178,7 +178,7 @@ void WinRegistryKey::setStringExpand(const std::string& name, const std::string&
 	if (RegSetValueExW(_hKey, uname.c_str(), 0, REG_EXPAND_SZ, (CONST BYTE*) uvalue.c_str(), (DWORD) (uvalue.size() + 1)*sizeof(wchar_t)) != ERROR_SUCCESS)
 		handleSetError(name); 
 #else
-	if (RegSetValueEx(_hKey, name.c_str(), 0, REG_EXPAND_SZ, (CONST BYTE*) value.c_str(), (DWORD) value.size() + 1) != ERROR_SUCCESS)
+	if (RegSetValueExA(_hKey, name.c_str(), 0, REG_EXPAND_SZ, (CONST BYTE*) value.c_str(), (DWORD) value.size() + 1) != ERROR_SUCCESS)
 		handleSetError(name); 
 #endif
 }
@@ -211,12 +211,12 @@ std::string WinRegistryKey::getStringExpand(const std::string& name)
 		return result;
 	}
 #else
-	if (RegQueryValueEx(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS || type != REG_SZ && type != REG_EXPAND_SZ)
+	if (RegQueryValueExA(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS || type != REG_SZ && type != REG_EXPAND_SZ)
 		throw NotFoundException(key(name));
 	if (size > 0)
 	{
 		char* buffer = new char[size + 1];
-		RegQueryValueEx(_hKey, name.c_str(), NULL, NULL, (BYTE*) buffer, &size);
+		RegQueryValueExA(_hKey, name.c_str(), NULL, NULL, (BYTE*) buffer, &size);
 		buffer[size] = 0;
 		char temp;
 		DWORD expSize = ExpandEnvironmentStringsA(buffer, &temp, 1);	
@@ -242,7 +242,7 @@ void WinRegistryKey::setInt(const std::string& name, int value)
 	if (RegSetValueExW(_hKey, uname.c_str(), 0, REG_DWORD, (CONST BYTE*) &data, sizeof(data)) != ERROR_SUCCESS)
 		handleSetError(name); 
 #else
-	if (RegSetValueEx(_hKey, name.c_str(), 0, REG_DWORD, (CONST BYTE*) &data, sizeof(data)) != ERROR_SUCCESS)
+	if (RegSetValueExA(_hKey, name.c_str(), 0, REG_DWORD, (CONST BYTE*) &data, sizeof(data)) != ERROR_SUCCESS)
 		handleSetError(name); 
 #endif
 }
@@ -260,7 +260,7 @@ int WinRegistryKey::getInt(const std::string& name)
 	if (RegQueryValueExW(_hKey, uname.c_str(), NULL, &type, (BYTE*) &data, &size) != ERROR_SUCCESS || type != REG_DWORD)
 		throw NotFoundException(key(name));
 #else
-	if (RegQueryValueEx(_hKey, name.c_str(), NULL, &type, (BYTE*) &data, &size) != ERROR_SUCCESS || type != REG_DWORD)
+	if (RegQueryValueExA(_hKey, name.c_str(), NULL, &type, (BYTE*) &data, &size) != ERROR_SUCCESS || type != REG_DWORD)
 		throw NotFoundException(key(name));
 #endif
 	return data;
@@ -276,7 +276,7 @@ void WinRegistryKey::deleteValue(const std::string& name)
 	if (RegDeleteValueW(_hKey, uname.c_str()) != ERROR_SUCCESS)
 		throw NotFoundException(key(name));
 #else
-	if (RegDeleteValue(_hKey, name.c_str()) != ERROR_SUCCESS)
+	if (RegDeleteValueA(_hKey, name.c_str()) != ERROR_SUCCESS)
 		throw NotFoundException(key(name));
 #endif
 }
@@ -355,7 +355,7 @@ bool WinRegistryKey::exists()
 		return true;
 	}
 #else
-	if (RegOpenKeyEx(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &hKey) != ERROR_SUCCESS)
+	if (RegOpenKeyExA(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &hKey) == ERROR_SUCCESS)
 	{
 		RegCloseKey(hKey);
 		return true;
@@ -376,7 +376,7 @@ WinRegistryKey::Type WinRegistryKey::type(const std::string& name)
 	if (RegQueryValueExW(_hKey, uname.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS)
 		throw NotFoundException(key(name));
 #else
-	if (RegQueryValueEx(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS)
+	if (RegQueryValueExA(_hKey, name.c_str(), NULL, &type, NULL, &size) != ERROR_SUCCESS)
 		throw NotFoundException(key(name));
 #endif
 	if (type != REG_SZ && type != REG_EXPAND_SZ && type != REG_DWORD)
@@ -402,9 +402,9 @@ bool WinRegistryKey::exists(const std::string& name)
 		RegCloseKey(hKey);
 	}
 #else
-	if (RegOpenKeyEx(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &hKey) != ERROR_SUCCESS)
+	if (RegOpenKeyExA(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &hKey) == ERROR_SUCCESS)
 	{
-		exists = RegQueryValueEx(hKey, name.c_str(), NULL, NULL, NULL, NULL) == ERROR_SUCCESS;
+		exists = RegQueryValueExA(hKey, name.c_str(), NULL, NULL, NULL, NULL) == ERROR_SUCCESS;
 		RegCloseKey(hKey);
 	}
 #endif
@@ -432,12 +432,12 @@ void WinRegistryKey::open()
 #else
 		if (_readOnly)
 		{
-			if (RegOpenKeyEx(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &_hKey) != ERROR_SUCCESS)
+			if (RegOpenKeyExA(_hRootKey, _subKey.c_str(), 0, KEY_READ | _extraSam, &_hKey) != ERROR_SUCCESS)
 				throw NotFoundException("Cannot open registry key: ", key());
 		}
 		else
 		{
-			if (RegCreateKeyEx(_hRootKey, _subKey.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE | _extraSam, NULL, &_hKey, NULL) != ERROR_SUCCESS)
+			if (RegCreateKeyExA(_hRootKey, _subKey.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE | _extraSam, NULL, &_hKey, NULL) != ERROR_SUCCESS)
 				throw SystemException("Cannot open registry key: ", key());
 		}
 #endif
@@ -545,7 +545,7 @@ void WinRegistryKey::subKeys(WinRegistryKey::Keys& keys)
 	DWORD bufSize = sizeof(buf);
 	for (DWORD i = 0; i< subKeyCount; ++i)
 	{
-		if (RegEnumKeyEx(_hKey, i, buf, &bufSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
+		if (RegEnumKeyExA(_hKey, i, buf, &bufSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
 		{
 			std::string name(buf);
 			keys.push_back(name);
@@ -584,7 +584,7 @@ void WinRegistryKey::values(WinRegistryKey::Values& vals)
 	DWORD bufSize = sizeof(buf);
 	for (DWORD i = 0; i< valueCount; ++i)
 	{
-		if (RegEnumValue(_hKey, i, buf, &bufSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
+		if (RegEnumValueA(_hKey, i, buf, &bufSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
 		{
 			std::string name(buf);
 			vals.push_back(name);

Util/src/WinService.cpp

@@ -134,7 +134,7 @@ void WinService::registerService(const std::string& path, const std::string& dis
 		upath.c_str(),
 		NULL, NULL, NULL, NULL, NULL);
 #else
-	_svcHandle = CreateService(
+	_svcHandle = CreateServiceA(
 		_scmHandle,
 		_name.c_str(),
 		displayName.c_str(), 
@@ -296,7 +296,7 @@ bool WinService::tryOpen() const
 		Poco::UnicodeConverter::toUTF16(_name, uname);
 		_svcHandle = OpenServiceW(_scmHandle, uname.c_str(), SERVICE_ALL_ACCESS);
 #else
-		_svcHandle = OpenService(_scmHandle, _name.c_str(), SERVICE_ALL_ACCESS);
+		_svcHandle = OpenServiceA(_scmHandle, _name.c_str(), SERVICE_ALL_ACCESS);
 #endif
 	}
 	return _svcHandle != 0;
@@ -325,7 +325,7 @@ POCO_LPQUERY_SERVICE_CONFIG WinService::config() const
 #if defined(POCO_WIN32_UTF8)
 		while (!QueryServiceConfigW(_svcHandle, pSvcConfig, size, &bytesNeeded))
 #else
-		while (!QueryServiceConfig(_svcHandle, pSvcConfig, size, &bytesNeeded))
+		while (!QueryServiceConfigA(_svcHandle, pSvcConfig, size, &bytesNeeded))
 #endif
 		{
 			if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)

Util/testsuite/TestSuite_vs100.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">bin\</OutDir>
     <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
     <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
@@ -114,7 +114,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -148,7 +148,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -211,7 +211,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -240,7 +240,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -274,7 +274,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -307,6 +307,7 @@
     <ClInclude Include="src\ConfigurationViewTest.h"/>
     <ClInclude Include="src\FilesystemConfigurationTest.h"/>
     <ClInclude Include="src\IniFileConfigurationTest.h"/>
+    <ClInclude Include="src\JSONConfigurationTest.h"/>
     <ClInclude Include="src\LayeredConfigurationTest.h"/>
     <ClInclude Include="src\LoggingConfiguratorTest.h"/>
     <ClInclude Include="src\MapConfigurationTest.h"/>
@@ -334,6 +335,7 @@
     <ClCompile Include="src\ConfigurationViewTest.cpp"/>
     <ClCompile Include="src\FilesystemConfigurationTest.cpp"/>
     <ClCompile Include="src\IniFileConfigurationTest.cpp"/>
+    <ClCompile Include="src\JSONConfigurationTest.cpp"/>
     <ClCompile Include="src\LayeredConfigurationTest.cpp"/>
     <ClCompile Include="src\LoggingConfiguratorTest.cpp"/>
     <ClCompile Include="src\MapConfigurationTest.cpp"/>

Util/testsuite/TestSuite_vs100.vcxproj.filters

@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Application">
-      <UniqueIdentifier>{ae09dcb9-78ff-4138-b7e4-6ec414c34b24}</UniqueIdentifier>
+      <UniqueIdentifier>{5103a9b0-69b8-444d-b88e-0eb95f1cae68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Header Files">
-      <UniqueIdentifier>{285972b2-6cf4-4acf-8e5f-27415200dc77}</UniqueIdentifier>
+      <UniqueIdentifier>{621d0355-0442-442a-9cea-b51d2c0078d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Source Files">
-      <UniqueIdentifier>{361175b6-f449-4679-bd7f-fedd0eeaecae}</UniqueIdentifier>
+      <UniqueIdentifier>{239706ff-e7b7-49b3-ae3c-7b45bacbb780}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d888d224-78a9-400d-9a32-d5da715bb248}</UniqueIdentifier>
+      <UniqueIdentifier>{14c24122-ce64-4bb9-a6c8-ceff0a818322}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{b4c4096d-08a9-41e9-8fbe-b6d24c0eb215}</UniqueIdentifier>
+      <UniqueIdentifier>{acbefc49-6717-4ab7-a567-a09b9569c58c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{60cb4a06-ed6b-4e13-9661-50bb331bc591}</UniqueIdentifier>
+      <UniqueIdentifier>{3faa6c26-b42f-41fb-85b1-88fe4cba478d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{07ed0878-5dc8-4f39-aa91-49475cff03b7}</UniqueIdentifier>
+      <UniqueIdentifier>{3d7d2c66-4538-4ed7-8a9c-8c8142871a42}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{8bb75a16-9627-4e44-b17a-f0a0ba20d6c2}</UniqueIdentifier>
+      <UniqueIdentifier>{96beee7b-9212-4aaf-8804-3f43307a8188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration">
-      <UniqueIdentifier>{c5a1436f-963e-4648-9add-0ba55beffff1}</UniqueIdentifier>
+      <UniqueIdentifier>{74fb7c45-9cb5-40e7-bac9-b819e8836d6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Header Files">
-      <UniqueIdentifier>{f6966824-de36-4bed-b211-39153dafda63}</UniqueIdentifier>
+      <UniqueIdentifier>{ed44ff39-4ac6-424a-aa68-5862584351f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Source Files">
-      <UniqueIdentifier>{31c3ece2-45a2-40d5-8609-17786acd664c}</UniqueIdentifier>
+      <UniqueIdentifier>{0a66284d-1817-41d3-b5df-bcb1bce80f3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options">
-      <UniqueIdentifier>{6696486e-e20d-48fe-8f09-43a7b7d524d3}</UniqueIdentifier>
+      <UniqueIdentifier>{0f573622-6be5-49d7-ba32-582506d2cdc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Header Files">
-      <UniqueIdentifier>{34dd39c4-4ed7-40a8-a2ce-3a5104712628}</UniqueIdentifier>
+      <UniqueIdentifier>{99cb55f4-7716-4f51-8818-f953247b8188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Source Files">
-      <UniqueIdentifier>{29238819-0429-43d7-a8d9-e609407c9fd9}</UniqueIdentifier>
+      <UniqueIdentifier>{7a3fdadc-9e82-43b0-b994-0ebd882db869}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows">
-      <UniqueIdentifier>{24d325cd-2782-4d91-b37d-f42e54063dba}</UniqueIdentifier>
+      <UniqueIdentifier>{bcb091b4-fc2a-4f10-acfa-db21d79591b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Header Files">
-      <UniqueIdentifier>{aeaa8570-3f71-4b8d-ac03-3923f7c9908a}</UniqueIdentifier>
+      <UniqueIdentifier>{df95a1fe-0a78-4658-adbf-bcbffce36526}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Source Files">
-      <UniqueIdentifier>{2ead5d3d-4053-42a9-9ad5-c408b982a32f}</UniqueIdentifier>
+      <UniqueIdentifier>{01718f68-c245-4119-8bb1-051fbf39ed01}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer">
-      <UniqueIdentifier>{15ddab26-c6b5-4262-aa11-cd17164dd3eb}</UniqueIdentifier>
+      <UniqueIdentifier>{29a4fb19-9840-4514-afbb-e9810b51c64f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Header Files">
-      <UniqueIdentifier>{1de1f265-223d-49ce-bac2-21ce3202f96f}</UniqueIdentifier>
+      <UniqueIdentifier>{01f62501-1767-480d-b5a6-3ec4762f79cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Source Files">
-      <UniqueIdentifier>{547bf535-81c6-4ca0-acc8-62148f8bb099}</UniqueIdentifier>
+      <UniqueIdentifier>{f6ab7eba-ee64-46f2-9289-f89e83fb5a57}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -84,6 +84,9 @@
     <ClInclude Include="src\IniFileConfigurationTest.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\JSONConfigurationTest.h">
+      <Filter>Configuration\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\LayeredConfigurationTest.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
@@ -161,6 +164,9 @@
     <ClCompile Include="src\IniFileConfigurationTest.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONConfigurationTest.cpp">
+      <Filter>Configuration\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\LayeredConfigurationTest.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>

Util/testsuite/TestSuite_x64_vs100.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">bin64\</OutDir>
     <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">obj64\$(Configuration)\</IntDir>
     <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">true</LinkIncremental>
@@ -114,7 +114,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -148,7 +148,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -211,7 +211,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -240,7 +240,7 @@
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -274,7 +274,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -307,6 +307,7 @@
     <ClInclude Include="src\ConfigurationViewTest.h"/>
     <ClInclude Include="src\FilesystemConfigurationTest.h"/>
     <ClInclude Include="src\IniFileConfigurationTest.h"/>
+    <ClInclude Include="src\JSONConfigurationTest.h"/>
     <ClInclude Include="src\LayeredConfigurationTest.h"/>
     <ClInclude Include="src\LoggingConfiguratorTest.h"/>
     <ClInclude Include="src\MapConfigurationTest.h"/>
@@ -334,6 +335,7 @@
     <ClCompile Include="src\ConfigurationViewTest.cpp"/>
     <ClCompile Include="src\FilesystemConfigurationTest.cpp"/>
     <ClCompile Include="src\IniFileConfigurationTest.cpp"/>
+    <ClCompile Include="src\JSONConfigurationTest.cpp"/>
     <ClCompile Include="src\LayeredConfigurationTest.cpp"/>
     <ClCompile Include="src\LoggingConfiguratorTest.cpp"/>
     <ClCompile Include="src\MapConfigurationTest.cpp"/>

Util/testsuite/TestSuite_x64_vs100.vcxproj.filters

@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Application">
-      <UniqueIdentifier>{645c47a9-f505-4f95-aa4e-23b202e805d0}</UniqueIdentifier>
+      <UniqueIdentifier>{56ea9cc1-a6b1-43d7-846b-86ed86435f59}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Header Files">
-      <UniqueIdentifier>{055a889d-7c41-41ca-a0e6-d92bbcd7590a}</UniqueIdentifier>
+      <UniqueIdentifier>{899d14c0-6264-417e-9e7c-4b4d2e97363a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Application\Source Files">
-      <UniqueIdentifier>{d88d97e4-85a7-4e16-8402-a3b1ceb23557}</UniqueIdentifier>
+      <UniqueIdentifier>{358e7191-20df-4968-a8bf-4c7228c90cd4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{4e63463e-85a2-49df-8d14-b15b49f59855}</UniqueIdentifier>
+      <UniqueIdentifier>{c04a2557-d078-4108-9282-f953c355e9b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7a792685-1fa0-43bb-ab1b-42c1c1cfd823}</UniqueIdentifier>
+      <UniqueIdentifier>{1614c60d-8176-40d1-aebb-5a9df38aa041}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{d8548cbd-0132-4ec8-978a-328fe0c503b5}</UniqueIdentifier>
+      <UniqueIdentifier>{a7ecb2db-b4e2-43de-b897-f79281f4a1e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{e70c95fc-1ba8-44c3-9a24-6448d7cb8cb3}</UniqueIdentifier>
+      <UniqueIdentifier>{0d3d7cc7-1aaf-452c-beb9-a191fcc0b00f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{3b846552-4cc4-43e6-a7fa-b2491f50a1fc}</UniqueIdentifier>
+      <UniqueIdentifier>{8a9c912a-014b-4a0b-b9ca-7b28a924ce94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration">
-      <UniqueIdentifier>{cf8fc36b-9e80-4760-bfd6-d833b1beb435}</UniqueIdentifier>
+      <UniqueIdentifier>{a842d9c6-cb50-41b7-8bf2-6c3ccf1f524a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Header Files">
-      <UniqueIdentifier>{121544d2-b054-4c58-b30d-5b3af6070feb}</UniqueIdentifier>
+      <UniqueIdentifier>{8f113c9f-26e2-4320-adc9-291dd75e4c05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Configuration\Source Files">
-      <UniqueIdentifier>{9e0b7bc2-7085-4677-9197-3ea836651722}</UniqueIdentifier>
+      <UniqueIdentifier>{93fb32d2-bb06-4a7a-be77-2524283b4414}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options">
-      <UniqueIdentifier>{c9da5020-3887-45cf-ae36-662b2d167118}</UniqueIdentifier>
+      <UniqueIdentifier>{33f0df3c-7dff-44da-8336-e8df261ab766}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Header Files">
-      <UniqueIdentifier>{315ff665-36e7-49f0-91cd-56fa0766f56b}</UniqueIdentifier>
+      <UniqueIdentifier>{ca7de624-aa3b-41e9-9b9b-e9af30c73b30}</UniqueIdentifier>
     </Filter>
     <Filter Include="Options\Source Files">
-      <UniqueIdentifier>{c7b1e0e9-c4a8-4eb7-9d44-650b84d699cf}</UniqueIdentifier>
+      <UniqueIdentifier>{11a5e13a-c7c6-4235-9aff-81b16cc6b80f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows">
-      <UniqueIdentifier>{3b8928eb-9b21-4348-8522-76f09db009ca}</UniqueIdentifier>
+      <UniqueIdentifier>{4892166a-c903-4ca7-8afc-039995c83de3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Header Files">
-      <UniqueIdentifier>{e9eb5c16-1966-453d-a608-3471256b1417}</UniqueIdentifier>
+      <UniqueIdentifier>{9949ac8e-f9ed-4de3-8988-954639896ba4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Windows\Source Files">
-      <UniqueIdentifier>{27bd9cb5-c05c-42b2-b031-9e166b0e19f1}</UniqueIdentifier>
+      <UniqueIdentifier>{d6970fa5-24c8-45bd-bb1d-307d5c051eb8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer">
-      <UniqueIdentifier>{1bc9e3ab-479c-4eeb-95c2-673220d955f5}</UniqueIdentifier>
+      <UniqueIdentifier>{c8aaef9e-e792-478d-a26c-0de04abb9364}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Header Files">
-      <UniqueIdentifier>{10022977-d86f-462d-882b-bd4a4530cdac}</UniqueIdentifier>
+      <UniqueIdentifier>{0f7f1d3d-9c0e-4f86-95a0-608794ea7c04}</UniqueIdentifier>
     </Filter>
     <Filter Include="Timer\Source Files">
-      <UniqueIdentifier>{5b2155dd-0ab8-4e29-b6a0-ebe815601d85}</UniqueIdentifier>
+      <UniqueIdentifier>{a330cb63-a66b-456b-b346-0db4665d4dbb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -84,6 +84,9 @@
     <ClInclude Include="src\IniFileConfigurationTest.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\JSONConfigurationTest.h">
+      <Filter>Configuration\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\LayeredConfigurationTest.h">
       <Filter>Configuration\Header Files</Filter>
     </ClInclude>
@@ -161,6 +164,9 @@
     <ClCompile Include="src\IniFileConfigurationTest.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONConfigurationTest.cpp">
+      <Filter>Configuration\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\LayeredConfigurationTest.cpp">
       <Filter>Configuration\Source Files</Filter>
     </ClCompile>

Util/testsuite/src/WinConfigurationTest.cpp

@@ -34,11 +34,13 @@
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
 #include "Poco/Util/WinRegistryConfiguration.h"
+#include "Poco/Util/WinRegistryKey.h"
 #include "Poco/Environment.h"
 #include "Poco/AutoPtr.h"
 
 
 using Poco::Util::WinRegistryConfiguration;
+using Poco::Util::WinRegistryKey;
 using Poco::Environment;
 using Poco::AutoPtr;
 
@@ -55,6 +57,10 @@ WinConfigurationTest::~WinConfigurationTest()
 
 void WinConfigurationTest::testConfiguration()
 {
+	WinRegistryKey regKey("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test");
+	if (regKey.exists()) regKey.deleteKey();
+	assert (!regKey.exists());
+
 	AutoPtr<WinRegistryConfiguration> pReg = new WinRegistryConfiguration("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test");
 	pReg->setString("name1", "value1");
 	assert (pReg->getString("name1") == "value1");

Util/testsuite/src/WinRegistryTest.cpp

@@ -55,11 +55,9 @@ WinRegistryTest::~WinRegistryTest()
 void WinRegistryTest::testRegistry()
 {
 	WinRegistryKey regKey("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test");
-	if (regKey.exists())
-	{
-		regKey.deleteKey();
-	}
+	if (regKey.exists()) regKey.deleteKey();
 	assert (!regKey.exists());
+
 	regKey.setString("name1", "value1");
 	assert (regKey.getString("name1") == "value1");
 	regKey.setString("name1", "Value1");