diff options
| author | Adam Shapiro <[email protected]> | 2016-02-29 14:11:37 -0800 |
|---|---|---|
| committer | Adam Shapiro <[email protected]> | 2016-02-29 14:11:37 -0800 |
| commit | 6e1115d6af3c22b693eccc472ebb0d53a1905cd9 (patch) | |
| tree | 2cea756b80b4696c298feb70f36235d95fc4cce6 /network/trans/WFPSampler/lib | |
| parent | 3c8ac8624f815e66b370ef412bbf13cbd2c732e2 (diff) | |
Revised Version of WFP Sampler
Revised WFP Sampler
Diffstat (limited to 'network/trans/WFPSampler/lib')
| -rw-r--r-- | network/trans/WFPSampler/lib/HelperFunctions_Macros.h | 8 | ||||
| -rw-r--r-- | network/trans/WFPSampler/lib/WFPSampler.vcxproj | 4 | ||||
| -rw-r--r-- | network/trans/WFPSampler/lib/WFPSampler.vcxproj.Filters | 6 |
3 files changed, 11 insertions, 7 deletions
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> |