From 1fc77fc63d572709f612ceee867d4e42cf5bf39d Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 23 Jun 2016 15:44:57 +0200
Subject: [PATCH] EAP method type is now a map

---
 lib/EAPBase/src/Module.cpp   |   7 ++++---
 lib/Events/res/EventsETW.man | Bin 9552 -> 11010 bytes
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp
index 08221bc..590db50 100644
--- a/lib/EAPBase/src/Module.cpp
+++ b/lib/EAPBase/src/Module.cpp
@@ -33,7 +33,7 @@ eap::module::module(type_t eap_method) :
     m_instance(NULL)
 {
     m_ep.create(&EAPMETHOD_TRACE_EVENT_PROVIDER);
-    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((BYTE)m_eap_method), event_data::blank);
+    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((DWORD)m_eap_method), event_data::blank);
 
     m_heap.create(0, 0, 0);
 }
@@ -41,7 +41,7 @@ eap::module::module(type_t eap_method) :
 
 eap::module::~module()
 {
-    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((BYTE)m_eap_method), event_data::blank);
+    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((DWORD)m_eap_method), event_data::blank);
 }
 
 
@@ -114,7 +114,8 @@ void eap::module::log_error(_In_ const EAP_ERROR *err) const
     vector<EVENT_DATA_DESCRIPTOR> evt_desc;
     evt_desc.reserve(8);
     evt_desc.push_back(event_data(err->dwWinError));
-    evt_desc.push_back(event_data(err->type.eapType.type));
+    DWORD dwType = err->type.eapType.type;
+    evt_desc.push_back(event_data(dwType));
     evt_desc.push_back(event_data(err->dwReasonCode));
     evt_desc.push_back(event_data(&(err->rootCauseGuid), sizeof(GUID)));
     evt_desc.push_back(event_data(&(err->repairGuid), sizeof(GUID)));
diff --git a/lib/Events/res/EventsETW.man b/lib/Events/res/EventsETW.man
index 5565d5b2405e4cdabd8c4b87f176718d0ebdf2ee..dab9c75358b80de4a8c8ceb9eaf37a22581c94f1 100644
GIT binary patch
delta 1026
zcma)5T}vB56g`x>Mr}SCiQ6SuXF?<7!LL{q+q4pjP)Z{yZGARaQ9%<MO`uRj{0o;p
zOaFn8{*U%qA6ona^{J1gXLd8uYzc&c**i1$oVj<-*&nY?*Uyig+&(Hez#*O^ieU_O
zMgdKp?4f}zluVBNc2Ywnu8y#SntXS>i2$o^Wj;d&bC~C>pkzFqb$u+Rv5F$fc!$?`
ziySg?KRGJriMu^G@?`07cwvtISr&S-l-m{cQ_JEFi|($a#BN^TrQcf<`93<E!!q;O
zn|YlT%U1RoSPN#TghBxtQydCwsPV-W71-pr;cK#oPyS9-w04V68JC#Vq&6QIA2Bxb
z4%Z6rQ6=V(V;9?ugPaQLj4C|mEmDi5av`-tekic6edg0C@-aOspPg^+e9%XG-ze{E
zEN4o~ab%-)F}OA$f1RW}iRNW8Hs%EcokSLG&Gc2f@+&^ux{CfurtF*Cc1%XzsI+XT
zh$M7uBsiHeZju$plZR^TKc59232@gj$KawjxZX(Xi!Nl`BHO1@bX;@mM0c%WHy94j
z-0WI>D8ur^El=PB+wDDx>BNA)XEWtQKagwnc<_Law}rYa=`S{J{nVRxva6J~P7Bm2
TZkE51qVQEe&U3b~#-q!B7C*m4

delta 203
zcmZn)yWq8<j&1TEZh^^bL^&q^;+(~3F*%V>cJeYo0d^;bN`?}K)X9!)qLVLhCv4W?
z_G4vDWk_Twm|QPl4^(I<Bs#fIPy<=vBoUd(2l!bwTL^v<n!G{HN7$9Yks*LVfgzV6
z6=+xnLq0>wWM=iL*u*!_S5Ia#c4Wu{Do<r70>XSCR$x$NFa(mBU~!mn0YDWXH6U4|
I$?96S0imBU+5i9m