Changeset 41ca52e in nscp

Timestamp:

12/26/10 15:47:48 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

stable

Children:

cefdcc8

Parents:

1d6bb09

Message:

 

Files:

• AutoBuild.h (modified) (1 diff)
• Jamroot (modified) (7 diffs)
• NSC.dist (modified) (1 diff)
• NSClient++-2005.sln (modified) (42 diffs)
• NSClient++-2005.vcproj (modified) (8 diffs)
• NSClient++.cpp (modified) (3 diffs)
• bjam/breakpad.jam (added)
• build.bat (modified) (1 diff)
• changelog (modified) (1 diff)
• env.bat (modified) (1 diff)
• helpers/error_reporter/Jamfile (added)
• helpers/error_reporter/Resource.h (added)
• helpers/error_reporter/reporter.cpp (added)
• helpers/error_reporter/reporter.h (added)
• helpers/error_reporter/reporter.rc (added)
• helpers/error_reporter/reporter.vcproj (added)
• helpers/error_reporter/res/standby.ico (added)
• helpers/error_reporter/stdafx.cpp (added)
• helpers/error_reporter/stdafx.h (added)
• helpers/installer/Product.wxs (modified) (1 diff)
• include/EnumProcess.cpp (modified) (5 diffs)
• include/EnumProcess.h (modified) (2 diffs)
• include/breakpad/breakpad_config.cpp (added)
• include/breakpad/breakpad_config.hpp (added)
• include/breakpad/crash_sender_win32.cpp (added)
• include/breakpad/exception_handler_win32.cpp (added)
• include/breakpad/exception_handler_win32.hpp (added)
• include/checkHelpers.hpp (modified) (3 diffs)
• include/config.h (modified) (1 diff)
• include/file_helpers.hpp (modified) (1 diff)
• include/file_logger.hpp (modified) (2 diffs)
• include/parsers/ast.hpp (modified) (1 diff)
• include/parsers/eval.hpp (modified) (2 diffs)
• include/parsers/grammar.cpp (modified) (3 diffs)
• include/parsers/where.cpp (modified) (1 diff)
• include/pdh/collectors.hpp (modified) (4 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (7 diffs)
• modules/CheckSystem/CheckSystem-2005.vcproj (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (3 diffs)
• modules/DebugLogMetrics/DebugLogMetrics.cpp (modified) (1 diff)
• modules/DebugLogMetrics/DebugLogMetrics.h (modified) (1 diff)
• modules/DebugLogMetrics/PDHCollector.cpp (modified) (1 diff)
• modules/NRPEListener/NRPEListener.cpp (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,9,148
-#define PRODUCTVER     0,3,9,148
-#define STRFILEVER     _T("0.3.9.148")
-#define STRPRODUCTVER  _T("0.3.9.148")
-#define STRPRODUCTDATE  _T("2010-11-14")
+#define FILEVER        0,3,9,222
+#define PRODUCTVER     0,3,9,222
+#define STRFILEVER     _T("0.3.9.222")
+#define STRPRODUCTVER  _T("0.3.9.222")
+#define STRPRODUCTDATE  _T("2010-12-26")
 #endif // AUTOBUILD_H

Jamroot

@@ -21 +21 @@
   import bjam/openssl ;
   import bjam/boost ;
+  import bjam/breakpad ;
   import bjam/cryptopp ;
   import bjam/psdk ;
@@ -55 +56 @@
   using bjam/openssl : : $(TOP)/lib-source/openssl-0.9.8g/include $(TOP)/lib ;
   using bjam/boost : : $(TOP)/lib-source/boost_1_35_0 $(TOP)/lib ;
+  using bjam/breakpad : : $(TOP)/lib-source/breakpad $(TOP)/lib ;
   using bjam/lua : : $(TOP)/lib-source/lua-5.1.2 ;
   using bjam/cryptopp : : $(TOP)/lib-source/"Crypto++"/src ;
@@ -78 +80 @@
   } else {
     echo "boost not avaliable! some features DISABLED (for instance regular expressions) (enable with --with-boost)" ; 
+  }
+
+  if [ bjam/breakpad.isEnabled ] = true {
+    echo "breakpad found (disable with --without-breakpad)" ; 
+    bjam/breakpad.printEnv ;
+  } else {
+    echo "breakpad not avaliable! some features DISABLED (for instance regular expressions) (enable with --with-breakpad)" ; 
   }
 
@@ -132 +141 @@
   include/Socket.cpp
   include/b64/b64.c
+  
+  include/breakpad/breakpad_config.cpp
+# include/breakpad/crash_sender_win32.cpp
+  include/breakpad/exception_handler_win32.cpp
+  
+  /breakpad//exception_handler
+  /breakpad//crash_generation_client
+  /breakpad//common
 
   : # requirements
@@ -140 +157 @@
   <find-static-library>ole32
   <variant>release:<dependency>update_version 
+
   : # default build
 
@@ -277 +295 @@
 explicit all-script-libs-targets ;
 
-alias all-root-targets : $(target) $(target-config) $(target-readme) $(target-guide) $(target-refman) $(target-license) $(target-changelog) $(target-counters) helpers/systray_helper ;
+alias all-root-targets : $(target) $(target-config) $(target-readme) $(target-guide) $(target-refman) $(target-license) $(target-changelog) $(target-counters) helpers/systray_helper helpers/error_reporter ;
 explicit all-root-targets ;
 
@@ -346 +364 @@
 
 alias build-binaries : dist dist-modules dist-helpers dist-scripts dist-script-libs ;
-#alias build-binaries : dist-helpers ;
+#alias build-binaries : dist ;
 explicit build-binaries ;
 

NSC.dist

@@ -34 +34 @@
 ;CheckTaskSched.dll
 
-
+[crash]
+; Archive crash dump files if a crash is detected
+;archive=1
+
+; Submit crash reports to a crash report server (this overrrides archive)
+;submit=0
+
+; Restart service if a crash is detected
+;restart=1
 
 [Settings]

NSClient++-2005.sln

@@ -6 +6 @@
     Release.AspNetCompiler.Debug = "False"
   EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}"
+  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}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+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
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}
     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
     {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
+    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
+    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
-    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
-    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
-    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
-    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}"
-  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}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+  ProjectSection(ProjectDependencies) = postProject
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
+    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560}
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}"
   ProjectSection(WebsiteProperties) = preProject
     Debug.AspNetCompiler.Debug = "True"
@@ -138 +158 @@
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
-    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
@@ -149 +169 @@
     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
-    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}"
   ProjectSection(WebsiteProperties) = preProject
     Debug.AspNetCompiler.Debug = "True"
@@ -158 +213 @@
   EndProjectSection
   ProjectSection(ProjectDependencies) = postProject
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560}
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
+    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
     {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-  ProjectSection(ProjectDependencies) = postProject
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
-    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
-    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
-    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}
-    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
-    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}
-    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
-    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-EndProject
-Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  EndProjectSection
-  ProjectSection(ProjectDependencies) = postProject
-    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}
-    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
-    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
-    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
-    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
-    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
-    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}
-    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
-    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
   EndProjectSection
 EndProject
@@ -262 +245 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer_dll_fw", "helpers\installer_dll_fw\installer_dll_fw.vcproj", "{DF1DB6FB-0448-46D6-AE82-9901495E5F1A}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exception_handler", "..\..\..\google-breakpad\trunk\src\client\windows\handler\exception_handler.vcproj", "{1E2EAF99-5703-4DE3-01BF-339A67FD4D61}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reporter", "helpers\error_reporter\reporter.vcproj", "{96466E47-3540-4989-9E2A-481C0819DAEA}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckNSCP", "modules\CheckNSCP\CheckNSCP-2005.vcproj", "{64BDF75C-F679-43BC-B112-A96A39983752}"
   ProjectSection(WebsiteProperties) = preProject
     Debug.AspNetCompiler.Debug = "True"
