Upgrade code signing

This adds support for Microsoft Azure Trusted Signing and removes signing of the Debug binaries to minimize the Trusted Signing API volume. Signed-off-by: Simon Rozman <simon@rozman.si>
WinStd, stdex, wxExtend: Update
2024-11-19 10:49:17 +01:00 · 2024-11-19 10:44:41 +01:00 · 2022-10-28 14:07:00 +02:00 · 2022-10-28 14:04:59 +02:00 · 2022-10-13 12:39:47 +02:00 · 2022-10-03 19:35:40 +02:00
259 changed files with 1993 additions and 4275 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -7,3 +7,6 @@
 [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/.tgitconfig
+++ b/.tgitconfig
@ -1,4 +0,0 @@
-[tgit]
-	projectlanguage = 1033
-	warnnosignedoffby = true
-	icon = include/icon_full.ico
--- a/CredWrite/CredWrite.rc
+++ b/CredWrite/CredWrite.rc
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@ -28,87 +28,39 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CredWrite</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\include\$(Platform).props" />
    <Import Project="..\include\$(Configuration).props" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="PCH.h" />
  </ItemGroup>
@ -134,14 +86,10 @@
    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="README.md" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@ -1,26 +1,13 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"

 using namespace std;
+using namespace stdex;
 using namespace winstd;

 class module_dummy : public eap::module {
@ -125,9 +112,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
    UNREFERENCED_PARAMETER(lpCmdLine);
    UNREFERENCED_PARAMETER(nCmdShow);

+    _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
    g_module.m_instance = hInstance;

    int res = CredWrite();
-    assert(!_CrtDumpMemoryLeaks());
    return res;
 }
--- a/CredWrite/PCH.cpp
+++ b/CredWrite/PCH.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/CredWrite/PCH.h
+++ b/CredWrite/PCH.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #pragma once
@ -25,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
@ -4,14 +4,13 @@
    <Import Project="..\include\$(Platform).props" />
    <Import Project="..\include\$(Configuration).props" />
  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_PropertySheetDisplayName>EAP Method Common</_PropertySheetDisplayName>
    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -21,8 +20,5 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
  </ItemGroup>
 </Project>
--- a/EAPMethods/EAP-TTLS.vcxproj
+++ b/EAPMethods/EAP-TTLS.vcxproj
@ -29,65 +29,29 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
    <RootNamespace>EAP-TTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="EAPMethod.props" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -96,12 +60,6 @@
      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ProjectReference Include="..\lib\EapHost\build\EapHost.vcxproj">
      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
@ -123,6 +81,5 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
--- a/EAPMethods/EAP-TTLS.vcxproj.filters
+++ b/EAPMethods/EAP-TTLS.vcxproj.filters
@ -26,6 +26,9 @@
    <ClCompile Include="Main.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="Register.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="res\EAPMethod.rc">
--- a/EAPMethods/EAP-TTLS_UI.vcxproj
+++ b/EAPMethods/EAP-TTLS_UI.vcxproj
@ -29,65 +29,29 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
    <RootNamespace>EAP-TTLS_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="EAPMethod_UI.props" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -96,12 +60,6 @@
      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ProjectReference Include="..\lib\EapHost\build\EapHost.vcxproj">
      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
--- a/EAPMethods/EAP-TTLS_UI.vcxproj.filters
+++ b/EAPMethods/EAP-TTLS_UI.vcxproj.filters
@ -30,6 +30,9 @@
    <ClCompile Include="Main_UI.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="Register_UI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="res\EAPMethod_UI.rc">
--- a/EAPMethods/EAPMethod.def
+++ b/EAPMethods/EAPMethod.def
--- a/EAPMethods/EAPMethod.props
+++ b/EAPMethods/EAPMethod.props
@ -3,8 +3,6 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="Common.props" />
  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
  <ItemDefinitionGroup>
    <Link>
      <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
@ -18,6 +16,7 @@
    <ClCompile Include="PCH.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
+    <ClCompile Include="Register.cpp" />
  </ItemGroup>
  <ItemGroup>
    <None Include="EAPMethod.def" />
--- a/EAPMethods/EAPMethod_UI.def
+++ b/EAPMethods/EAPMethod_UI.def
--- a/EAPMethods/EAPMethod_UI.props
+++ b/EAPMethods/EAPMethod_UI.props
@ -3,8 +3,6 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="Common.props" />
  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeaderFile>PCH_UI.h</PrecompiledHeaderFile>
@ -21,6 +19,7 @@
    <ClCompile Include="PCH_UI.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
+    <ClCompile Include="Register_UI.cpp" />
  </ItemGroup>
  <ItemGroup>
    <None Include="EAPMethod_UI.def" />
@ -66,7 +65,7 @@
    <ProjectReference Include="..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
      <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- 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,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
@ -41,10 +27,10 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
    if (fdwReason == DLL_PROCESS_ATTACH) {
 #ifdef _DEBUG
        //Sleep(10000);
+        _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
        g_peer.m_instance = hinstDLL;
-    } else if (fdwReason == DLL_PROCESS_DETACH)
-        assert(!_CrtDumpMemoryLeaks());
+    }

    return TRUE;
 }
