209 changed files with 460 additions and 510 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -7,6 +7,3 @@
 [submodule "lib/wxExtend"]
 	path = lib/wxExtend
 	url = https://github.com/Amebis/wxExtend.git
-[submodule "lib/stdex"]
-	path = lib/stdex
-	url = https://github.com/Amebis/stdex.git
--- a/CredWrite/CredWrite.rc
+++ b/CredWrite/CredWrite.rc
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@ -58,7 +58,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -86,6 +86,9 @@
    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="README.md" />
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@ -1,13 +1,12 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

 #include "PCH.h"

 using namespace std;
-using namespace stdex;
 using namespace winstd;

 class module_dummy : public eap::module {
--- a/CredWrite/PCH.cpp
+++ b/CredWrite/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/CredWrite/PCH.h
+++ b/CredWrite/PCH.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -11,8 +11,8 @@
 #include "../lib/EAPBase/include/Module.h"

 #include <WinStd/Common.h>
+#include <WinStd/Base64.h>
 #include <WinStd/Win.h>
-#include <stdex/base64.hpp>

 #include <Windows.h>
 #include <eaptypes.h> // Must include after <Windows.h>
--- a/EAPMethods/Common.props
+++ b/EAPMethods/Common.props
@ -10,7 +10,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -20,5 +20,8 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
  </ItemGroup>
 </Project>
--- a/EAPMethods/EAPMethod.def
+++ b/EAPMethods/EAPMethod.def
--- a/EAPMethods/EAPMethod_UI.def
+++ b/EAPMethods/EAPMethod_UI.def
--- a/EAPMethods/MSIBuild.EAP-TTLS/Makefile
+++ b/EAPMethods/MSIBuild.EAP-TTLS/Makefile
--- a/EAPMethods/MSIBuild/Makefile
+++ b/EAPMethods/MSIBuild/Makefile
--- a/EAPMethods/MSIBuild/MakefileEAPMethod.mak
+++ b/EAPMethods/MSIBuild/MakefileEAPMethod.mak
--- a/EAPMethods/Main.cpp
+++ b/EAPMethods/Main.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EAPMethods/Main_UI.cpp
+++ b/EAPMethods/Main_UI.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -171,7 +171,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml(

    // Create configuration XML document.
    com_obj<IXMLDOMDocument2> pConfigDoc;
-    if (FAILED(hr = CoCreateInstance(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, pConfigDoc)))
+    if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER)))
        return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document."));

    pConfigDoc->put_async(VARIANT_FALSE);
--- a/EAPMethods/PCH.cpp
+++ b/EAPMethods/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EAPMethods/PCH.h
+++ b/EAPMethods/PCH.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EAPMethods/PCH_UI.cpp
+++ b/EAPMethods/PCH_UI.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EAPMethods/PCH_UI.h
+++ b/EAPMethods/PCH_UI.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EAPMethods/Register.cpp
+++ b/EAPMethods/Register.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2020-2022 Amebis
+    Copyright © 2020-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -44,15 +44,12 @@ STDAPI DllRegisterServer()
    try {
        tstring sz, sz2;
        reg_key key_methods, key_author, key_method;
-        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY, key_methods);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_methods.open(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY)) throw win_runtime_error();
        sprintf(sz, _T("%u"), EAPMETHOD_AUTHOR_ID);
-        s = RegCreateKeyEx(key_methods, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_author, NULL);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_author.create(key_methods, sz.c_str(), NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE)) throw win_runtime_error();
        set_value(key_author, NULL, _T(PRODUCT_NAME_STR));
        sprintf(sz, _T("%u"), EAPMETHOD_TYPE);
-        s = RegCreateKeyEx(key_author, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_method, NULL);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_method.create(key_author, sz.c_str(), NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE)) throw win_runtime_error();
        if (!GetModuleFileName(g_peer.m_instance, sz)) throw win_runtime_error("GetModuleFileName failed.");
        sprintf(sz2, _T("@%s,-1"), sz.c_str());
        set_value(key_method, _T("PeerDllPath")     , sz);
@ -80,8 +77,7 @@ STDAPI DllUnregisterServer()
    try {
        tstring sz;
        reg_key key_methods;
-        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ, key_methods);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_methods.open(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ)) throw win_runtime_error();
        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
        if (!key_methods.delete_subkey(sz.c_str())) throw win_runtime_error();
    } catch(...) {}
--- a/EAPMethods/Register_UI.cpp
+++ b/EAPMethods/Register_UI.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2020-2022 Amebis
+    Copyright © 2020-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -44,15 +44,12 @@ STDAPI DllRegisterServer()
    try {
        tstring sz;
        reg_key key_methods, key_author, key_method;
-        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY, key_methods);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_methods.open(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY)) throw win_runtime_error();
        sprintf(sz, _T("%u"), EAPMETHOD_AUTHOR_ID);
-        s = RegCreateKeyEx(key_methods, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_author, NULL);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_author.create(key_methods, sz.c_str(), NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE)) throw win_runtime_error();
        set_value(key_author, NULL, _T(PRODUCT_NAME_STR));
        sprintf(sz, _T("%u"), EAPMETHOD_TYPE);
-        s = RegCreateKeyEx(key_author, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_method, NULL);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_method.create(key_author, sz.c_str(), NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE)) throw win_runtime_error();
        if (!GetModuleFileName(g_peer.m_instance, sz)) throw win_runtime_error("GetModuleFileName failed.");
        set_value(key_method, _T("PeerConfigUIPath")        , sz);
        set_value(key_method, _T("PeerIdentityPath")        , sz);
