From b2edd7427086304b0849d64439ebcd08519d815e Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 15 Jan 2020 13:45:25 +0100
Subject: [PATCH] Introduce localization catalog domain name

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 lib/EAPBase_UI/include/Module.h | 6 +++++-
 lib/EAPBase_UI/src/Module.cpp   | 4 +++-
 lib/TTLS_UI/src/Module.cpp      | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/EAPBase_UI/include/Module.h b/lib/EAPBase_UI/include/Module.h
index eb6bc45..d264056 100644
--- a/lib/EAPBase_UI/include/Module.h
+++ b/lib/EAPBase_UI/include/Module.h
@@ -46,8 +46,9 @@ namespace eap
         /// Constructs a EAP UI peer module for the given EAP type
         ///
         /// \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.
@@ -146,6 +147,9 @@ namespace eap
             _In_                                  DWORD dwUIContextDataSize,
             _Inout_                               BYTE  **ppDataFromInteractiveUI,
             _Inout_                               DWORD *pdwDataFromInteractiveUISize) = 0;
+
+    public:
+        const winstd::tstring m_domain; ///< Localization catalog domain name
     };
 
     /// @}
diff --git a/lib/EAPBase_UI/src/Module.cpp b/lib/EAPBase_UI/src/Module.cpp
index c60fdbc..f6e5de9 100644
--- a/lib/EAPBase_UI/src/Module.cpp
+++ b/lib/EAPBase_UI/src/Module.cpp
@@ -27,7 +27,9 @@ using namespace winstd;
 // 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)
 {
 }
 
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index 42d2df9..e1c6e06 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -28,7 +28,7 @@ using namespace winstd;
 // 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.
-    wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent);
+    wxInitializerPeer init(m_instance, m_domain, hwndParent);
 
     // Create and launch configuration dialog.
     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;
 
     // Initialize application.
-    wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent);
+    wxInitializerPeer init(m_instance, m_domain, hwndParent);
 
     if (cfg.m_providers.size() > 1) {
         // Multiple identity providers: User has to select one first.
@@ -403,7 +403,7 @@ void eap::peer_ttls_ui::invoke_interactive_ui(
 #endif
     {
         // Initialize application.
-        wxInitializerPeer init(m_instance, wxT("EAP-TTLS_UI"), hwndParent);
+        wxInitializerPeer init(m_instance, m_domain, hwndParent);
 
         sanitizing_wstring
             challenge(reinterpret_cast<sanitizing_wstring::const_pointer>(ctx.m_data.data()), ctx.m_data.size()/sizeof(sanitizing_wstring::value_type)),