@ -106,8 +92,12 @@ DWORD WINAPI EapPeerGetInfo(EAP_TYPE* pEapType, EAP_PEER_METHOD_ROUTINES* pEapPe
    if (pEapType->type != EAPMETHOD_TYPE)
        return dwResult = ERROR_NOT_SUPPORTED;

-    pEapPeerMethodRoutines->dwVersion                    = PRODUCT_VERSION;
-    pEapPeerMethodRoutines->pEapType                     = NULL;
+    pEapPeerMethodRoutines->dwVersion =
+        ((PRODUCT_VERSION_MAJ   & 0xff) << 24) |
+        ((PRODUCT_VERSION_MIN   & 0xff) << 16) |
+        ((PRODUCT_VERSION_REV   & 0xff) <<  8) |
+         (PRODUCT_VERSION_BUILD & 0xff);
+    pEapPeerMethodRoutines->pEapType = NULL;

    pEapPeerMethodRoutines->EapPeerInitialize            = EapPeerInitialize;
    pEapPeerMethodRoutines->EapPeerShutdown              = EapPeerShutdown;
--- a/EAPMethods/Main_UI.cpp
+++ b/EAPMethods/Main_UI.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH_UI.h"
@ -42,6 +28,7 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
    if (fdwReason == DLL_PROCESS_ATTACH) {
 #ifdef _DEBUG
        //Sleep(10000);
+        _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
        g_peer.m_instance = hinstDLL;

@ -55,10 +42,6 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
    } else if (fdwReason == DLL_PROCESS_DETACH) {
        if (g_act_ctx)
            ReleaseActCtx(g_act_ctx);
-
-        // wxWidgets library has some global objects allocating data on heap in constructors,
-        // causing false-positive memory leak reports.
-        //assert(!_CrtDumpMemoryLeaks());
    }

    return TRUE;
@ -188,7 +171,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml(

    // Create configuration XML document.
    com_obj<IXMLDOMDocument2> pConfigDoc;
-    if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER)))
+    if (FAILED(hr = CoCreateInstance(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, pConfigDoc)))
        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,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/EAPMethods/PCH.h
+++ b/EAPMethods/PCH.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #pragma once
@ -27,3 +13,5 @@
 #else
 #error Unknown EAP Method type.
 #endif
+
+extern EAPMETHOD_PEER g_peer;
--- a/EAPMethods/PCH_UI.cpp
+++ b/EAPMethods/PCH_UI.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 G<EFBFBD>ANT
-
-    This file is part of G<EFBFBD>ANTLink.
-
-    G<EFBFBD>ANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    G<EFBFBD>ANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with G<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH_UI.h"
--- a/EAPMethods/PCH_UI.h
+++ b/EAPMethods/PCH_UI.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #pragma once
@ -29,3 +15,5 @@
 #else
 #error Unknown EAP Method type.
 #endif
+
+extern EAPMETHOD_PEER_UI g_peer;
--- a/EAPMethods/Register.cpp
+++ b/EAPMethods/Register.cpp
@ -0,0 +1,89 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2022 Amebis
+    Copyright © 2016 GÉANT
+*/
+
+#include "PCH.h"
+
+using namespace std;
+using namespace winstd;
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ LPCTSTR sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue), (DWORD)((_tcslen(sValue) + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ const tstring &sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue.c_str()), (DWORD)((sValue.length() + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ DWORD dwValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_DWORD, reinterpret_cast<LPCBYTE>(&dwValue), sizeof(dwValue));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+///
+/// Registers method in EapHost registry
+///
+/// \returns S_OK if successful; E_FAIL otherwise
+///
+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);
+        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);
+        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 (!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);
+        set_value(key_method, _T("PeerFriendlyName"), sz2);
+        set_value(key_method, _T("Properties")      , (DWORD)389871807);
+
+        return S_OK;
+    } catch(win_runtime_error &err) {
+        OutputDebugStr(_T("%hs (error %u)\n"), err.what(), err.number());
+        return E_FAIL;
+    } catch(...) {
+        OutputDebugStr(_T("Registering DLL failed.\n"));
+        return E_FAIL;
+    }
+}
+
+
+///
+/// Unregisters method from EapHost registry
+///
+/// \returns Always S_OK
+///
+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);
+        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
+        if (!key_methods.delete_subkey(sz.c_str())) throw win_runtime_error();
+    } catch(...) {}
+    return S_OK;
+}
--- a/EAPMethods/Register_UI.cpp
+++ b/EAPMethods/Register_UI.cpp
@ -0,0 +1,90 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2022 Amebis
+    Copyright © 2016 GÉANT
+*/
+
+#include "PCH_UI.h"
+
+using namespace std;
+using namespace winstd;
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ LPCTSTR sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue), (DWORD)((_tcslen(sValue) + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ const tstring &sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue.c_str()), (DWORD)((sValue.length() + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ DWORD dwValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_DWORD, reinterpret_cast<LPCBYTE>(&dwValue), sizeof(dwValue));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+///
+/// Registers method UI in EapHost registry
+///
+/// \returns S_OK if successful; E_FAIL otherwise
+///
+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);
+        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);
+        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 (!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);
+        set_value(key_method, _T("PeerInteractiveUIPath")   , sz);
+        set_value(key_method, _T("PeerInvokePasswordDialog"), (DWORD)0);
+        set_value(key_method, _T("PeerInvokeUsernameDialog"), (DWORD)0);
+
+        return S_OK;
+    } catch(win_runtime_error &err) {
+        OutputDebugStr(_T("%hs (error %u)\n"), err.what(), err.number());
+        return E_FAIL;
+    } catch(...) {
+        OutputDebugStr(_T("Registering DLL failed.\n"));
+        return E_FAIL;
+    }
+}
+
+
+///
+/// Unregisters method UI from EapHost registry
+///
+/// \returns Always S_OK
+///
+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);
+        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
+        key_methods.delete_subkey(sz.c_str());
+    } catch(...) {}
+    return S_OK;
+}
--- a/EAPMethods/locale/ca_ES.po
+++ b/EAPMethods/locale/ca_ES.po
@ -1,6 +1,7 @@
+# 
 # Translators:
 # eduki <ecercos@xtec.cat>, 2018
