Changeset 6672c56 in nscp

Timestamp:

11/10/09 00:02:12 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

773ad32

Parents:

7f9c823

Message:

• Fixed a few bugs in the old_settings store.
• Swapped out all mutexes from the core (NSClient++)

Files:

• NSClient++-2005.sln (modified) (31 diffs)
• include/settings/settings_old.hpp (modified) (3 diffs)
• include/strEx.h (modified) (1 diff)
• modules/CheckDisk/CheckDisk-2005.vcproj (modified) (3 diffs)
• modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (24 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (14 diffs)
• service/NSClient++.h (modified) (3 diffs)

NSClient++-2005.sln

@@ -98 +98 @@
 EndProject
 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
   ProjectSection(ProjectDependencies) = postProject
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
@@ -122 +118 @@
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}
   EndProjectSection
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}"
@@ -195 +195 @@
   EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClient++", "service\NSClient++-2005.vcproj", "{2286162D-7571-4735-BAC8-4A8D33A4F42D}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "main", "main", "{CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClient++", "service\NSClient++-2005.vcproj", "{2286162D-7571-4735-BAC8-4A8D33A4F42D}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "main", "main", "{CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
 EndProject
 Global
-  GlobalSection(SubversionScc) = preSolution
-    Svn-Managed = True
-    Manager = AnkhSVN - Subversion Support for Visual Studio
-  EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     Debug|Any CPU = Debug|Any CPU
@@ -223 +215 @@
     Debug|Win32 = Debug|Win32
     Debug|x64 = Debug|x64
+    Debug-MemCheck|Any CPU = Debug-MemCheck|Any CPU
+    Debug-MemCheck|Mixed Platforms = Debug-MemCheck|Mixed Platforms
+    Debug-MemCheck|Win32 = Debug-MemCheck|Win32
+    Debug-MemCheck|x64 = Debug-MemCheck|x64
+    Distribution|Any CPU = Distribution|Any CPU
+    Distribution|Mixed Platforms = Distribution|Mixed Platforms
+    Distribution|Win32 = Distribution|Win32
+    Distribution|x64 = Distribution|x64
     Nightly|Any CPU = Nightly|Any CPU
     Nightly|Mixed Platforms = Nightly|Mixed Platforms
@@ -239 +239 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|x64.ActiveCfg = Debug|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|x64.Build.0 = Debug|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|Win32.Build.0 = Distribution|Win32
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|x64.ActiveCfg = Distribution|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Distribution|x64.Build.0 = Distribution|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -260 +274 @@
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|x64.ActiveCfg = Debug|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|x64.Build.0 = Debug|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|Win32.Build.0 = Distribution|Win32
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|x64.ActiveCfg = Distribution|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Distribution|x64.Build.0 = Distribution|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -281 +309 @@
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|x64.ActiveCfg = Debug|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|x64.Build.0 = Debug|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|Win32.Build.0 = Distribution|Win32
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|x64.ActiveCfg = Distribution|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Distribution|x64.Build.0 = Distribution|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -302 +344 @@
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|x64.ActiveCfg = Debug|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|x64.Build.0 = Debug|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|Win32.Build.0 = Distribution|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|x64.ActiveCfg = Distribution|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution|x64.Build.0 = Distribution|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -322 +378 @@
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|x64.ActiveCfg = Debug|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|x64.Build.0 = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|Win32.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|x64.ActiveCfg = Debug|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Distribution|x64.Build.0 = Debug|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -342 +410 @@
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|x64.ActiveCfg = Debug|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|x64.Build.0 = Debug|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|Win32.Build.0 = Distribution|Win32
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|x64.ActiveCfg = Distribution|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Distribution|x64.Build.0 = Distribution|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -363 +445 @@
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|x64.ActiveCfg = Debug|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|x64.Build.0 = Debug|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|Win32.Build.0 = Distribution|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|x64.ActiveCfg = Distribution|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution|x64.Build.0 = Distribution|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -384 +480 @@
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|x64.ActiveCfg = Debug|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|x64.Build.0 = Debug|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|Win32.Build.0 = Distribution|Win32
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|x64.ActiveCfg = Distribution|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Distribution|x64.Build.0 = Distribution|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -405 +515 @@
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|x64.ActiveCfg = Debug|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|x64.Build.0 = Debug|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|Win32.Build.0 = Distribution|Win32
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|x64.ActiveCfg = Distribution|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Distribution|x64.Build.0 = Distribution|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -425 +549 @@
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|x64.ActiveCfg = Debug|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|x64.Build.0 = Debug|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|Win32.Build.0 = Distribution|Win32
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|x64.ActiveCfg = Distribution|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Distribution|x64.Build.0 = Distribution|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -445 +583 @@
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Win32.ActiveCfg = Debug|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Any CPU.Build.0 = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Any CPU.Build.0 = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.Build.0 = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Win32.ActiveCfg = Debug-MemCheck|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|x64.ActiveCfg = Debug-MemCheck|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Any CPU.Build.0 = Debug-MemCheck|Any CPU
@@ -463 +613 @@
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|x64.ActiveCfg = Debug|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|x64.Build.0 = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|Win32.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|x64.ActiveCfg = Debug|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Distribution|x64.Build.0 = Debug|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -482 +644 @@
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|x64.ActiveCfg = Debug|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|x64.Build.0 = Debug|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|Win32.Build.0 = Distribution|Win32
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|x64.ActiveCfg = Distribution|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Distribution|x64.Build.0 = Distribution|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -501 +677 @@
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.ActiveCfg = Debug|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.Build.0 = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Win32.Build.0 = Distribution|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|x64.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|x64.Build.0 = Distribution|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -522 +712 @@
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug|x64.ActiveCfg = Debug
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug|x64.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Any CPU.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Any CPU.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Win32.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|Win32.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|x64.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Debug-MemCheck|x64.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Any CPU.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Any CPU.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Mixed Platforms.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Mixed Platforms.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Win32.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|Win32.Build.0 = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|x64.ActiveCfg = Debug
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Distribution|x64.Build.0 = Debug
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Nightly|Any CPU.ActiveCfg = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Nightly|Any CPU.Build.0 = Release
@@ -542 +748 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|x64.ActiveCfg = Debug|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|x64.Build.0 = Debug|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|Win32.Build.0 = Distribution|Win32
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|x64.ActiveCfg = Distribution|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Distribution|x64.Build.0 = Distribution|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -562 +782 @@
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.ActiveCfg = Debug|x64
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.Build.0 = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Win32.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|x64.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|x64.Build.0 = Debug|x64
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Any CPU.ActiveCfg = Release|Win32
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32
@@ -582 +814 @@
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug|Win32.ActiveCfg = Debug|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|Any CPU.Build.0 = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|Win32.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Debug-MemCheck|x64.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|Mixed Platforms.Build.0 = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|Win32.ActiveCfg = Debug|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Distribution|x64.ActiveCfg = Debug|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Nightly|Any CPU.ActiveCfg = Release|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Nightly|Any CPU.Build.0 = Release|Any CPU
@@ -599 +843 @@
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug|Win32.ActiveCfg = Debug|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug|x64.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|Win32.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|Win32.Build.0 = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Debug-MemCheck|x64.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|Any CPU.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|Mixed Platforms.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|Mixed Platforms.Build.0 = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|Win32.ActiveCfg = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|Win32.Build.0 = Debug|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Distribution|x64.ActiveCfg = Debug|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Nightly|Any CPU.ActiveCfg = Release|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32
@@ -616 +872 @@
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|x64.ActiveCfg = Debug|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|x64.Build.0 = Debug|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|Win32.Build.0 = Distribution|Win32
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|x64.ActiveCfg = Distribution|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Distribution|x64.Build.0 = Distribution|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -635 +905 @@
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|Win32.ActiveCfg = Debug|Win32
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|x64.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|Win32.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|x64.ActiveCfg = Debug|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Distribution|x64.Build.0 = Debug|x64
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Nightly|Any CPU.ActiveCfg = Release|Win32
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32
@@ -651 +933 @@
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|x64.ActiveCfg = Debug|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|x64.Build.0 = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|Win32.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|x64.ActiveCfg = Debug|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Distribution|x64.Build.0 = Debug|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Nightly|Any CPU.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Nightly|Mixed Platforms.ActiveCfg = Release|x64
@@ -670 +964 @@
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.ActiveCfg = Debug
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.Build.0 = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Any CPU.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Win32.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|x64.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Any CPU.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Mixed Platforms.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Win32.ActiveCfg = Debug
+    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|x64.ActiveCfg = Debug
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Any CPU.ActiveCfg = Release
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Any CPU.Build.0 = Release
@@ -685 +987 @@
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|x64.ActiveCfg = Release
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|x64.Build.0 = Release
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Any CPU.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.ActiveCfg = Release|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.Build.0 = Release|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug|Any CPU.ActiveCfg = Debug|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
@@ -712 +994 @@
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug|x64.ActiveCfg = Debug|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug|x64.Build.0 = Debug|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|Win32.Build.0 = Distribution|Win32
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|x64.ActiveCfg = Distribution|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Distribution|x64.Build.0 = Distribution|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Nightly|Any CPU.ActiveCfg = Nightly|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
@@ -726 +1022 @@
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|x64.ActiveCfg = Release|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|x64.Build.0 = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.Build.0 = Distribution|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.Build.0 = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Any CPU.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.Build.0 = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.Build.0 = Nightly|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.Build.0 = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.Build.0 = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.ActiveCfg = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.Build.0 = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -759 +1090 @@
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937} = {FC917E21-188A-44EE-9EF2-7C1274C2D719}
   EndGlobalSection