@@ -294 +295 @@
     OP5|Win32 = OP5|Win32
     OP5|x64 = OP5|x64
+    Purify|Any CPU = Purify|Any CPU
+    Purify|Itanium = Purify|Itanium
+    Purify|Mixed Platforms = Purify|Mixed Platforms
+    Purify|Win32 = Purify|Win32
+    Purify|x64 = Purify|x64
     Release|Any CPU = Release|Any CPU
     Release|Itanium = Release|Itanium
@@ -340 +346 @@
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.OP5|x64.ActiveCfg = Nightly|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.OP5|x64.Build.0 = Nightly|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|Itanium.ActiveCfg = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|Win32.ActiveCfg = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|x64.ActiveCfg = OP5|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Purify|x64.Build.0 = OP5|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|Any CPU.ActiveCfg = Release|x64
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|Itanium.ActiveCfg = Release|x64
@@ -387 +400 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.OP5|x64.ActiveCfg = Nightly|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.OP5|x64.Build.0 = Nightly|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|Itanium.ActiveCfg = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|Win32.ActiveCfg = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|x64.ActiveCfg = OP5|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Purify|x64.Build.0 = OP5|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|Any CPU.ActiveCfg = Release|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|Itanium.ActiveCfg = Release|x64
@@ -434 +454 @@
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.OP5|x64.ActiveCfg = Nightly|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.OP5|x64.Build.0 = Nightly|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|Itanium.ActiveCfg = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|Win32.ActiveCfg = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|x64.ActiveCfg = OP5|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Purify|x64.Build.0 = OP5|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Any CPU.ActiveCfg = Release|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Itanium.ActiveCfg = Release|x64
@@ -481 +508 @@
     {BA246C01-063A-4548-8957-32D5CC76171B}.OP5|x64.ActiveCfg = Nightly|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.OP5|x64.Build.0 = Nightly|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|Itanium.ActiveCfg = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|Win32.ActiveCfg = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|x64.ActiveCfg = OP5|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Purify|x64.Build.0 = OP5|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Any CPU.ActiveCfg = Release|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Itanium.ActiveCfg = Release|x64
@@ -528 +562 @@
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.OP5|x64.ActiveCfg = Nightly|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.OP5|x64.Build.0 = Nightly|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|Itanium.ActiveCfg = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|Win32.ActiveCfg = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|x64.ActiveCfg = OP5|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Purify|x64.Build.0 = OP5|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|Any CPU.ActiveCfg = Release|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|Itanium.ActiveCfg = Release|x64
@@ -575 +616 @@
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.OP5|x64.ActiveCfg = Nightly|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.OP5|x64.Build.0 = Nightly|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|Itanium.ActiveCfg = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|Win32.ActiveCfg = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|x64.ActiveCfg = OP5|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Purify|x64.Build.0 = OP5|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Any CPU.ActiveCfg = Release|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Itanium.ActiveCfg = Release|x64
@@ -622 +670 @@
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.OP5|x64.ActiveCfg = Nightly|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.OP5|x64.Build.0 = Nightly|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|Itanium.ActiveCfg = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|Win32.ActiveCfg = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|x64.ActiveCfg = OP5|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Purify|x64.Build.0 = OP5|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Any CPU.ActiveCfg = Release|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Itanium.ActiveCfg = Release|x64
@@ -669 +724 @@
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.OP5|x64.ActiveCfg = Nightly|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.OP5|x64.Build.0 = Nightly|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|Itanium.ActiveCfg = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|Win32.ActiveCfg = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|x64.ActiveCfg = OP5|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Purify|x64.Build.0 = OP5|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|Any CPU.ActiveCfg = Release|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|Itanium.ActiveCfg = Release|x64
@@ -716 +778 @@
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.OP5|x64.ActiveCfg = Nightly|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.OP5|x64.Build.0 = Nightly|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|Itanium.ActiveCfg = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|Win32.ActiveCfg = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|x64.ActiveCfg = OP5|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Purify|x64.Build.0 = OP5|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Any CPU.ActiveCfg = Release|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Itanium.ActiveCfg = Release|x64
@@ -763 +832 @@
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.OP5|x64.ActiveCfg = Nightly|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.OP5|x64.Build.0 = Nightly|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|Itanium.ActiveCfg = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|Win32.ActiveCfg = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|x64.ActiveCfg = OP5|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Purify|x64.Build.0 = OP5|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Any CPU.ActiveCfg = Release|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Itanium.ActiveCfg = Release|x64
@@ -802 +878 @@
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Nightly|Win32.Build.0 = Nightly|Win32
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Nightly|x64.ActiveCfg = Nightly|x64
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Nightly|x64.Build.0 = Nightly|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.OP5|Any CPU.ActiveCfg = OP5|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.OP5|Itanium.ActiveCfg = OP5|x64
@@ -811 +886 @@
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.OP5|x64.ActiveCfg = Nightly|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.OP5|x64.Build.0 = Nightly|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|Itanium.ActiveCfg = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|Win32.ActiveCfg = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|x64.ActiveCfg = OP5|x64
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Purify|x64.Build.0 = OP5|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|Any CPU.ActiveCfg = Release|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|Itanium.ActiveCfg = Release|x64
@@ -853 +935 @@
     {0E2B21D9-F432-4127-8E92-7716B1072510}.OP5|Win32.ActiveCfg = OP5|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.OP5|x64.ActiveCfg = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Any CPU.ActiveCfg = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Any CPU.Build.0 = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Itanium.ActiveCfg = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Mixed Platforms.ActiveCfg = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Mixed Platforms.Build.0 = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|Win32.ActiveCfg = OP5|Any CPU
+    {0E2B21D9-F432-4127-8E92-7716B1072510}.Purify|x64.ActiveCfg = OP5|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -900 +989 @@
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.OP5|x64.ActiveCfg = Nightly|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.OP5|x64.Build.0 = Nightly|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|Itanium.ActiveCfg = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|Win32.ActiveCfg = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|x64.ActiveCfg = OP5|x64
+    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Purify|x64.Build.0 = OP5|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Release|Any CPU.ActiveCfg = Release|x64
     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Release|Itanium.ActiveCfg = Release|x64
@@ -947 +1043 @@
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.OP5|x64.ActiveCfg = Nightly|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.OP5|x64.Build.0 = Nightly|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|Itanium.ActiveCfg = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|Win32.ActiveCfg = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|x64.ActiveCfg = OP5|x64
+    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Purify|x64.Build.0 = OP5|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|Any CPU.ActiveCfg = Release|x64
     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|Itanium.ActiveCfg = Release|x64