-# jmontane, 2019
+# Joan Montané, 2019
 # Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
--- a/EAPMethods/locale/de_DE.po
+++ b/EAPMethods/locale/de_DE.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
--- a/EAPMethods/locale/el_GR.po
+++ b/EAPMethods/locale/el_GR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Vicky Kons <vickyk@admin.grnet.gr>, 2017
 # Halil Adem <hadem@noc.grnet.gr>, 2020
--- a/EAPMethods/locale/es_ES.po
+++ b/EAPMethods/locale/es_ES.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # Alberto Martínez Setién, 2020
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EAPMethods/locale/et_EE.po
+++ b/EAPMethods/locale/et_EE.po
@ -1,7 +1,8 @@
+# 
 # Translators:
 # Indrek Rokk <indrek.rokk@eenet.ee>, 2018
-# Anne M <anne@eenet.ee>, 2019
 # Simon Rozman <simon@rozman.si>, 2020
+# Anne M <anne@eenet.ee>, 2021
 # 
 #, fuzzy
 msgid ""
@ -9,7 +10,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: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Anne M <anne@eenet.ee>, 2021\n"
 "Language-Team: Estonian (https://www.transifex.com/eduroam_devel/teams/11799/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -75,7 +76,7 @@ msgstr "Kasutajakonto andmete kustutamine ebaõnnestus (viga %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 ""
+msgstr "(ei midagi)"

 #: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
@ -520,7 +521,7 @@ msgstr "Serveri usaldamine"

 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
-msgstr ""
+msgstr "Loetle serverid, mida usaldad vahendusrünnete tõrjumiseks."

 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@ -601,11 +602,11 @@ msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "No certificate selected"
-msgstr ""
+msgstr "Sertifikaati ei ole valitud"

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Valideerimiskonflikt"

 #: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
--- a/EAPMethods/locale/hr_HR.po
+++ b/EAPMethods/locale/hr_HR.po
@ -1,6 +1,7 @@
+# 
 # Translators:
-# Dubravko Penezic <dpenezic@gmail.com>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
+# Dubravko Penezic <dpenezic@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@ -8,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: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2022\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"
@ -599,7 +600,7 @@ msgstr ""

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

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
--- a/EAPMethods/locale/hu_HU.po
+++ b/EAPMethods/locale/hu_HU.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
--- a/EAPMethods/locale/it_IT.po
+++ b/EAPMethods/locale/it_IT.po
@ -1,6 +1,8 @@
+# 
 # Translators:
 # Daniele Albrizio <daniele@albrizio.it>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
+# Daniele Albrizio <dalbrizio@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@ -8,13 +10,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: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Daniele Albrizio <dalbrizio@gmail.com>, 2022\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=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
@ -74,7 +76,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 ""
+msgstr "(nessuno)"

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

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

 #: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
@ -328,6 +330,7 @@ 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"
@ -527,6 +530,7 @@ 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:"
@ -609,7 +613,7 @@ msgstr ""

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

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
@ -713,7 +717,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 ""
+msgstr "Metodo EAP-TTLS"

 #: 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,5 +1,6 @@
+# 
 # Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2017
+# Tom Ivar Myren <tom.myren@sikt.no>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
--- a/EAPMethods/locale/pl_PL.po
+++ b/EAPMethods/locale/pl_PL.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
--- a/EAPMethods/locale/pt_PT.po
+++ b/EAPMethods/locale/pt_PT.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Pedro Simões <psimoes@fccn.pt>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EAPMethods/locale/ro_RO.po
+++ b/EAPMethods/locale/ro_RO.po
@ -1,6 +1,7 @@
+# 
 # Translators:
-# Raul Opruta <raul.opruta@roedu.net>, 2020
 # Simon Rozman <simon@rozman.si>, 2020
+# Raul Opruta <raul.opruta@roedu.net>, 2020
 # 
 #, fuzzy
 msgid ""
@ -8,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: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Raul Opruta <raul.opruta@roedu.net>, 2020\n"
 "Language-Team: Romanian (Romania) (https://www.transifex.com/eduroam_devel/teams/11799/ro_RO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -616,11 +617,11 @@ msgstr ""

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "No certificate selected"
-msgstr ""
+msgstr "Niciun certificat selectat"

 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Conflict la validare"

 #: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
--- a/EAPMethods/locale/sl_SI.po
+++ b/EAPMethods/locale/sl_SI.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
@ -5,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
@ -14,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@ -27,7 +28,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"

-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@ -35,67 +36,67 @@ msgstr ""
 "Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz "
 "konfiguracije?"

-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Opozorilo"

-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Poverilnice EAP"

-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Nastavitve ponudnika"

-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
 #, c-format
 msgid "%s User Credentials"
 msgstr "Uporabnikove poverilnice za %s"

-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
+#: lib/EAPBase_UI/include/EAP_UI.h:866 lib/TTLS_UI/src/Module.cpp:196
 #: lib/TTLS_UI/src/Module.cpp:305
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
 "Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"

-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
+#: lib/EAPBase_UI/include/EAP_UI.h:869 lib/TTLS_UI/src/Module.cpp:198
 #: lib/TTLS_UI/src/Module.cpp:307
 msgid "Writing credentials failed."
 msgstr "Zapisovanje poverilnic ni uspelo."

-#: lib/EAPBase_UI/include/EAP_UI.h:899
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Izbris poverilnic ni uspel (napaka %u)."

-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: 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 "(brez)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(napaka %u)"

-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 msgid "(error)"
 msgstr "(napaka)"

-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr "(brez)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(prazen ID)"

-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "Za&pomni si"

-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Odkljukajte, če želite shraniti poverilnice"

-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(vaša organizacija)"

@ -127,11 +128,11 @@ msgstr "Odpre dialog z nastavitvami ponudnika"
 msgid "Select the source where your credentials used to connect are stored."
 msgstr "Izberite vir, kjer so shranjene vaše poverilnice za povezovanje."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Uporabi iz &Upravitelja poverilnic"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Uporabi iz &Upravitelja poverilnic:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@ -139,39 +140,15 @@ msgstr ""
 "Izberite to možnost, če želite uporabiti poverilnice shranjene v Upravitelju"
 " poverilnic Windows"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identiteta:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Vaše trenutne poverilnice shranjene v Upravitelju poverilnic Windows"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
-msgstr "Počisti poverilni&ce"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Uporabi iz nastavitev &profila:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
-msgid ""
-"Click to clear your credentials from Credential Manager.\n"
-"Note: You will be prompted to enter credentials when connecting."
-msgstr ""
-"Kliknite, da počistite svoje poverilnice iz upravitelja poverilnic.\n"
-"Opomba: Za vnos poverilnic boste pozvani ob povezovanju."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr "Na&stavi poverilnice ..."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
-msgid "Click here to set or modify your credentials"
-msgstr "Kliknite tukaj, da nastavite ali spremenite svoje poverilnice"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr "Uporabi iz nastavitev &profila"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@ -179,47 +156,67 @@ msgstr ""
 "Izberite to možnost, če želite shraniti poverilnice kot del nastavitev "
 "profila"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Profile configuration credentials"
 msgstr "Poverilnice nastavitev profila"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "Počisti poverilni&ce"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+msgstr ""
+"Kliknite, da počistite svoje poverilnice iz upravitelja poverilnic.\n"
+"Opomba: Za vnos poverilnic boste pozvani ob povezovanju."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:294
+msgid "&Set Credentials..."
+msgstr "Na&stavi poverilnice ..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr "Kliknite tukaj, da nastavite ali spremenite svoje poverilnice"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "ID uporabnika in geslo"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 msgid "Please provide your user ID and password."
 msgstr "Vnesite svoj ID uporabnika in geslo."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 msgid "User ID:"
 msgstr "ID uporabnika:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr "Tukaj vnesite svoje up. ime (up. ime@domena.si, DOMENA\\Uporabnik ipd.)"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
 msgid "Password:"
 msgstr "Geslo:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Tukaj vnesite svoje geslo"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID uporabnika"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr "Vnesite svoj ID uporabnika."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "Vaša organizacija"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@ -228,54 +225,42 @@ msgstr ""
 "predstavi, uporabniki lažje razumejo sporočila programa in ustrezneje "
 "reagirajo."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:464
 msgid "Your organization &name:"
 msgstr "Ime vaše orga&nizacije:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Ime vaše organizacije, kot bo nastopalo na obvestilih s stikom na center za "
 "pomoč"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 msgid "(Keep it short, please)"
 msgstr "(Naj bo kratko, prosim)"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr "Podatk&i centra za pomoč:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Naslov spletne strani vašega centra za pomoč"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "E-poštni naslov vašega centra za pomoč"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr "Telefonska številka vašega centra za pomoč"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr "Enolični identifikator ponudnika"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@ -283,33 +268,33 @@ msgstr ""
 "Dodelite svoji organizaciji enoznačen identifikator, da omogočite souporabo "
 "istih poverilnic različnim omrežnim profilom."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "&Namespace:"
 msgstr "Ime&nski prostor:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Enolični &identifikator ponudnika:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Identifikator vaše organizacije za souporabo istih poverilnic različnih "
 "profilov"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:614
 msgid "Configuration Lock"
 msgstr "Zaklep konfiguracije"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@ -317,7 +302,7 @@ msgstr ""
 "Svojo konfiguracijo lahko zaklenete in preprečite končnim uporabnikom "
 "nenamerno spreminjanje. Uporabniki bodo lahko vnašali samo poverilnice."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@ -325,51 +310,51 @@ msgstr ""
 "Zak&leni to konfiguracijo in prepreči vse nadaljnje spremembe preko up. "
 "vmesnika."

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Pozor: Ko zaklenete, vrnitev ne bo več možna preko tega dialoga!)"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr "Identiteta"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr "Izberite ID uporabnika, s katerim se prosilec predstavi overovitelju:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "Prava iden&titeta"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Uporabi moje pravo uporabniško ime"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr "Uporabi prazno id&entiteto"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr "Izpusti moje uporabniško ime in uporabi samo @mojadomena.si"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr "&Identiteta po meri:"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr "Navedite identiteto po meri"

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr "Zunanja po meri za uporabo"