+  GlobalSection(SubversionScc) = preSolution
+    Svn-Managed = True
+    Manager = AnkhSVN - Subversion Support for Visual Studio
+  EndGlobalSection
   GlobalSection(DPCodeReviewSolutionGUID) = preSolution
     DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

include/settings/settings_old.hpp

@@ -145 +145 @@
     }
     SettingsCore::key_path_type map_key(SettingsCore::key_path_type new_key) {
-      key_map::iterator it = keys_.find(new_key);
-      if (it == keys_.end())
-        return new_key;
-      return (*it).second;
+      key_map::iterator it1 = keys_.find(new_key);
+      if (it1 != keys_.end())
+        return (*it1).second;
+      path_map::iterator it2 = sections_.find(new_key.first);
+      if (it2 != sections_.end())
+        return SettingsCore::key_path_type((*it2).second, new_key.second);
+      return new_key;
     }
     //////////////////////////////////////////////////////////////////////////
@@ -176 +179 @@
 
     std::wstring internal_get_value(std::wstring path, std::wstring key, int bufferSize = 1024) {
+      get_core()->get_logger()->quick_debug(path + _T("//") + key);
       TCHAR* buffer = new TCHAR[bufferSize+2];
       if (buffer == NULL)
@@ -237 +241 @@
         throw SettingsException(_T("has_key_int:: Failed to allocate memory for buffer!"));
       std::wstring mapped = map_path(path);
-      unsigned int count = ::GetPrivateProfileSection(mapped.c_str(), buffer, BUFF_LEN, get_file_name().c_str());
+      unsigned int count = ::GetPrivateProfileSection(mapped.c_str(), buffer, bufferLength-2, get_file_name().c_str());
       if (count == bufferLength-2) {
         delete [] buffer;

include/strEx.h

@@ -664 +664 @@
   {
     bool operator() (const std::wstring& x, const std::wstring& y) const {
-      return StrCmpI<std::wstring>(x,y);
+      return StrCmpI<std::wstring>(x,y) < 0;
       //return _wcsicmp( x.c_str(), y.c_str() ) < 0;
     }

modules/CheckDisk/CheckDisk-2005.vcproj

@@ -346 +346 @@
     <Configuration
       Name="Distribution|Win32"
+      OutputDirectory="$(SolutionDir)$(ConfigurationName)"
       IntermediateDirectory="$(ConfigurationName)"
       ConfigurationType="1"
@@ -639 +640 @@
     <Configuration
       Name="Debug-MemCheck|Win32"
+      OutputDirectory="$(SolutionDir)$(ConfigurationName)"
       IntermediateDirectory="$(ConfigurationName)"
       ConfigurationType="1"
@@ -781 +783 @@
     <Configuration
       Name="OP5|Win32"
+      OutputDirectory="$(SolutionDir)$(ConfigurationName)"
       IntermediateDirectory="$(ConfigurationName)"
       ConfigurationType="1"

modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj

@@ -23 +23 @@
   <Configurations>
     <Configuration
+      Name="Debug|Win32"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="4"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="1"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug|x64"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="3"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        IgnoreDefaultLibraryNames="MSVCRT"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="17"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
@@ -32 +200 @@
       <Tool
         Name="VCPreBuildEventTool"
-        ExcludedFromBuild="true"
       />
       <Tool
@@ -49 +216 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
       />
       <Tool
@@ -63 +235 @@
         Name="VCLinkerTool"
         AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        AdditionalLibraryDirectories=""
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="1"
       />
       <Tool
@@ -91 +273 @@
     <Configuration
       Name="Release|x64"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="3"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        AdditionalLibraryDirectories=""
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="17"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Distribution|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
       IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
@@ -115 +379 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
       />
       <Tool
@@ -129 +398 @@
         Name="VCLinkerTool"
         AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="1"
       />
       <Tool
@@ -156 +434 @@
     </Configuration>
     <Configuration
-      Name="Debug|Win32"
-      OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-      IntermediateDirectory="$(ConfigurationName)"
+      Name="Distribution|x64"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
       CharacterSet="1"
       >
@@ -176 +455 @@
       <Tool
         Name="VCMIDLTool"
+        TargetEnvironment="3"
       />
       <Tool
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
       />
       <Tool
@@ -193 +478 @@
       <Tool
         Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="17"
       />
       <Tool
@@ -220 +515 @@
     </Configuration>
     <Configuration
-      Name="Debug|x64"
-      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+      Name="Nightly|Win32"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        TargetMachine="1"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Nightly|x64"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
       CharacterSet="1"
       >
@@ -240 +613 @@
       <Tool
         Name="VCMIDLTool"
+        TargetEnvironment="3"
       />
       <Tool
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        DebugInformationFormat="3"
       />
       <Tool
@@ -257 +634 @@
       <Tool
         Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        TargetMachine="17"
       />
       <Tool
@@ -278 +664 @@
       <Tool
         Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug-MemCheck|Win32"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MEMCHECK"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="4"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="1"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug-MemCheck|x64"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="3"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="$(OutDir)\$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        IgnoreDefaultLibraryNames="MSVCRT"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="17"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug|Itanium"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="2"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="2"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="../../Debug/modules/$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        IgnoreDefaultLibraryNames="MSVCRT"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        RandomizedBaseAddress="1"
+        DataExecutionPrevention="0"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="5"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Release|Itanium"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="2"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="2"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="../../Release/modules/$(ProjectName).dll"
+        LinkIncremental="1"
+        AdditionalLibraryDirectories=""
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        RandomizedBaseAddress="1"
+        DataExecutionPrevention="0"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="5"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Distribution|Itanium"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="2"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="2"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        RuntimeLibrary="0"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="../../Dist/modules/$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="false"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        RandomizedBaseAddress="1"
+        DataExecutionPrevention="0"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="5"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Nightly|Itanium"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="2"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="2"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        RuntimeLibrary="2"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="../../Dist/modules/$(ProjectName).dll"
+        LinkIncremental="1"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        SubSystem="2"
+        OptimizeReferences="2"
+        EnableCOMDATFolding="2"
+        RandomizedBaseAddress="1"
+        DataExecutionPrevention="0"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="5"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug-MemCheck|Itanium"
+      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+      CharacterSet="2"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+        TargetEnvironment="2"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        Optimization="0"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"
+        MinimalRebuild="true"
+        BasicRuntimeChecks="3"
+        RuntimeLibrary="1"
+        UsePrecompiledHeader="2"
+        WarningLevel="3"
+        Detect64BitPortabilityProblems="false"
+        DebugInformationFormat="3"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+        OutputFile="../../Debug/modules/$(ProjectName).dll"
+        LinkIncremental="2"
+        AdditionalLibraryDirectories=""
+        IgnoreDefaultLibraryNames="MSVCRT"
+        ModuleDefinitionFile="CheckExternalScripts.def"
+        GenerateDebugInformation="true"
+        ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"
+        SubSystem="2"
+        RandomizedBaseAddress="1"
+        DataExecutionPrevention="0"
+        ImportLibrary="$(OutDir)/CheckExternalScripts.lib"
+        TargetMachine="5"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
       />
       <Tool
@@ -296 +1259 @@
         >
         <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
           Name="Release|Win32"
           >
@@ -306 +1287 @@
         <FileConfiguration
           Name="Release|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=""
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=""
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|x64"
           >
           <Tool
@@ -443 +1406 @@
         >
         <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
           Name="Release|Win32"
           >
@@ -461 +1442 @@
         </FileConfiguration>
         <FileConfiguration
+          Name="Distribution|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|Itanium"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|Itanium"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|Itanium"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|Itanium"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|Itanium"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+      </File>
+      <File
+        RelativePath="..\..\include\Socket.cpp"
+        >
+        <FileConfiguration
           Name="Debug|Win32"
           >
@@ -471 +1555 @@
         <FileConfiguration
           Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|x64"
           >
           <Tool
@@ -582 +1684 @@
         >
         <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="1"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="1"
+          />
+        </FileConfiguration>
+        <FileConfiguration
           Name="Release|Win32"
           >
@@ -591 +1709 @@
         <FileConfiguration
           Name="Release|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="1"
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="1"
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|x64"
           >
           <Tool
@@ -706 +1808 @@
         >
         <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+            PrecompiledHeaderThrough=""
+          />
+        </FileConfiguration>
+        <FileConfiguration
           Name="Release|Win32"
           >
@@ -716 +1836 @@
         <FileConfiguration
           Name="Release|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=""
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=""
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|x64"
           >
           <Tool
@@ -864 +1966 @@
       </File>
       <File
-        RelativePath="..\..\include\execute_process.hpp"
+        RelativePath="..\..\include\NSCHelper.h"
         >
       </File>
       <File
-        RelativePath="..\..\include\file_helpers.hpp"
+        RelativePath="..\..\include\Socket.h"
         >
       </File>
       <File
-        RelativePath="..\..\include\NSCHelper.h"
+        RelativePath="..\..\include\SSLSocket.h"
         >
       </File>

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -85 +85 @@
     if ((*it).empty())
       continue;
+    NSC_DEBUG_MSG_STD(_T("Looking under: ") + setting_keys::external_scripts::SCRIPT_SECTION_PATH + _T(", ") + (*it));
     std::wstring s = NSCModuleHelper::getSettingsString(setting_keys::external_scripts::SCRIPT_SECTION_PATH, (*it), _T(""));
     if (s.empty()) {

service/NSClient++.cpp

@@ -1013 +1013 @@
   std::wstring moduleList = _T("");
   {
-    ReadLock readLock(&m_mutexRW, true, 10000);
-    if (!readLock.IsLocked()) {
+    boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(5));
+    if (!readLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return -1;
@@ -1059 +1059 @@
  */
 void NSClientT::addPlugins(const std::list<std::wstring> plugins) {
-  ReadLock readLock(&m_mutexRW, true, 10000);
-  if (!readLock.IsLocked()) {
+  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
+  if (!readLock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
     return;
@@ -1074 +1074 @@
 void NSClientT::unloadPlugins(bool unloadLoggers) {
   {
-    WriteLock writeLock(&m_mutexRW, true, 10000);
-    if (!writeLock.IsLocked()) {
+    boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
+    if (!writeLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return;
@@ -1084 +1084 @@
   }
   {
-    ReadLock readLock(&m_mutexRW, true, 10000);
-    if (!readLock.IsLocked()) {
+    boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+    if (!readLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return;
@@ -1108 +1108 @@
   }
   {
-    WriteLock writeLock(&m_mutexRW, true, 10000);
-    if (!writeLock.IsLocked()) {
+    boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
+    if (!writeLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return;
@@ -1134 +1134 @@
   bool hasBroken = false;
   {
-    ReadLock readLock(&m_mutexRW, true, 10000);
-    if (!readLock.IsLocked()) {
+    boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+    if (!readLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return;
@@ -1185 +1185 @@
   plugin->load_dll();
   {
-    WriteLock writeLock(&m_mutexRW, true, 10000);
-    if (!writeLock.IsLocked()) {
+    boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
+    if (!writeLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return plugin;
@@ -1202 +1202 @@
 
 std::wstring NSClientT::describeCommand(std::wstring command) {
-  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
-  if (!readLock.IsLocked()) {
+  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(5));
+  if (!readLock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
     return _T("Failed to get mutex when describing command: ") + command;
@@ -1214 +1214 @@
 std::list<std::wstring> NSClientT::getAllCommandNames() {
   std::list<std::wstring> lst;
-  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
-  if (!readLock.IsLocked()) {
+  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(5));
+  if (!readLock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
     return lst;
@@ -1225 +1225 @@
 }
 void NSClientT::registerCommand(std::wstring cmd, std::wstring desc) {
-  WriteLock writeLock(&m_mutexRWcmdDescriptions, true, 10000);
-  if (!writeLock.IsLocked()) {
+  boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(10));
+  if (!writeLock.owns_lock()) {
     LOG_ERROR_STD(_T("FATAL ERROR: Failed to describe command:") + cmd);
     return;
@@ -1313 +1313 @@
     }
   } else {
-    ReadLock readLock(&m_mutexRW, true, 5000);
-    if (!readLock.IsLocked()) {
+    boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+    if (!readLock.owns_lock()) {
       LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
       return NSCAPI::returnUNKNOWN;
@@ -1352 +1352 @@
 
 void NSClientT::listPlugins() {
-  ReadLock readLock(&m_mutexRW, true, 10000);
-  if (!readLock.IsLocked()) {
+  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+  if (!readLock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
     return;
@@ -1418 +1418 @@
       file_stl = file_stl.substr(pos);
     {
-      ReadLock readLock(&m_mutexRW, true, 5000);
-      if (!readLock.IsLocked()) {
+      boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+      if (!readLock.owns_lock()) {
         log_broken_message(_T("Message was lost as the (mutexRW) core was locked: ") + message);
         return;
       }
-      boost::unique_lock<boost::timed_mutex> lock(messageMutex, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+      boost::unique_lock<boost::timed_mutex> lock(messageMutex, boost::get_system_time() + boost::posix_time::seconds(5));
       if (!lock.owns_lock()) {
         log_broken_message(_T("Message was lost as the core was locked: ") + message);
@@ -1488 +1488 @@
 }
 std::wstring NSClientT::getBasePath(void) {
-  boost::unique_lock<boost::timed_mutex> lock(internalVariables, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+  boost::unique_lock<boost::timed_mutex> lock(internalVariables, boost::get_system_time() + boost::posix_time::seconds(5));
   if (!lock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get mutex."));

service/NSClient++.h

@@ -24 +24 @@
 #include <service/system_service.hpp>
 #include "NSCPlugin.h"
-#include <Mutex.h>
+//#include <Mutex.h>
 #include <NSCAPI.h>
-#include <MutexRW.h>
+//#include <MutexRW.h>
 #include <map>
 #include <com_helpers.hpp>
@@ -32 +32 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 
 /**
@@ -101 +103 @@
   boost::timed_mutex internalVariables;
   boost::timed_mutex messageMutex;
-  MutexRW  m_mutexRW;
-  MutexRW  m_mutexRWcmdDescriptions;
+  boost::shared_mutex m_mutexRW;
+  boost::shared_mutex m_mutexRWcmdDescriptions;
   cmdMap cmdDescriptions_;
   typedef enum log_status {log_unknown, log_looking, log_debug, log_nodebug };