@@ -995 +1098 @@
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.ActiveCfg = Nightly|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.Build.0 = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|Itanium.ActiveCfg = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|Win32.ActiveCfg = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|x64.ActiveCfg = OP5|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Purify|x64.Build.0 = OP5|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Itanium.ActiveCfg = Release|x64
@@ -1043 +1153 @@
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.OP5|x64.ActiveCfg = Nightly|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.OP5|x64.Build.0 = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|Itanium.ActiveCfg = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|Win32.ActiveCfg = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|x64.ActiveCfg = OP5|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Purify|x64.Build.0 = OP5|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Any CPU.ActiveCfg = Release|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Itanium.ActiveCfg = Release|x64
@@ -1088 +1205 @@
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Nightly|Win32.ActiveCfg = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Nightly|x64.ActiveCfg = Release
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Nightly|x64.Build.0 = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.OP5|Any CPU.ActiveCfg = OP5
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.OP5|Any CPU.Build.0 = OP5
@@ -1097 +1213 @@
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.OP5|Win32.ActiveCfg = OP5
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.OP5|x64.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Any CPU.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Any CPU.Build.0 = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Itanium.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Itanium.Build.0 = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Mixed Platforms.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Mixed Platforms.Build.0 = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Win32.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|Win32.Build.0 = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|x64.ActiveCfg = Release
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Purify|x64.Build.0 = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|Any CPU.ActiveCfg = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|Any CPU.Build.0 = Release
@@ -1132 +1258 @@
     {6206F046-3D36-4258-BB03-3291A7070117}.Nightly|Win32.ActiveCfg = Release|Win32
     {6206F046-3D36-4258-BB03-3291A7070117}.Nightly|x64.ActiveCfg = Release|x64
-    {6206F046-3D36-4258-BB03-3291A7070117}.Nightly|x64.Build.0 = Release|x64
     {6206F046-3D36-4258-BB03-3291A7070117}.OP5|Any CPU.ActiveCfg = OP5|x64
     {6206F046-3D36-4258-BB03-3291A7070117}.OP5|Itanium.ActiveCfg = OP5|x64
@@ -1139 +1264 @@
     {6206F046-3D36-4258-BB03-3291A7070117}.OP5|Win32.ActiveCfg = OP5|Win32
     {6206F046-3D36-4258-BB03-3291A7070117}.OP5|x64.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|Itanium.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|Win32.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|x64.ActiveCfg = OP5|x64
+    {6206F046-3D36-4258-BB03-3291A7070117}.Purify|x64.Build.0 = OP5|x64
     {6206F046-3D36-4258-BB03-3291A7070117}.Release|Any CPU.ActiveCfg = Release|Win32
     {6206F046-3D36-4258-BB03-3291A7070117}.Release|Itanium.ActiveCfg = Release|Win32
@@ -1172 +1304 @@
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Nightly|Win32.ActiveCfg = Nightly|Win32
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Nightly|x64.ActiveCfg = Nightly|x64
-    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Nightly|x64.Build.0 = Nightly|x64
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.OP5|Any CPU.ActiveCfg = OP5|x64
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.OP5|Itanium.ActiveCfg = OP5|x64
@@ -1179 +1310 @@
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.OP5|Win32.ActiveCfg = OP5|Win32
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.OP5|x64.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|Itanium.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|Win32.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|x64.ActiveCfg = OP5|x64
+    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Purify|x64.Build.0 = OP5|x64
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Any CPU.ActiveCfg = Release|x64
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Itanium.ActiveCfg = Release|x64
@@ -1225 +1363 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.OP5|x64.ActiveCfg = Nightly|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.OP5|x64.Build.0 = Nightly|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|Itanium.ActiveCfg = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|Win32.ActiveCfg = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|x64.ActiveCfg = OP5|x64
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Purify|x64.Build.0 = OP5|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Release|Any CPU.ActiveCfg = Release|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Release|Itanium.ActiveCfg = Release|x64
@@ -1271 +1416 @@
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.OP5|x64.ActiveCfg = Nightly|x64
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.OP5|x64.Build.0 = Nightly|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|Itanium.ActiveCfg = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|Win32.ActiveCfg = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|x64.ActiveCfg = OP5|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Purify|x64.Build.0 = OP5|x64
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Any CPU.ActiveCfg = Release|Win32
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Itanium.ActiveCfg = Release|Win32
@@ -1313 +1465 @@
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.OP5|Win32.ActiveCfg = OP5|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.OP5|x64.ActiveCfg = Release|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Any CPU.ActiveCfg = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Any CPU.Build.0 = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Itanium.ActiveCfg = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Mixed Platforms.ActiveCfg = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Mixed Platforms.Build.0 = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|Win32.ActiveCfg = OP5|Any CPU
+    {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Purify|x64.ActiveCfg = OP5|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -1352 +1511 @@
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.OP5|Win32.ActiveCfg = OP5|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.OP5|x64.ActiveCfg = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Any CPU.ActiveCfg = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Itanium.ActiveCfg = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Mixed Platforms.ActiveCfg = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Mixed Platforms.Build.0 = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Win32.ActiveCfg = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|Win32.Build.0 = OP5|Win32
+    {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Purify|x64.ActiveCfg = OP5|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Release|Any CPU.ActiveCfg = Release|Win32
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648}.Release|Itanium.ActiveCfg = Release|Win32
@@ -1396 +1562 @@
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Nightly|Win32.ActiveCfg = Release
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Nightly|x64.ActiveCfg = Release
-    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Nightly|x64.Build.0 = Release
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.OP5|Any CPU.ActiveCfg = OP5
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.OP5|Any CPU.Build.0 = OP5
@@ -1407 +1572 @@
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.OP5|x64.ActiveCfg = Release
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.OP5|x64.Build.0 = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Any CPU.ActiveCfg = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Any CPU.Build.0 = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Itanium.ActiveCfg = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Itanium.Build.0 = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Mixed Platforms.ActiveCfg = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Mixed Platforms.Build.0 = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Win32.ActiveCfg = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|Win32.Build.0 = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|x64.ActiveCfg = Release
+    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Purify|x64.Build.0 = Release
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Release|Any CPU.ActiveCfg = Release
     {10A0052D-542B-47AD-85C3-1A3DD45BF2ED}.Release|Any CPU.Build.0 = Release
@@ -1457 +1632 @@
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.OP5|x64.ActiveCfg = OP5|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.OP5|x64.Build.0 = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|Itanium.ActiveCfg = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|Win32.ActiveCfg = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|x64.ActiveCfg = OP5|x64
+    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Purify|x64.Build.0 = OP5|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Release|Any CPU.ActiveCfg = Release|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Release|Itanium.ActiveCfg = Release|x64
@@ -1497 +1679 @@
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.OP5|Win32.Build.0 = Release|Win32
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.OP5|x64.ActiveCfg = Release|Win32
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|Any CPU.ActiveCfg = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|Itanium.ActiveCfg = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|Mixed Platforms.ActiveCfg = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|Mixed Platforms.Build.0 = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|Win32.ActiveCfg = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|x64.ActiveCfg = Release|x64
+    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Purify|x64.Build.0 = Release|x64
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Release|Any CPU.ActiveCfg = Release|Win32
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Release|Itanium.ActiveCfg = Release|Win32
@@ -1530 +1719 @@
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Nightly|Win32.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Nightly|x64.ActiveCfg = Release|x64
-    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Nightly|x64.Build.0 = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.OP5|Any CPU.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.OP5|Itanium.ActiveCfg = Release|x64
@@ -1538 +1726 @@
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.OP5|x64.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.OP5|x64.Build.0 = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|Any CPU.ActiveCfg = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|Itanium.ActiveCfg = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|Mixed Platforms.ActiveCfg = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|Mixed Platforms.Build.0 = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|Win32.ActiveCfg = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|x64.ActiveCfg = Release|x64
+    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Purify|x64.Build.0 = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|Any CPU.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|Itanium.ActiveCfg = Release|x64
@@ -1546 +1741 @@
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|x64.ActiveCfg = Release|x64
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|x64.Build.0 = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Itanium.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Win32.ActiveCfg = Debug|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|Win32.Build.0 = Debug|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|x64.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug|x64.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|Itanium.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|Itanium.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|Win32.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|x64.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Distribution|x64.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|Any CPU.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|Itanium.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|Mixed Platforms.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|Mixed Platforms.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|Win32.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|x64.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Nightly|x64.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|Any CPU.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|Itanium.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|Mixed Platforms.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|Mixed Platforms.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|Win32.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|x64.ActiveCfg = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.OP5|x64.Build.0 = Debug|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Any CPU.ActiveCfg = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Itanium.ActiveCfg = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Mixed Platforms.ActiveCfg = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Mixed Platforms.Build.0 = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Win32.ActiveCfg = Purify|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|Win32.Build.0 = Purify|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|x64.ActiveCfg = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Purify|x64.Build.0 = Purify|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Any CPU.ActiveCfg = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Itanium.ActiveCfg = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Mixed Platforms.Build.0 = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Win32.ActiveCfg = Release|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|Win32.Build.0 = Release|Win32
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|x64.ActiveCfg = Release|x64
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61}.Release|x64.Build.0 = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Itanium.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Win32.ActiveCfg = Debug|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|Win32.Build.0 = Debug|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug|x64.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|Itanium.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|x64.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Debug-MemCheck|x64.Build.0 = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|Any CPU.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|Itanium.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|Mixed Platforms.Build.0 = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|Win32.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|x64.ActiveCfg = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Distribution|x64.Build.0 = Debug|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Any CPU.ActiveCfg = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Itanium.ActiveCfg = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Mixed Platforms.Build.0 = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|Win32.Build.0 = Nightly|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|x64.ActiveCfg = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Nightly|x64.Build.0 = Nightly|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Any CPU.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Itanium.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Mixed Platforms.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Mixed Platforms.Build.0 = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Win32.ActiveCfg = OP5|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|Win32.Build.0 = OP5|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|x64.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.OP5|x64.Build.0 = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|Itanium.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|Win32.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|x64.ActiveCfg = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Purify|x64.Build.0 = OP5|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Any CPU.ActiveCfg = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Itanium.ActiveCfg = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Mixed Platforms.Build.0 = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Win32.ActiveCfg = Release|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|Win32.Build.0 = Release|Win32
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|x64.ActiveCfg = Release|x64
+    {96466E47-3540-4989-9E2A-481C0819DAEA}.Release|x64.Build.0 = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Itanium.ActiveCfg = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Win32.ActiveCfg = Debug|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|Win32.Build.0 = Debug|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|x64.ActiveCfg = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug|x64.Build.0 = Debug|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Itanium.ActiveCfg = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|Win32.Build.0 = Distribution|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|x64.ActiveCfg = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Distribution|x64.Build.0 = Distribution|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Any CPU.ActiveCfg = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Itanium.ActiveCfg = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Mixed Platforms.Build.0 = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|Win32.Build.0 = Nightly|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|x64.ActiveCfg = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Nightly|x64.Build.0 = Nightly|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Any CPU.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Itanium.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Mixed Platforms.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Mixed Platforms.Build.0 = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Win32.ActiveCfg = OP5|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|Win32.Build.0 = OP5|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|x64.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.OP5|x64.Build.0 = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|Any CPU.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|Itanium.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|Mixed Platforms.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|Mixed Platforms.Build.0 = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|Win32.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|x64.ActiveCfg = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Purify|x64.Build.0 = OP5|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Any CPU.ActiveCfg = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Itanium.ActiveCfg = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Mixed Platforms.Build.0 = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Win32.ActiveCfg = Release|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|Win32.Build.0 = Release|Win32
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|x64.ActiveCfg = Release|x64
+    {64BDF75C-F679-43BC-B112-A96A39983752}.Release|x64.Build.0 = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -1567 +1921 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {9757464B-C125-4307-A84A-F4181AE6A081}
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {9757464B-C125-4307-A84A-F4181AE6A081}
+    {64BDF75C-F679-43BC-B112-A96A39983752} = {9757464B-C125-4307-A84A-F4181AE6A081}
     {0E2B21D9-F432-4127-8E92-7716B1072510} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
