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

Distinguish or merge variables with same names

Browse Source 
...to resolve C4457 warnings.
This commit is contained in:
Simon Rozman 2018-09-04 14:42:40 +02:00
parent c8c54e5d54
commit 4ae70c8575
4 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
EventMonitor/ETWLog.cpp
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2015-2016 Amebis Copyright 2015-2018 Amebis
Copyright 2016 GÉANT Copyright 2016 GÉANT
This file is part of GÉANTLink. This file is part of GÉANTLink.
@ -204,11 +204,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
ULONG ulResult; ULONG ulResult;
for (unsigned int i = 0; ; i++) { for (unsigned int i = 0; ; i++) {
//tstring log_file(tstring_printf(i ? _T("test.etl") : _T("test %u.etl"), i)); //tstring log_file(tstring_printf(i ? _T("test.etl") : _T("test %u.etl"), i));
tstring name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i)); tstring session_name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));
// Allocate session properties. // Allocate session properties.
ULONG ULONG
ulSizeName = (ULONG)((name .length() + 1)*sizeof(TCHAR)), ulSizeName = (ULONG)((session_name.length() + 1)*sizeof(TCHAR)),
//ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)), //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)),
ulSize = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/; ulSize = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/;
unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize])); unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize]));
@ -226,13 +226,13 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
//properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName; //properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName;
//memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile); //memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile);
if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) { if ((ulResult = m_session.create(session_name.c_str(), properties.get())) == ERROR_SUCCESS) {
break; break;
} else if (ulResult == ERROR_ACCESS_DENIED) { } else if (ulResult == ERROR_ACCESS_DENIED) {
wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session.")); wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."));
return; return;
} else if (ulResult == ERROR_ALREADY_EXISTS) { } else if (ulResult == ERROR_ALREADY_EXISTS) {
wxLogDebug(_("The %s event session already exists."), name); wxLogDebug(_("The %s event session already exists."), session_name);
// Do not despair... Retry with a new session name and ID. // Do not despair... Retry with a new session name and ID.
continue; continue;
} else { } else {

10
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2015-2016 Amebis Copyright 2015-2018 Amebis
Copyright 2016 GÉANT Copyright 2016 GÉANT
This file is part of GÉANTLink. This file is part of GÉANTLink.
@ -462,7 +462,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
m_hwnd_popup(NULL) m_hwnd_popup(NULL)
{ {
// Verify if the monitor is already running. // Verify if the monitor is already running.
const WNDCLASSEX wnd_class_desc = { const WNDCLASSEX wnd_class_desc_master = {
sizeof(WNDCLASSEX), // cbSize sizeof(WNDCLASSEX), // cbSize
0, // style 0, // style
winproc, // lpfnWndProc winproc, // lpfnWndProc
@ -476,7 +476,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
_T(__FUNCTION__), // lpszClassName _T(__FUNCTION__), // lpszClassName
NULL // hIconSm NULL // hIconSm
}; };
ATOM wnd_class = RegisterClassEx(&wnd_class_desc); ATOM wnd_class = RegisterClassEx(&wnd_class_desc_master);
if (!wnd_class) if (!wnd_class)
throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class."); throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class.");
tstring_guid guid_str(guid); tstring_guid guid_str(guid);
@ -486,7 +486,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
m_is_master = false; m_is_master = false;
// Register slave windows class slightly different, not to include slaves in FindWindowEx(). // Register slave windows class slightly different, not to include slaves in FindWindowEx().
const WNDCLASSEX wnd_class_desc = { const WNDCLASSEX wnd_class_desc_slave = {
sizeof(WNDCLASSEX), // cbSize sizeof(WNDCLASSEX), // cbSize
0, // style 0, // style
winproc, // lpfnWndProc winproc, // lpfnWndProc
@ -500,7 +500,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
_T(__FUNCTION__) _T("-Slave"), // lpszClassName _T(__FUNCTION__) _T("-Slave"), // lpszClassName
NULL // hIconSm NULL // hIconSm
}; };
wnd_class = RegisterClassEx(&wnd_class_desc); wnd_class = RegisterClassEx(&wnd_class_desc_slave);
if (!wnd_class) if (!wnd_class)
throw win_runtime_error(__FUNCTION__ " Error registering slave monitor window class."); throw win_runtime_error(__FUNCTION__ " Error registering slave monitor window class.");
} else { } else {

40
lib/TTLS/src/Config.cpp
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2015-2016 Amebis Copyright 2015-2018 Amebis
Copyright 2016 GÉANT Copyright 2016 GÉANT
This file is part of GÉANTLink. This file is part of GÉANTLink.
@ -92,15 +92,17 @@ void eap::config_method_ttls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode
HRESULT hr; HRESULT hr;
// <ClientSideCredential> {
com_obj<IXMLDOMElement> pXmlElClientSideCredential; // <ClientSideCredential>
if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:ClientSideCredential"), bstr(L"ClientSideCredential"), namespace_eapmetadata, pXmlElClientSideCredential))) com_obj<IXMLDOMElement> pXmlElClientSideCredential;
throw com_runtime_error(hr, __FUNCTION__ " Error creating <ClientSideCredential> element."); if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:ClientSideCredential"), bstr(L"ClientSideCredential"), namespace_eapmetadata, pXmlElClientSideCredential)))
throw com_runtime_error(hr, __FUNCTION__ " Error creating <ClientSideCredential> element.");
// <ClientSideCredential>/<AnonymousIdentity> // <ClientSideCredential>/<AnonymousIdentity>
if (!m_anonymous_identity.empty()) if (!m_anonymous_identity.empty())
if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElClientSideCredential, bstr(L"AnonymousIdentity"), namespace_eapmetadata, bstr(m_anonymous_identity)))) if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElClientSideCredential, bstr(L"AnonymousIdentity"), namespace_eapmetadata, bstr(m_anonymous_identity))))
throw com_runtime_error(hr, __FUNCTION__ " Error creating <AnonymousIdentity> element."); throw com_runtime_error(hr, __FUNCTION__ " Error creating <AnonymousIdentity> element.");
}
// <InnerAuthenticationMethod> // <InnerAuthenticationMethod>
com_obj<IXMLDOMElement> pXmlElInnerAuthenticationMethod; com_obj<IXMLDOMElement> pXmlElInnerAuthenticationMethod;
@ -165,8 +167,8 @@ void eap::config_method_ttls::load(_In_ IXMLDOMNode *pConfigRoot)
} }
} else { } else {
// Nonexisting <ClientSideCredential> means: use blank configured credentials. // Nonexisting <ClientSideCredential> means: use blank configured credentials.
com_obj<IXMLDOMElement> pXmlElClientCertificate; com_obj<IXMLDOMElement> pXmlElClientCertificate_blank;
hr = eapxml::create_element(pDoc, pXmlElClientSideCredential, bstr(L"eap-metadata:ClientCertificate"), bstr(L"ClientCertificate"), namespace_eapmetadata, pXmlElClientCertificate); hr = eapxml::create_element(pDoc, pXmlElClientSideCredential, bstr(L"eap-metadata:ClientCertificate"), bstr(L"ClientCertificate"), namespace_eapmetadata, pXmlElClientCertificate_blank);
} }
} }
} }
@ -178,14 +180,16 @@ void eap::config_method_ttls::load(_In_ IXMLDOMNode *pConfigRoot)
m_anonymous_identity.clear(); m_anonymous_identity.clear();
// <ClientSideCredential> {
com_obj<IXMLDOMElement> pXmlElClientSideCredential; // <ClientSideCredential>
if (SUCCEEDED(eapxml::select_element(pConfigRoot, bstr(L"eap-metadata:ClientSideCredential"), pXmlElClientSideCredential))) { com_obj<IXMLDOMElement> pXmlElClientSideCredential;
wstring xpathClientSideCredential(xpath + L"/ClientSideCredential"); if (SUCCEEDED(eapxml::select_element(pConfigRoot, bstr(L"eap-metadata:ClientSideCredential"), pXmlElClientSideCredential))) {
wstring xpathClientSideCredential(xpath + L"/ClientSideCredential");
// <AnonymousIdentity> // <AnonymousIdentity>
eapxml::get_element_value(pXmlElClientSideCredential, bstr(L"eap-metadata:AnonymousIdentity"), m_anonymous_identity); eapxml::get_element_value(pXmlElClientSideCredential, bstr(L"eap-metadata:AnonymousIdentity"), m_anonymous_identity);
m_module.log_config((xpathClientSideCredential + L"/AnonymousIdentity").c_str(), m_anonymous_identity.c_str()); m_module.log_config((xpathClientSideCredential + L"/AnonymousIdentity").c_str(), m_anonymous_identity.c_str());
}
} }
// <InnerAuthenticationMethod> // <InnerAuthenticationMethod>

2
lib/TTLS_UI/src/Module.cpp
View File

@ -193,7 +193,7 @@ void eap::peer_ttls_ui::invoke_identity_ui(
log_event(&EAPMETHOD_TRACE_EVT_CRED_NO_METHOD, event_data(target_name), event_data::blank); log_event(&EAPMETHOD_TRACE_EVT_CRED_NO_METHOD, event_data(target_name), event_data::blank);
continue; continue;
} }
config_method_ttls *cfg_method = dynamic_cast<config_method_ttls*>(cfg_prov->m_methods.front().get()); cfg_method = dynamic_cast<config_method_ttls*>(cfg_prov->m_methods.front().get());
assert(cfg_method); assert(cfg_method);
// Prepare new set of credentials for given provider. // Prepare new set of credentials for given provider.