@ -81,8 +78,7 @@ STDAPI DllUnregisterServer()
    try {
        tstring sz;
        reg_key key_methods;
-        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ, key_methods);
-        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!key_methods.open(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ)) throw win_runtime_error();
        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
        key_methods.delete_subkey(sz.c_str());
    } catch(...) {}
--- a/EAPMethods/locale/es_ES.po
+++ b/EAPMethods/locale/es_ES.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EAPMethods/locale/hr_HR.po
+++ b/EAPMethods/locale/hr_HR.po
@ -1,7 +1,7 @@
 # 
 # Translators:
+# Dubravko Penezic <dpenezic@gmail.com>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
-# Dubravko Penezic <dpenezic@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2022\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -600,7 +600,7 @@ msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "No certificate selected"
-msgstr "Nije odabran certifikat"
+msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
--- a/EAPMethods/locale/it_IT.po
+++ b/EAPMethods/locale/it_IT.po
@ -2,7 +2,6 @@
 # Translators:
 # Daniele Albrizio <daniele@albrizio.it>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
-# Daniele Albrizio <dalbrizio@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@ -10,13 +9,13 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Daniele Albrizio <dalbrizio@gmail.com>, 2022\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
@ -76,7 +75,7 @@ msgstr "Cancellazione delle credenziali non riuscita (errore %u)."
 #: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
 #: lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(none)"
-msgstr "(nessuno)"
+msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
@ -89,7 +88,7 @@ msgstr "(errore)"

 #: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
-msgstr "(ID vuoto)"
+msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
@ -330,7 +329,6 @@ msgstr "Identità"
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Seleziona l'ID utente con cui il supplicant si presenta all'autenticatore:"

 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
@ -530,7 +528,6 @@ msgstr "Fiducia nel Server"
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
 msgstr ""
-"Descrivi i server di cui ti fidi per prevenire attacchi man-in-the-middle."

 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@ -613,7 +610,7 @@ msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "No certificate selected"
-msgstr "Nessun certificato selezionato "
+msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
@ -717,7 +714,7 @@ msgstr "EAP-TTLS"
 #: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP-TTLS Method"
-msgstr "Metodo EAP-TTLS"
+msgstr ""

 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
--- a/EAPMethods/locale/nb_NO.po
+++ b/EAPMethods/locale/nb_NO.po
@ -1,6 +1,6 @@
 # 
 # Translators:
-# Tom Ivar Myren <tom.myren@sikt.no>, 2017
+# Tom Ivar Myren <tom.myren@uninett.no>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
--- a/EAPMethods/locale/pt_PT.po
+++ b/EAPMethods/locale/pt_PT.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EAPMethods/res/EAPMethod.rc
+++ b/EAPMethods/res/EAPMethod.rc
--- a/EAPMethods/res/EAPMethod_UI.rc
+++ b/EAPMethods/res/EAPMethod_UI.rc
--- a/EventMonitor/App.cpp
+++ b/EventMonitor/App.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/App.h
+++ b/EventMonitor/App.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -64,8 +64,8 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c
    for (size_t i = 0, i_end = sessions.GetCount(); i < i_end; i++) {
        // Open trace.
        tlf.LoggerName = const_cast<LPTSTR>((LPCTSTR)(sessions[i]));
-        event_trace trace(OpenTrace(&tlf));
-        if (!trace) {
+        event_trace trace;
+        if (!trace.create(&tlf)) {
            wxLogError(_("Error opening event trace (error %u)."), GetLastError());
            continue;
        }
--- a/EventMonitor/ETWLog.h
+++ b/EventMonitor/ETWLog.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -31,7 +31,6 @@ class wxPersistentETWListCtrl;
 #include <wx/persist/window.h>
 #include <wx/thread.h>

-#include <stdex/vector_queue.hpp>
 #include <WinStd/ETW.h>

 #include <memory>
@ -155,7 +154,7 @@ protected:
    ///
    /// Functor for GUID comparison
    ///
-    struct less_guid
+    struct less_guid : public std::binary_function<GUID, GUID, bool>
    {
        ///
        /// Compares two GUIDs
@ -308,8 +307,8 @@ protected:
    guidset m_sources;                                  ///< Set of enabled sources

    wxListItemAttr m_item_attr[2][4];                   ///< Current item attributes
-    stdex::vector_queue<winstd::event_rec> m_rec_db;    ///< Event record database
-    stdex::vector_queue<size_t> m_rec_idx;              ///< Event record database indices of shown records
+    winstd::vector_queue<winstd::event_rec> m_rec_db;   ///< Event record database
+    winstd::vector_queue<size_t> m_rec_idx;             ///< Event record database indices of shown records

    size_t m_col_format_width[5];                       ///< Column widths for pre-formatted row display (0 = unlimited)
 };
--- a/EventMonitor/EventMonitor.rc
+++ b/EventMonitor/EventMonitor.rc
--- a/EventMonitor/EventMonitor.vcxproj
+++ b/EventMonitor/EventMonitor.vcxproj
@ -58,7 +58,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
@ -89,6 +89,9 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
--- a/EventMonitor/Frame.cpp
+++ b/EventMonitor/Frame.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -33,9 +33,14 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
    wxString prod_status_bar;
    prod_status_bar.Printf(_("Toggles display of %s records"), wxT(PRODUCT_NAME_STR));

-    winstd::library lib_comres(LoadLibraryEx(_T("comres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
-    winstd::library lib_ieframe(LoadLibraryEx(_T("ieframe.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
-    winstd::library lib_shell32(LoadLibraryEx(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
+    winstd::library lib_comres;
+    lib_comres.load(_T("comres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+
+    winstd::library lib_ieframe;
+    lib_ieframe.load(_T("ieframe.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+
+    winstd::library lib_shell32;
+    lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);

    wxSize size_menu(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
    wxSize size_tool(size_menu);
--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/LogPanel.cpp
+++ b/EventMonitor/LogPanel.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/LogPanel.h
+++ b/EventMonitor/LogPanel.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/PCH.cpp
+++ b/EventMonitor/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/PCH.h
+++ b/EventMonitor/PCH.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/EventMonitor/locale/es_ES.po
+++ b/EventMonitor/locale/es_ES.po
@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/it_IT.po
+++ b/EventMonitor/locale/it_IT.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/nb_NO.po
+++ b/EventMonitor/locale/nb_NO.po
@ -1,6 +1,6 @@
 # 
 # Translators:
-# Tom Ivar Myren <tom.myren@sikt.no>, 2016
+# Tom Ivar Myren <tom.myren@uninett.no>, 2016
 # 
 #, fuzzy
 msgid ""
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Tom Ivar Myren <tom.myren@sikt.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/pt_PT.po
+++ b/EventMonitor/locale/pt_PT.po
@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\EAP-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
@ -81,6 +83,18 @@ Global
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32
@ -339,6 +353,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
--- a/MSI/Base/Main/Makefile
+++ b/MSI/Base/Main/Makefile
--- a/MSI/Base/Makefile
+++ b/MSI/Base/Makefile
--- a/MSI/Base/locale/es_ES.po
+++ b/MSI/Base/locale/es_ES.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/it_IT.po
+++ b/MSI/Base/locale/it_IT.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/nb_NO.po
+++ b/MSI/Base/locale/nb_NO.po
@ -1,7 +1,7 @@
 # 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
-# Tom Ivar Myren <tom.myren@sikt.no>, 2016
+# Tom Ivar Myren <tom.myren@uninett.no>, 2016
 # 
 #, fuzzy
 msgid ""
@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-09-10 07:51+0000\n"
-"Last-Translator: Tom Ivar Myren <tom.myren@sikt.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/MSI/Base/locale/pt_PT.po
+++ b/MSI/Base/locale/pt_PT.po
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@ -1 +1 @@
-Subproject commit eccce8c523c9193c1e3a627e4dd8a80cd3cd5703
+Subproject commit 2b76e6de79b7251c4511c4b20f17100d9cecf5dd
--- a/BIN
+++ b/BIN
--- a/MakefileEAPMethod.mak
+++ b/MakefileEAPMethod.mak
--- a/MakefileLang.mak
+++ b/MakefileLang.mak
--- a/MakefileLangPlatCfg.mak
+++ b/MakefileLangPlatCfg.mak
--- a/MakefilePlat.mak
+++ b/MakefilePlat.mak
--- a/MakefilePlatCfg.mak
+++ b/MakefilePlatCfg.mak
--- a/MsiUseFeature/Main.cpp
+++ b/MsiUseFeature/Main.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -40,14 +40,13 @@ static int MsiUseFeature()

    if (nArgs > 2) {
        reg_key key;
-        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\") _T(VENDOR_NAME_STR) _T("\\") _T(PRODUCT_NAME_STR), 0, KEY_READ, key);
-        if (s != ERROR_SUCCESS) {
-            OutputDebugStr(_T("Product registry key cannot be opened (error %u).\n"), s);
+        if (!key.open(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\") _T(VENDOR_NAME_STR) _T("\\") _T(PRODUCT_NAME_STR), 0, KEY_READ)) {
+            OutputDebugStr(_T("Product registry key cannot be opened (error %u).\n"), GetLastError());
            return 3;
        }

        wstring lang;
-        s = RegQueryStringValue(key, _T("Language"), lang);
+        LSTATUS s = RegQueryStringValue(key, _T("Language"), lang);
        if (s != ERROR_SUCCESS) {
            OutputDebugStr(_T("Error reading registry value (error %u).\n"), s);
            return 3;
--- a/MsiUseFeature/MsiUseFeature.rc
+++ b/MsiUseFeature/MsiUseFeature.rc
--- a/MsiUseFeature/MsiUseFeature.vcxproj
+++ b/MsiUseFeature/MsiUseFeature.vcxproj
@ -76,6 +76,11 @@
  <ItemGroup>
    <ResourceCompile Include="MsiUseFeature.rc" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets" />
 </Project>
--- a/MsiUseFeature/PCH.cpp
+++ b/MsiUseFeature/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/MsiUseFeature/PCH.h
+++ b/MsiUseFeature/PCH.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/README.md
+++ b/README.md
@ -101,25 +101,14 @@ The product compilation references wxWidgets libraries using `WXWIN` environment

 ### Digital Signing of Build Outputs

-In order to have the build process digitally sign the Release output files, one should setup either:
+In order to have the build process digitally sign output files, one should provide the following:

- Local signing:
-   1. A signing certificate/hardware key
-   2. The following variables in the environment:
-      - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, e.g. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-      - `ManifestTimestampRFC3161Url` - set the value to URL used to perform timestamp signature (e.g. `http://sha256timestamp.ws.symantec.com/sha256/timestamp`, `http://timestamp.digicert.com` etc.). In order to perform the timestamp signing successfully, the computer running the build should be online and able to access this URL.
+1. A signing certificate installed in the current user’s certificate store.
+2. The following variables in the environment:
+  - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
+  - `ManifestTimestampRFC3161Url` - set the value to URL used to perform RFC3161 timestamp signature (i.e. `http://sha256timestamp.ws.symantec.com/sha256/timestamp`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.

- Microsoft Trusted Signing:
-   1. Install [Trusted Signing dlib package](https://www.nuget.org/packages/Microsoft.Trusted.Signing.Client):
-      ```cmd
-      nuget install Microsoft.Trusted.Signing.Client -Version 1.0.53 -x`
-      ```
-   2. Provide a [`manifest.json`](https://learn.microsoft.com/en-us/azure/trusted-signing/how-to-signing-integrations#create-a-json-file) file and place it at `%APPDATA%\Microsoft.Trusted.Signing.Client.json`:
-      ```cmd
-      notepad "%APPDATA%\Microsoft.Trusted.Signing.Client.json"
-      ```
-
-Debug configurations are not digitally signed by design.
+Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.

 ### Building

--- a/WLANManager/MSIBuild/Makefile
+++ b/WLANManager/MSIBuild/Makefile
--- a/WLANManager/Main.cpp
+++ b/WLANManager/Main.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -53,9 +53,8 @@ static int WLANManager()
    // Open WLAN handle.
    DWORD dwNegotiatedVersion;
    wlan_handle wlan;
-    DWORD dwResult = WlanOpenHandle(WLAN_API_MAKE_VERSION(2, 0), NULL, &dwNegotiatedVersion, wlan);
-    if (dwResult != ERROR_SUCCESS) {
-        DisplayError(_T("%s function failed (error %u)."), _T("WlanOpenHandle"), dwResult);
+    if (!wlan.open(WLAN_API_MAKE_VERSION(2, 0), &dwNegotiatedVersion)) {
+        DisplayError(_T("%s function failed (error %u)."), _T("WlanOpenHandle"), GetLastError());
        return 2;
    } else if (dwNegotiatedVersion < WLAN_API_MAKE_VERSION(2, 0)) {
        DisplayError(_T("WlanOpenHandle negotiated unsupported version (expected: %u, negotiated: %u)."), WLAN_API_MAKE_VERSION(2, 0), dwNegotiatedVersion);
@ -66,7 +65,7 @@ static int WLANManager()
    {
        // Get a list of WLAN interfaces.
        WLAN_INTERFACE_INFO_LIST *pInterfaceList;
-        dwResult = WlanEnumInterfaces(wlan, NULL, &pInterfaceList);
+        DWORD dwResult = WlanEnumInterfaces(wlan, NULL, &pInterfaceList);
        if (dwResult != ERROR_SUCCESS) {
            DisplayError(_T("%s function failed (error %u)."), _T("WlanEnumInterfaces"), dwResult);
            return 4;
@ -85,7 +84,7 @@ static int WLANManager()
        if (!interface_name.empty()) {
            // Read the interface name from registry.
            reg_key key;
-            if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, tstring_printf(_T("SYSTEM\\CurrentControlSet\\Control\\Network\\%s\\%s\\Connection"), devclass_net.c_str(), tstring_guid(interfaces->InterfaceInfo[i].InterfaceGuid).c_str()).c_str(), 0, KEY_READ, key) == ERROR_SUCCESS) {
+            if (key.open(HKEY_LOCAL_MACHINE, tstring_printf(_T("SYSTEM\\CurrentControlSet\\Control\\Network\\%s\\%s\\Connection"), devclass_net.c_str(), tstring_guid(interfaces->InterfaceInfo[i].InterfaceGuid).c_str()).c_str(), 0, KEY_READ)) {
                wstring name;
                if (RegQueryStringValue(key, _T("Name"), name) == ERROR_SUCCESS && _wcsicmp(interface_name.c_str(), name.c_str()) != 0) {
                    // Not the interface we are interested in.
@ -98,7 +97,7 @@ static int WLANManager()
        {
            // Get a list of profiles.
            WLAN_PROFILE_INFO_LIST *pProfileList;
-            dwResult = WlanGetProfileList(wlan, &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, &pProfileList);
+            DWORD dwResult = WlanGetProfileList(wlan, &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, &pProfileList);
            if (dwResult != ERROR_SUCCESS) {
                DisplayError(_T("%s function failed (error %u)."), _T("WlanGetProfileList"), dwResult);
                return 4;
@ -118,7 +117,7 @@ static int WLANManager()
        // Launch WLAN profile config dialog.
        WLAN_REASON_CODE wlrc = L2_REASON_CODE_SUCCESS;
        #pragma warning(suppress: 6387) // TODO: MSDN nor SAL annotation don't indicate NULL HWND are OK with WlanUIEditProfile().
-        dwResult = WlanUIEditProfile(WLAN_UI_API_VERSION, pwcArglist[2], &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, WLSecurityPage, NULL, &wlrc);
+        DWORD dwResult = WlanUIEditProfile(WLAN_UI_API_VERSION, pwcArglist[2], &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, WLSecurityPage, NULL, &wlrc);
        if (dwResult != ERROR_SUCCESS) {
            // WlanUIEditProfile() displays own error dialog on failure.
            //DisplayError(_T("%s function failed (error %u)."), _T("WlanUIEditProfile"), dwResult);
--- a/WLANManager/PCH.cpp
+++ b/WLANManager/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/WLANManager/PCH.h
+++ b/WLANManager/PCH.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/WLANManager/WLANManager.rc
+++ b/WLANManager/WLANManager.rc
--- a/WLANManager/WLANManager.vcxproj
+++ b/WLANManager/WLANManager.vcxproj
@ -58,7 +58,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -73,6 +73,11 @@
  <ItemGroup>
    <ResourceCompile Include="WLANManager.rc" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
+  </ItemGroup>
  <ItemGroup>
    <None Include="locale\bg_BG.po" />
    <None Include="locale\ca_ES.po" />
--- a/WLANManager/locale/es_ES.po
+++ b/WLANManager/locale/es_ES.po
@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/WLANManager/locale/it_IT.po
+++ b/WLANManager/locale/it_IT.po
@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/WLANManager/locale/nb_NO.po
+++ b/WLANManager/locale/nb_NO.po
@ -1,6 +1,6 @@
 # 
 # Translators:
-# Tom Ivar Myren <tom.myren@sikt.no>, 2016
+# Tom Ivar Myren <tom.myren@uninett.no>, 2016
 # 
 #, fuzzy
 msgid ""
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2019-08-12 14:09+0200\n"
 "PO-Revision-Date: 2016-08-28 10:03+0000\n"
-"Last-Translator: Tom Ivar Myren <tom.myren@sikt.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/WLANManager/locale/pt_PT.po
+++ b/WLANManager/locale/pt_PT.po
@ -1,6 +1,6 @@
 # 
 # Translators:
-# Pedro Simões <psimoes@fccn.pt>, 2022
+# Pedro Simões <psimoes@fccn.pt>, 2016
 # 
 #, fuzzy
 msgid ""
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2019-08-12 14:09+0200\n"
 "PO-Revision-Date: 2016-08-28 10:03+0000\n"
-"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2022\n"
+"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2016\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
@ -39,5 +39,3 @@ msgstr "WLAN Manager"
 msgid ""
 "Helper utility to support direct shortcuts to Wireless Network Properties"
 msgstr ""
-"Utilitário auxiliar para oferecer suporte a atalhos diretos para "
-"Propriedades de rede sem fio"
--- a/bin/MkLnk.wsf
+++ b/bin/MkLnk.wsf
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 1991-2022 Amebis
+    Copyright © 1991-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <package>
 	<job id="MkLnk">
 		<runtime>
-			<description>Creates shortcut to a program - Copyright © 2015-2022 Amebis</description>
+			<description>Creates shortcut to a program - Copyright © 2015-2021 Amebis</description>
 			<unnamed name="&lt;Shortcut.lnk&gt;" required="true"  helpstring="Shortcut file to create"/>
 			<unnamed name="&lt;Target&gt;"       required="true"  helpstring="Target file the shortcut invokes"/>
 			<named name="A" type="string"        required="false" helpstring="Command line arguments"/>
--- a/include/ARM64.props
+++ b/include/ARM64.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--- a/include/Common.props
+++ b/include/Common.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@ -17,7 +17,6 @@
    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <CAExcludePath>$(WXWIN);$(CAExcludePath)</CAExcludePath>
-    <SpectreMitigation>Spectre</SpectreMitigation>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
@ -29,7 +28,6 @@
      <StringPooling>true</StringPooling>
      <EnablePREfast>true</EnablePREfast>
      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
--- a/include/Debug.props
+++ b/include/Debug.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@ -20,4 +20,9 @@
      <EnableCOMDATFolding>false</EnableCOMDATFolding>
    </Link>
  </ItemDefinitionGroup>
+  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
+    <Message Text="Signing output file..." />
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
+    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
+  </Target>
 </Project>
--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/Release.props
+++ b/include/Release.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@ -26,14 +26,9 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
  </ItemDefinitionGroup>
-  <Target Name="SignLocal" Condition="('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary') and '$(ManifestCertificateThumbprint)' != ''"
-    AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
-    <Exec Command="signtool.exe sign /sha1 &quot;$(ManifestCertificateThumbprint)&quot; /fd SHA256 /tr &quot;$(ManifestTimestampRFC3161Url)&quot; /td SHA256 /q &quot;$(TargetPath)&quot;" />
-    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
-  </Target>
-  <Target Name="SignAzure" Condition="('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary') and exists('$(APPDATA)\Microsoft.Trusted.Signing.Client.json')"
-    AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
-    <Exec Command="signtool.exe sign /dlib &quot;$(USERPROFILE)\.nuget\packages\microsoft.trusted.signing.client\1.0.53\bin\$(PreferredToolArchitecture)\Azure.CodeSigning.Dlib.dll&quot; /dmdf &quot;$(APPDATA)\Microsoft.Trusted.Signing.Client.json&quot; /fd SHA256 /tr &quot;http://timestamp.acs.microsoft.com&quot; /td SHA256 /q &quot;$(TargetPath)&quot;" />
+  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
+    <Message Text="Signing output file..." />
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /tr &quot;%ManifestTimestampRFC3161Url%&quot; /td sha256 /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
  </Target>
 </Project>
--- a/include/Version.h
+++ b/include/Version.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -24,26 +24,26 @@
 //
 #define PRODUCT_VERSION_MAJ      1
 #define PRODUCT_VERSION_MIN      3
-#define PRODUCT_VERSION_REV      8
+#define PRODUCT_VERSION_REV      5
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.3h"
-#define PRODUCT_BUILD_YEAR_STR   "2022"
+#define PRODUCT_VERSION_STR      "1.3e"
+#define PRODUCT_BUILD_YEAR_STR   "2021"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.3.8"
+#define PRODUCT_VERSION_INST     "1.3.5"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{4AAA7B01-3457-45EE-BCD1-C3FD4117F018}"
+#define PRODUCT_VERSION_GUID     "{DCFDC4D7-81DE-4BEA-9E35-62BB56766EA6}"

 //
 // Product vendor
--- a/include/Win32.props
+++ b/include/Win32.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--- a/include/x64.props
+++ b/include/x64.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2016-2022 Amebis
+    Copyright © 2016-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--- a/include/xgettext.props
+++ b/include/xgettext.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 1991-2022 Amebis
+    Copyright © 1991-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--- a/include/xgettext.targets
+++ b/include/xgettext.targets
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 1991-2022 Amebis
+    Copyright © 1991-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--- a/include/xgettext.xml
+++ b/include/xgettext.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 1991-2022 Amebis
+    Copyright © 1991-2021 Amebis
    Copyright © 2016 GÉANT
 -->
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
--- a/lib/EAPBase/build/EAPBase.vcxproj
+++ b/lib/EAPBase/build/EAPBase.vcxproj
@ -58,7 +58,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/lib/EAPBase/include/Config.h
+++ b/lib/EAPBase/include/Config.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/include/Credentials.h
+++ b/lib/EAPBase/include/Credentials.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/include/EAP.h
+++ b/lib/EAPBase/include/EAP.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -1264,7 +1264,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::cert_contex
    if (dwCertEncodedSize) {
        auto ptr_end = cursor.ptr + dwCertEncodedSize;
        assert(ptr_end <= cursor.ptr_end);
-        val = CertCreateCertificateContext(dwCertEncodingType, (BYTE*)cursor.ptr, dwCertEncodedSize);
+        val.create(dwCertEncodingType, (BYTE*)cursor.ptr, dwCertEncodedSize);
        cursor.ptr = ptr_end;
    } else
        val.free();
--- a/lib/EAPBase/include/EAPXML.h
+++ b/lib/EAPBase/include/EAPXML.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -544,8 +544,8 @@ namespace eapxml

 #pragma once

-#include <stdex/hex.hpp>
-#include <stdex/base64.hpp>
+#include <WinStd/Base64.h>
+#include <WinStd/Hex.h>

 #include <assert.h>

@ -711,7 +711,7 @@ namespace eapxml
        winstd::bstr bstr;
        HRESULT hr = get_element_value(pXmlParent, bstrElementName, bstr, ppXmlElement);
        if (SUCCEEDED(hr)) {
-            stdex::base64_dec dec;
+            winstd::base64_dec dec;
            bool is_last;
            dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
        }
@ -726,7 +726,7 @@ namespace eapxml
        winstd::bstr bstr;
        HRESULT hr = get_element_value(pXmlParent, bstrElementName, bstr, ppXmlElement);
        if (SUCCEEDED(hr)) {
-            stdex::hex_dec dec;
+            winstd::hex_dec dec;
            bool is_last;
            dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
        }
@ -763,11 +763,11 @@ namespace eapxml
        winstd::bstr bstrDefault, bstrEn;
        for (long i = 0; ; i++) {
            if (i >= lCount) {
-                if (!!bstrDefault) {
+                if (bstrDefault != NULL) {
                    // Return "C" localization.
                    pbstrValue = std::move(bstrDefault);
                    return S_OK;
-                } else if (!!bstrEn) {
+                } else if (bstrEn != NULL) {
                    // Return "en" localization.
                    pbstrValue = std::move(bstrEn);
                    return S_OK;
@ -853,55 +853,31 @@ namespace eapxml

    inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ DWORD dwValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement)
    {
-        return put_element_value(
-            pDoc,
-            pCurrentDOMNode,
-            bstrElementName,
-            bstrNamespace,
-            winstd::bstr(winstd::wstring_printf(L"%d", dwValue)),
-            ppXmlElement);
+        return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(winstd::wstring_printf(L"%d", dwValue)), ppXmlElement);
    }


    inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ bool bValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement)
    {
-        return put_element_value(
-            pDoc,
-            pCurrentDOMNode,
-            bstrElementName,
-            bstrNamespace,
-            winstd::bstr(bValue ? L"true": L"false"),
-            ppXmlElement);
+        return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(bValue ? L"true": L"false"), ppXmlElement);
    }


    inline HRESULT put_element_base64(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement)
    {
        std::wstring sBase64;
-        stdex::base64_enc enc;
+        winstd::base64_enc enc;
        enc.encode(sBase64, pValue, nValueLen);
-        return put_element_value(
-            pDoc,
-            pCurrentDOMNode,
-            bstrElementName,
-            bstrNamespace,
-            winstd::bstr(sBase64),
-            ppXmlElement);
+        return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(sBase64), ppXmlElement);
    }


    inline HRESULT put_element_hex(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement)
    {
        std::wstring sHex;
-        stdex::hex_enc enc;
+        winstd::hex_enc enc;
        enc.encode(sHex, pValue, nValueLen);
-        return put_element_value(
-            pDoc,
-            pCurrentDOMNode,
-            bstrElementName,
-            bstrNamespace,
-            winstd::bstr(sHex),
-            ppXmlElement);
+        return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(sHex), ppXmlElement);
    }


@ -969,7 +945,7 @@ namespace eapxml
        winstd::bstr bstr;
        HRESULT hr = get_attrib_value(pXmlParent, bstrAttributeName, &bstr);
        if (SUCCEEDED(hr)) {
-            stdex::base64_dec dec;
+            winstd::base64_dec dec;
            bool is_last;
            dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
        }
@ -984,7 +960,7 @@ namespace eapxml
        winstd::bstr bstr;
        HRESULT hr = get_attrib_value(pXmlParent, bstrAttributeName, &bstr);
        if (SUCCEEDED(hr)) {
-            stdex::hex_dec dec;
+            winstd::hex_dec dec;
            bool is_last;
            dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
        }
@ -1009,43 +985,31 @@ namespace eapxml

    inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_ DWORD dwValue)
    {
-        return put_attrib_value(
-            pCurrentDOMNode,
-            bstrAttributeName,
-            winstd::bstr(winstd::wstring_printf(L"%d", dwValue)));
+        return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(winstd::wstring_printf(L"%d", dwValue)));
    }


    inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_ bool bValue)
    {
-        return put_attrib_value(
-            pCurrentDOMNode,
-            bstrAttributeName,
-            winstd::bstr(bValue ? L"true": L"false"));
+        return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(bValue ? L"true": L"false"));
    }


    inline HRESULT put_attrib_base64(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen)
    {
        std::wstring sBase64;
-        stdex::base64_enc enc;
+        winstd::base64_enc enc;
        enc.encode(sBase64, pValue, nValueLen);
-        return put_attrib_value(
-            pCurrentDOMNode,
-            bstrAttributeName,
-            winstd::bstr(sBase64));
+        return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(sBase64));
    }


    inline HRESULT put_attrib_hex(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen)
    {
        std::wstring sHex;
-        stdex::hex_enc enc;
+        winstd::hex_enc enc;
        enc.encode(sHex, pValue, nValueLen);
-        return put_attrib_value(
-            pCurrentDOMNode,
-            bstrAttributeName,
-            winstd::bstr(sHex));
+        return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(sHex));
    }


--- a/lib/EAPBase/include/Method.h
+++ b/lib/EAPBase/include/Method.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -407,7 +407,7 @@ namespace eap
            DWORD keyinfo_size = 0;
            if (!CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_RSA_PRIVATE_KEY, s_rsa_key, sizeof(s_rsa_key), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
                throw winstd::win_runtime_error(__FUNCTION__ " CryptDecodeObjectEx failed.");
-            if (!CryptImportKey(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0, key_rsa))
+            if (!key_rsa.import(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0))
                throw winstd::win_runtime_error(__FUNCTION__ " Key import failed.");

            // Import the 256-bit AES session key.
@ -482,7 +482,7 @@ namespace eap
        {
            // Create hash.
            winstd::crypt_hash hash;
-            if (!CryptCreateHash(hProv, CALG_MD5, NULL, 0, hash))
+            if (!hash.create(hProv, CALG_MD5))
                throw winstd::win_runtime_error(__FUNCTION__ " Creating MD5 hash failed.");
            DWORD dwHashSize;
            CryptGetHashParam(hash, HP_HASHSIZE, dwHashSize, 0);
@ -563,7 +563,7 @@ namespace eap
 #if EAP_ENCRYPT_BLOBS
            // Prepare cryptographics provider.
            winstd::crypt_prov cp;
-            if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+            if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
                throw winstd::win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

            // Decrypt data.
@ -592,7 +592,7 @@ namespace eap
 #if EAP_ENCRYPT_BLOBS
            // Prepare cryptographics provider.
            winstd::crypt_prov cp;
-            if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+            if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
                throw winstd::win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

            // Decrypt data.
@ -627,7 +627,7 @@ namespace eap
 #if EAP_ENCRYPT_BLOBS
            // Prepare cryptographics provider.
            winstd::crypt_prov cp;
-            if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+            if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
                throw winstd::win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

            // Encrypt BLOB.
@ -675,7 +675,7 @@ namespace eap

            // Prepare cryptographics provider.
            winstd::crypt_prov cp;
-            if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+            if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
                throw winstd::win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

            // Encrypt BLOB.
--- a/lib/EAPBase/include/UIContext.h
+++ b/lib/EAPBase/include/UIContext.h
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016-2017 GÉANT
 */

--- a/lib/EAPBase/src/Config.cpp
+++ b/lib/EAPBase/src/Config.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/src/Credentials.cpp
+++ b/lib/EAPBase/src/Credentials.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -292,7 +292,7 @@ eap::credentials::source_t eap::credentials_identity::combine(
    if (cred_cached) {
        // Using EAP service cached credentials.
        *this = *dynamic_cast<const credentials_identity*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
        return source_t::cache;
    }

@ -300,7 +300,7 @@ eap::credentials::source_t eap::credentials_identity::combine(
    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
        // Using configured credentials.
        *this = *dynamic_cast<const credentials_identity*>(cfg_with_cred->m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
        return source_t::config;
    }

@ -311,7 +311,7 @@ eap::credentials::source_t eap::credentials_identity::combine(

            // Using stored credentials.
            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
            return source_t::storage;
        } catch (...) {
            // Not actually an error.
@ -403,7 +403,7 @@ void eap::credentials_pass::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *p

    // Prepare cryptographics provider.
    crypt_prov cp;
-    if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+    if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
        throw win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

    // <Password>
@ -452,28 +452,28 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot)

    if (encryption && CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, encryption, encryption.length(), _L(PRODUCT_NAME_STR) _L(" v2"), -1, NULL, NULL, 0) == CSTR_EQUAL) {
        // Decode Base64.
-        stdex::base64_dec dec;
+        winstd::base64_dec dec;
        bool is_last;
        vector<unsigned char> password_enc;
        dec.decode(password_enc, is_last, (BSTR)password, password.length());

        // Prepare cryptographics provider.
        crypt_prov cp;
-        if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+        if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
            throw win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

        m_password = m_module.decrypt_str<char_traits<wchar_t>, sanitizing_allocator<wchar_t> >(cp, password_enc.data(), password_enc.size());
        m_enc_alg  = enc_alg_t::native;
    } else if (encryption && CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, encryption, encryption.length(), _L(PRODUCT_NAME_STR), -1, NULL, NULL, 0) == CSTR_EQUAL) {
        // Decode Base64.
-        stdex::base64_dec dec;
+        winstd::base64_dec dec;
        bool is_last;
        vector<unsigned char> password_enc;
        dec.decode(password_enc, is_last, (BSTR)password, password.length());

        // Prepare cryptographics provider.
        crypt_prov cp;
-        if (!CryptAcquireContext(cp, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+        if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
            throw win_runtime_error(__FUNCTION__ " CryptAcquireContext failed.");

        #pragma warning(suppress: 4996) // Support for backward compatibility.
@ -609,7 +609,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
    if (cred_cached) {
        // Using EAP service cached credentials.
        *this = *dynamic_cast<const credentials_pass*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
        return source_t::cache;
    }

@ -617,7 +617,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
        // Using configured credentials.
        *this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
        return source_t::config;
    }

@ -628,7 +628,7 @@ eap::credentials::source_t eap::credentials_pass::combine(

            // Using stored credentials.
            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
            return source_t::storage;
        } catch (...) {
            // Not actually an error.
--- a/lib/EAPBase/src/EAP.cpp
+++ b/lib/EAPBase/src/EAP.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/src/Method.cpp
+++ b/lib/EAPBase/src/Method.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/lib/EAPBase/src/Module.cpp
+++ b/lib/EAPBase/src/Module.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

@ -16,17 +16,18 @@ using namespace winstd;

 eap::module::module(_In_ eap_type_t eap_method) :
    m_eap_method(eap_method),
-    m_instance(NULL),
-    m_heap(HeapCreate(0, 0, 0))
+    m_instance(NULL)
 {
    m_ep.create(&EAPMETHOD_TRACE_EVENT_PROVIDER);
-    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((unsigned int)m_eap_method), blank_event_data);
+    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((unsigned int)m_eap_method), event_data::blank);
+
+    m_heap.create(0, 0, 0);
 }


 eap::module::~module()
 {
-    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((unsigned int)m_eap_method), blank_event_data);
+    m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((unsigned int)m_eap_method), event_data::blank);
 }


@ -185,7 +186,7 @@ std::vector<unsigned char> eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytec
    DWORD keyinfo_size = 0;
    if (!CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_RSA_PRIVATE_KEY, s_rsa_key, sizeof(s_rsa_key), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
        throw winstd::win_runtime_error(__FUNCTION__ " CryptDecodeObjectEx failed.");
-    if (!CryptImportKey(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0, key_rsa))
+    if (!key_rsa.import(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0))
        throw winstd::win_runtime_error(__FUNCTION__ " Key import failed.");

    // Export AES session key encrypted with public RSA key.
@ -214,7 +215,7 @@ std::vector<unsigned char> eap::module::encrypt_md5(_In_ HCRYPTPROV hProv, _In_b
 {
    // Create hash.
    crypt_hash hash;
-    if (!CryptCreateHash(hProv, CALG_MD5, NULL, 0, hash))
+    if (!hash.create(hProv, CALG_MD5))
        throw win_runtime_error(__FUNCTION__ " Creating MD5 hash failed.");

    // Encrypt data.
@ -366,7 +367,7 @@ void eap::peer::get_identity(
        // Credentials missing or incomplete.
        if ((dwFlags & EAP_FLAG_MACHINE_AUTH) == 0) {
            // Per-user authentication, request UI.
-            log_event(&EAPMETHOD_TRACE_EVT_CRED_INVOKE_UI2, blank_event_data);
+            log_event(&EAPMETHOD_TRACE_EVT_CRED_INVOKE_UI2, event_data::blank);
            *ppUserDataOut = NULL;
            *pdwUserDataOutSize = 0;
            *pfInvokeUI = TRUE;
@ -380,7 +381,7 @@ void eap::peer::get_identity(

    // Build our identity. ;)
    wstring identity(std::move(cfg_method->get_public_identity(*cred_out.m_cred.get())));
-    log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), blank_event_data);
+    log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), event_data::blank);
    size_t size = sizeof(WCHAR)*(identity.length() + 1);
    *ppwszIdentity = (WCHAR*)alloc_memory(size);
    memcpy(*ppwszIdentity, identity.c_str(), size);
--- a/lib/EAPBase/src/PCH.cpp
+++ b/lib/EAPBase/src/PCH.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-License-Identifier: GPL-3.0-or-later
-    Copyright © 2015-2022 Amebis
+    Copyright © 2015-2021 Amebis
    Copyright © 2016 GÉANT
 */

--- a/Show More
+++ b/Show More