diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index afb2c9e..22ab217 100644 --- a/EAPMethods/MSIBuild/Makefile +++ b/EAPMethods/MSIBuild/Makefile @@ -35,6 +35,7 @@ Property Signature_ s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) AppSearch Property Signature_ OLD$(MSIBUILD_PRODUCT_NAME_UC)DIR clEAPTTLS.dll.$(PLAT) +OLD$(MSIBUILD_PRODUCT_NAME_UC)DIR clEAPMethodEvents.dll.$(PLAT) < - $(IntDir);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories) + temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories) - $(IntDir);%(AdditionalIncludeDirectories) + temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);%(AdditionalIncludeDirectories) diff --git a/EAPMethods/build/EAPMethodEvents.props b/EAPMethods/build/EAPMethodEvents.props new file mode 100644 index 0000000..dfcde04 --- /dev/null +++ b/EAPMethods/build/EAPMethodEvents.props @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPMethodEvents.rc b/EAPMethods/build/EAPMethodEvents.rc new file mode 100644 index 0000000..844d254 Binary files /dev/null and b/EAPMethods/build/EAPMethodEvents.rc differ diff --git a/EAPMethods/build/EAPMethodEvents.vcxproj b/EAPMethods/build/EAPMethodEvents.vcxproj new file mode 100644 index 0000000..4e250b3 --- /dev/null +++ b/EAPMethods/build/EAPMethodEvents.vcxproj @@ -0,0 +1,104 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} + Win32Proj + EAPMethodEvents + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + Compiling manifest... + Compiling manifest... + Compiling manifest... + Compiling manifest... + $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) + $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) + $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) + $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) + + + + + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPMethodEvents.vcxproj.filters b/EAPMethods/build/EAPMethodEvents.vcxproj.filters new file mode 100644 index 0000000..157e582 --- /dev/null +++ b/EAPMethods/build/EAPMethodEvents.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS.props b/EAPMethods/build/EAPTTLS.props index e2974e7..905e5a0 100644 --- a/EAPMethods/build/EAPTTLS.props +++ b/EAPMethods/build/EAPTTLS.props @@ -6,7 +6,6 @@ - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) diff --git a/EAPMethods/build/EAPTTLS.rc b/EAPMethods/build/EAPTTLS.rc index 45ddcc5..71db1d5 100644 Binary files a/EAPMethods/build/EAPTTLS.rc and b/EAPMethods/build/EAPTTLS.rc differ diff --git a/EAPMethods/build/EAPTTLS.vcxproj b/EAPMethods/build/EAPTTLS.vcxproj index 496f275..2b4778e 100644 --- a/EAPMethods/build/EAPTTLS.vcxproj +++ b/EAPMethods/build/EAPTTLS.vcxproj @@ -97,23 +97,9 @@ {47399d91-7eb9-41de-b521-514ba5db0c43} - - - - Document - mc.exe "%(Identity)" -u -b -z "EAPMethodETW" -e "h" -h "$(IntDir)." -r "$(IntDir)." - mc.exe "%(Identity)" -u -b -z "EAPMethodETW" -e "h" -h "$(IntDir)." -r "$(IntDir)." - mc.exe "%(Identity)" -u -b -z "EAPMethodETW" -e "h" -h "$(IntDir)." -r "$(IntDir)." - mc.exe "%(Identity)" -u -b -z "EAPMethodETW" -e "h" -h "$(IntDir)." -r "$(IntDir)." - Compiling manifest... - Compiling manifest... - Compiling manifest... - Compiling manifest... - $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) - $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) - $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) - $(IntDir)EAPMethodETW.h;$(IntDir)EAPMethodETW.rc;$(IntDir)EAPMethodETW_MSG00001.bin;$(IntDir)EAPMethodETWTEMP.BIN;%(Outputs) - + + {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} + diff --git a/EAPMethods/build/EAPTTLS.vcxproj.filters b/EAPMethods/build/EAPTTLS.vcxproj.filters index ac58632..1c80dcd 100644 --- a/EAPMethods/build/EAPTTLS.vcxproj.filters +++ b/EAPMethods/build/EAPTTLS.vcxproj.filters @@ -32,9 +32,4 @@ Resource Files - - - Resource Files - - \ No newline at end of file diff --git a/EAPMethods/res/EAPMethod.man b/EAPMethods/res/EAPMethodETW.man similarity index 97% rename from EAPMethods/res/EAPMethod.man rename to EAPMethods/res/EAPMethodETW.man index 5e9f56e..4b9df02 100644 Binary files a/EAPMethods/res/EAPMethod.man and b/EAPMethods/res/EAPMethodETW.man differ diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index 2c3943b..b9ced08 100644 --- a/EAPMethods/src/Main.cpp +++ b/EAPMethods/src/Main.cpp @@ -102,10 +102,10 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l g_ep = new event_provider(); assert(g_ep); g_ep->create(&EAPMETHOD_TRACE_EVENT_PROVIDER); - g_ep->write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, EAPMETHOD_TYPE); + g_ep->write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((unsigned int)EAPMETHOD_TYPE), event_data::blank); } else if (fdwReason == DLL_PROCESS_DETACH) { assert(g_ep); - g_ep->write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, EAPMETHOD_TYPE); + g_ep->write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((unsigned int)EAPMETHOD_TYPE), event_data::blank); delete g_ep; assert(!_CrtDumpMemoryLeaks()); diff --git a/VS10Solution.sln b/VS10Solution.sln index 24c056d..6a1c031 100644 --- a/VS10Solution.sln +++ b/VS10Solution.sln @@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPMethodEvents", "EAPMethods\build\EAPMethodEvents.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -50,12 +52,21 @@ Global {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.Build.0 = Release|Win32 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.ActiveCfg = Debug|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.Build.0 = Debug|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.ActiveCfg = Release|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.Build.0 = Release|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} EndGlobalSection diff --git a/include/ResourceDLL.props b/include/ResourceDLL.props new file mode 100644 index 0000000..9db83be --- /dev/null +++ b/include/ResourceDLL.props @@ -0,0 +1,22 @@ + + + + + + true + + + + Windows + true + Default + + + false + + + AFX_RESOURCE_DLL;%(PreprocessorDefinitions) + + + + diff --git a/lib/WinStd b/lib/WinStd index 9be7e7e..f915078 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 9be7e7eafb62f815155a9635764ce7770a5daa25 +Subproject commit f91507801b9bb0a51f70806478d16b133eec261d