Update submodule URLs

Signed-off-by: Simon Rozman <simon@rozman.si>

.gitignore

@@ -1,6 +1,3 @@
-/*.opensdf
+/.vs
-/*.sdf
-/*.suo
-/ipch
 *.user
 temp

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lib/WinStd"]
 	path = lib/WinStd
-	url = https://github.com/Amebis/WinStd.git
+	url = https://git.amebis.si/Amebis/WinStd.git
 [submodule "lib/MSICALib"]
 	path = lib/MSICALib
-	url = https://github.com/Amebis/MSICALib.git
+	url = https://git.amebis.si/Amebis/MSICALib.git

MSICA.sln

@@ -1,52 +1,56 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.Build.0 = Debug|Win32
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.ActiveCfg = Debug|x64
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.Build.0 = Debug|x64
+		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|ARM64.Build.0 = Release|ARM64
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.ActiveCfg = Release|Win32
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64
+		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.Build.0 = Debug|Win32
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.ActiveCfg = Debug|x64
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.Build.0 = Debug|x64
+		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|ARM64.Build.0 = Release|ARM64
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.ActiveCfg = Release|Win32
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.Build.0 = Release|Win32
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.ActiveCfg = Release|x64
 		{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.Build.0 = Release|x64
-		{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|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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{8552EE55-177E-4F51-B51B-BAF7D6462CDE} = {26350A68-2F55-4732-972C-4A5E9077699E}
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {26350A68-2F55-4732-972C-4A5E9077699E}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C683F89B-816D-4124-B3D4-F44182E34490}
 	EndGlobalSection
 EndGlobal

MSICA/MSICA.cpp

@@ -1,23 +1,9 @@
-/*
+/*
-    Copyright 1991-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 1991-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -82,7 +68,7 @@ extern "C" BOOL WINAPI DllMain(_In_ HINSTANCE hInstance, _In_ DWORD dwReason, _I
 // Exported functions
 ////////////////////////////////////////////////////////////////////
 
-UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall)
+UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall)
 {
     //::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK);
 
@@ -165,12 +151,12 @@ UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall)
                         // Execute query!
                         uiResult = ::MsiViewExecute(hViewBinary, hRecord);
                         if (uiResult == NO_ERROR) {
-                            PMSIHANDLE hRecord;
+                            PMSIHANDLE hRecordCert;
 
                             // Fetch one record from the view.
-                            uiResult = ::MsiViewFetch(hViewBinary, &hRecord);
+                            uiResult = ::MsiViewFetch(hViewBinary, &hRecordCert);
                             if (uiResult == NO_ERROR)
-                                uiResult = ::MsiRecordReadStream(hRecord, 1, binCert);
+                                uiResult = ::MsiRecordReadStream(hRecordCert, 1, binCert);
                             ::MsiViewClose(hViewBinary);
                             if (uiResult != NO_ERROR) break;
                         } else
@@ -588,7 +574,7 @@ UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall)
 }
 
 
-UINT MSICA_API ExecuteSequence(MSIHANDLE hInstall)
+UINT __declspec(dllexport) ExecuteSequence(MSIHANDLE hInstall)
 {
     //::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK);
 

MSICA/MSICA.h

@@ -1,20 +1,6 @@
-/*
+/*
-    Copyright 1991-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 1991-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __MSICA_H__
@@ -32,24 +18,12 @@
 #define MSICA_VERSION_BUILD  0
 
 #define MSICA_VERSION_STR    "2.0"
-#define MSICA_BUILD_YEAR_STR "2017"
+#define MSICA_BUILD_YEAR_STR "2018"
 
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
+#if !defined(RC_INVOKED) && !defined(__midl)
 
 #include <msi.h>
 
-////////////////////////////////////////////////////////////////////
-// Calling declaration
-////////////////////////////////////////////////////////////////////
-
-#if defined(MSICA_DLL)
-#define MSICA_API __declspec(dllexport)
-#elif defined(MSICA_DLLIMP)
-#define MSICA_API __declspec(dllimport)
-#else
-#define MSICA_API
-#endif
-
 ////////////////////////////////////////////////////////////////////
 // Exported functions
 ////////////////////////////////////////////////////////////////////
@@ -58,12 +32,12 @@
 extern "C" {
 #endif
 
-    UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall);
+    UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall);
-    UINT MSICA_API ExecuteSequence(MSIHANDLE hInstall);
+    UINT __declspec(dllexport) ExecuteSequence(MSIHANDLE hInstall);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // !RC_INVOKED && !MIDL_PASS
+#endif
-#endif // __MSICA_H__
+#endif

MSICA/MSICA.props

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 1991-2017 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\MSICALib\include;..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

MSICA/MSICA.vcxproj

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,73 +28,61 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A7D9EBC1-1E64-4399-9C88-6692F8742153}</ProjectGuid>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\$(Platform).props" Condition="exists('..\include\$(Platform).props')" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Configuration).props" Condition="exists('..\include\$(Configuration).props')" />
-    <Import Project="MSICA.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
-    <Import Project="MSICA.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Release.props" />
-    <Import Project="MSICA.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Debug.props" />
-    <Import Project="MSICA.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <ClCompile>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\MSICALib\include;..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include=".\MSICA.cpp" />
-    <ClCompile Include=".\stdafx.cpp">
+    <ClCompile Include=".\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\MSICA.h" />
-    <ClInclude Include=".\stdafx.h" />
+    <ClInclude Include=".\pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include=".\res\MSICA.rc" />
@@ -95,9 +91,6 @@
     <ProjectReference Include="..\lib\MSICALib\build\MSICALib.vcxproj">
       <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

MSICA/MSICA.vcxproj.filters

@@ -18,7 +18,7 @@
     <ClCompile Include=".\MSICA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\stdafx.cpp">
+    <ClCompile Include=".\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -26,7 +26,7 @@
     <ClInclude Include=".\MSICA.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\stdafx.h">
+    <ClInclude Include=".\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

MSICA/locale/MSICA.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MSICA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 22:48+0200\n"
+"POT-Creation-Date: 2022-02-17 13:30+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -14,10 +14,12 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __\n"
 "X-Poedit-Basepath: ..\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.4.2\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Poedit-SearchPath-0: MSIBuild\n"
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:4
@@ -25,6 +27,10 @@ msgstr ""
 msgid "Removing scheduled tasks"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:12
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4
@@ -36,6 +42,8 @@ msgstr ""
 msgid "Scheduled task: [1]"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:5
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:5
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:5
@@ -43,6 +51,12 @@ msgstr ""
 msgid "Stopping services"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:5
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:10
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:11
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:5
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:10
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:11
@@ -58,6 +72,8 @@ msgstr ""
 msgid "Service: [1]"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:6
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:6
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:6
@@ -65,6 +81,10 @@ msgstr ""
 msgid "Removing WLAN profiles"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:6
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:9
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:6
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:6
@@ -76,6 +96,8 @@ msgstr ""
 msgid "WLAN profile: [1]"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:7
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:7
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:7
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:7
@@ -83,6 +105,10 @@ msgstr ""
 msgid "Removing certificates"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:7
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:8
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:7
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:7
@@ -94,6 +120,8 @@ msgstr ""
 msgid "Certificate: [1]"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:8
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:8
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:8
@@ -101,6 +129,8 @@ msgstr ""
 msgid "Installing certificates"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:9
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:9
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:9
@@ -108,6 +138,8 @@ msgstr ""
 msgid "Installing WLAN profiles"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:10
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:10
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:10
@@ -115,6 +147,8 @@ msgstr ""
 msgid "Configuring services"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:11
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:11
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:11
@@ -122,6 +156,8 @@ msgstr ""
 msgid "Starting services"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.ARM64.Release.ActionText-2.idtx:12
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:12
 #: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:12

MSICA/locale/de_DE.po

@@ -1,20 +1,22 @@
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: MSICA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-05 08:41+0200\n"
+"POT-Creation-Date: 2018-09-19 08:58+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91601/de_DE/)\n"
-"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
-"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"Language: de_DE\n"
-"X-Poedit-KeywordsList: __\n"
-"X-Poedit-Basepath: .\n"
-"X-Generator: Poedit 1.8.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.1.1\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-KeywordsList: __\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4

MSICA/locale/it_IT.po

@@ -0,0 +1,133 @@
+# Translators:
+# Denis Renzi <itis05@virgilio.it>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: MSICA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-09-19 08:58+0200\n"
+"PO-Revision-Date: 2018-09-19 09:07+0000\n"
+"Last-Translator: Denis Renzi <itis05@virgilio.it>, 2020\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/amebis/teams/91601/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"
+"X-Generator: Poedit 2.1.1\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-KeywordsList: __\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:4
+msgid "Removing scheduled tasks"
+msgstr "Rimozione di attività pianificate"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:12
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:12
+msgid "Scheduled task: [1]"
+msgstr "Attività pianificata: [1]"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:5
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:5
+msgid "Stopping services"
+msgstr "Servizi di arresto"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:5
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:10
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:11
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:5
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:5
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:10
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:11
+msgid "Service: [1]"
+msgstr "Servizio: [1]"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:6
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:6
+msgid "Removing WLAN profiles"
+msgstr "Rimuovi profilo WLAN"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:6
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:9
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:6
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:6
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:9
+msgid "WLAN profile: [1]"
+msgstr "Profilo WLAN: [1]"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:7
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:7
+msgid "Removing certificates"
+msgstr "Rimozione dei certificati"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:7
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:8
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:7
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:7
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:8
+msgid "Certificate: [1]"
+msgstr "Certificati: [1]"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:8
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:8
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:8
+msgid "Installing certificates"
+msgstr "Installa certificati"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:9
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:9
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:9
+msgid "Installing WLAN profiles"
+msgstr "Installa profilo WLAN"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:10
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:10
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:10
+msgid "Configuring services"
+msgstr "Configura servizi"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:11
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:11
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:11
+msgid "Starting services"
+msgstr "Avvia servizi"
+
+#: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:12
+#: MSIBuild/en_US.x64.Debug.ActionText-2.idtx:12
+#: MSIBuild/en_US.x64.Release.ActionText-2.idtx:12
+msgid "Installing scheduled tasks"
+msgstr "Installazione di attività pianificate"

MSICA/locale/ru_RU.po

@@ -1,21 +1,23 @@
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: MSICA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-05 08:42+0200\n"
+"POT-Creation-Date: 2018-09-19 08:58+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
-"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91601/ru_RU/)\n"
-"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Poedit 2.1.1\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: __\n"
-"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-SourceCharset: UTF-8\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4

MSICA/locale/sl_SI.po

@@ -1,21 +1,23 @@
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: MSICA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-05 08:41+0200\n"
+"POT-Creation-Date: 2018-09-19 08:58+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
-"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91601/sl_SI/)\n"
-"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: UTF-8\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.1.1\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: __\n"
-"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-SourceCharset: UTF-8\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
 
 #: MSIBuild/en_US.Win32.Debug.ActionText-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.ActionText-2.idtx:4

MSICA/pch.cpp

@@ -0,0 +1,6 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2022 Amebis
+*/
+
+#include "pch.h"

