Revised Version of WFP Sampler

Revised WFP Sampler

15 files changed, 110 insertions, 92 deletions

diff --git a/network/trans/WFPSampler/WFPSampler.sln b/network/trans/WFPSampler/WFPSampler.sln
index 8e0094ed..d0bea94a 100644
--- a/network/trans/WFPSampler/WFPSampler.sln
+++ b/network/trans/WFPSampler/WFPSampler.sln
@@ -3,33 +3,33 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{6CEF8C70-B826-4826-A0F3-84D28B1D1C47}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{7DD950F3-D068-438B-808A-EE9BE2D1F34D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Syslib", "Syslib", "{922391A4-38BC-4EEE-B2A5-10B9E1F73C95}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Syslib", "Syslib", "{A25AAF9B-B68E-4A59-BC83-2F37CEE83780}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{D11B19F4-F0DC-40E6-BF4D-B64C3F118A0D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{0A0F2A9A-E5F5-47E5-8577-7202C6D7A51A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Svc", "Svc", "{95B605C0-B839-4E59-A860-F9703D1C5466}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Svc", "Svc", "{DF04CE8E-3029-4EA3-B483-3E1EC9261DBB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{30FEBC98-C9BE-4329-9B06-666F2A0FC94C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C0D76C2F-D876-4BF1-89EB-10438B8EAF6B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "lib\WFPSampler.vcxproj", "{9049BF3E-29C4-4934-90C3-5E68C79036B4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "lib\WFPSampler.vcxproj", "{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "syslib\WFPSampler.vcxproj", "{512C5A72-2415-45CA-A1B2-851C97781F9E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "syslib\WFPSampler.vcxproj", "{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSamplerCalloutDriver", "sys\WFPSamplerCalloutDriver.vcxproj", "{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSamplerCalloutDriver", "sys\WFPSamplerCalloutDriver.vcxproj", "{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{512C5A72-2415-45CA-A1B2-851C97781F9E} = {512C5A72-2415-45CA-A1B2-851C97781F9E}
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C} = {6F3E7DC1-C828-463C-BC9E-290B56D0F58C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSamplerService", "svc\WFPSamplerService.vcxproj", "{312373E3-9E58-48CC-A61C-73F3A3B0179B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSamplerService", "svc\WFPSamplerService.vcxproj", "{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4} = {9049BF3E-29C4-4934-90C3-5E68C79036B4}
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1} = {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "exe\WFPSampler.vcxproj", "{649E7C26-3C81-45CB-98E1-D40349D7B3F2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "exe\WFPSampler.vcxproj", "{778259E7-3481-41CC-891C-375F6FAE1F19}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4} = {9049BF3E-29C4-4934-90C3-5E68C79036B4}
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1} = {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}
 	EndProjectSection
 EndProject
 Global
@@ -40,55 +40,55 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Debug|Win32.Build.0 = Debug|Win32
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Release|Win32.ActiveCfg = Release|Win32
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Release|Win32.Build.0 = Release|Win32
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Debug|x64.ActiveCfg = Debug|x64
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Debug|x64.Build.0 = Debug|x64
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Release|x64.ActiveCfg = Release|x64
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4}.Release|x64.Build.0 = Release|x64
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Debug|Win32.Build.0 = Debug|Win32
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Release|Win32.ActiveCfg = Release|Win32
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Release|Win32.Build.0 = Release|Win32
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Debug|x64.ActiveCfg = Debug|x64
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Debug|x64.Build.0 = Debug|x64
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Release|x64.ActiveCfg = Release|x64
-		{512C5A72-2415-45CA-A1B2-851C97781F9E}.Release|x64.Build.0 = Release|x64
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Debug|Win32.Build.0 = Debug|Win32
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Release|Win32.ActiveCfg = Release|Win32
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Release|Win32.Build.0 = Release|Win32
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Debug|x64.ActiveCfg = Debug|x64
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Debug|x64.Build.0 = Debug|x64
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Release|x64.ActiveCfg = Release|x64
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}.Release|x64.Build.0 = Release|x64
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Debug|Win32.Build.0 = Debug|Win32
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Release|Win32.ActiveCfg = Release|Win32
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Release|Win32.Build.0 = Release|Win32
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Debug|x64.ActiveCfg = Debug|x64
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Debug|x64.Build.0 = Debug|x64
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Release|x64.ActiveCfg = Release|x64
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B}.Release|x64.Build.0 = Release|x64
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Debug|Win32.Build.0 = Debug|Win32
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Release|Win32.ActiveCfg = Release|Win32
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Release|Win32.Build.0 = Release|Win32
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Debug|x64.ActiveCfg = Debug|x64
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Debug|x64.Build.0 = Debug|x64
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Release|x64.ActiveCfg = Release|x64
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2}.Release|x64.Build.0 = Release|x64
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|Win32.Build.0 = Debug|Win32
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|Win32.ActiveCfg = Release|Win32
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|Win32.Build.0 = Release|Win32
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|x64.ActiveCfg = Debug|x64
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|x64.Build.0 = Debug|x64
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|x64.ActiveCfg = Release|x64
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|x64.Build.0 = Release|x64
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|Win32.Build.0 = Debug|Win32
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|Win32.ActiveCfg = Release|Win32
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|Win32.Build.0 = Release|Win32
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|x64.ActiveCfg = Debug|x64
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|x64.Build.0 = Debug|x64
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|x64.ActiveCfg = Release|x64
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|x64.Build.0 = Release|x64
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|Win32.Build.0 = Debug|Win32
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|Win32.ActiveCfg = Release|Win32
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|Win32.Build.0 = Release|Win32
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|x64.ActiveCfg = Debug|x64
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|x64.Build.0 = Debug|x64
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|x64.ActiveCfg = Release|x64
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|x64.Build.0 = Release|x64
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|Win32.Build.0 = Debug|Win32
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|Win32.ActiveCfg = Release|Win32
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|Win32.Build.0 = Release|Win32
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|x64.ActiveCfg = Debug|x64
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|x64.Build.0 = Debug|x64
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|x64.ActiveCfg = Release|x64
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|x64.Build.0 = Release|x64
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|Win32.ActiveCfg = Debug|Win32
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|Win32.Build.0 = Debug|Win32
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Release|Win32.ActiveCfg = Release|Win32
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Release|Win32.Build.0 = Release|Win32
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|x64.ActiveCfg = Debug|x64
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|x64.Build.0 = Debug|x64
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Release|x64.ActiveCfg = Release|x64
+		{778259E7-3481-41CC-891C-375F6FAE1F19}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9049BF3E-29C4-4934-90C3-5E68C79036B4} = {6CEF8C70-B826-4826-A0F3-84D28B1D1C47}
-		{512C5A72-2415-45CA-A1B2-851C97781F9E} = {922391A4-38BC-4EEE-B2A5-10B9E1F73C95}
-		{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3} = {D11B19F4-F0DC-40E6-BF4D-B64C3F118A0D}
-		{312373E3-9E58-48CC-A61C-73F3A3B0179B} = {95B605C0-B839-4E59-A860-F9703D1C5466}
-		{649E7C26-3C81-45CB-98E1-D40349D7B3F2} = {30FEBC98-C9BE-4329-9B06-666F2A0FC94C}
+		{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1} = {7DD950F3-D068-438B-808A-EE9BE2D1F34D}
+		{6F3E7DC1-C828-463C-BC9E-290B56D0F58C} = {A25AAF9B-B68E-4A59-BC83-2F37CEE83780}
+		{909C6B51-0D92-440A-9FEB-B7A2715D8EDE} = {0A0F2A9A-E5F5-47E5-8577-7202C6D7A51A}
+		{E5EAD883-D15D-42DA-BCF6-78484F91BEC2} = {DF04CE8E-3029-4EA3-B483-3E1EC9261DBB}
+		{778259E7-3481-41CC-891C-375F6FAE1F19} = {C0D76C2F-D876-4BF1-89EB-10438B8EAF6B}
 	EndGlobalSection
 EndGlobal
diff --git a/network/trans/WFPSampler/exe/WFPSampler.vcxproj b/network/trans/WFPSampler/exe/WFPSampler.vcxproj
index 62c833ee..34c79187 100644
--- a/network/trans/WFPSampler/exe/WFPSampler.vcxproj
+++ b/network/trans/WFPSampler/exe/WFPSampler.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{649E7C26-3C81-45CB-98E1-D40349D7B3F2}</ProjectGuid>
+    <ProjectGuid>{778259E7-3481-41CC-891C-375F6FAE1F19}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9E22E687-050F-4927-8518-52188494A972}</SampleGuid>
+    <SampleGuid>{FB205303-28A2-4DC2-A648-6A009F5B5C23}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/network/trans/WFPSampler/exe/WFPSampler.vcxproj.Filters b/network/trans/WFPSampler/exe/WFPSampler.vcxproj.Filters
index 88b52042..53a436b8 100644
--- a/network/trans/WFPSampler/exe/WFPSampler.vcxproj.Filters
+++ b/network/trans/WFPSampler/exe/WFPSampler.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{31FB934B-A010-4E7D-9A21-C196110E39E4}</UniqueIdentifier>
+      <UniqueIdentifier>{1E908F30-09F4-4068-9EE6-BA6BC66DA5FE}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7EA14BFC-1419-406C-86A0-9A7468E86FD8}</UniqueIdentifier>
+      <UniqueIdentifier>{E4D478E6-E75C-413D-AF47-7FC799A8302B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{DF54F0E0-F664-4EC6-BC4A-990C39A66A4B}</UniqueIdentifier>
+      <UniqueIdentifier>{5D786DCD-327A-4AFA-B5BD-7ADE2C00E5C8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/network/trans/WFPSampler/lib/HelperFunctions_Macros.h b/network/trans/WFPSampler/lib/HelperFunctions_Macros.h
index afa09939..8b0ae8c4 100644
--- a/network/trans/WFPSampler/lib/HelperFunctions_Macros.h
+++ b/network/trans/WFPSampler/lib/HelperFunctions_Macros.h
@@ -145,7 +145,8 @@ VOID HlprLogError(_In_ PCWSTR pMessage,
    {                                                  \
       size_t SAFE_SIZE = 0;                           \
       HLPR_DELETE_ARRAY(pPtr);                        \
-      if(SizeTMult(sizeof(object),                    \
+      if(count &&                                     \
+         SizeTMult(sizeof(object),                    \
                    (size_t)count,                     \
                    &SAFE_SIZE) == S_OK &&             \
          SAFE_SIZE >= (sizeof(object) * count))       \
@@ -157,6 +158,7 @@ VOID HlprLogError(_In_ PCWSTR pMessage,
       }                                               \
       else                                            \
       {                                               \
+         pPtr = 0;                                    \
          HlprLogError(L"[count: %d][objectSize: %d]", \
                       count,                          \
                       sizeof(object));                \
@@ -178,7 +180,8 @@ VOID HlprLogError(_In_ PCWSTR pMessage,
    {                                                          \
       size_t SAFE_SIZE = 0;                                   \
       HLPR_DELETE_ARRAY(pPtr);                                \
-      if(SizeTMult(sizeof(object),                            \
+      if(count &&                                             \
+         SizeTMult(sizeof(object),                            \
                    (size_t)count,                             \
                    &SAFE_SIZE) == S_OK &&                     \
          SAFE_SIZE >= (sizeof(object) * count))               \
@@ -190,6 +193,7 @@ VOID HlprLogError(_In_ PCWSTR pMessage,
       }                                                       \
       else                                                    \
       {                                                       \
+         pPtr = 0;                                            \
          HlprLogError(L"[count: %d][objectSize: %d]",         \
                       count,                                  \
                       sizeof(object));                        \
diff --git a/network/trans/WFPSampler/lib/WFPSampler.vcxproj b/network/trans/WFPSampler/lib/WFPSampler.vcxproj
index 46182304..713e363f 100644
--- a/network/trans/WFPSampler/lib/WFPSampler.vcxproj
+++ b/network/trans/WFPSampler/lib/WFPSampler.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9049BF3E-29C4-4934-90C3-5E68C79036B4}</ProjectGuid>
+    <ProjectGuid>{26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <SupportsPackaging>false</SupportsPackaging>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{076E4E09-5294-44A9-AE1A-251F59D32A52}</SampleGuid>
+    <SampleGuid>{266CA76A-7B80-446A-80F9-4322B0A18BC6}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/network/trans/WFPSampler/lib/WFPSampler.vcxproj.Filters b/network/trans/WFPSampler/lib/WFPSampler.vcxproj.Filters
index b88ea5bd..a6f0ea72 100644
--- a/network/trans/WFPSampler/lib/WFPSampler.vcxproj.Filters
+++ b/network/trans/WFPSampler/lib/WFPSampler.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D42F364B-2CA4-4EA2-80D6-895BFE9C44D4}</UniqueIdentifier>
+      <UniqueIdentifier>{C3A25104-30FB-4172-91AD-1CBAEF6CAE86}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9403B31A-C7BB-4094-8943-3E168F09182E}</UniqueIdentifier>
+      <UniqueIdentifier>{0C28E722-2A88-4136-8A7B-5BF93D416472}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{773B4FFA-2A89-474E-A9AB-43C84AA0B2D2}</UniqueIdentifier>
+      <UniqueIdentifier>{4B0DF65C-E96E-467D-BD3C-CF4CE1B1C33B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/network/trans/WFPSampler/scripts/WFPSamplerInstall.cmd b/network/trans/WFPSampler/scripts/WFPSamplerInstall.cmd
index 9e4300c6..69b85710 100644
--- a/network/trans/WFPSampler/scripts/WFPSamplerInstall.cmd
+++ b/network/trans/WFPSampler/scripts/WFPSamplerInstall.cmd
@@ -110,7 +110,6 @@
    ECHO Copying WFPSampler application binaries to %WinDir%\System32\
       COPY /Y %WFPSAMPLER_EXE% %WinDir%\System32\
       COPY /Y %WFPSAMPLERSERVICE_EXE% %WinDir%\System32\
-goto :Cleanup
    IF EXIST %WinDir%\System32\WFPSamplerService.Exe (
       ECHO.
       ECHO Registering the WFPSampler Service
diff --git a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj
index a24d6d91..00e24f27 100644
--- a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj
+++ b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{312373E3-9E58-48CC-A61C-73F3A3B0179B}</ProjectGuid>
+    <ProjectGuid>{E5EAD883-D15D-42DA-BCF6-78484F91BEC2}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{BE41C1BA-3C21-458E-BDDD-7AB136137508}</SampleGuid>
+    <SampleGuid>{256D7B80-D376-4F69-B8B0-F835E2A36519}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj.Filters b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj.Filters
index b51ac17a..37cd87fe 100644
--- a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj.Filters
+++ b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{492F25BA-6855-45CC-8C4E-BD00CB4C34CF}</UniqueIdentifier>
+      <UniqueIdentifier>{03F0A214-9365-4005-81D1-C51DF9B00A70}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{86FB0B19-58E5-4E59-8D0C-7D7AABB718A4}</UniqueIdentifier>
+      <UniqueIdentifier>{B7E8D8E8-97E8-44C9-B9C1-58A60A85584E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{C8A6605B-93D4-4F38-AEE2-69EA9C851085}</UniqueIdentifier>
+      <UniqueIdentifier>{76A2A097-7042-4A43-85A4-63097EC86F13}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj
index 4c508f66..ef8b57f3 100644
--- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj
+++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F3FAA0B-ABE5-47D5-9110-DB54E8FF0EE3}</ProjectGuid>
+    <ProjectGuid>{909C6B51-0D92-440A-9FEB-B7A2715D8EDE}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{3E644B07-F227-4361-93F6-32B4E32551C0}</SampleGuid>
+    <SampleGuid>{0AEE6AAB-0332-4F13-9D87-16C8FE0B32F8}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj.Filters b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj.Filters
index 9f9e53a0..17f32d53 100644
--- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj.Filters
+++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{C90430E1-22EE-4B6F-B26C-B62F8B7F7501}</UniqueIdentifier>
+      <UniqueIdentifier>{345E1EBE-9872-4115-B074-122DEC9C71C5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{DABF0058-9631-4C98-9FFD-1F764BC6A528}</UniqueIdentifier>
+      <UniqueIdentifier>{E97547F8-B401-4B1F-A142-ABC3B98E3BDA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{4AB31C3E-00AC-4265-9B26-F2B386FC6580}</UniqueIdentifier>
+      <UniqueIdentifier>{389173E7-E207-4AA3-A587-7CEBA5DEE71D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{FA8CA4F6-420C-4B63-9CB1-9669BFFF827E}</UniqueIdentifier>
+      <UniqueIdentifier>{B5F6601D-B926-4DDF-9D1D-C5A5AB8FD468}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp
index 3a2a7785..f2782ce7 100644
--- a/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp
+++ b/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp
@@ -118,10 +118,17 @@ NTSTATUS PrvKrnlHlprCopyBufferToMDL(_In_reads_(bytesToCopy) const BYTE* pBuffer,
 
    if(MmGetMdlByteCount(pMDL) >= mdlOffset + bytesToCopy)
    {
-      BYTE* pSystemAddress = 0;
+      BYTE*  pSystemAddress = 0;
+      UINT32 noExecute      = 0;
+
+#if(NTDDI_VERSION >= NTDDI_WIN8)
+
+      noExecute = MdlMappingNoExecute;
+
+#endif /// (NTDDI_VERSION >= NTDDI_WIN8)
 
       pSystemAddress = (BYTE*)MmGetSystemAddressForMdlSafe(pMDL,
-                                                           LowPagePriority);
+                                                           LowPagePriority | noExecute);
       if(pSystemAddress)
       {
          RtlCopyMemory(pSystemAddress + mdlOffset,
diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_Macros.h b/network/trans/WFPSampler/syslib/HelperFunctions_Macros.h
index 7f218415..36c2ec00 100644
--- a/network/trans/WFPSampler/syslib/HelperFunctions_Macros.h
+++ b/network/trans/WFPSampler/syslib/HelperFunctions_Macros.h
@@ -220,7 +220,8 @@ extern "C"
       )                                                        \
    {                                                           \
       size_t SAFE_SIZE = 0;                                    \
-      if(RtlSizeTMult(sizeof(object),                          \
+      if(count &&                                              \
+         RtlSizeTMult(sizeof(object),                          \
                       (size_t)count,                           \
                       &SAFE_SIZE) == STATUS_SUCCESS &&         \
          SAFE_SIZE >= (sizeof(object) * count))                \
@@ -233,7 +234,10 @@ extern "C"
                           SAFE_SIZE);                          \
       }                                                        \
       else                                                     \
+      {                                                        \
+         pPtr = 0;                                             \
          break;                                                \
+      }                                                        \
    }
 
 /**
@@ -252,7 +256,8 @@ extern "C"
       )                                                            \
    {                                                               \
       size_t SAFE_SIZE = 0;                                        \
-      if(RtlSizeTMult(sizeof(object),                              \
+      if(count &&                                                  \
+         RtlSizeTMult(sizeof(object),                              \
                       (size_t)count,                               \
                       &SAFE_SIZE) == STATUS_SUCCESS &&             \
          SAFE_SIZE >= (sizeof(object) * count))                    \
@@ -265,7 +270,10 @@ extern "C"
                           SAFE_SIZE);                              \
       }                                                            \
       else                                                         \
+      {                                                            \
+         pPtr = 0;                                                 \
          break;                                                    \
+      }                                                            \
    }
 
 /**
diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj
index 1718f5d9..e0a0f007 100644
--- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj
+++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{512C5A72-2415-45CA-A1B2-851C97781F9E}</ProjectGuid>
+    <ProjectGuid>{6F3E7DC1-C828-463C-BC9E-290B56D0F58C}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR>
     <SupportsPackaging>false</SupportsPackaging>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{86BC8178-D674-4761-AA8D-A4D4FAA95D25}</SampleGuid>
+    <SampleGuid>{702C5BD2-236E-422B-83F1-B830DC4B94F0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj.Filters b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj.Filters
index e8a37dd2..22252ac3 100644
--- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj.Filters
+++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{0C5D633B-BA32-475A-A409-5938564ACC13}</UniqueIdentifier>
+      <UniqueIdentifier>{1C592EE1-2615-43A7-88FA-65D7B4387A51}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D731A15D-8E93-4919-8EAA-1622C9379D8B}</UniqueIdentifier>
+      <UniqueIdentifier>{77D2AB57-F5BD-4F3F-9FD2-705067B43DB6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{67EEF6D2-CB2C-4297-808D-6F916E6FF66A}</UniqueIdentifier>
+      <UniqueIdentifier>{D3374740-F905-4B0B-9C4F-84E50545294D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{BB02E02B-7BD9-4147-B016-07EF55164047}</UniqueIdentifier>
+      <UniqueIdentifier>{C9487E8E-96EA-4AE5-B55F-3840FB4C30AB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>