-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Konfiguracija povezave EAP"

-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Ponudnik identitete EAP"

@ -587,7 +572,7 @@ msgstr ""
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primer: vzo.rec.si;streznik2.rec.si)"

-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Uporabnikovo potrdilo"

@ -611,32 +596,40 @@ msgstr ""
 "Vaša identiteta (up. ime@domena), ki bo nadomestila tisto s potrdila; ali "
 "prazno, če želite uporabiti tisto s potrdila"

-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr "Digitalno potrdilo ni izbrano"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Nesoglasje pri preverjanju"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Dodaj potrdilo"

-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Datoteke s potrdili (*.cer;*.crt;*.der;*.p7b;*.pem)"

-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Datoteke s potrdili X.509 (*.cer;*.crt;*.der;*.pem)"

-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Datoteke s potrdili PKCS #7 (*.p7b)"

-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr "Vse datoteke (*.*)"

-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Napačna ali nepodprta datoteka s potrdilom %s"

-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 msgid "Error"
 msgstr "Napaka"

@ -661,17 +654,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u)."

 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Zunanje overovljanje"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Notranje overovljanje"

-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Izberite metodo notranjega overovljanja s seznama"

-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Zunanje overovljanje"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
--- a/EAPMethods/locale/sr_RS.po
+++ b/EAPMethods/locale/sr_RS.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
--- a/EAPMethods/locale/tr_TR.po
+++ b/EAPMethods/locale/tr_TR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Gokhan Eryol <gokhaneryol@gmail.com>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
--- 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,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/EventMonitor/App.h
+++ b/EventMonitor/App.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 ///
--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
@ -78,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;
-        if (!trace.create(&tlf)) {
+        event_trace trace(OpenTrace(&tlf));
+        if (!trace) {
            wxLogError(_("Error opening event trace (error %u)."), GetLastError());
            continue;
        }
@ -608,33 +594,34 @@ wxString wxETWListCtrl::OnGetItemText(const winstd::event_rec &rec, long column)
        // Get event meta-info.
        unique_ptr<TRACE_EVENT_INFO> info;
        ULONG ulResult;
-        if ((ulResult = TdhGetEventInformation((PEVENT_RECORD)&rec, 0, NULL, info)) == ERROR_SUCCESS) {
-            if (info->DecodingSource != DecodingSourceWPP) {
-                if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) {
-                    // This is a string-only event. Print it.
-                    return reinterpret_cast<LPCWSTR>(rec.UserData);
-                } else {
-                    // This is not a string-only event. Prepare parameters.
+        if ((ulResult = TdhGetEventInformation((PEVENT_RECORD)&rec, 0, NULL, info)) != ERROR_SUCCESS)
+            return tstring_printf(_T("(Error getting event information (error %u))"), ulResult).c_str();

-                    BYTE nPtrSize = (rec.EventHeader.Flags & EVENT_HEADER_FLAG_32_BIT_HEADER) ? 4 : 8;
-                    vector<tstring> props;
-                    vector<DWORD_PTR> props_msg;
-                    props.reserve(info->TopLevelPropertyCount);
-                    props_msg.reserve(info->TopLevelPropertyCount);
-                    for (ULONG i = 0; i < info->TopLevelPropertyCount; i++) {
-                        props.push_back(std::move(PropertyToString((PEVENT_RECORD)&rec, info.get(), i, NULL, 0, nPtrSize)));
-                        props_msg.push_back((DWORD_PTR)props[i].c_str());
-                    }
+        if (info->DecodingSource != DecodingSourceWPP) {
+            if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) {
+                // This is a string-only event. Print it.
+                return reinterpret_cast<LPCWSTR>(rec.UserData);
+            } else {
+                // This is not a string-only event. Prepare parameters.

-                    if (info->EventMessageOffset) {
-                        // Format the message.
-                        return wstring_msg(0, reinterpret_cast<LPCTSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset), props_msg.data()).c_str();
-                    }
+                BYTE nPtrSize = (rec.EventHeader.Flags & EVENT_HEADER_FLAG_32_BIT_HEADER) ? 4 : 8;
+                vector<tstring> props;
+                vector<DWORD_PTR> props_msg;
+                props.reserve(info->TopLevelPropertyCount);
+                props_msg.reserve(info->TopLevelPropertyCount);
+                for (ULONG i = 0; i < info->TopLevelPropertyCount; i++) {
+                    props.push_back(std::move(PropertyToString((PEVENT_RECORD)&rec, info.get(), i, NULL, 0, nPtrSize)));
+                    props_msg.push_back((DWORD_PTR)props[i].c_str());
+                }
+
+                if (info->EventMessageOffset) {
+                    // Format the message.
+                    return wstring_msg(0, reinterpret_cast<LPCTSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset), props_msg.data()).c_str();
                }
-            } else if (info->EventMessageOffset) {
-                // This is a WPP event.
-                return reinterpret_cast<LPCWSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset);
            }