@@ -1575 +1930 @@
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
+    {1E2EAF99-5703-4DE3-01BF-339A67FD4D61} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}

NSClient++-2005.vcproj

@@ -85 +85 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib advapi32.lib ws2_32.lib Userenv.lib"
+        AdditionalDependencies="kernel32.lib user32.lib advapi32.lib ws2_32.lib Userenv.lib C:\source\google-breakpad\trunk\src\client\windows\Release\lib\exception_handler.lib"
         OutputFile="$(OutDir)\$(ProjectName).exe"
         LinkIncremental="1"
@@ -257 +257 @@
         PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
         BasicRuntimeChecks="3"
-        RuntimeLibrary="3"
+        RuntimeLibrary="1"
         UsePrecompiledHeader="2"
         PrecompiledHeaderThrough="StdAfx.h"
@@ -651 +651 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+        PreprocessorDefinitions="USE_BREAKPAD"
         UsePrecompiledHeader="2"
         PrecompiledHeaderThrough="StdAfx.h"
@@ -675 +675 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib google-breakpad-exception_handler.lib google-breakpad-crash_generation_client.lib google-breakpad-common.lib"
         OutputFile="$(OutDir)\$(ProjectName).exe"
         LinkIncremental="1"
@@ -746 +746 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="include"
-        PreprocessorDefinitions="ARCH_x64"
+        PreprocessorDefinitions="USE_BREAKPAD"
         UsePrecompiledHeader="2"
         PrecompiledHeaderThrough="StdAfx.h"
@@ -769 +769 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib google-breakpad-exception_handler.lib google-breakpad-crash_generation_client.lib google-breakpad-common.lib"
         OutputFile="$(OutDir)\$(ProjectName).exe"
         LinkIncremental="1"
@@ -2001 +2001 @@
       </File>
       <File
+        RelativePath=".\include\breakpad\breakpad_config.cpp"
+        >
+        <FileConfiguration
+          Name="Release|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="OP5|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="OP5|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+      </File>
+      <File
+        RelativePath=".\include\breakpad\exception_handler_win32.cpp"
+        >
+        <FileConfiguration
+          Name="Release|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|x64"
+          ExcludedFromBuild="true"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Nightly|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug-MemCheck|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="OP5|Win32"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+        <FileConfiguration
+          Name="OP5|x64"
+          >
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"
+          />
+        </FileConfiguration>
+      </File>
+      <File
         RelativePath=".\include\NSCHelper.cpp"
         >
@@ -3677 +3878 @@
       </File>
     </Filter>
+    <File
+      RelativePath=".\include\breakpad\exception_handler_win32.ccp"
+      >
+    </File>
     <File
       RelativePath=".\NSClient++.manifest"

NSClient++.cpp

@@ -24 +24 @@
 #include <Userenv.h>
 #include <remote_processes.hpp>
+#include <file_helpers.hpp>
 #include <Lmcons.h>
 //#ifdef DEBUG
 #include <crtdbg.h>
 //#endif
+#ifdef USE_BREAKPAD
+#include <breakpad/exception_handler_win32.hpp>
+// Used for breakpad crash handling
+static ExceptionManager *g_exception_manager = NULL;
+#endif
 
 NSClient mainClient(SZSERVICENAME); // Global core instance.