MSICA/pch.h

@@ -0,0 +1,24 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2022 Amebis
+*/
+
+#pragma once
+
+#include <WinStd\COM.h>
+
+#include <corerror.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wlanapi.h>
+
+// Must not statically link to Wlanapi.dll as it is not available on Windows
+// without a WLAN interface.
+extern VOID  (WINAPI *pfnWlanFreeMemory)(__in PVOID pMemory);
+extern DWORD (WINAPI *pfnWlanOpenHandle)(__in DWORD dwClientVersion, __reserved PVOID pReserved, __out PDWORD pdwNegotiatedVersion, __out PHANDLE phClientHandle);
+extern DWORD (WINAPI *pfnWlanCloseHandle)(__in HANDLE hClientHandle, __reserved PVOID pReserved);
+extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserved PVOID pReserved, __deref_out PWLAN_INTERFACE_INFO_LIST *ppInterfaceList);
+
+#include <MSICALib.h>
+
+#include "MSICA.h"

MSICA/stdafx.cpp

@@ -1,20 +0,0 @@
-/*
-    Copyright 1991-2017 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"

MSICA/stdafx.h

@@ -1,44 +0,0 @@
-/*
-    Copyright 1991-2017 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef _WINDLL
-#define MSICA_DLL // This library is compiled as a DLL
-#endif
-
-#include <WinStd\COM.h>
-
-#include <Windows.h>
-
-#include <corerror.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wlanapi.h>
-
-// Must not statically link to Wlanapi.dll as it is not available on Windows
-// without a WLAN interface.
-extern VOID  (WINAPI *pfnWlanFreeMemory)(__in PVOID pMemory);
-extern DWORD (WINAPI *pfnWlanOpenHandle)(__in DWORD dwClientVersion, __reserved PVOID pReserved, __out PDWORD pdwNegotiatedVersion, __out PHANDLE phClientHandle);
-extern DWORD (WINAPI *pfnWlanCloseHandle)(__in HANDLE hClientHandle, __reserved PVOID pReserved);
-extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserved PVOID pReserved, __deref_out PWLAN_INTERFACE_INFO_LIST *ppInterfaceList);
-
-#include <MSICALib.h>
-
-#include "MSICA.h"

include/ARM64.props

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="common.props" />
+  </ImportGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>MSICA ARM64</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Lib>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Lib>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+      <AdditionalDependencies>ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>

include/Debug.props

@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 2016-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA Debug</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -29,7 +14,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>true</SmallerTypeCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -38,16 +22,9 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <!--
+    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /q &quot;$(TargetPath)&quot;" />
-		To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-		<SignFile> switches to SHA256 if the signing certificate is SHA256.
-		Reverted to signtool.exe until we can drop Windows XP and Vista support.
-	-->
-    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-    <Exec Command="signtool.exe sign /du &quot;http://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/Release.props

@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 2016-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA Release</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -33,21 +18,19 @@
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
+    <Link>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <!--
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /tr &quot;%ManifestTimestampRFC3161Url%&quot; /td sha256 /q &quot;$(TargetPath)&quot;" />
-		To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-		<SignFile> switches to SHA256 if the signing certificate is SHA256.
-		Reverted to signtool.exe until we can drop Windows XP and Vista support.
-	-->
-    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-    <Exec Command="signtool.exe sign /du &quot;http://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /t &quot;%ManifestTimestampUrl%&quot; /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/Win32.props

@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 2016-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA Win32</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -34,5 +19,4 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/common.props

@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 2016-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="ExtensionSettings">
     <Import Project="xgettext.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <UpdaterVersion>MSICA</UpdaterVersion>
-  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA Common</_PropertySheetDisplayName>
     <IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
     <OutDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>NTDDI_VERSION=NTDDI_WINXP;_WIN32_WINNT=_WIN32_WINNT_WINXP;wxMSVC_VERSION_AUTO;WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NTDDI_VERSION=NTDDI_WIN7;_WIN32_WINNT=_WIN32_WINNT_WIN7;wxMSVC_VERSION_AUTO;WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <StringPooling>true</StringPooling>
       <DisableSpecificWarnings>4100;4505</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
     <POCompile>
       <CheckAccel>Amperstand</CheckAccel>
       <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
     </POCompile>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/x64.props

@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 2016-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA x64</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -34,5 +19,4 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/xgettext.props

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2017 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 1991-2022 Amebis
-    This file is part of MSICA.
-
-    MSICA 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.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(POCompileBeforeTargets)' == '' and '$(POCompileAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">

include/xgettext.targets

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2016 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 1991-2022 Amebis
-    This file is part of ZRCola.
-
-    ZRCola 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.
-
-    ZRCola 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 ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>

include/xgettext.xml

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2016 Amebis
+    SPDX-License-Identifier: GPL-3.0-or-later
-
+    Copyright © 1991-2022 Amebis
-    This file is part of ZRCola.
-
-    ZRCola 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.
-
-    ZRCola 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 ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
   <Rule Name="POCompile" PageTemplate="tool" DisplayName="PO Compiler" SwitchPrefix="--" Order="200">

lib/MSICALib

@@ -1 +1 @@
-Subproject commit 0db18a40b165258aec8d15f092d89287dc89dbf1
+Subproject commit 3fbf1b80ae52e87415ed0af11e9d3933ea5edee8

lib/WinStd

@@ -1 +1 @@
-Subproject commit ffea8e5fbb368075712dd9901af1d48b18534749
+Subproject commit 6dead076a2e48e7f561c6e72e027c48ffcbb07be

output/.gitignore

@@ -2,3 +2,5 @@
 /Win32.Release
 /x64.Debug
 /x64.Release
+/ARM64.Debug
+/ARM64.Release