+        } else if (info->EventMessageOffset) {
+            // This is a WPP event.
+            return reinterpret_cast<LPCWSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset);
        }
    }
    }
@ -1059,7 +1046,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
    // Get the size of the array if the property is an array.
    ULONG ulArraySize = 0;
    if ((ulResult = GetArraySize(pEvent, pInfo, ulPropIndex, &ulArraySize)) != ERROR_SUCCESS)
-        return tstring_printf(_T("(Error getting array size (error %u))"), ulResult);;
+        return tstring_printf(_T("(Error getting array size (error %u))"), ulResult);

    tstring out;
    bool out_nonfirst = false;
--- a/EventMonitor/ETWLog.h
+++ b/EventMonitor/ETWLog.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

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

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

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

    wxListItemAttr m_item_attr[2][4];                   ///< Current item attributes
-    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
+    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

    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
@ -28,90 +28,42 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
    <RootNamespace>EventMonitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\include\$(Platform).props" />
    <Import Project="..\include\$(Configuration).props" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ResourceCompile Include="EventMonitor.rc" />
  </ItemGroup>
@ -137,10 +89,7 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EventMonitor/Frame.cpp
+++ b/EventMonitor/Frame.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
@ -47,14 +33,9 @@ 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;
-    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);
+    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));

    wxSize size_menu(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
    wxSize size_tool(size_menu);
--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@ -1,27 +1,13 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 class wxEventMonitorFrame;
 class wxPersistentEventMonitorFrame;

-#pragma once;
+#pragma once

 #include "LogPanel.h"

--- a/EventMonitor/LogPanel.cpp
+++ b/EventMonitor/LogPanel.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/EventMonitor/LogPanel.h
+++ b/EventMonitor/LogPanel.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 class wxEventMonitorLogPanel;
--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/PCH.cpp
+++ b/EventMonitor/PCH.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/EventMonitor/PCH.h
+++ b/EventMonitor/PCH.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #pragma once
--- a/EventMonitor/locale/ca_ES.po
+++ b/EventMonitor/locale/ca_ES.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # eduki <ecercos@xtec.cat>, 2016
 # 
--- a/EventMonitor/locale/de_DE.po
+++ b/EventMonitor/locale/de_DE.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # eduroam_devel <stefan.winter@restena.lu>, 2016
 # Eric Hoch <eric.hoch@hhu.de>, 2016
--- a/EventMonitor/locale/el_GR.po
+++ b/EventMonitor/locale/el_GR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Vicky Kons <vickyk@admin.grnet.gr>, 2016
 # Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016
--- a/EventMonitor/locale/es_ES.po
+++ b/EventMonitor/locale/es_ES.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # José Manuel Macías, 2016
 # 
@ -13,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/et_EE.po
+++ b/EventMonitor/locale/et_EE.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Indrek Rokk <indrek.rokk@eenet.ee>, 2018
 # Anne M <anne@eenet.ee>, 2019
--- a/EventMonitor/locale/hr_HR.po
+++ b/EventMonitor/locale/hr_HR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Dubravko Penezic <dpenezic@gmail.com>, 2016
 # 
--- a/EventMonitor/locale/it_IT.po
+++ b/EventMonitor/locale/it_IT.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
 # Daniele Albrizio <daniele@albrizio.it>, 2018
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\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,5 +1,6 @@
+# 
 # Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2016
+# Tom Ivar Myren <tom.myren@sikt.no>, 2016
 # 
 #, fuzzy
 msgid ""
@ -7,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@uninett.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@sikt.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/pl_PL.po
+++ b/EventMonitor/locale/pl_PL.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Tomasz Wolniewicz <tw2529@gmail.com>, 2016
 # 
--- a/EventMonitor/locale/pt_PT.po
+++ b/EventMonitor/locale/pt_PT.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Pedro Simões <psimoes@fccn.pt>, 2017
 # 
@ -13,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/ro_RO.po
+++ b/EventMonitor/locale/ro_RO.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Raul Opruta <raul.opruta@roedu.net>, 2020
 # 
--- a/EventMonitor/locale/sl_SI.po
+++ b/EventMonitor/locale/sl_SI.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 
--- a/EventMonitor/locale/sr_RS.po
+++ b/EventMonitor/locale/sr_RS.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2016
 # 
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@ -15,8 +15,6 @@ 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-16.0.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}"
@ -45,7 +43,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
 EndProject