@@ -550 +556 @@
 bool NSClientT::initCore(bool boot, std::wstring module) {
   LOG_DEBUG(_T("Attempting to start NSCLient++ - " SZVERSION));
+  std::wstring appRoot = file_helpers::folders::get_local_appdata_folder(SZAPPNAME);
   try {
     Settings::getInstance()->setFile(getBasePath(), _T("NSC.ini"));
@@ -565 +572 @@
     return false;
   }
+
+#ifdef USE_BREAKPAD
+  if (!g_exception_manager) {
+    g_exception_manager = new ExceptionManager(false);
+
+    g_exception_manager->setup_app(SZSERVICENAME, STRPRODUCTVER, STRPRODUCTDATE);
+
+    if (Settings::getInstance()->getInt(CRASH_SECTION_TITLE, CRASH_RESTART, CRASH_RESTART_DEFAULT)==1)
+      g_exception_manager->setup_restart(Settings::getInstance()->getString(CRASH_SECTION_TITLE, CRASH_RESTART_NAME, SZSERVICENAME));
+
+    bool crashHandling = false;
+    if (Settings::getInstance()->getInt(CRASH_SECTION_TITLE, CRASH_SUBMIT, CRASH_SUBMIT_DEFAULT)==1) {
+      std::wstring crashUrl = Settings::getInstance()->getString(CRASH_SECTION_TITLE, CRASH_SUBMIT_URL, CRASH_SUBMIT_URL_DEFAULT);
+      g_exception_manager->setup_submit(false, crashUrl);
+      NSC_DEBUG_MSG(_T("Submitting crash dumps to central server: ") + crashUrl);
+      crashHandling = true;
+    }
+    if (Settings::getInstance()->getInt(CRASH_SECTION_TITLE, CRASH_ARCHIVE, CRASH_ARCHIVE_DEFAULT)==1) {
+      std::wstring crashFolder = Settings::getInstance()->getString(CRASH_SECTION_TITLE, CRASH_ARCHIVE_FOLDER, file_helpers::folders::get_subfolder(appRoot, _T("crash dumps")));
+      g_exception_manager->setup_archive(crashFolder);
+      NSC_DEBUG_MSG(_T("Archiving crash dumps in: ") + crashFolder);
+      crashHandling = true;
+    }
+    if (!crashHandling) {
+      NSC_LOG_ERROR(_T("No crash handling configured"));
+    }
+    g_exception_manager->StartMonitoring();
+  }
+#else
+  LOG_ERROR_STD(_T("Warning Not compiled with breakpad support!"));
+#endif
 
   if (enable_shared_session_) {

build.bat

@@ -2 +2 @@
 @call env.bat
 
-echo :: %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries >> build.log
-        %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries
+echo :: %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off "--with-psdk=%PLATTFORM_SDK_INCLUDE%" "--with-breakpad=%GOOGLE_BREAKPAD_INCLUDE%" %* build-binaries >> build.log
+        %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off "--with-psdk=%PLATTFORM_SDK_INCLUDE%" "--with-breakpad=%GOOGLE_BREAKPAD_INCLUDE%" %* build-binaries
 if %ERRORLEVEL% == 1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log

changelog

@@ -6 +6 @@
  * Fix depend onservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
- 
+
+2010-12-26 MickeM
+ * Improved crash reporter to support BOTH archive and send.
+ * Improved crash reporter to archive under APPDATA (Local Settings/NSClient++/crash dumps)
+ * Started on the new CheckNSCP (internal health plugin)
+ * Added a "text description" file to crash dump folder to see which version crashed and what not.
+ * General improvments to the crash helper.
+ * Added check_nscp which is a basic command to check the internal health of NSClient++
+
+2010-12-25 MickeM
+ * Fixed issue with performance coutners and erroneouse pointers in some rare cases.
+   (Thank you google breakpad)
+ * Added date to crash reports (to make it simpler to find correct symbols)
+ 
+2010-12-14 MickeM
+ * CheckEventLog: Fixed so type can be compared to various string keys: error, warning, info, auditSuccess, auditFailure
+ * CheckEventLog: Fixed so invalid parses are reported better (check the "rest" buffer)
+    CheckEventLog file=Application "filter=generated gt -600m AND message LIKE 'Click2Run'" ...
+    WARNING:Parsing failed: AND message LIKE 'Click2Run'
+ * CheckEventLog: Added support for "not like" operator.
+    CheckEventLog file=Application "filter=generated gt -600m AND message not like 'Click2Run'" ...
+ * CrashHandler: Added several options to the crash handler (so it can be configurable)
+    Everything reside under the [crash] sectiuon and the avalible keys are:
+     * restart=1 # if we shall restart the service when a crash is detected.
+     * service_name=<name of service to restart>
+     * submit=0 # if we shall submit crash reports to crash.nsclient.org
+     * url=http://crash.nsclient.org/submit
+     * archive=1 # Archive crashdumps
+     * folder=<appfolder>/dumps
+ 
+2010-12-13 MickeM
+ + Added not responding detection to CheckProcState
+   All "hung" processes will be considerd "hung" (and not started/stopped)
+   When process is "not hung" (badapp.exe)
+    CheckProcState quake.exe=stopped badapp.exe=started notepad++.exe=started
+     OK:OK: All processes are running.
+    CheckProcState quake.exe=stopped badapp.exe=hung notepad++.exe=started
+     CRITICAL:CRITICAL: BadApp.exe: started (critical)
+   Where as when it is hung:
+    CheckProcState quake.exe=stopped badapp.exe=started notepad++.exe=started
+     CRITICAL:CRITICAL: BadApp.exe: hung (critical)
+    CheckProcState quake.exe=stopped badapp.exe=hung notepad++.exe=started
+     OK:OK: All processes are running.
+   
+2010-12-12 MickeM
+ + Added initial support for google breakpad
+   This means if nsclient++ crash two things will happen now.
+   1. Crash reports will be sent to crash.nsclient.org (this will be optionalin the near future)
+   2. service will restart
+   You can try this out in /test mode using the "assert" command.
+   
 2010-11-14 MickeM
  * Added the "extended NRPE payload packet patch"

env.bat

@@ -81 +81 @@
 rem #
 rem #
+
+SET GOOGLE_BREAKPAD_INCLUDE=C:\source\google-breakpad\trunk\src
+
 SET ZIP7_PATH=C:\Program Files\7-Zip
 SET PERL_PATH=C:\Perl64\bin

helpers/installer/Product.wxs

@@ -98 +98 @@
                           IconIndex="0" Description="Start the $(var.App.Title) systemtray agent"/>
               </File>
+              <File Id="NSClientErrorReporter" Name="reporter.exe" DiskId="1" Source="$(var.Source)/reporter.exe" Vital="yes" />
               
               <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Path.ini)/NSC.ini" Vital="yes"/>

include/EnumProcess.cpp

@@ -159 +159 @@
       continue;
     CProcessEntry entry;
+    entry.hung = false;
     try {
-      if (error_interface!=NULL)
-        error_interface->report_debug_enter(_T("describe_pid"));
+//      if (error_interface!=NULL)
+//        error_interface->report_debug_enter(_T("describe_pid"));
       try {
         entry = describe_pid(dwPIDs[i], expand_command_line);
@@ -169 +170 @@
         entry = describe_pid(dwPIDs[i], false);
       }
-      if (error_interface!=NULL)
-        error_interface->report_debug_exit(_T("describe_pid"));
+//      if (error_interface!=NULL)
+//        error_interface->report_debug_exit(_T("describe_pid"));
       if (VDMDBG!=NULL&&find_16bit) {
         if (error_interface!=NULL)
@@ -184 +185 @@
     } catch (process_enumeration_exception &e) {
       if (error_interface!=NULL)
-        error_interface->report_error(_T("Unhandled exception describing PID: ") + strEx::itos(dwPIDs[i]) + _T(": ") + e.what());
+        error_interface->report_error(_T("Unhandeled exception describing PID: ") + strEx::itos(dwPIDs[i]) + _T(": ") + e.what());
     } catch (...) {
       if (error_interface!=NULL)
@@ -190 +191 @@
     }
   }
+
+  std::vector<DWORD> hung_pids = find_crashed_pids(error_interface);
+  for (process_list::iterator entry = ret.begin(); entry != ret.end(); ++entry) {
+    if (std::find(hung_pids.begin(), hung_pids.end(), entry->dwPID) != hung_pids.end())
+      (*entry).hung = true;
+    else
+      (*entry).hung = false;
+  }
+
   delete [] dwPIDs;
   if (error_interface!=NULL)
     error_interface->report_debug_exit(_T("enumerate_processes"));
   return ret;
+}
+
+struct enum_data {
+  CEnumProcess::error_reporter * error_interface;
+  std::vector<DWORD> crashed_pids;
+
+};
+
+BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam ) {
+  enum_data *data = reinterpret_cast<enum_data*>(lParam);
+  DWORD pid;
+  GetWindowThreadProcessId(hwnd, &pid);
+  if (GetWindow(hwnd, GW_OWNER) != NULL)
+    return TRUE;
+  PDWORD result;
+  if (!SendMessageTimeout(hwnd, WM_NULL, 0, 0, SMTO_ABORTIFHUNG, 500, reinterpret_cast<PDWORD_PTR>(&result))) {
+    if (data->error_interface!=NULL)
+      data->error_interface->report_debug(_T("pid: ") + strEx::itos(pid) + _T(" was hung"));
+    data->crashed_pids.push_back(pid);
+  }
+
+//  TCHAR *buffer = new TCHAR[1024];
+//  int len = GetWindowText(hwnd, buffer, 1023);
+//  buffer[30] = 0;
+//  if (data->error_interface!=NULL)
+//    data->error_interface->report_debug(_T("pid: ") + res + strEx::itos(pid) + _T(" - ") + strEx::itos(len) + _T(" - ") + buffer);
+//  //std::wcout << _T("pid: ") << pid << _T(" - ") << len << _T(" : ") << buffer << std::endl;
+//  delete [] buffer;
+  return TRUE;
+}
+
+std::vector<DWORD> CEnumProcess::find_crashed_pids(CEnumProcess::error_reporter * error_interface) {
+  if (error_interface)
+    error_interface->report_debug_enter(_T("find_crashed_pids"));
+  enum_data data;
+  data.error_interface = error_interface;
+  if(!EnumWindows(&EnumWindowsProc, reinterpret_cast<LPARAM>(&data))) {
+    if (error_interface)
+      error_interface->report_error(_T("Failed to enumerate windows: ") + error::lookup::last_error());
+  }
+  if (error_interface)
+    error_interface->report_debug_exit(_T("find_crashed_pids"));
+  return data.crashed_pids;
 }
 
