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

Introduce localization catalog domain name

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-01-15 13:45:25 +01:00
parent 0a280975fb
commit b2edd74270
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/EAPBase_UI/include/Module.h
View File

@ -46,8 +46,9 @@ namespace eap
/// Constructs a EAP UI peer module for the given EAP type /// Constructs a EAP UI peer module for the given EAP type
/// ///
/// \param[in] eap_method EAP method type ID /// \param[in] eap_method EAP method type ID
/// \param[in] domain Localization catalog domain name. Usually EAP method name followed by "_UI".
/// ///
peer_ui(_In_ winstd::eap_type_t eap_method); peer_ui(_In_ winstd::eap_type_t eap_method, _In_opt_ LPCTSTR domain = nullptr);
/// ///
/// Converts XML into the configuration BLOB. /// Converts XML into the configuration BLOB.
@ -146,6 +147,9 @@ namespace eap
_In_ DWORD dwUIContextDataSize, _In_ DWORD dwUIContextDataSize,
_Inout_ BYTE **ppDataFromInteractiveUI, _Inout_ BYTE **ppDataFromInteractiveUI,
_Inout_ DWORD *pdwDataFromInteractiveUISize) = 0; _Inout_ DWORD *pdwDataFromInteractiveUISize) = 0;
public:
const winstd::tstring m_domain; ///< Localization catalog domain name
}; };
/// @} /// @}

4
lib/EAPBase_UI/src/Module.cpp
View File

@ -27,7 +27,9 @@ using namespace winstd;
// eap::peer_ui // eap::peer_ui
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
eap::peer_ui::peer_ui(_In_ eap_type_t eap_method) : module(eap_method) eap::peer_ui::peer_ui(_In_ eap_type_t eap_method, _In_opt_ LPCTSTR domain) :
m_domain(domain ? domain : _T("")),
module(eap_method)
{ {
} }

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

@ -28,7 +28,7 @@ using namespace winstd;
// eap::peer_ttls_ui // eap::peer_ttls_ui
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
eap::peer_ttls_ui::peer_ttls_ui() : peer_ui(eap_type_t::ttls) eap::peer_ttls_ui::peer_ttls_ui() : peer_ui(eap_type_t::ttls, _T("EAP-TTLS_UI"))
{ {
} }
@ -56,7 +56,7 @@ void eap::peer_ttls_ui::invoke_config_ui(
} }
// Initialize application. // Initialize application.
wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent); wxInitializerPeer init(m_instance, m_domain, hwndParent);
// Create and launch configuration dialog. // Create and launch configuration dialog.
wxEAPConfigDialog<wxTTLSConfigWindow> dlg(cfg, init.m_parent); wxEAPConfigDialog<wxTTLSConfigWindow> dlg(cfg, init.m_parent);
@ -124,7 +124,7 @@ void eap::peer_ttls_ui::invoke_identity_ui(
config_method_tls_tunnel *cfg_method = NULL; config_method_tls_tunnel *cfg_method = NULL;
// Initialize application. // Initialize application.
wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent); wxInitializerPeer init(m_instance, m_domain, hwndParent);
if (cfg.m_providers.size() > 1) { if (cfg.m_providers.size() > 1) {
// Multiple identity providers: User has to select one first. // Multiple identity providers: User has to select one first.
@ -403,7 +403,7 @@ void eap::peer_ttls_ui::invoke_interactive_ui(
#endif #endif
{ {
// Initialize application. // Initialize application.
wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent); wxInitializerPeer init(m_instance, m_domain, hwndParent);
sanitizing_wstring sanitizing_wstring
challenge(reinterpret_cast<sanitizing_wstring::const_pointer>(ctx.m_data.data()), ctx.m_data.size()/sizeof(sanitizing_wstring::value_type)), challenge(reinterpret_cast<sanitizing_wstring::const_pointer>(ctx.m_data.data()), ctx.m_data.size()/sizeof(sanitizing_wstring::value_type)),