Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Incorrect letter case referencing EapHost service fixed

Browse Source
This commit is contained in:
Simon Rozman
2016-08-26 18:00:54 +02:00
parent 9704046868
commit 9daa5b52a4
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
EventMonitor/ETWLog.cpp
View File

@@ -178,7 +178,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
m_col_format_width[0] = 26;
m_col_format_width[1] = 5;
m_col_format_width[2] = 5;
m_col_format_width[3] = std::max<int>(std::max<int>(_countof("EAPHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
m_col_format_width[3] = std::max<int>(std::max<int>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
m_col_format_width[4] = 0;
// Prepare all possible item attributes.
@@ -266,8 +266,8 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
0,
NULL)) != ERROR_SUCCESS)
{
// If the EAPHost trace provider failed to enable, do not despair.
wxLogDebug(_("Error enabling EAPHost event provider (error %u)."), ulResult);
// If the EapHost trace provider failed to enable, do not despair.
wxLogDebug(_("Error enabling EapHost event provider (error %u)."), ulResult);
}
if ((ulResult = EnableTraceEx(
@@ -599,7 +599,7 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
// Get event source.
return
IsEqualGUID(rec.EventHeader.ProviderId, EAPMETHOD_TRACE_EVENT_PROVIDER) ? wxT(PRODUCT_NAME_STR) :
IsEqualGUID(rec.EventHeader.ProviderId, s_provider_eaphost ) ? wxT("EAPHost" ) :
IsEqualGUID(rec.EventHeader.ProviderId, s_provider_eaphost ) ? wxT("EapHost" ) :
IsEqualGUID(rec.EventHeader.ProviderId, s_provider_schannel ) ? wxT("Schannel" ) : wxEmptyString;
case 4: {
@@ -712,7 +712,7 @@ void wxPersistentETWListCtrl::Save() const
}
SaveValue(wxT("ScrollAuto" ), wnd->m_scroll_auto );
SaveValue(wxT("SourceEAPHost" ), wnd->m_source_eaphost );
SaveValue(wxT("SourceEapHost" ), wnd->m_source_eaphost );
SaveValue(wxT("SourceSchannel"), wnd->m_source_schannel);
SaveValue(wxT("SourceProduct" ), wnd->m_source_product );
SaveValue(wxT("Level" ), (int)wnd->m_level );
@@ -737,7 +737,7 @@ bool wxPersistentETWListCtrl::Restore()
int dummy_int;
RestoreValue(wxT("ScrollAuto" ), &(wnd->m_scroll_auto ));
RestoreValue(wxT("SourceEAPHost" ), &(wnd->m_source_eaphost ));
RestoreValue(wxT("SourceEapHost" ), &(wnd->m_source_eaphost ));
RestoreValue(wxT("SourceSchannel"), &(wnd->m_source_schannel));
RestoreValue(wxT("SourceProduct" ), &(wnd->m_source_product ));
if (RestoreValue(wxT("Level"), &dummy_int))

4
EventMonitor/ETWLog.h
View File

@@ -144,12 +144,12 @@ protected:
public:
bool m_scroll_auto; ///< Is autoscrolling enabled?
bool m_source_eaphost; ///< Shows EAPHost messages
bool m_source_eaphost; ///< Shows EapHost messages
bool m_source_schannel; ///< Shows Schannel messages
bool m_source_product; ///< Shows native messages
UCHAR m_level; ///< Shows messages up to this level of verboseness
static const GUID s_provider_eaphost; ///< EAPHost event provider ID
static const GUID s_provider_eaphost; ///< EapHost event provider ID
static const GUID s_provider_schannel; ///< Schannel event provider ID
protected:

22
EventMonitor/Frame.cpp
View File

@@ -104,10 +104,10 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
m_menuView->AppendSeparator();
wxMenuItem* m_menuViewSourceEAPHost;
m_menuViewSourceEAPHost = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_EAPHOST, wxString("EAPHost") , _("Toggles EAPHost rows"), wxITEM_CHECK);
//m_menuViewSourceEAPHost->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_menu));
m_menuView->Append(m_menuViewSourceEAPHost);
wxMenuItem* m_menuViewSourceEapHost;
m_menuViewSourceEapHost = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_EAPHOST, wxString("EapHost") , _("Toggles EapHost rows"), wxITEM_CHECK);
//m_menuViewSourceEapHost->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_menu));
m_menuView->Append(m_menuViewSourceEapHost);
wxMenuItem* m_menuViewSourceSchannel;
m_menuViewSourceSchannel = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_SCHANNEL, wxString("Schannel") , _("Toggles Schannel rows"), wxITEM_CHECK);
@@ -155,7 +155,7 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
m_toolbarView->AddSeparator();
m_toolViewSourceEAPHost = m_toolbarView->AddTool(wxID_VIEW_SOURCE_EAPHOST, "EAPHost", wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_tool), wxNullBitmap, wxITEM_CHECK, _("Toggles EAPHost rows"), _("Toggles EAPHost rows"), NULL);
m_toolViewSourceEapHost = m_toolbarView->AddTool(wxID_VIEW_SOURCE_EAPHOST, "EapHost", wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_tool), wxNullBitmap, wxITEM_CHECK, _("Toggles EapHost rows"), _("Toggles EapHost rows"), NULL);
m_toolViewSourceSchannel = m_toolbarView->AddTool(wxID_VIEW_SOURCE_SCHANNEL, "Schannel", wxLoadIconFromResource(lib_ieframe, MAKEINTRESOURCE(36870), size_tool), wxNullBitmap, wxITEM_CHECK, _("Toggles Schannel rows"), _("Toggles Schannel rows"), NULL);
@@ -200,8 +200,8 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
this->Connect(wxID_SELECT_NONE , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone ));
this->Connect(wxID_VIEW_SCROLL_AUTO , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate ));
this->Connect(wxID_VIEW_SCROLL_AUTO , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll ));
this->Connect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEAPHostUpdate ));
this->Connect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEAPHost ));
this->Connect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEapHostUpdate ));
this->Connect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEapHost ));
this->Connect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceSchannelUpdate));
this->Connect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceSchannel ));
this->Connect(wxID_VIEW_SOURCE_PRODUCT , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceProductUpdate ));
@@ -227,8 +227,8 @@ wxEventMonitorFrame::~wxEventMonitorFrame()
this->Disconnect(wxID_SELECT_NONE , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone ));
this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate ));
this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll ));
this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEAPHostUpdate));
this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEAPHost ));
this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEapHostUpdate));
this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEapHost ));
this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceSchannelUpdate));
this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceSchannel ));
this->Disconnect(wxID_VIEW_SOURCE_PRODUCT, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceProductUpdate));
@@ -324,13 +324,13 @@ void wxEventMonitorFrame::OnViewScroll(wxCommandEvent& event)
}
void wxEventMonitorFrame::OnViewSourceEAPHostUpdate(wxUpdateUIEvent& event)
void wxEventMonitorFrame::OnViewSourceEapHostUpdate(wxUpdateUIEvent& event)
{
event.Check(m_panel->m_log->m_source_eaphost);
}
void wxEventMonitorFrame::OnViewSourceEAPHost(wxCommandEvent& event)
void wxEventMonitorFrame::OnViewSourceEapHost(wxCommandEvent& event)
{
bool state_new = event.IsChecked();
if (m_panel->m_log->m_source_eaphost != state_new) {

6
EventMonitor/Frame.h
View File

@@ -81,8 +81,8 @@ protected:
void OnEditSelectNone(wxCommandEvent& event);
void OnViewScrollUpdate(wxUpdateUIEvent& event);
void OnViewScroll(wxCommandEvent& event);
void OnViewSourceEAPHostUpdate(wxUpdateUIEvent& event);
void OnViewSourceEAPHost(wxCommandEvent& event);
void OnViewSourceEapHostUpdate(wxUpdateUIEvent& event);
void OnViewSourceEapHost(wxCommandEvent& event);
void OnViewSourceSchannelUpdate(wxUpdateUIEvent& event);
void OnViewSourceSchannel(wxCommandEvent& event);
void OnViewSourceProductUpdate(wxUpdateUIEvent& event);
@@ -106,7 +106,7 @@ protected:
wxAuiToolBarItem* m_toolEditClear;
wxAuiToolBar* m_toolbarView;
wxAuiToolBarItem* m_toolViewScrollAuto;
wxAuiToolBarItem* m_toolViewSourceEAPHost;
wxAuiToolBarItem* m_toolViewSourceEapHost;
wxAuiToolBarItem* m_toolViewSourceSchannel;
wxAuiToolBarItem* m_toolViewSourceProduct;
wxAuiToolBarItem* m_toolViewLevelVerbose;