@@ -227 +280 @@
     }
   }
+
   CloseHandle(hProc);
   return entry;

include/EnumProcess.h

@@ -85 +85 @@
     std::wstring command_line;
     DWORD  dwPID;
+    bool hung;
   };
 
@@ -108 +109 @@
   void enable_token_privilege(LPTSTR privilege);
   void disable_token_privilege(LPTSTR privilege);
+  std::vector<DWORD> find_crashed_pids(CEnumProcess::error_reporter * error_interface);
   bool has_PSAPI() {
     return PSAPI != NULL;

include/checkHelpers.hpp

@@ -514 +514 @@
   const int state_stopped   = 0x02;
   const int state_not_found = 0x06;
+  const int state_hung      = 0x0e;
 
   class state_handler {
@@ -529 +530 @@
         else if (*it == _T("not found"))
           ret |= state_not_found;
+        else if (*it == _T("hung"))
+          ret |= state_hung;
       }
       return ret;
@@ -541 +544 @@
       else if (value == state_not_found)
         return _T("not found");
+      else if (value == state_hung)
+        return _T("hung");
       return _T("unknown");
     }

include/config.h

@@ -229 +229 @@
 #define LOG_ROOT_DEFAULT _T("exe")
 
+
+// CRash settings
+#define CRASH_SECTION_TITLE _T("crash")
+#define CRASH_RESTART _T("restart")
+#define CRASH_RESTART_DEFAULT 1
+#define CRASH_RESTART_NAME _T("service_name")
+
+#define CRASH_SUBMIT _T("submit")
+#define CRASH_SUBMIT_DEFAULT 0
+#define CRASH_SUBMIT_URL _T("url")
+#define CRASH_SUBMIT_URL_DEFAULT _T("http://crash.nsclient.org/submit")
+
+#define CRASH_ARCHIVE _T("archive")
+#define CRASH_ARCHIVE_DEFAULT 1
+#define CRASH_ARCHIVE_FOLDER _T("folder")
+
 // Main Settings
 #define MAIN_SECTION_TITLE _T("Settings")

include/file_helpers.hpp

@@ -66 +66 @@
       return pattern.first + _T("\\") + pattern.second;
     }