@ -83,18 +81,6 @@ 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
@ -353,7 +339,6 @@ 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/ca_ES.po
+++ b/MSI/Base/locale/ca_ES.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # eduki <ecercos@xtec.cat>, 2016
--- a/MSI/Base/locale/de_DE.po
+++ b/MSI/Base/locale/de_DE.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # eduroam_devel <stefan.winter@restena.lu>, 2016
--- a/MSI/Base/locale/el_GR.po
+++ b/MSI/Base/locale/el_GR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Vicky Kons <vickyk@admin.grnet.gr>, 2016
--- a/MSI/Base/locale/es_ES.po
+++ b/MSI/Base/locale/es_ES.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # José Manuel Macías, 2016
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/et_EE.po
+++ b/MSI/Base/locale/et_EE.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2018
 # Anne M <anne@eenet.ee>, 2018
--- a/MSI/Base/locale/hr_HR.po
+++ b/MSI/Base/locale/hr_HR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Dubravko Penezic <dpenezic@gmail.com>, 2016
--- a/MSI/Base/locale/hu_HU.po
+++ b/MSI/Base/locale/hu_HU.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 
--- a/MSI/Base/locale/it_IT.po
+++ b/MSI/Base/locale/it_IT.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\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,6 +1,7 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
-# Tom Ivar Myren <tom.myren@uninett.no>, 2016
+# Tom Ivar Myren <tom.myren@sikt.no>, 2016
 # 
 #, fuzzy
 msgid ""
@ -8,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@uninett.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@sikt.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/pl_PL.po
+++ b/MSI/Base/locale/pl_PL.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Tomasz Wolniewicz <tw2529@gmail.com>, 2016
--- a/MSI/Base/locale/pt_PT.po
+++ b/MSI/Base/locale/pt_PT.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Pedro Simões <psimoes@fccn.pt>, 2016
@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/ro_RO.po
+++ b/MSI/Base/locale/ro_RO.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Raul Opruta <raul.opruta@roedu.net>, 2020
 # Simon Rozman <simon@rozman.si>, 2020
--- a/MSI/Base/locale/sl_SI.po
+++ b/MSI/Base/locale/sl_SI.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 
--- a/MSI/Base/locale/sr_RS.po
+++ b/MSI/Base/locale/sr_RS.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2016
--- a/MSI/Base/locale/tr_TR.po
+++ b/MSI/Base/locale/tr_TR.po
@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Gokhan Eryol <gokhaneryol@gmail.com>, 2017
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@ -1 +1 @@
-Subproject commit e1a01465701da2f554e27a9eaccf7a2a5da0f23b
+Subproject commit eccce8c523c9193c1e3a627e4dd8a80cd3cd5703
--- 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,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
@ -54,13 +40,14 @@ static int MsiUseFeature()

    if (nArgs > 2) {
        reg_key key;
-        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());
+        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);
            return 3;
        }

        wstring lang;