+  };
+
+  class folders {
+#ifndef CSIDL_COMMON_APPDATA 
+#define CSIDL_COMMON_APPDATA 0x0023 
+#define CSIDL_LOCAL_APPDATA  0x001c
+#endif
+    typedef BOOL (WINAPI *fnSHGetSpecialFolderPath)(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate);
+    static BOOL WINAPI _SHGetSpecialFolderPath(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate) {
+      static fnSHGetSpecialFolderPath __SHGetSpecialFolderPath = NULL;
+      if (!__SHGetSpecialFolderPath) {
+        HMODULE hDLL = LoadLibrary(_T("shell32.dll"));
+        if (hDLL != NULL) { 
+          __SHGetSpecialFolderPath = (fnSHGetSpecialFolderPath)GetProcAddress(hDLL,"SHGetSpecialFolderPathW");
+        }
+      }
+      if(__SHGetSpecialFolderPath)
+        return __SHGetSpecialFolderPath(hwndOwner, lpszPath, nFolder, fCreate);
+      return FALSE;
+    }
+  public:
+    static inline std::wstring get_folder(int folderId) {
+      TCHAR buf[MAX_PATH+1];
+      if (!_SHGetSpecialFolderPath(NULL, buf, folderId, FALSE)) {
+        return _T("");
+      }
+      return buf;
+    }
+
+    static std::wstring get_local_appdata() {
+      return get_folder(CSIDL_LOCAL_APPDATA);
+    }
+
+    static std::wstring get_local_appdata_folder(std::wstring pathname) {
+      return get_subfolder(file_helpers::folders::get_local_appdata(), pathname);
+    }
+    static std::wstring get_local_appdata_file(std::wstring pathname, std::wstring filename) {
+      return get_local_appdata_folder(pathname) + _T("\\") + filename;
+    }
+
+    static std::wstring get_subfolder(std::wstring root, std::wstring folder) {
+      std::wstring path = root + _T("\\") + folder;
+      if (!file_helpers::checks::exists(path)) {
+        if (_wmkdir(path.c_str()) != 0)
+          return _T("");
+      }
+      return path;
+    }
 
 

include/file_logger.hpp

@@ -6 +6 @@
 #include <string>
 
+#include <file_helpers.hpp>
+
 
 namespace simple_file {
-
-#ifndef CSIDL_COMMON_APPDATA 
-#define CSIDL_COMMON_APPDATA 0x0023 
-#define CSIDL_LOCAL_APPDATA  0x001c
-#endif
-  typedef BOOL (WINAPI *fnSHGetSpecialFolderPath)(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate);
-    static BOOL WINAPI _SHGetSpecialFolderPath(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate) {
-      static fnSHGetSpecialFolderPath __SHGetSpecialFolderPath = NULL;
-      if (!__SHGetSpecialFolderPath) {
-        HMODULE hDLL = LoadLibrary(_T("shell32.dll"));
-        if (hDLL != NULL) { 
-          __SHGetSpecialFolderPath = (fnSHGetSpecialFolderPath)GetProcAddress(hDLL,"SHGetSpecialFolderPathW");
-        }
-      }
-      if(__SHGetSpecialFolderPath)
-        return __SHGetSpecialFolderPath(hwndOwner, lpszPath, nFolder, fCreate);
-      return FALSE;
-    }
-
 
   class file_appender {
@@ -47 +30 @@
     }
     std::wstring getFileName(std::wstring pathname, std::wstring filename) {
-      if (file_.empty()) {
-        std::wstring path = getFolder() + _T("\\") + pathname;
-        if (!directoryExists(path)) {
-          if (_wmkdir(path.c_str()) != 0)
-            return _T("");
-        }
-        file_ = path + _T("\\") + filename;
-      }
+      if (file_.empty()) 
+        file_ = file_helpers::folders::get_local_appdata_file(pathname, filename);
       return file_;
     }
   private:
-    inline std::wstring getFolder() {
-      TCHAR buf[MAX_PATH+1];
-      if (!_SHGetSpecialFolderPath(NULL, buf, CSIDL_LOCAL_APPDATA, FALSE)) {
-        return _T("") + error::lookup::last_error();
-      }
-      return buf;
-    }
-    bool directoryExists(std::wstring path) {
-      DWORD dwAtt = ::GetFileAttributes(path.c_str());
-      if (dwAtt == INVALID_FILE_ATTRIBUTES) {
-        return false;
-      } else if ((dwAtt&FILE_ATTRIBUTE_DIRECTORY)==FILE_ATTRIBUTE_DIRECTORY) {
-        return true;
-      }
-      return false;
-    }
+
 
     HANDLE openAppendOrNew(std::wstring file) {

include/parsers/ast.hpp

@@ -39 +39 @@
 
     enum operators {
-      op_eq, op_le, op_lt, op_gt, op_ge, op_ne, op_in, op_nin, op_or, op_and, op_inv, op_not, op_like
+      op_eq, op_le, op_lt, op_gt, op_ge, op_ne, op_in, op_nin, op_or, op_and, op_inv, op_not, op_like, op_not_like
     };
 

include/parsers/eval.hpp

@@ -114 +114 @@
             return s1.find(s2) != std::wstring::npos;
           return s2.find(s1) != std::wstring::npos;
+          //if (res)
+          //  std::wcout << _T("Found: ") << s1 << _T(" in ") << s2 << std::endl;
+          return res;
+        };
+      };
+      template<typename THandler>
+      struct operator_not_like : public simple_bool_binary_operator_impl<THandler> {
+        bool eval_int(value_type type, THandler &handler, const expression_ast<THandler> &left, const expression_ast<THandler> & right) const {
+          return false;
+        }
+        bool eval_string(value_type type, THandler &handler, const expression_ast<THandler> &left, const expression_ast<THandler> & right) const { 
+          std::wstring s1 = left.get_string(handler);
+          std::wstring s2 = right.get_string(handler);
+          bool res;
+          if (s1.size() > s2.size() && s2.size() > 0)
+            return s1.find(s2) == std::wstring::npos;
+          return s2.find(s1) == std::wstring::npos;
           //if (res)
           //  std::wcout << _T("Found: ") << s1 << _T(" in ") << s2 << std::endl;
@@ -295 +312 @@
       if (op == op_like)
         return bin_op_type(new operator_impl::operator_like<THandler>());
+      if (op == op_not_like)
+        return bin_op_type(new operator_impl::operator_not_like<THandler>());
 
       if (op == op_and)

include/parsers/grammar.cpp

@@ -1 +1 @@
 #include <parsers/grammar.hpp>
+#include <iostream>
+#include <fstream>
+
 
 namespace qi = boost::spirit::qi;
 namespace ascii = boost::spirit::ascii;
+namespace phoenix = boost::phoenix;
 
 namespace parsers {
@@ -158 +162 @@
           | qi::lit("gt")                   [_val = op_gt]
           | qi::lit("like")                 [_val = op_like]
+          | qi::lit("not like")               [_val = op_not_like]
           ;
 
@@ -176 +181 @@
               >> ')'] 
           ;
+
+//          qi::on_error<qi::fail>( expression , std::wcout
+//            << phoenix::val(_T("Error! Expecting "))
+//            << _4                               // what failed?
+//            << phoenix::val(_T(" here: \""))
+//            << phoenix::construct<std::wstring>(_3, _2)   // iterators to error-pos, end
+//            << phoenix::val(_T("\""))
+//            << std::endl
+//);
+//          qi::on_error<qi::fail>( expression , std::cout
+//            << phoenix::val("Error! Expecting ")
+//            << _4                               // what failed?
+//            << phoenix::val(" here: \"")
+//            << phoenix::construct<std::string>(_3, _2)   // iterators to error-pos, end
+//            << phoenix::val("\"")
+//            << std::endl
+//            );
+
+      //        << ("Error! Expecting ")
+      //        << _4                               // what failed?
+      //        << (" here: \"")
+      //        << construct<std::string>(_3, _2)   // iterators to error-pos, end
+      //        << ("\"")
+//      << std::endl
+
     }
 

include/parsers/where.cpp

@@ -258 +258 @@
       iterator_type iter = expr.begin();
       iterator_type end = expr.end();
-      if (phrase_parse(iter, end, calc, ascii::space, resulting_tree))
-        return true;
+      if (phrase_parse(iter, end, calc, ascii::space, resulting_tree)) {
+        rest = std::wstring(iter, end);
+        return rest.empty();
+        //std::wcout<< _T("Rest: ") << rest << std::endl;
+        //return true;
+      }
       rest = std::wstring(iter, end);
+      //std::wcout << _T("Rest: ") << rest << std::endl;
       return false;
     }

include/pdh/collectors.hpp

@@ -125 +125 @@
     const PDH::PDHCounter *parent_;
   public:
-    StaticPDHCounterListener() : value_(0), hasValue_(false) {}
+    StaticPDHCounterListener() : value_(0), hasValue_(false), parent_(NULL) {}
     virtual void collect(const PDH::PDHCounter &counter) {
       PDHCounterMutexHandler mutex(&mutex_);
@@ -161 +161 @@
     const PDH::PDHCounter *parent_;
   public:
-    StaticPDHCounterListener() : value_(0), hasValue_(false) {}
+    StaticPDHCounterListener() : value_(0), hasValue_(false), parent_(NULL) {}
     virtual void collect(const PDH::PDHCounter &counter) {
       PDHCounterMutexHandler mutex(&mutex_);
@@ -197 +197 @@
     const PDH::PDHCounter *parent_;
   public:
-    StaticPDHCounterListener() : value_(0), hasValue_(false) {}
+    StaticPDHCounterListener() : value_(0), hasValue_(false), parent_(NULL) {}
     virtual void collect(const PDH::PDHCounter &counter) {
       PDHCounterMutexHandler mutex(&mutex_);
@@ -236 +236 @@
     const PDH::PDHCounter *parent_;
   public:
-    RoundINTPDHBufferListenerImpl() : buffer(NULL), length(0), current(0), hasValue_(false) {}
-    RoundINTPDHBufferListenerImpl(int length_) : length(length_), current(0), hasValue_(false) {
+    RoundINTPDHBufferListenerImpl() : buffer(NULL), length(0), current(0), hasValue_(false), parent_(NULL) {}
+    RoundINTPDHBufferListenerImpl(int length_) : length(length_), current(0), hasValue_(false), parent_(NULL) {
       PDHCounterMutexHandler mutex(mutex_);
       if (!mutex.hasLock())

modules/CheckEventLog/CheckEventLog.cpp

@@ -65 +65 @@
       error_type errors;
       static const parsers::where::value_type type_custom_severity = parsers::where::type_custom_int_1;
+      static const parsers::where::value_type type_custom_type = parsers::where::type_custom_int_2;
       EventLogRecord *record;
       type_obj() : record(NULL) {
@@ -72 +73 @@
           (_T("id"), (type_int))
           (_T("source"), (type_string))
-          (_T("type"), (type_int))
+          (_T("type"), (type_custom_type))
           (_T("severity"), (type_custom_severity))
           (_T("message"), (type_string))
@@ -91 +92 @@
       bool can_convert(parsers::where::value_type from, parsers::where::value_type to) {
         if ((from == parsers::where::type_string)&&(to == type_custom_severity))
+          return true;
+        if ((from == parsers::where::type_string)&&(to == type_custom_type))
           return true;
         return false;
@@ -159 +162 @@
         if (to == type_custom_severity)
           return true;
+        if (to == type_custom_type)
+          return true;
         return false;
       }
@@ -165 +170 @@
         if (to == type_custom_severity)
           ret = &type_obj::fun_convert_severity;
+        if (to == type_custom_type)
+          ret = &type_obj::fun_convert_type;
         return ret;
       }
@@ -170 +177 @@
       parsers::where::expression_ast<type_obj> fun_convert_severity(parsers::where::value_type target_type, parsers::where::expression_ast<type_obj> const& subject) {
         return parsers::where::expression_ast<type_obj>(parsers::where::int_value(convert_severity(subject.get_string(*this))));
+      }
+      parsers::where::expression_ast<type_obj> fun_convert_type(parsers::where::value_type target_type, parsers::where::expression_ast<type_obj> const& subject) {
+        return parsers::where::expression_ast<type_obj>(parsers::where::int_value(convert_type(subject.get_string(*this))));
       }
       int convert_severity(std::wstring str) {
@@ -183 +193 @@
         return strEx::stoi(str);
       }
-
+      int convert_type(std::wstring str) {
+        if (str == _T("error"))
+          return EVENTLOG_ERROR_TYPE;
+        if (str == _T("warning"))
+          return EVENTLOG_WARNING_TYPE;
+        if (str == _T("info"))
+          return EVENTLOG_INFORMATION_TYPE;
+        if (str == _T("auditSuccess"))
+          return EVENTLOG_AUDIT_SUCCESS;
+        if (str == _T("auditFailure"))
+          return EVENTLOG_AUDIT_FAILURE;
+        return strEx::stoi(str);
+      }
 
       std::wstring get_error() {

modules/CheckSystem/CheckSystem-2005.vcproj

@@ -2724 +2724 @@
       </File>
       <File
-        RelativePath="..\..\include\pdh\single_threaded_impl.hpp"
+        RelativePath="..\..\include\pdh\thread_safe_impl.hpp"
         >
       </File>

modules/CheckSystem/CheckSystem.cpp

@@ -784 +784 @@
 typedef struct NSPROCDATA__ {
   unsigned int count;
+  unsigned int hung_count;
   CEnumProcess::CProcessEntry entry;
   std::wstring key;
 
-  NSPROCDATA__() : count(0) {}
-  NSPROCDATA__(const NSPROCDATA__ &other) : count(other.count), entry(other.entry), key(other.key) {}
+  NSPROCDATA__() : count(0), hung_count(0) {}
+  NSPROCDATA__(const NSPROCDATA__ &other) : count(other.count), hung_count(other.hung_count), entry(other.entry), key(other.key) {}
 } NSPROCDATA;
 typedef std::map<std::wstring,NSPROCDATA,strEx::case_blind_string_compare> NSPROCLST;
@@ -836 +837 @@
       ret[key].entry = (*entry);
       ret[key].count = 1;
+      ret[key].hung_count = (*entry).hung?1:0;
       ret[key].key = key;
-    } else
+    } else {
+      if ((*entry).hung) 
+        (*it).second.hung_count++;
       (*it).second.count++;
+    }
   }
   return ret;
@@ -971 +976 @@
       checkHolders::MaxMinStateValueType<int, checkHolders::state_type> value;
       if (bFound) {
-        value.count = (*proc).second.count;
-        value.state = checkHolders::state_started;
+        if ((*proc).second.hung_count > 0) {
+          NSC_LOG_ERROR_STD(_T("Hung proc: ") + strEx::itos((*proc).second.hung_count));
+          value.count = (*proc).second.count;
+          value.state = checkHolders::state_hung;
+        } else {
+          value.count = (*proc).second.count;
+          value.state = checkHolders::state_started;
+        }
       } else {
         value.count = 0;

modules/DebugLogMetrics/DebugLogMetrics.cpp

@@ -39 +39 @@
 
 bool DebugLogMetrics::loadModule() {
-  timeout = NSCModuleHelper::getSettingsInt(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT ,EXTSCRIPT_SETTINGS_TIMEOUT_DEFAULT);
-  scriptDirectory_ = NSCModuleHelper::getSettingsString(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR ,EXTSCRIPT_SETTINGS_SCRIPTDIR_DEFAULT);
-  root_ = NSCModuleHelper::getBasePath();
+//  timeout = NSCModuleHelper::getSettingsInt(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT ,EXTSCRIPT_SETTINGS_TIMEOUT_DEFAULT);
+//  scriptDirectory_ = NSCModuleHelper::getSettingsString(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR ,EXTSCRIPT_SETTINGS_SCRIPTDIR_DEFAULT);
+//  root_ = NSCModuleHelper::getBasePath();
   pdhThread.createThread(_T("NSClient++"));
   return true;

modules/DebugLogMetrics/DebugLogMetrics.h

@@ -27 +27 @@
 class DebugLogMetrics {
 private:
-  struct command_data {
-    command_data() {}
-    command_data(std::wstring command_, std::wstring arguments_) : command(command_), arguments(arguments_) {}
-    std::wstring command;
-    std::wstring arguments;
-  };
-  typedef std::map<strEx::blindstr, command_data> command_list;
-  command_list commands;
-  command_list alias;
-  unsigned int timeout;
-  std::wstring scriptDirectory_;
-  std::wstring root_;
+//  struct command_data {
+//    command_data() {}
+//    command_data(std::wstring command_, std::wstring arguments_) : command(command_), arguments(arguments_) {}
+//    std::wstring command;
+//    std::wstring arguments;
+//  };
+//  typedef std::map<strEx::blindstr, command_data> command_list;
+//  command_list commands;
+//  command_list alias;
+//  unsigned int timeout;
+//  std::wstring scriptDirectory_;
+//  std::wstring root_;
   PDHCollectorThread pdhThread;
 

modules/DebugLogMetrics/PDHCollector.cpp

@@ -156 +156 @@
       return 0;
     }
-    file_.set_file(_T("nsclient++"),_T("process_info.csv"));
+    file_.set_file(SZAPPNAME,_T("process_info.csv"));
     NSC_DEBUG_MSG_STD(_T("Logging perfoamnce metrics to: ") + file_.getFileName());
     PDH::PDHQuery pdh;

modules/NRPEListener/NRPEListener.cpp

@@ -412 +412 @@
     return NRPEData(NSCAPI::returnOK, _T("I (") + NSCModuleHelper::getApplicationVersionString() + _T(") seem to be doing fine..."), buffer_length_);
   }
+//  if (cmd.first == _T("__CRASH__")) {
+//    int *foo = NULL;
+//    *foo = 2;
+//  }
   std::wstring msg, perf;