-        LSTATUS s = RegQueryStringValue(key, _T("Language"), lang);
+        s = RegQueryStringValue(key, _T("Language"), lang);
        if (s != ERROR_SUCCESS) {
            OutputDebugStr(_T("Error reading registry value (error %u).\n"), s);
            return 3;
@ -84,7 +71,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
    UNREFERENCED_PARAMETER(lpCmdLine);
    UNREFERENCED_PARAMETER(nCmdShow);

+    _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
+
    int res = MsiUseFeature();
-    assert(!_CrtDumpMemoryLeaks());
    return res;
 }
--- a/MsiUseFeature/MsiUseFeature.rc
+++ b/MsiUseFeature/MsiUseFeature.rc
--- a/MsiUseFeature/MsiUseFeature.vcxproj
+++ b/MsiUseFeature/MsiUseFeature.vcxproj
@ -28,87 +28,39 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{679D03C5-CD70-4FFA-93F8-A4AB3637509B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
    <RootNamespace>MsiUseFeature</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\include\$(Platform).props" />
    <Import Project="..\include\$(Configuration).props" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="PCH.h" />
  </ItemGroup>
@ -124,12 +76,6 @@
  <ItemGroup>
    <ResourceCompile Include="MsiUseFeature.rc" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
--- a/MsiUseFeature/PCH.cpp
+++ b/MsiUseFeature/PCH.cpp
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #include "PCH.h"
--- a/MsiUseFeature/PCH.h
+++ b/MsiUseFeature/PCH.h
@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */

 #pragma once
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	5293dfc1a7	Upgrade code signing This adds support for Microsoft Azure Trusted Signing and removes signing of the Debug binaries to minimize the Trusted Signing API volume. Signed-off-by: Simon Rozman <simon@rozman.si>	2024-11-19 10:49:17 +01:00
Simon Rozman	2a918254f6	WinStd, stdex, wxExtend: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2024-11-19 10:44:41 +01:00
Simon Rozman	0f3070033f	Stop reusing winstd::eap_attr after moved from MSVC C26800 warned us an object is not guaranteed to be cleared after being moved from. At least in std C++ implementations. Thou winstd does clear all objects after being moved from, we could just silence C26800 warning. But what if some day winstd behavior changes and with us having this warning silenced? std::eap_attr has no clear() method, therefore revert to using scope and temporary object. It achieves the same effect as clear after moved from does. Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-28 14:07:00 +02:00
Simon Rozman	887129ccc0	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-28 14:04:59 +02:00
Simon Rozman	511b8c04ea	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-13 12:39:47 +02:00
Simon Rozman	a174e42b3b	Preset version to 1.3h Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:35:40 +02:00
Simon Rozman	0ad6f61e15	WinStd, stdex: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	5cffd63cf5	MSI: Install WLANManager.exe to user computer It was being deployed as a satellite assembly since GÉANT didn't really use it. For other deployments it proves useful. It is required to run it on the user computer anyway, so no harm if the WLANManager.exe gets installed. Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	3215cc0cc7	Makefile: Discontinue publishing binaries to GitHub Publishing binaries to https://github.com/Amebis/GEANTLink-dist was a customer requirement. As GÉANT is no longer deploying GÉANTLink, this makes no sense any more. Should anybody require this feature, please contact me. Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	97958040a3	Makefile: Cleanup Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	4f69180e3d	Update translations from Transifex Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	232b374488	Preset version to 1.3g Signed-off-by: Simon Rozman <simon@rozman.si>	2022-10-03 19:09:37 +02:00
Simon Rozman	b049b7eeb8	Set version to 1.3f Signed-off-by: Simon Rozman <simon@rozman.si>	2022-04-07 08:58:57 +02:00
Simon Rozman	4d67075ff4	Update translations from Transifex Signed-off-by: Simon Rozman <simon@rozman.si>	2022-04-07 08:56:55 +02:00
Simon Rozman	af7bbb5ae4	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-04-07 08:52:22 +02:00
Simon Rozman	b0a7c5fd16	Enable MSVC Spectre mitigation Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-21 09:17:11 +01:00
Simon Rozman	53845c6abe	MSI: Simplify ProgramFiles(64)Folder property use Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-14 11:37:33 +01:00
Simon Rozman	609d55cfeb	stdex: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-07 11:46:45 +01:00
Simon Rozman	a2cab07a30	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-03 18:02:31 +01:00
Simon Rozman	831dcf680c	wxExtend: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-02 15:43:50 +01:00
Simon Rozman	52b29a48b8	MSIBuild: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-03-02 15:43:48 +01:00
Simon Rozman	8304e666a3	MSI: Discontinue prefixed row IDs in tables humanSimon, is this really you? 😉 Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-15 12:50:30 +01:00
Simon Rozman	05d51ce6b6	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-15 12:49:08 +01:00
Simon Rozman	4ed294171e	WinStd, stdex: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-04 14:46:54 +01:00
Simon Rozman	db34e71705	Move vector_queue from WinStd to stdex Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-04 14:45:07 +01:00
Simon Rozman	280e9206f2	stdex: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-03 15:42:04 +01:00
Simon Rozman	47b602e1fa	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-03 15:42:04 +01:00
Simon Rozman	19c523509b	Move Hex from WinStd to stdex Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-03 15:42:04 +01:00
Simon Rozman	a254dd527a	Move Base64 from WinStd to stdex Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-03 14:16:47 +01:00
Simon Rozman	6f92e82598	WinStd: Update Signed-off-by: Simon Rozman <simon@rozman.si>	2022-02-03 13:03:59 +01:00
Simon Rozman	5e7f55880a	Update Copyright and build year Signed-off-by: Simon Rozman <simon@rozman.si>	2022-01-07 11:21:33 +01:00
Simon Rozman	84fae77ed3	Prepare PDB.zip file locally The GEANTLink-dist repo is hosted on GitHub and hit the file size limit. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 15:35:36 +01:00
Simon Rozman	48ef747388	Set version to 1.3e Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 15:06:11 +01:00
Simon Rozman	4bd38d5d89	Address ICE warnings Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 15:06:11 +01:00
Simon Rozman	ce2cc15cc6	Discontinue PRODUCT_VERSION Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 14:12:42 +01:00
Simon Rozman	4ef4ec6f31	Introduce PDB packaging Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 13:48:45 +01:00
Simon Rozman	358dd021db	Hardcode MSIBUILD_OUTPUT_DIR and MSIBUILD_ROOT KISS!!! Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 13:24:40 +01:00
Simon Rozman	d0d0174576	MSIBuild: bump Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 12:32:42 +01:00
Simon Rozman	b44aeb7a79	Open-code CAB.mak All other MSI compilations are open-coded but this one. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 12:32:07 +01:00
Simon Rozman	4c4cb35bce	Hardcode output folder name KISS!!! Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 10:26:55 +01:00
Simon Rozman	0e7a9c7448	Redirect output files to the output folder Thou linker can locate the output .lib file of referenced projects wherever .lib is just fine, this helps us to gather all .pdb files in the output folder. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 07:20:50 +01:00
Simon Rozman	0d905f414e	Cleanup project files Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-01 06:28:32 +01:00
Simon Rozman	4fce7f58e1	MSIBuild: bump Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-23 14:52:26 +01:00
Simon Rozman	174baa36c1	Rebuild credentials if EapPeerBeginSession() did not provide them Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-23 14:11:57 +01:00
Simon Rozman	67805dc9d1	Add missing data length check Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-23 13:35:48 +01:00
Simon Rozman	83ad0ef45d	Preset version to 1.3d Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-23 10:10:50 +01:00
Simon Rozman	f144b85047	Set version to 1.3c Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-22 15:42:00 +01:00
Simon Rozman	b55ddd7d86	Update Copyright and build year Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-22 15:31:23 +01:00
Simon Rozman	b96ebfbce4	Switch to SPDX license notice Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-22 15:20:57 +01:00
Simon Rozman	0b7b16396a	Include full event source registration in Event Monitor MSI too Should user install EAP methods other than using GÉANTLink provided MSI files, the event source was only partially registered causing incomplete event display. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-22 15:20:56 +01:00
Simon Rozman	12ef3059e9	Backport EAPSup code changes This introduces some PEAP/EAP-TTLS split code, but helps maintain shared code base. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-22 15:20:56 +01:00
Simon Rozman	1994da974a	Backport EAPSup project changes Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-20 08:17:12 +01:00
Simon Rozman	2862faba73	Fix UTF-8 encoding Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-20 08:14:44 +01:00
Simon Rozman	ddf6ce6997	Update translations from Transifex Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-19 16:18:16 +01:00
Simon Rozman	e1707cfb01	Use environment to detect MSI tools path Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-19 15:58:57 +01:00
Simon Rozman	b00f379655	Resolve charset .idtx/.idt confusion NMake inline files are always created using ACP. The "1252" in the .idtx header has no effect on this. However, we must encode the .idt files using correct charset/codepage regardless the ACP being used on the building machine. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-19 15:55:31 +01:00
Simon Rozman	44e02e51e3	Remove excessive semicolon	2021-11-19 15:48:48 +01:00
Simon Rozman	1f6716b279	Cleanup WINSTD_NOVTABLE/__declspec(novtable) This was originally intended as a compiler hint. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-19 15:48:06 +01:00
Simon Rozman	71976a8a0b	wxExtend: bump Signed-off-by: Simon Rozman <simon@rozman.si>	2021-11-19 15:46:04 +01:00
Simon Rozman	78478a203f	Delegate memory leak detection to CRT _CrtDumpMemoryLeaks() direct call misreports heap allocations owned by globally initialized objects. Using _CRTDBG_LEAK_CHECK_DF delays the memory leak check until after globally initialized objects are destroyed. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:46:00 +02:00
Simon Rozman	682dc048e9	Migrate manual DLL registration to DllRegisterServer() Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:45:44 +02:00
Simon Rozman	51fa08cc71	wxExtend: bump Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:40:15 +02:00
Simon Rozman	2e9f073e94	Fix Events project and move .rc to res Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:40:15 +02:00
Simon Rozman	dd9cd83400	Output error text when event information retrieval fails In some cases Event Monitor reported blank event text. I am suspecting the TdhGetEventInformation() fails for some reason resulting in a silent failure to return event text. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:40:15 +02:00
Simon Rozman	d113388a69	Remove TortoiseGit settings Git client choice is not a thing of the repository, but individual developer. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-06-29 15:40:14 +02:00
Simon Rozman	d62089d5bd	Fix initial keyboard focus After rearranging the configuration dialog panels, the inner authentication (PAP) is no longer the topmost panel/control. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-05-13 09:07:54 +02:00
Simon Rozman	a6bdb42ece	Deprecate encrypted BLOB checksum The MD5 checksum was calculated on unencrypted data. This offered a possibility for a dictionary attack. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-05-13 08:26:07 +02:00
Simon Rozman	7897d0716c	MSIBuild: Bump Signed-off-by: Simon Rozman <simon@rozman.si>	2020-05-13 07:33:42 +02:00
Simon Rozman	842f46dac8	Pre-set version to 1.3b Signed-off-by: Simon Rozman <simon@rozman.si>	2020-04-20 16:38:53 +02:00