MSI: Squash INSTALLLEVEL 1,2,3 → 1

Our default used to be INSTALLLEVEL 3, but Microsoft default is 1. By
overriding Microsoft default in Property table, we override the
INSTALLLEVEL user might have specified on the command line.

Since our installations no longer use "Minimal/Typical/Full", we may
squash "Minimal" and "Typical" into Minimal.

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

.gitignore

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

Makefile

@@ -1,5 +1,9 @@
+#    SPDX-License-Identifier: GPL-3.0-or-later
+#    Copyright © 2016-2022 Amebis
+
 KEY_DIR=..\include
 
+
 ######################################################################
 # Main targets
 ######################################################################
@@ -15,6 +19,7 @@ Clean ::
 # Folder creation
 ######################################################################
 
+"$(APPDATA)\Updater" \
 "$(KEY_DIR)" :
 	if not exist $@ md $@
 
@@ -24,20 +29,21 @@ Clean ::
 ######################################################################
 
 GenRSAKeypair :: \
+	"$(APPDATA)\Updater" \
 	"$(KEY_DIR)" \
 	"$(KEY_DIR)\UpdaterKeyPrivate.bin" \
 	"$(KEY_DIR)\UpdaterKeyPublic.bin"
 
-"$(KEY_DIR)\UpdaterKeypair.txt" :
+"$(APPDATA)\Updater\Keypair.txt" :
 	openssl.exe genrsa -out $@ 4096
 
-"$(KEY_DIR)\UpdaterKeyPrivate.bin" : "$(KEY_DIR)\UpdaterKeypair.txt"
+"$(KEY_DIR)\UpdaterKeyPrivate.bin" : "$(APPDATA)\Updater\Keypair.txt"
 	if exist $@ del /f /q $@
 	if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	openssl.exe rsa -in $** -inform PEM -outform DER -out "$(@:"=).tmp"
 	move /y "$(@:"=).tmp" $@ > NUL
 
-"$(KEY_DIR)\UpdaterKeyPublic.bin" : "$(KEY_DIR)\UpdaterKeypair.txt"
+"$(KEY_DIR)\UpdaterKeyPublic.bin" : "$(APPDATA)\Updater\Keypair.txt"
 	if exist $@ del /f /q $@
 	if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	openssl.exe rsa -in $** -inform PEM -outform DER -out "$(@:"=).tmp" -pubout

UpdCheck/MSIBuild/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

UpdCheck/UpdCheck.h

@@ -1,25 +1,11 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
 */
 
 #pragma once
 
 #define IDR_KEY_PUBLIC  1
 
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
-#endif // !defined(RC_INVOKED) && !defined(MIDL_PASS)
+#if !defined(RC_INVOKED) && !defined(__midl)
+#endif // !defined(RC_INVOKED) && !defined(__midl)

UpdCheck/UpdCheck.props

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\lib\wxExtend\include;..\..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

UpdCheck/UpdCheck.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,88 +28,67 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
     <RootNamespace>UpdCheck</RootNamespace>
   </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>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </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>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <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\Win32.props" />
-    <Import Project="..\..\include\Debug.props" />
-    <Import Project="UpdCheck.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="UpdCheck.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <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\Release.props" />
-    <Import Project="UpdCheck.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="UpdCheck.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\Updater\include;..\..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="UpdCheck.h" />
+    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UpdCheck.rc" />
   </ItemGroup>
   <ItemGroup>
+    <POCompile Include="locale\de_DE.po" />
+    <POCompile Include="locale\ru_RU.po" />
     <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="locale\sl_SI.po" />
+    <None Include="locale\UpdCheck.pot" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtend.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Updater\build\Updater.vcxproj">
+      <Project>{990d8cf9-4457-4dc0-aa18-4968ef434741}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

UpdCheck/UpdCheck.vcxproj.filters

@@ -22,15 +22,12 @@
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UpdCheck.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -40,7 +37,18 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="locale\sl_SI.po">
+    <POCompile Include="locale\de_DE.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="locale\ru_RU.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="locale\sl_SI.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="locale\UpdCheck.pot">
       <Filter>Resource Files\Localization</Filter>
     </None>
   </ItemGroup>

UpdCheck/locale/UpdCheck.pot

@@ -0,0 +1,63 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdCheck\n"
+"POT-Creation-Date: 2022-02-17 13:30+0100\n"
+"PO-Revision-Date: 2016-03-30 11:37+0200\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.2\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: MSIBuild/en_US.ARM64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Automatic Updating"
+msgstr ""
+
+#: MSIBuild/en_US.ARM64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Task for background product updating"
+msgstr ""
+
+#: MSIBuild/en_US.ARM64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[SimpleProductName] Update"
+msgstr ""
+
+#: MSIBuild/en_US.ARM64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[Manufacturer]"
+msgstr ""
+
+#: MSIBuild/en_US.ARM64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "Regularly checks for program updates, downloads, and installs them"
+msgstr ""

UpdCheck/locale/de_DE.po

@@ -0,0 +1,54 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdCheck\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-03-30 11:37+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91597/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\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: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Automatic Updating"
+msgstr ""
+
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Task for background product updating"
+msgstr ""
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[SimpleProductName] Update"
+msgstr ""
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[Manufacturer]"
+msgstr "[Manufacturer]"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "Regularly checks for program updates, downloads, and installs them"
+msgstr ""

UpdCheck/locale/ru_RU.po

@@ -0,0 +1,55 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdCheck\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-03-30 11:37+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91597/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Automatic Updating"
+msgstr "Автоматическое обновление"
+
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Task for background product updating"
+msgstr "Задача фонового обновления продукта"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[SimpleProductName] Update"
+msgstr "[SimpleProductName] Обновление"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[Manufacturer]"
+msgstr "[Manufacturer]"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "Regularly checks for program updates, downloads, and installs them"
+msgstr ""
+"Регулярно проверяет, доступны ли обновления программы, и устанавливает их."

UpdCheck/locale/sl_SI.po

@@ -1,30 +1,54 @@
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: UpdCheck\n"
-"POT-Creation-Date: 2016-03-15 10:56+0100\n"
-"PO-Revision-Date: 2016-03-15 10:57+0100\n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
-"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
-"Language: sl_SI\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-03-30 11:37+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91597/sl_SI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\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"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: main.cpp:40
-msgid "Show this help message"
-msgstr "Pokaži to sporočilo pomoči"
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Automatic Updating"
+msgstr "Samodejno posodabljanje"
 
-#: main.cpp:41
-msgid "input file"
-msgstr "vhodna datoteka"
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+msgid "Task for background product updating"
+msgstr "Opravilo za samodejno posodabljanje izdelka"
 
-#: main.cpp:42
-msgid "output file"
-msgstr "izhodna datoteka"
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[SimpleProductName] Update"
+msgstr "Posodabljanje [SimpleProductName]"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "[Manufacturer]"
+msgstr "[Manufacturer]"
+
+#: MSIBuild/en_US.Win32.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.ScheduledTask-2.idtx:4
+#: MSIBuild/en_US.x64.Release.ScheduledTask-2.idtx:4
+msgid "Regularly checks for program updates, downloads, and installs them"
+msgstr "Redno preverja za posodobitve programa, prenese in jih namesti"

UpdCheck/main.cpp

@@ -1,300 +1,54 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
 */
 
-#include "stdafx.h"
-
-
-///
-/// Module initializer
-///
-class wxUpdCheckInitializer : public wxInitializer
-{
-protected:
-    FILE *m_pLogFile;
-
-public:
-    wxConfig m_config;
-    wxString m_path;
-    wxLocale m_locale;
-
-public:
-    wxUpdCheckInitializer();
-    virtual ~wxUpdCheckInitializer();
-};
-
-
-wxUpdCheckInitializer::wxUpdCheckInitializer() :
-    m_pLogFile(NULL),
-    m_config(wxT(UPDATER_CFG_APPLICATION) wxT("\\Updater"), wxT(UPDATER_CFG_VENDOR)),
-    wxInitializer()
-{
-    if (wxInitializer::IsOk()) {
-        // Set desired locale.
-        wxLanguage language = (wxLanguage)m_config.Read(wxT("Language"), wxLANGUAGE_DEFAULT);
-        if (wxLocale::IsAvailable(language))
-            wxVERIFY(m_locale.Init(language));
-
-        if (!m_config.Read(wxT("CachePath"), &m_path))
-            m_path = wxFileName::GetTempDir();
-        if (!wxEndsWithPathSeparator(m_path))
-            m_path += wxFILE_SEP_PATH;
-
-        if (!wxDirExists(m_path))
-            wxMkdir(m_path);
-
-        m_pLogFile = fopen(m_path + wxT(UPDATER_LOG_FILE), "w+");
-        if (m_pLogFile)
-            delete wxLog::SetActiveTarget(new wxLogStderr(m_pLogFile));
-    } else
-        m_pLogFile = NULL;
-}
-
-
-wxUpdCheckInitializer::~wxUpdCheckInitializer()
-{
-    if (m_pLogFile != NULL) {
-        delete wxLog::SetActiveTarget(NULL);
-        fclose(m_pLogFile);
-    }
-}
+#include "pch.h"
 
 
 ///
 /// Main function
 ///
-int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
+int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
 {
     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
 
     // Initialize wxWidgets.
-    wxUpdCheckInitializer initializer;
+    wxInitializer initializer;
     if (!initializer.IsOk())
         return -1;
 
-    // Create RSA AES cryptographic context.
-    wxCryptoSessionRSAAES cs;
-    if (!cs.IsOk())
-        return -1;
+    // Initialize configuration.
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR)));
+    if (cfgPrev) wxDELETE(cfgPrev);
 
-    // Import public key.
-    wxCryptoKey ck;
-    {
-        HRSRC res = ::FindResource(NULL, MAKEINTRESOURCE(IDR_KEY_PUBLIC), RT_RCDATA);
-        wxASSERT_MSG(res, wxT("public key not found"));
-        HGLOBAL res_handle = ::LoadResource(NULL, res);
-        wxASSERT_MSG(res_handle, wxT("loading resource failed"));
-
-        if (!ck.ImportPublic(cs, ::LockResource(res_handle), ::SizeofResource(NULL, res)))
-            return -1;
+    // Initialize locale.
+    wxLocale locale;
+#pragma warning(suppress: 26812) // wxLanguage is unscoped
+    wxLanguage lang_ui;
+    if (wxInitializeLocale(locale, &lang_ui)) {
+        // Do not add translation catalog, to keep log messages in English.
+        // Log files are for help-desk and should remain globally intelligible.
+        //wxVERIFY(locale.AddCatalog(wxT("Updater") wxT(wxExtendVersion)));
     }
 
-    long val;
-    wxDateTime last_checked = initializer.m_config.Read(wxT("LastChecked"), &val) ? wxDateTime((time_t)val) : wxInvalidDateTime;
+    // Create output folder.
+    wxString path(wxFileName::GetTempDir());
+    if (!wxEndsWithPathSeparator(path))
+        path += wxFILE_SEP_PATH;
+    if (!wxDirExists(path))
+        wxMkdir(path);
 
-    for (const wxChar *server = wxT(UPDATER_HTTP_SERVER); server[0]; server += wcslen(server) + 1) {
-        wxXmlDocument doc;
+    // Prepare log file.
+    wxFFile log_file(path + wxT("Updater-") wxT(PRODUCT_CFG_APPLICATION) wxT(".log"), wxT("wt"));
+    if (log_file.IsOpened())
+        delete wxLog::SetActiveTarget(new wxLogStderr(log_file.fp()));
 
-        wxLogStatus(wxT("Contacting repository at %s..."), server);
-
-        // Load repository database.
-        wxHTTP http;
-        if (last_checked.IsValid())
-            http.SetHeader(wxS("If-Modified-Since"), last_checked.Format(wxS("%a, %d %b %Y %H:%M:%S %z")));
-        if (!http.Connect(server, UPDATER_HTTP_PORT)) {
-            wxLogWarning(wxT("Error resolving %s server name."), server);
-            continue;
-        }
-        wxInputStream *httpStream = http.GetInputStream(wxS(UPDATER_HTTP_PATH));
-        if (!httpStream) {
-            if (http.GetResponse() == 304) {
-                wxLogStatus(wxT("Repository did not change since the last time..."));
-                return 0;
-            }
-
-            wxLogWarning(wxT("Error response received from server %s (port %u) requesting %s."), server, UPDATER_HTTP_PORT, UPDATER_HTTP_PATH);
-            continue;
-        }
-        wxLogStatus(wxT("Loading repository catalogue..."));
-        if (!doc.Load(*httpStream, "UTF-8", wxXMLDOC_KEEP_WHITESPACE_NODES)) {
-            wxLogWarning(wxT("Error loading repository catalogue."));
-            wxDELETE(httpStream);
-            http.Close();
-            continue;
-        }
-        wxDELETE(httpStream);
-        http.Close();
-
-        wxLogStatus(wxT("Verifying repository catalogue signature..."));
-
-        // Find the (first) signature.
-        wxXmlNode *document = doc.GetDocumentNode();
-        std::vector<BYTE> sig;
-        for (wxXmlNode *prolog = document->GetChildren(); prolog; prolog = prolog->GetNext()) {
-            if (prolog->GetType() == wxXML_COMMENT_NODE) {
-                wxString content = prolog->GetContent();
-                size_t content_len = content.length();
-                if (content_len >= _countof(wxS(UPDATER_SIGNATURE_MARK)) - 1 &&
-                    memcmp((const wxStringCharType*)content, wxS(UPDATER_SIGNATURE_MARK), sizeof(wxStringCharType)*(_countof(wxS(UPDATER_SIGNATURE_MARK)) - 1)) == 0)
-                {
-                    // Read the signature.
-                    size_t signature_len = content_len - (_countof(wxS(UPDATER_SIGNATURE_MARK)) - 1);
-                    sig.resize(wxBase64DecodedSize(signature_len));
-                    size_t res = wxBase64Decode(sig.data(), sig.capacity(), content.Right(signature_len), wxBase64DecodeMode_SkipWS);
-                    if (res != wxCONV_FAILED) {
-                        sig.resize(res);
-
-                        // Remove the signature as it is not a part of the validation check.
-                        document->RemoveChild(prolog);
-                        wxDELETE(prolog);
-                        break;
-                    } else
-                        sig.clear();
+    wxUpdCheckThread worker(lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(lang_ui));
+    const wxUpdCheckThread::wxResult res = worker.CheckForUpdate();
+    switch (res) {
+    case wxUpdCheckThread::wxResult::UpdateAvailable: return worker.LaunchUpdate(NULL, true) ? 0 : 1;
+    case wxUpdCheckThread::wxResult::UpToDate       : return 0;
+    default                                         : return static_cast<int>(res);
     }
 }
-        }
-
-        if (sig.empty()) {
-            wxLogWarning(wxT("Signature not found in the repository catalogue."));
-            continue;
-        }
-
-        // Hash the content.
-        wxCryptoHashSHA1 ch(cs);
-        if (!wxXmlHashNode(ch, document))
-            continue;
-
-        // We have the hash, we have the signature, we have the public key. Now verify.
-        if (!wxCryptoVerifySignature(ch, sig.data(), sig.size(), ck)) {
-            wxLogWarning(wxT("Repository catalogue signature does not match its content, or signature verification failed."));
-            continue;
-        }
-
-        // The signature is correct. Now parse the file.
-        wxLogStatus(wxT("Parsing repository catalogue..."));
-
-        // Start processing the XML file.
-        wxXmlNode *elRoot = doc.GetRoot();
-        const wxString &nameRoot = elRoot->GetName();
-        if (nameRoot != wxT("Packages")) {
-            wxLogWarning(wxT("Invalid root element in repository catalogue (actual: %s, expected %s)."), nameRoot.c_str(), wxT("Packages"));
-            continue;
-        }
-
-        // Iterate over packages.
-        wxUint32 versionMax = 0;
-        wxString versionStrMax;
-        wxString urlMax;
-        std::vector<BYTE> sigMax;
-        for (wxXmlNode *elPackage = elRoot->GetChildren(); elPackage; elPackage = elPackage->GetNext()) {
-            if (elPackage->GetType() == wxXML_ELEMENT_NODE && elPackage->GetName() == wxT("Package")) {
-                // Get package version.
-                wxUint32 version = 0;
-                wxString versionStr;
-                for (wxXmlNode *elVersion = elPackage->GetChildren(); elVersion; elVersion = elVersion->GetNext()) {
-                    if (elVersion->GetType() == wxXML_ELEMENT_NODE && elVersion->GetName() == wxT("Version")) {
-                        for (wxXmlNode *elVersionNote = elVersion->GetChildren(); elVersionNote; elVersionNote = elVersionNote->GetNext()) {
-                            if (elVersionNote->GetType() == wxXML_ELEMENT_NODE) {
-                                const wxString &name = elVersionNote->GetName();
-                                if (name == wxT("hex"))
-                                    version = _tcstoul(elVersionNote->GetNodeContent(), NULL, 16);
-                                else if (name == wxT("desc"))
-                                    versionStr = elVersionNote->GetNodeContent();
-                            }
-                        }
-                    }
-                }
-                if (version <= UPDATER_PRODUCT_VERSION || version < versionMax) {
-                    // This package is older than currently installed product or the superseeded package found.
-                    continue;
-                }
-
-                // Get package download URL for our platform and language.
-                wxString platformId;
-#if defined(__WINDOWS__)
-                platformId += wxT("win");
-#endif
-#if defined(_WIN64)
-                platformId += wxT("-amd64");
-#else
-                platformId += wxT("-x86");
-#endif
-                wxString languageId(initializer.m_locale.GetCanonicalName());
-                wxString url;
-                std::vector<BYTE> sig;
-                for (wxXmlNode *elDownloads = elPackage->GetChildren(); elDownloads; elDownloads = elDownloads->GetNext()) {
-                    if (elDownloads->GetType() == wxXML_ELEMENT_NODE && elDownloads->GetName() == wxT("Downloads")) {
-                        for (wxXmlNode *elPlatform = elDownloads->GetChildren(); elPlatform; elPlatform = elPlatform->GetNext()) {
-                            if (elPlatform->GetType() == wxXML_ELEMENT_NODE) {
-                                if (elPlatform->GetName() == wxT("Platform") && elPlatform->GetAttribute(wxT("id")) == platformId) {
-                                    // Get language.
-                                    for (wxXmlNode *elLocale = elPlatform->GetChildren(); elLocale; elLocale = elLocale->GetNext()) {
-                                        if (elLocale->GetType() == wxXML_ELEMENT_NODE && elLocale->GetName() == wxT("Localization") && elLocale->GetAttribute(wxT("lang")) == languageId) {
-                                            for (wxXmlNode *elLocaleNote = elLocale->GetChildren(); elLocaleNote; elLocaleNote = elLocaleNote->GetNext()) {
-                                                if (elLocaleNote->GetType() == wxXML_ELEMENT_NODE) {
-                                                    const wxString &name = elLocaleNote->GetName();
-                                                    if (name == wxT("url"))
-                                                        url = elLocaleNote->GetNodeContent();
-                                                    else if (name == wxT("signature")) {
-                                                        // Read the signature.
-                                                        wxString content(elLocaleNote->GetNodeContent());
-                                                        sig.resize(wxBase64DecodedSize(content.length()));
-                                                        size_t res = wxBase64Decode(sig.data(), sig.capacity(), content, wxBase64DecodeMode_SkipWS);
-                                                        if (res != wxCONV_FAILED)
-                                                            sig.resize(res);
-                                                        else
-                                                            sig.clear();
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                if (url.IsEmpty() || sig.empty()) {
-                    // This package is for different architecture and/or language.
-                    // ... or missing URL and/or signature.
-                    continue;
-                }
-
-                versionMax = version;
-                versionStrMax = versionStr;
-                urlMax = url;
-                sigMax = sig;
-            }
-        }
-
-        if (versionMax) {
-            wxLogMessage(wxT("Update package found (version: %s, URL: %s)."), versionStrMax.c_str(), urlMax.c_str());
-
-
-        } else
-            wxLogStatus(wxT("Update check complete. Your package is up to date."));
-
-        // Save the last check date.
-        initializer.m_config.Write(wxT("LastChecked"), (long)wxDateTime::GetTimeNow());
-
-        return 0;
-    }
-
-    // No success.
-    return 1;
-}

UpdCheck/pch.cpp

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

UpdCheck/pch.h

@@ -0,0 +1,21 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#include <Updater/chkthread.h>
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/app.h>
+#include <wx/config.h>
+#include <wx/dir.h>
+#include <wx/ffile.h>
+#include <wx/filename.h>
+#include <wx/init.h>
+#include <wx/scopedptr.h>
+#pragma warning(pop)
+
+#include <wxex/common.h>

UpdCheck/stdafx.cpp

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

UpdCheck/stdafx.h

@@ -1,40 +0,0 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../../include/UpdaterCfg.h"
-
-#include "UpdCheck.h"
-#include "../include/Updater.h"
-
-#include <wx/app.h>
-#include <wx/base64.h>
-#include <wx/config.h>
-#include <wx/datetime.h>
-#include <wx/filename.h>
-#include <wx/protocol/http.h>
-#include <wx/xml/xml.h>
-
-#include <wxex/common.h>
-#include <wxex/crypto.h>
-#include <wxex/xml.h>
-
-#include <algorithm>
-#include <vector>

UpdPublish/UpdPublish.h

@@ -0,0 +1,9 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#if !defined(RC_INVOKED) && !defined(__midl)
+#endif // !defined(RC_INVOKED) && !defined(__midl)

UpdPublish/UpdPublish.vcxproj

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <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>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C5829278-D55E-41EB-B866-1E7D814694D1}</ProjectGuid>
+    <RootNamespace>UpdPublish</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</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 Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="UpdPublish.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UpdPublish.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <POCompile Include="locale\de_DE.po" />
+    <POCompile Include="locale\ru_RU.po" />
+    <POCompile Include="locale\sl_SI.po" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="locale\UpdPublish.pot" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

UpdPublish/UpdPublish.vcxproj.filters

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Resource Files\Localization">
+      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
+      <Extensions>po;pot</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UpdPublish.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UpdPublish.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <POCompile Include="locale\de_DE.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="locale\ru_RU.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="locale\sl_SI.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="locale\UpdPublish.pot">
+      <Filter>Resource Files\Localization</Filter>
+    </None>
+  </ItemGroup>
+</Project>

UpdPublish/locale/.gitignore

@@ -0,0 +1 @@
+/*.mo

UpdPublish/locale/UpdPublish.pot

@@ -0,0 +1,46 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdPublish\n"
+"POT-Creation-Date: 2022-02-17 13:29+0100\n"
+"PO-Revision-Date: 2018-09-19 10:47+0200\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.2\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: main.cpp:113
+msgid "Show this help message"
+msgstr ""
+
+#: main.cpp:114
+msgid "Package file to calculate hash from"
+msgstr ""
+
+#: main.cpp:115
+msgid "<input repository file>"
+msgstr ""
+
+#: main.cpp:116
+msgid "<output repository file>"
+msgstr ""
+
+#: main.cpp:117
+msgid "<platform>"
+msgstr ""
+
+#: main.cpp:118
+msgid "<language>"
+msgstr ""
+
+#: main.cpp:119
+msgid "<download URL>"
+msgstr ""

UpdPublish/locale/de_DE.po

@@ -0,0 +1,47 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdPublish\n"
+"POT-Creation-Date: 2018-09-19 10:47+0200\n"
+"PO-Revision-Date: 2018-09-19 10:47+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91597/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\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: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: main.cpp:127
+msgid "Show this help message"
+msgstr "Zeige diesen Hilfstext"
+
+#: main.cpp:128
+msgid "Package file to calculate SHA-1 hash from"
+msgstr ""
+
+#: main.cpp:129
+msgid "input repository file"
+msgstr ""
+
+#: main.cpp:130
+msgid "output repository file"
+msgstr ""
+
+#: main.cpp:131
+msgid "platform"
+msgstr ""
+
+#: main.cpp:132
+msgid "language"
+msgstr ""
+
+#: main.cpp:133
+msgid "download URL"
+msgstr ""

UpdPublish/locale/ru_RU.po

@@ -0,0 +1,45 @@
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdPublish\n"
+"POT-Creation-Date: 2018-09-19 10:47+0200\n"
+"PO-Revision-Date: 2018-09-19 10:47+0200\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91597/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: main.cpp:127
+msgid "Show this help message"
+msgstr ""
+
+#: main.cpp:128
+msgid "Package file to calculate SHA-1 hash from"
+msgstr ""
+
+#: main.cpp:129
+msgid "input repository file"
+msgstr ""
+
+#: main.cpp:130
+msgid "output repository file"
+msgstr ""
+
+#: main.cpp:131
+msgid "platform"
+msgstr ""
+
+#: main.cpp:132
+msgid "language"
+msgstr ""
+
+#: main.cpp:133
+msgid "download URL"
+msgstr ""

UpdPublish/locale/sl_SI.po

@@ -0,0 +1,47 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdPublish\n"
+"POT-Creation-Date: 2018-09-19 10:47+0200\n"
+"PO-Revision-Date: 2018-09-19 10:47+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91597/sl_SI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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.1.1\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: main.cpp:127
+msgid "Show this help message"
+msgstr "Pokaži to sporočilo pomoči"
+
+#: main.cpp:128
+msgid "Package file to calculate SHA-1 hash from"
+msgstr "Datoteka paketa, od katere izračunamo odtis SHA-1"
+
+#: main.cpp:129
+msgid "input repository file"
+msgstr "vhodna datoteka repozitorija"
+
+#: main.cpp:130
+msgid "output repository file"
+msgstr "izhodna datoteka repozitorija"
+
+#: main.cpp:131
+msgid "platform"
+msgstr "platforma"
+
+#: main.cpp:132
+msgid "language"
+msgstr "jezik"
+
+#: main.cpp:133
+msgid "download URL"
+msgstr "URL za prenos"

UpdPublish/main.cpp

@@ -0,0 +1,291 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#include "pch.h"
+
+
+void UpdaterAddURL(wxXmlNode *elLocale, const wxString &url)
+{
+    wxXmlNode *elUrl = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("url"));
+    elUrl->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, url));
+
+    elLocale->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elLocale->AddChild(elUrl);
+    elLocale->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t\t")));
+}
+
+
+void UpdaterAddHash(wxXmlNode *elLocale, const wxMemoryBuffer &hash)
+{
+    wxXmlNode *elHash = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("hash"));
+    elHash->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxHexEncode(hash)));
+
+    elLocale->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elLocale->AddChild(elHash);
+    elLocale->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t\t")));
+}
+
+
+void UpdaterAddLocalization(wxXmlNode *elPlatform, const wxString &languageId, const wxString &url, const wxMemoryBuffer &hash)
+{
+    wxXmlNode *elLocale = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("Localization"));
+    elLocale->AddAttribute(new wxXmlAttribute(wxT("lang"), languageId));
+    elLocale->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t\t")));
+    UpdaterAddURL(elLocale, url);
+    if (!hash.IsEmpty())
+        UpdaterAddHash(elLocale, hash);
+
+    elPlatform->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elPlatform->AddChild(elLocale);
+    elPlatform->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t")));
+}
+
+
+void UpdaterAddPlatform(wxXmlNode *elDownloads, const wxString &platformId, const wxString &languageId, const wxString &url, const wxMemoryBuffer &hash)
+{
+    wxXmlNode *elPlatform = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("Platform"));
+    elPlatform->AddAttribute(new wxXmlAttribute(wxT("id"), platformId));
+    elPlatform->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t")));
+    UpdaterAddLocalization(elPlatform, languageId, url, hash);
+
+    elDownloads->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elDownloads->AddChild(elPlatform);
+    elDownloads->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t")));
+}
+
+
+void UpdaterAddDownloads(wxXmlNode *elPackage, const wxString &platformId, const wxString &languageId, const wxString &url, const wxMemoryBuffer &hash)
+{
+    wxXmlNode *elDownloads = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("Downloads"));
+    elDownloads->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t")));
+    UpdaterAddPlatform(elDownloads, platformId, languageId, url, hash);
+
+    elPackage->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elPackage->AddChild(elDownloads);
+    elPackage->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t")));
+}
+
+
+void UpdaterAddPackage(wxXmlNode *elPackages, const wxString &platformId, const wxString &languageId, const wxString &url, const wxMemoryBuffer &hash)
+{
+    wxXmlNode *elHex = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("hex"));
+    elHex->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxString::Format(wxT("%08x"), PRODUCT_VERSION)));
+
+    wxXmlNode *elDesc = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("desc"));
+    elDesc->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT(PRODUCT_VERSION_STR)));
+
+    wxXmlNode *elVersion = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("Version"));
+    elVersion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t")));
+    elVersion->AddChild(elHex);
+    elVersion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t\t")));
+    elVersion->AddChild(elDesc);
+    elVersion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t")));
+
+    wxXmlNode *elPackage = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("Package"));
+    elPackage->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t\t")));
+    elPackage->AddChild(elVersion);
+    elPackage->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n\t")));
+    UpdaterAddDownloads(elPackage, platformId, languageId, url, hash);
+
+    elPackages->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\t")));
+    elPackages->AddChild(elPackage);
+    elPackages->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("\n")));
+}
+
+
+///
+/// Main function
+///
+int _tmain(int argc, _TCHAR *argv[])
+{
+    wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
+
+    // Initialize wxWidgets.
+    wxInitializer initializer;
+    if (!initializer.IsOk())
+        return -1;
+
+    // Parse command line.
+    static const wxCmdLineEntryDesc cmdLineDesc[] =
+    {
+        { wxCMD_LINE_SWITCH, "h" , "help", _("Show this help message"             ), wxCMD_LINE_VAL_NONE  , wxCMD_LINE_OPTION_HELP      },
+        { wxCMD_LINE_OPTION, "f" , "file", _("Package file to calculate hash from"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL   },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<input repository file>"            ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<output repository file>"           ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<platform>"                         ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<language>"                         ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<download URL>"                     ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+
+        { wxCMD_LINE_NONE }
+    };
+    wxCmdLineParser parser(cmdLineDesc, argc, argv);
+    switch (parser.Parse()) {
+    case -1:
+        // Help was given, terminating.
+        return 0;
+
+    case 0:
+        // everything is ok; proceed
+        break;
+
+    default:
+        wxLogWarning(wxT("Syntax error detected, aborting."));
+        return -1;
+    }
+
+    // Load input XML document.
+    const wxString& filenameIn = parser.GetParam(0);
+    wxXmlDocument doc;
+    if (!doc.Load(filenameIn, "UTF-8", wxXMLDOC_KEEP_WHITESPACE_NODES))
+        return 1;
+
+    // Verify document type (root element).
+    wxXmlNode *elPackages = doc.GetRoot();
+    const wxString &nameRoot = elPackages->GetName();
+    if (nameRoot != wxT("Packages")) {
+        wxLogWarning(wxT("Invalid root element in repository catalogue (actual: %s, expected %s)."), nameRoot.c_str(), wxT("Packages"));
+        return 2;
+    }
+
+    // Get package file hash.
+    wxString filenamePckg;
+    wxMemoryBuffer hash;
+    if (parser.Found(wxT("f"), &filenamePckg)) {
+        // Create RSA AES cryptographic session.
+        wxCryptoSessionRSAAES cs;
+        wxCHECK(cs.IsOk(), -1);
+
+        // Calculate file hash.
+        wxUpdaterHashGen ch(cs);
+        wxCHECK(ch.HashFile(filenamePckg), 3);
+        ch.GetValue(hash);
+    }
+
+    // Iterate over packages.
+    bool url_present = false;
+    const wxString& platformId = parser.GetParam(2);
+    const wxString& language = parser.GetParam(3);
+    const wxString& url = parser.GetParam(4);
+    wxString languageId(language);
+    for (wxXmlNode *elPackage = elPackages->GetChildren(); elPackage; elPackage = elPackage->GetNext()) {
+        #pragma warning(suppress: 26812) // wxXmlNodeType is unscoped
+        if (elPackage->GetType() == wxXML_ELEMENT_NODE && elPackage->GetName() == wxT("Package")) {
+            // Get package version.
+            wxUint32 version = 0;
+            wxString versionStr;
+            for (wxXmlNode *elVersion = elPackage->GetChildren(); elVersion; elVersion = elVersion->GetNext()) {
+                if (elVersion->GetType() == wxXML_ELEMENT_NODE && elVersion->GetName() == wxT("Version")) {
+                    for (wxXmlNode *elVersionNote = elVersion->GetChildren(); elVersionNote; elVersionNote = elVersionNote->GetNext()) {
+                        if (elVersionNote->GetType() == wxXML_ELEMENT_NODE) {
+                            const wxString &name = elVersionNote->GetName();
+                            if (name == wxT("hex"))
+                                version = _tcstoul(elVersionNote->GetNodeContent(), NULL, 16);
+                            else if (name == wxT("desc"))
+                                versionStr = elVersionNote->GetNodeContent();
+                        }
+                    }
+                }
+            }
+            if (version != PRODUCT_VERSION) {
+                // This package is not our version. Skip.
+                continue;
+            }
+
+            // Set package download URL for given platform and language.
+            for (wxXmlNode *elDownloads = elPackage->GetChildren(); elDownloads; elDownloads = elDownloads->GetNext()) {
+                if (elDownloads->GetType() == wxXML_ELEMENT_NODE && elDownloads->GetName() == wxT("Downloads")) {
+                    for (wxXmlNode *elPlatform = elDownloads->GetChildren(); elPlatform; elPlatform = elPlatform->GetNext()) {
+                        if (elPlatform->GetType() == wxXML_ELEMENT_NODE) {
+                            if (elPlatform->GetName() == wxT("Platform") && elPlatform->GetAttribute(wxT("id")) == platformId) {
+                                // Get language.
+                                for (wxXmlNode *elLocale = elPlatform->GetChildren(); elLocale; elLocale = elLocale->GetNext()) {
+                                    if (elLocale->GetType() == wxXML_ELEMENT_NODE && elLocale->GetName() == wxT("Localization") && elLocale->GetAttribute(wxT("lang")) == languageId) {
+                                        bool hash_present = false;
+                                        for (wxXmlNode *elLocaleNote = elLocale->GetChildren(); elLocaleNote; elLocaleNote = elLocaleNote->GetNext()) {
+                                            if (elLocaleNote->GetType() == wxXML_ELEMENT_NODE) {
+                                                const wxString &name = elLocaleNote->GetName();
+                                                if (name == wxT("url")) {
+                                                    if (elLocaleNote->GetNodeContent() == url)
+                                                        url_present = true;
+                                                } else if (!hash.IsEmpty() && name == wxT("hash")) {
+                                                    // Read the hash.
+                                                    wxMemoryBuffer hashOrig;
+                                                    wxString content(elLocaleNote->GetNodeContent());
+                                                    size_t len = wxHexDecodedSize(content.length());
+                                                    size_t res = wxHexDecode(hashOrig.GetWriteBuf(len), len, content, wxHexDecodeMode::SkipWS);
+                                                    if (res != wxCONV_FAILED) {
+                                                        hashOrig.SetDataLen(res);
+                                                        if (hash.GetDataLen() == hashOrig.GetDataLen() &&
+                                                            memcmp(hash.GetData(), hashOrig.GetData(), hash.GetDataLen()) == 0)
+                                                        {
+                                                            hash_present = true;
+                                                        } else {
+                                                            wxLogError(wxT("This update package is already in the database. However, its hash is different."));
+                                                            return 3;
+                                                        }
+                                                    } else {
+                                                        wxLogError(wxT("This update package is already in the database. However, its hash is corrupt."));
+                                                        return 4;
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        if (!url_present) {
+                                            // Add URL.
+                                            UpdaterAddURL(elLocale, url);
+                                            url_present = true;
+                                        }
+                                        if (!hash_present && !hash.IsEmpty()) {
+                                            // Add hash.
+                                            UpdaterAddHash(elLocale, hash);
+                                        }
+                                    }
+                                }
+
+                                if (!url_present) {
+                                    // Add localization.
+                                    UpdaterAddLocalization(elPlatform, languageId, url, hash);
+                                    url_present = true;
+                                }
+                            }
+                        }
+                    }
+
+                    if (!url_present) {
+                        // Add platform.
+                        UpdaterAddPlatform(elDownloads, platformId, languageId, url, hash);
+                        url_present = true;
+                    }
+                }
+            }
+
+            if (!url_present) {
+                // Add downloads.
+                UpdaterAddDownloads(elPackage, platformId, languageId, url, hash);
+                url_present = true;
+            }
+        }
+    }
+
+    if (!url_present) {
+        // Add package.
+        UpdaterAddPackage(elPackages, platformId, languageId, url, hash);
+        url_present = true;
+    }
+
+    // Write output XML document.
+    const wxString& filenameOut = parser.GetParam(1);
+    if (!doc.Save(filenameOut, wxXML_NO_INDENTATION)) {
+        wxLogError(wxT("%s: error USX0004: Error writing output file.\n"), filenameOut.fn_str());
+
+        // Remove the output file (if exists).
+        wxRemoveFile(filenameOut);
+
+        return 4;
+    }
+
+    return 0;
+}

UpdPublish/pch.cpp

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

UpdPublish/pch.h

@@ -0,0 +1,22 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#include "../Updater/include/Updater/common.h"
+
+#include "UpdPublish.h"
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/app.h>
+#include <wx/base64.h>
+#include <wx/cmdline.h>
+#include <wx/xml/xml.h>
+#pragma warning(pop)
+
+#include <wxex/crypto.h>
+#include <wxex/hex.h>
+#include <wxex/xml.h>

UpdSignXML/UpdSignXML.h

@@ -1,25 +1,11 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
 */
 
 #pragma once
 
 #define IDR_KEY_PRIVATE 1
 
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
-#endif // !defined(RC_INVOKED) && !defined(MIDL_PASS)
+#if !defined(RC_INVOKED) && !defined(__midl)
+#endif // !defined(RC_INVOKED) && !defined(__midl)

UpdSignXML/UpdSignXML.props

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\lib\wxExtend\include;..\..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

UpdSignXML/UpdSignXML.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>
@@ -23,85 +31,66 @@
     <RootNamespace>UpdSignXML</RootNamespace>
   </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>
-    <UseOfAtl>Dynamic</UseOfAtl>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Dynamic</UseOfAtl>
-  </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>
-    <UseOfAtl>Dynamic</UseOfAtl>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Dynamic</UseOfAtl>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <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\Win32.props" />
-    <Import Project="..\..\include\Debug.props" />
-    <Import Project="UpdSignXML.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="UpdSignXML.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <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\Release.props" />
-    <Import Project="UpdSignXML.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="UpdSignXML.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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 Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
     <ClInclude Include="UpdSignXML.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtend.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UpdSignXML.rc" />
   </ItemGroup>
   <ItemGroup>
+    <POCompile Include="locale\de_DE.po" />
+    <POCompile Include="locale\ru_RU.po" />
     <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="locale\UpdSignXML.pot" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

UpdSignXML/UpdSignXML.vcxproj.filters

@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -27,7 +27,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="UpdSignXML.h">
@@ -40,8 +40,19 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <POCompile Include="locale\de_DE.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="locale\ru_RU.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
     <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="locale\UpdSignXML.pot">
+      <Filter>Resource Files\Localization</Filter>
+    </None>
+  </ItemGroup>
 </Project>

UpdSignXML/locale/UpdSignXML.pot

@@ -0,0 +1,30 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdSignXML\n"
+"POT-Creation-Date: 2022-02-17 13:29+0100\n"
+"PO-Revision-Date: 2018-09-19 10:49+0200\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.2\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: main.cpp:24
+msgid "Show this help message"
+msgstr ""
+
+#: main.cpp:25
+msgid "<input file>"
+msgstr ""
+
+#: main.cpp:26
+msgid "<output file>"
+msgstr ""

UpdSignXML/locale/de_DE.po

@@ -0,0 +1,31 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdSignXML\n"
+"POT-Creation-Date: 2018-09-19 10:49+0200\n"
+"PO-Revision-Date: 2018-09-19 10:49+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91597/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\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: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: main.cpp:38
+msgid "Show this help message"
+msgstr "Zeige diesen Hilfstext"
+
+#: main.cpp:39
+msgid "input file"
+msgstr ""
+
+#: main.cpp:40
+msgid "output file"
+msgstr ""

UpdSignXML/locale/ru_RU.po

@@ -0,0 +1,29 @@
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: UpdSignXML\n"
+"POT-Creation-Date: 2018-09-19 10:49+0200\n"
+"PO-Revision-Date: 2018-09-19 10:49+0200\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91597/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: main.cpp:38
+msgid "Show this help message"
+msgstr ""
+
+#: main.cpp:39
+msgid "input file"
+msgstr ""
+
+#: main.cpp:40
+msgid "output file"
+msgstr ""

UpdSignXML/locale/sl_SI.po

@@ -1,45 +1,31 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: UpdSignXML\n"
-"POT-Creation-Date: 2016-03-15 20:09+0100\n"
-"PO-Revision-Date: 2016-03-15 20:10+0100\n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
-"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
-"Language: sl_SI\n"
+"POT-Creation-Date: 2018-09-19 10:49+0200\n"
+"PO-Revision-Date: 2018-09-19 10:49+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91597/sl_SI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\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"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: main.cpp:138
+#: main.cpp:38
 msgid "Show this help message"
 msgstr "Pokaži to sporočilo pomoči"
 
-#: main.cpp:139
-msgid "Hexadecimal version of the product"
-msgstr "Verzija izdelka šesnajstiško"
+#: main.cpp:39
+msgid "input file"
+msgstr "vhodna datoteka"
 
-#: main.cpp:140
-msgid "String version of the product"
-msgstr "Verzija izdelka opisno"
-
-#: main.cpp:141
-msgid "Package language"
-msgstr "Jezik paketa"
-
-#: main.cpp:142
-msgid "Package download URL"
-msgstr "URL za prenos paketa"
-
-#: main.cpp:143
+#: main.cpp:40
 msgid "output file"
 msgstr "izhodna datoteka"
-
-#~ msgid "Package URL in the form of platform;language;URL"
-#~ msgstr "Naslov URL paketa oblike platforma;jezik;URL"

UpdSignXML/main.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 ///
@@ -36,8 +22,8 @@ int _tmain(int argc, _TCHAR *argv[])
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
         { wxCMD_LINE_SWITCH, "h" , "help", _("Show this help message"), wxCMD_LINE_VAL_NONE  , wxCMD_LINE_OPTION_HELP      },
-        { wxCMD_LINE_PARAM , NULL, NULL  , _("input file"            ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
-        { wxCMD_LINE_PARAM , NULL, NULL  , _("output file"           ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<input file>"          ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL  , _("<output file>"         ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
 
         { wxCMD_LINE_NONE }
     };
@@ -65,6 +51,7 @@ int _tmain(int argc, _TCHAR *argv[])
     // Examine prologue if the document is already signed and remove all signatures found.
     wxXmlNode *document = doc.GetDocumentNode();
     for (wxXmlNode *prolog = document->GetChildren(); prolog;) {
+        #pragma warning(suppress: 26812) // wxXmlNodeType is unscoped
         if (prolog->GetType() == wxXML_COMMENT_NODE) {
             wxString content = prolog->GetContent();
             if (content.length() >= _countof(wxS(UPDATER_SIGNATURE_MARK)) - 1 &&
@@ -90,17 +77,25 @@ int _tmain(int argc, _TCHAR *argv[])
     // Import the private key into the session from resources.
     {
         HRSRC res = ::FindResource(NULL, MAKEINTRESOURCE(IDR_KEY_PRIVATE), RT_RCDATA);
-        wxASSERT_MSG(res, wxT("private key not found"));
+        if (!res) {
+            wxLogError(wxT("%s: error USX0005: Error locating private key.\n"));
+            return -1;
+        }
         HGLOBAL res_handle = ::LoadResource(NULL, res);
-        wxASSERT_MSG(res_handle, wxT("loading resource failed"));
-
-        wxCryptoKey ck;
-        if (!ck.ImportPrivate(cs, ::LockResource(res_handle), ::SizeofResource(NULL, res)))
+        if (!res_handle) {
+            wxLogError(wxT("%s: error USX0006: Error loading private key.\n"));
             return -1;
         }
 
+        wxCryptoKey ck;
+        if (!ck.ImportPrivate(cs, ::LockResource(res_handle), ::SizeofResource(NULL, res))) {
+            wxLogError(wxT("%s: error USX0007: Error importing private key.\n"));
+            return -1;
+        }
+    }
+
     // Hash the XML content.
-    wxCryptoHashSHA1 ch(cs);
+    wxUpdaterHashGen ch(cs);
     if (!wxXmlHashNode(ch, document))
         return 2;
 

UpdSignXML/pch.cpp

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

UpdSignXML/pch.h

@@ -0,0 +1,21 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#include "../Updater/include/Updater/common.h"
+
+#include "UpdSignXML.h"
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/app.h>
+#include <wx/base64.h>
+#include <wx/cmdline.h>
+#include <wx/xml/xml.h>
+#pragma warning(pop)
+
+#include <wxex/crypto.h>
+#include <wxex/xml.h>

UpdSignXML/stdafx.cpp

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

UpdSignXML/stdafx.h

@@ -1,35 +0,0 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "UpdSignXML.h"
-#include "../include/Updater.h"
-
-#include <wx/app.h>
-#include <wx/base64.h>
-#include <wx/cmdline.h>
-#include <wx/xml/xml.h>
-
-#include <wxex/common.h>
-#include <wxex/crypto.h>
-#include <wxex/xml.h>
-
-#include <algorithm>
-#include <vector>

Updater.mak

@@ -1,50 +0,0 @@
-#
-#    Copyright 2016 Amebis
-#
-#    This file is part of Updater.
-#
-#    Updater 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.
-#
-#    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
-#
-
-!IFNDEF UPDATER_CFG
-UPDATER_CFG=HKLM\Software\Amebis\ZRCola\Updater
-!ENDIF
-
-!IFNDEF UPDATER_OUTPUT_DIR
-UPDATER_OUTPUT_DIR=output\update
-!ENDIF
-
-!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-UPDATER_REG_FLAGS=/f /reg:64
-UPDATER_REG_FLAGS32=/f /reg:32
-!ELSE
-UPDATER_REG_FLAGS=/f
-!ENDIF
-
-
-######################################################################
-# Main targets
-######################################################################
-
-UpdaterRegisterSettings ::
-	reg.exe add "$(UPDATER_CFG)" /v "CachePath" /t REG_SZ /d "$(MAKEDIR)\$(UPDATER_OUTPUT_DIR)" $(UPDATER_REG_FLAGS) > NUL
-!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-	reg.exe add "$(UPDATER_CFG)" /v "CachePath" /t REG_SZ /d "$(MAKEDIR)\$(UPDATER_OUTPUT_DIR)" $(UPDATER_REG_FLAGS32) > NUL
-!ENDIF
-
-UpdaterUnregisterSettings ::
-	-reg.exe delete "$(UPDATER_CFG)" /v "CachePath" $(UPDATER_REG_FLAGS) > NUL
-!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-	-reg.exe delete "$(UPDATER_CFG)" /v "CachePath" $(UPDATER_REG_FLAGS32) > NUL
-!ENDIF

Updater.sln

@@ -1,67 +1,104 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECE3F336-FFD2-41EE-AD8F-17BD7472BDCB}"
-	ProjectSection(SolutionItems) = preProject
-		include\Updater.h = include\Updater.h
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdCheck", "UpdCheck\UpdCheck.vcxproj", "{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtend.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "..\lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdSignXML", "UpdSignXML\UpdSignXML.vcxproj", "{2A403460-7834-41B8-9823-199E8FE36FA8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdPublish", "UpdPublish\UpdPublish.vcxproj", "{C5829278-D55E-41EB-B866-1E7D814694D1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{28F748D5-D691-4F00-9464-37AF062CF91F}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\UpdaterCfg.h = ..\include\UpdaterCfg.h
+	EndProjectSection
+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
+		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|Win32.Build.0 = Debug|Win32
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x64.ActiveCfg = Debug|x64
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x64.Build.0 = Debug|x64
+		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|ARM64.Build.0 = Release|ARM64
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|Win32.ActiveCfg = Release|Win32
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|Win32.Build.0 = Release|Win32
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x64.ActiveCfg = Release|x64
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x64.Build.0 = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|Win32.Build.0 = Debug|Win32
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x64.ActiveCfg = Debug|x64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x64.Build.0 = Debug|x64
+		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|ARM64.Build.0 = Release|ARM64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|Win32.ActiveCfg = Release|Win32
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|Win32.Build.0 = Release|Win32
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x64.ActiveCfg = Release|x64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x64.Build.0 = Release|x64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|Win32.Build.0 = Debug|Win32
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x64.ActiveCfg = Debug|x64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x64.Build.0 = Debug|x64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|ARM64.Build.0 = Release|ARM64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|Win32.ActiveCfg = Release|Win32
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|Win32.Build.0 = Release|Win32
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x64.ActiveCfg = Release|x64
+		{C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x64.Build.0 = Release|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.Build.0 = Debug|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.ActiveCfg = Release|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.Build.0 = Release|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
-		{518777CC-0A59-4415-A12A-82751ED75343} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
+		{990D8CF9-4457-4DC0-AA18-4968EF434741} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E86510CB-829C-41C4-8E19-CBB300B80B81}
 	EndGlobalSection
 EndGlobal

Updater/MSIBuild/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

Updater/MSIBuild/Makefile

@@ -0,0 +1,71 @@
+#    SPDX-License-Identifier: GPL-3.0-or-later
+#    Copyright © 1991-2022 Amebis
+
+!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
+
+!IFNDEF MSIBUILD_LANGID
+!ERROR Parameter MSIBUILD_LANGID is undefined.
+!ENDIF
+
+!IFNDEF MSIBUILD_LANG_GUID
+!ERROR Parameter MSIBUILD_LANG_GUID is undefined.
+!ENDIF
+
+!IFNDEF UPDATER_LOC_DIR
+!ERROR Parameter UPDATER_LOC_DIR is undefined.
+!ENDIF
+
+
+######################################################################
+# Component
+
+All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+	move /y << $@ > NUL
+Component	ComponentId	Directory_	Attributes	Condition	KeyPath
+s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
+Component	Component
+!IF "$(LANG)" != "en_US"
+Updater.mo.$(LANG)	{5F141A03-07EE-4AC4-$(MSIBUILD_LANG_GUID)-CFB1833C1A04}	UPDATERLOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		Updater.mo.$(LANG)
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Directory
+
+All :: "$(LANG).$(PLAT).$(CFG).Directory-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Directory-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+	move /y << $@ > NUL
+Directory	Directory_Parent	DefaultDir
+s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	l255
+Directory	Directory
+!IF "$(LANG)" != "en_US"
+UPDATERLOC$(MSIBUILD_LANG_GUID)DIR	$(UPDATER_LOC_DIR)	$(LANG)
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# File
+
+All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+	move /y << $@ > NUL
+File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
+File	File
+!IF "$(LANG)" != "en_US"
+Updater.mo.$(LANG)	Updater.mo.$(LANG)	UPDATE~1.MO|Updater$(UPDATER_VERSION).mo	0		$(MSIBUILD_LANGID)	0	1
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Build MSM module!
+######################################################################
+
+!INCLUDE "..\..\..\MSI\MSIBuild\MSM.mak"

Updater/build/Updater.vcxproj

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <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>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{990D8CF9-4457-4DC0-AA18-4968EF434741}</ProjectGuid>
+    <RootNamespace>Updater</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</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 Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>UPDATER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <POCompile>
+      <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName)$(UpdaterVersion).mo</OutputFile>
+    </POCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\main.cpp" />
+    <ClCompile Include="..\src\pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\src\chkthread.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\updater\chkthread.h" />
+    <ClInclude Include="..\include\Updater\common.h" />
+    <ClInclude Include="..\src\pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <POCompile Include="..\locale\de_DE.po" />
+    <POCompile Include="..\locale\ru_RU.po" />
+    <POCompile Include="..\locale\sl_SI.po" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\locale\Updater.pot" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\res\Updater.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\include\xgettext.targets" />
+  </ImportGroup>
+</Project>

Updater/build/Updater.vcxproj.filters

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Resource Files\Localization">
+      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
+      <Extensions>po;pot</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\chkthread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\Updater\common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\updater\chkthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\locale\Updater.pot">
+      <Filter>Resource Files\Localization</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <POCompile Include="..\locale\sl_SI.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="..\locale\de_DE.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+    <POCompile Include="..\locale\ru_RU.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\res\Updater.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Updater/include/Updater/chkthread.h

@@ -0,0 +1,159 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#include "common.h"
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/arrstr.h>
+#include <wx/config.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/thread.h>
+#include <wx/xml/xml.h>
+#pragma warning(pop)
+
+#include <wxex/crypto.h>
+
+
+///
+/// wxEVT_UPDATER_CHECK_COMPLETE event
+///
+wxDECLARE_EVENT(wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEvent);
+
+
+///
+/// Update check thread
+///
+class wxUpdCheckThread : public wxThread
+{
+public:
+    ///
+    /// Thread exit codes
+    ///
+    enum class wxResult {
+        Uninitialized   = -1,  ///< Initialization failed
+        Aborted         = -2,  ///< Thread aborted
+        RepoUnavailable = -3,  ///< No update package information available
+        PkgUnavailable  = -4,  ///< Update package not available
+
+        UpdateAvailable =  0,  ///< Update downloaded, verified and prepared to install
+        UpToDate,              ///< Product is up-to-date
+    };
+
+    wxUpdCheckThread(const wxString &langId, wxEvtHandler *parent = NULL);
+    ~wxUpdCheckThread();
+
+    ///
+    /// Checks for updates and safely downloads update package when available.
+    ///
+    inline wxResult CheckForUpdate()
+    {
+        return DoCheckForUpdate();
+    }
+
+    ///
+    /// Aborts current update check
+    ///
+    inline void Abort() noexcept
+    {
+        m_abort = true;
+    }
+
+protected:
+    ///
+    /// Thread's body
+    ///
+    /// \returns Exit code
+    ///
+    ExitCode Entry() override;
+
+    ///
+    /// Overrriden method to allow custom termination when Updater is launched in the main thread.
+    ///
+    bool TestDestroy() override;
+
+    ///
+    /// Checks for updates and safely downloads update package when available.
+    ///
+    wxResult DoCheckForUpdate();
+
+    ///
+    /// Downloads repository database (with integrity check).
+    ///
+    /// \returns Repository database. Use wxDELETE after use.
+    ///
+    wxXmlDocument* GetCatalogue();
+
+    ///
+    /// Parses repository database.
+    ///
+    /// \returns
+    /// - true if parsing succeeded
+    /// - false otherwise
+    ///
+    bool ParseCatalogue(const wxXmlDocument &doc);
+
+    ///
+    /// Stores update package meta-information to cache.
+    ///
+    /// \returns
+    /// - true if writing succeeded
+    /// - false otherwise
+    ///
+    bool WriteUpdatePackageMeta();
+
+    ///
+    /// Retrieves update package meta-information from cache.
+    ///
+    /// \returns
+    /// - true if reading succeeded
+    /// - false otherwise
+    ///
+    bool ReadUpdatePackageMeta();
+
+    ///
+    /// Downloads update package.
+    ///
+    /// \returns
+    /// - true if downloading succeeded
+    /// - false otherwise
+    ///
+    bool DownloadUpdatePackage();
+
+public:
+    ///
+    /// Launches update.
+    ///
+    /// \param[in] hParent   Handle of parent window
+    /// \param[in] headless  Launch silent install
+    ///
+    /// \returns
+    /// - true if launch succeeded
+    /// - false otherwise
+    ///
+    bool LaunchUpdate(WXHWND hParent = NULL, bool headless = false);
+
+
+protected:
+    wxEvtHandler *m_parent; ///< Parent to notify
+    bool m_ok;              ///< Is class initialized correctly?
+    volatile bool m_abort;  ///< Should Update check abort?
+
+    wxString m_langId;      ///< Language identifier
+    wxConfig m_config;      ///< Application configuration
+    wxString m_path;        ///< Working directory (downloaded files, etc.)
+    wxCryptoSession *m_cs;  ///< Cryptographics session
+    wxCryptoKey *m_ck;      ///< Public key for update database integrity validation
+
+    wxUint32 m_version;     ///< Latest product version available (numerical)
+    wxString m_versionStr;  ///< Latest product version available (string)
+    wxArrayString m_urls;   ///< List of update package file downloads
+    wxMemoryBuffer m_hash;  ///< Update package hash
+
+    wxString m_fileName;    ///< Downloaded package file name
+};

Updater/include/Updater/common.h

@@ -0,0 +1,26 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#if !defined(__UPDATER_common_h__)
+#define __UPDATER_common_h__
+
+#include "../../../../include/UpdaterCfg.h"
+
+//
+// Resource IDs
+//
+#define UPDATER_IDR_KEY_PUBLIC          1
+
+#if !defined(RC_INVOKED) && !defined(__midl)
+
+#include <codeanalysis\warnings.h>
+#ifndef WXWIDGETS_CODE_ANALYSIS_WARNINGS
+#define WXWIDGETS_CODE_ANALYSIS_WARNINGS ALL_CODE_ANALYSIS_WARNINGS 26812 26814
+#endif
+
+#define UPDATER_SIGNATURE_MARK "SIGNATURE:"
+
+#endif // !defined(RC_INVOKED) && !defined(__midl)
+#endif // !defined(__UPDATER_common_h__)

Updater/locale/.gitignore

@@ -0,0 +1 @@
+/*.mo

Updater/locale/Updater.pot

@@ -0,0 +1,130 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Updater\n"
+"POT-Creation-Date: 2022-02-17 13:30+0100\n"
+"PO-Revision-Date: 2016-02-06 09:04+0100\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.2\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: src\n"
+"X-Poedit-SearchPath-1: include\n"
+
+#: src/chkthread.cpp:98 src/chkthread.cpp:112
+msgid "Update check complete. Your product is up to date."
+msgstr ""
+
+#: src/chkthread.cpp:132
+msgid "Downloading repository catalogue..."
+msgstr ""
+
+#: src/chkthread.cpp:140
+#, c-format
+msgid "Contacting repository at %s..."
+msgstr ""
+
+#: src/chkthread.cpp:148
+#, c-format
+msgid "Error resolving %s server name."
+msgstr ""
+
+#: src/chkthread.cpp:154
+msgid "Repository did not change since the last time."
+msgstr ""
+
+#: src/chkthread.cpp:157
+#, c-format
+msgid "%u status received from server %s (port %u) requesting %s."
+msgstr ""
+
+#: src/chkthread.cpp:160
+#, c-format
+msgid "Error response received from server %s (port %u) requesting %s."
+msgstr ""
+
+#: src/chkthread.cpp:171 src/chkthread.cpp:444
+#, c-format
+msgid "Can not open/create %s file for writing."
+msgstr ""
+
+#: src/chkthread.cpp:184 src/chkthread.cpp:483
+#, c-format
+msgid "Can not write to %s file."
+msgstr ""
+
+#: src/chkthread.cpp:193
+msgid "Error loading repository catalogue."
+msgstr ""
+
+#: src/chkthread.cpp:199
+msgid "Verifying repository catalogue signature..."
+msgstr ""
+
+#: src/chkthread.cpp:231
+msgid "Signature not found in the repository catalogue."
+msgstr ""
+
+#: src/chkthread.cpp:244
+msgid "Repository catalogue signature does not match its content, or signature verification failed."
+msgstr ""
+
+#: src/chkthread.cpp:251
+#, c-format
+msgid "Invalid root element in repository catalogue (actual: %s, expected: %s)."
+msgstr ""
+
+#: src/chkthread.cpp:268
+msgid "Parsing repository catalogue..."
+msgstr ""
+
+#: src/chkthread.cpp:355
+#, c-format
+msgid "Update package found (version: %s)."
+msgstr ""
+
+#: src/chkthread.cpp:413
+msgid "Reading update package meta-information from cache failed or incomplete."
+msgstr ""
+
+#: src/chkthread.cpp:436
+msgid "Update package file already downloaded and ready to install."
+msgstr ""
+
+#: src/chkthread.cpp:464
+#, c-format
+msgid "Downloading update package %s..."
+msgstr ""
+
+#: src/chkthread.cpp:467
+msgid "Error response received."
+msgstr ""
+
+#: src/chkthread.cpp:494
+msgid "Update package downloaded and ready to install."
+msgstr ""
+
+#: src/chkthread.cpp:497
+msgid "Update package file corrupt."
+msgstr ""
+
+#: src/chkthread.cpp:506
+msgid "Launching update..."
+msgstr ""
+
+#: src/chkthread.cpp:525
+#, c-format
+msgid "msiexec.exe launch succeeded. For detailed information, see %s file."
+msgstr ""
+
+#: src/chkthread.cpp:528
+#, c-format
+msgid "msiexec.exe launch failed. ShellExecute returned %i."
+msgstr ""

Updater/locale/de_DE.po

@@ -0,0 +1,134 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Updater\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-02-06 09:04+0100\n"
+"Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91597/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\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: src\n"
+"X-Poedit-SearchPath-1: include\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: src/chkthread.cpp:111 src/chkthread.cpp:125
+msgid "Update check complete. Your product is up to date."
+msgstr ""
+
+#: src/chkthread.cpp:145
+msgid "Downloading repository catalogue..."
+msgstr ""
+
+#: src/chkthread.cpp:153
+#, c-format
+msgid "Contacting repository at %s..."
+msgstr ""
+
+#: src/chkthread.cpp:161
+#, c-format
+msgid "Error resolving %s server name."
+msgstr ""
+
+#: src/chkthread.cpp:167
+msgid "Repository did not change since the last time."
+msgstr ""
+
+#: src/chkthread.cpp:170
+#, c-format
+msgid "%u status received from server %s (port %u) requesting %s."
+msgstr ""
+
+#: src/chkthread.cpp:173
+#, c-format
+msgid "Error response received from server %s (port %u) requesting %s."
+msgstr ""
+
+#: src/chkthread.cpp:184 src/chkthread.cpp:454
+#, c-format
+msgid "Can not open/create %s file for writing."
+msgstr ""
+
+#: src/chkthread.cpp:197 src/chkthread.cpp:493
+#, c-format
+msgid "Can not write to %s file."
+msgstr ""
+
+#: src/chkthread.cpp:206
+msgid "Error loading repository catalogue."
+msgstr ""
+
+#: src/chkthread.cpp:212
+msgid "Verifying repository catalogue signature..."
+msgstr ""
+
+#: src/chkthread.cpp:243
+msgid "Signature not found in the repository catalogue."
+msgstr ""
+
+#: src/chkthread.cpp:256
+msgid ""
+"Repository catalogue signature does not match its content, or signature "
+"verification failed."
+msgstr ""
+
+#: src/chkthread.cpp:263
+#, c-format
+msgid ""
+"Invalid root element in repository catalogue (actual: %s, expected: %s)."
+msgstr ""
+
+#: src/chkthread.cpp:280
+msgid "Parsing repository catalogue..."
+msgstr ""
+
+#: src/chkthread.cpp:365
+#, c-format
+msgid "Update package found (version: %s)."
+msgstr ""
+
+#: src/chkthread.cpp:423
+msgid ""
+"Reading update package meta-information from cache failed or incomplete."
+msgstr ""
+
+#: src/chkthread.cpp:446
+msgid "Update package file already downloaded and ready to install."
+msgstr ""
+
+#: src/chkthread.cpp:474
+#, c-format
+msgid "Downloading update package %s..."
+msgstr ""
+
+#: src/chkthread.cpp:477
+msgid "Error response received."
+msgstr ""
+
+#: src/chkthread.cpp:504
+msgid "Update package downloaded and ready to install."
+msgstr ""
+
+#: src/chkthread.cpp:507
+msgid "Update package file corrupt."
+msgstr ""
+
+#: src/chkthread.cpp:516
+msgid "Launching update..."
+msgstr ""
+
+#: src/chkthread.cpp:535
+#, c-format
+msgid "msiexec.exe launch succeeded. For detailed information, see %s file."
+msgstr ""
+
+#: src/chkthread.cpp:538
+#, c-format
+msgid "msiexec.exe launch failed. ShellExecute returned %i."
+msgstr ""

Updater/locale/ru_RU.po

@@ -0,0 +1,144 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Updater\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-02-06 09:04+0100\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91597/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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-SearchPath-0: src\n"
+"X-Poedit-SearchPath-1: include\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: src/chkthread.cpp:111 src/chkthread.cpp:125
+msgid "Update check complete. Your product is up to date."
+msgstr ""
+"Проверка на наличие обновлений завершена. У вас последняя версия программы."
+
+#: src/chkthread.cpp:145
+msgid "Downloading repository catalogue..."
+msgstr "Загрузка каталога репозитория ..."
+
+#: src/chkthread.cpp:153
+#, c-format
+msgid "Contacting repository at %s..."
+msgstr "Контактирование репозитория при %s ..."
+
+#: src/chkthread.cpp:161
+#, c-format
+msgid "Error resolving %s server name."
+msgstr "Ошибка при разрешении имени сервера %s."
+
+#: src/chkthread.cpp:167
+msgid "Repository did not change since the last time."
+msgstr "Репозиторий не от последней проверки изменился."
+
+#: src/chkthread.cpp:170
+#, c-format
+msgid "%u status received from server %s (port %u) requesting %s."
+msgstr ""
+
+#: src/chkthread.cpp:173
+#, c-format
+msgid "Error response received from server %s (port %u) requesting %s."
+msgstr "От сервера %s (порт %u) получен ошибочный ответ при запросе %s."
+
+#: src/chkthread.cpp:184 src/chkthread.cpp:454
+#, c-format
+msgid "Can not open/create %s file for writing."
+msgstr "Открытие/создание файла %s для записи невозможно."
+
+#: src/chkthread.cpp:197 src/chkthread.cpp:493
+#, c-format
+msgid "Can not write to %s file."
+msgstr "Запись в файл %s невозможен."
+
+#: src/chkthread.cpp:206
+msgid "Error loading repository catalogue."
+msgstr "Ошибка при загрузке каталога репозитория."
+
+#: src/chkthread.cpp:212
+msgid "Verifying repository catalogue signature..."
+msgstr "Проверка подписи каталога репозитория ..."
+
+#: src/chkthread.cpp:243
+msgid "Signature not found in the repository catalogue."
+msgstr "Подпись в каталоге репозитория не найдена."
+
+#: src/chkthread.cpp:256
+msgid ""
+"Repository catalogue signature does not match its content, or signature "
+"verification failed."
+msgstr ""
+"Подпись каталога репозитория, или не соответствует его содержанию или "
+"проверка подписи завершилась ошибкой."
+
+#: src/chkthread.cpp:263
+#, c-format
+msgid ""
+"Invalid root element in repository catalogue (actual: %s, expected: %s)."
+msgstr ""
+"Недействительный корневой элемент в каталоге репозитория (фактический: %s, "
+"ожидаемый: %s)."
+
+#: src/chkthread.cpp:280
+msgid "Parsing repository catalogue..."
+msgstr "Анализ каталога репозитория ..."
+
+#: src/chkthread.cpp:365
+#, c-format
+msgid "Update package found (version: %s)."
+msgstr "Найден пакет обновления (версия: %s)."
+
+#: src/chkthread.cpp:423
+msgid ""
+"Reading update package meta-information from cache failed or incomplete."
+msgstr ""
+"Чтение метаданных пакета обновления в кэше завершилась ошибкой, или чтение "
+"не завершилось."
+
+#: src/chkthread.cpp:446
+msgid "Update package file already downloaded and ready to install."
+msgstr "Файл пакета обновления уже загружен и готов к установке."
+
+#: src/chkthread.cpp:474
+#, c-format
+msgid "Downloading update package %s..."
+msgstr "Загрузка пакета обновления %s ..."
+
+#: src/chkthread.cpp:477
+msgid "Error response received."
+msgstr "Получен ошибочный ответ."
+
+#: src/chkthread.cpp:504
+msgid "Update package downloaded and ready to install."
+msgstr "Пакет обновления загружен и готов к установке."
+
+#: src/chkthread.cpp:507
+msgid "Update package file corrupt."
+msgstr "Файл пакета обновления испорчен."
+
+#: src/chkthread.cpp:516
+msgid "Launching update..."
+msgstr "Запуск обновления ..."
+
+#: src/chkthread.cpp:535
+#, c-format
+msgid "msiexec.exe launch succeeded. For detailed information, see %s file."
+msgstr ""
+"Запуск msiexec.exe успешно выполнен. Для получения подробной информации см. "
+"файл %s."
+
+#: src/chkthread.cpp:538
+#, c-format
+msgid "msiexec.exe launch failed. ShellExecute returned %i."
+msgstr "Запуск msiexec.exe завершился ошибкой. ShellExecute возвратил %i."

Updater/locale/sl_SI.po

@@ -0,0 +1,142 @@
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Updater\n"
+"POT-Creation-Date: 2018-09-19 08:59+0200\n"
+"PO-Revision-Date: 2016-02-06 09:04+0100\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91597/sl_SI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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.1.1\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: src\n"
+"X-Poedit-SearchPath-1: include\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: src/chkthread.cpp:111 src/chkthread.cpp:125
+msgid "Update check complete. Your product is up to date."
+msgstr "Preverjanje posodobitev končano. Nameščena je najnovejša različica."
+
+#: src/chkthread.cpp:145
+msgid "Downloading repository catalogue..."
+msgstr "Prenos repozitorijevega kataloga ..."
+
+#: src/chkthread.cpp:153
+#, c-format
+msgid "Contacting repository at %s..."
+msgstr "Dostop do repozitorija na %s ..."
+
+#: src/chkthread.cpp:161
+#, c-format
+msgid "Error resolving %s server name."
+msgstr "Napaka pri ugotavljanju naslova strežnika %s."
+
+#: src/chkthread.cpp:167
+msgid "Repository did not change since the last time."
+msgstr "Repozitorij se od zadnjič ni spremenil."
+
+#: src/chkthread.cpp:170
+#, c-format
+msgid "%u status received from server %s (port %u) requesting %s."
+msgstr "Prejet status %u s strežnika %s (vrata %u) pri zahtevi za %s."
+
+#: src/chkthread.cpp:173
+#, c-format
+msgid "Error response received from server %s (port %u) requesting %s."
+msgstr "Prejet odgovor o napaki s strežnika %s (vrata %u) pri zahtevi za %s."
+
+#: src/chkthread.cpp:184 src/chkthread.cpp:454
+#, c-format
+msgid "Can not open/create %s file for writing."
+msgstr "Ne morem odpreti/ustvariti datoteke %s za pisanje."
+
+#: src/chkthread.cpp:197 src/chkthread.cpp:493
+#, c-format
+msgid "Can not write to %s file."
+msgstr "Ne morem pisati v datoteko %s."
+
+#: src/chkthread.cpp:206
+msgid "Error loading repository catalogue."
+msgstr "Napaka pri nalaganju repozitorijevega kataloga."
+
+#: src/chkthread.cpp:212
+msgid "Verifying repository catalogue signature..."
+msgstr "Preverjanje podpisa repozitorijevega kataloga ..."
+
+#: src/chkthread.cpp:243
+msgid "Signature not found in the repository catalogue."
+msgstr "V repozitorijevem katalogu ni podpisa."
+
+#: src/chkthread.cpp:256
+msgid ""
+"Repository catalogue signature does not match its content, or signature "
+"verification failed."
+msgstr ""
+"Podpis repozitorijevega kataloga ne ustreza njegovi vsebini, oziroma "
+"preverjanje podpisa ni uspelo."
+
+#: src/chkthread.cpp:263
+#, c-format
+msgid ""
+"Invalid root element in repository catalogue (actual: %s, expected: %s)."
+msgstr ""
+"Napačen korenski element v repozitorijevem katalogu (dejanski: %s, "
+"pričakovan: %s)."
+
+#: src/chkthread.cpp:280
+msgid "Parsing repository catalogue..."
+msgstr "Razčlemba repozitorijevega kataloga ..."
+
+#: src/chkthread.cpp:365
+#, c-format
+msgid "Update package found (version: %s)."
+msgstr "Posodobitveni paket najden (verzija: %s)."
+
+#: src/chkthread.cpp:423
+msgid ""
+"Reading update package meta-information from cache failed or incomplete."
+msgstr ""
+"Branje meta-informacij posodobitvenega paketa iz predpomnilnika ni uspelo "
+"ali ni bilo celotno."
+
+#: src/chkthread.cpp:446
+msgid "Update package file already downloaded and ready to install."
+msgstr "Posodobitveni paket je že prenesen in pripravljen na namestitev."
+
+#: src/chkthread.cpp:474
+#, c-format
+msgid "Downloading update package %s..."
+msgstr "Prenos posodobitvenega paketa %s ..."
+
+#: src/chkthread.cpp:477
+msgid "Error response received."
+msgstr "Prejet odgovor o napaki."
+
+#: src/chkthread.cpp:504
+msgid "Update package downloaded and ready to install."
+msgstr "Posodobitveni paket je prenesen in pripravljen na namestitev."
+
+#: src/chkthread.cpp:507
+msgid "Update package file corrupt."
+msgstr "Posodobitveni paket je pokvarjen."
+
+#: src/chkthread.cpp:516
+msgid "Launching update..."
+msgstr "Zagon posodobitve ..."
+
+#: src/chkthread.cpp:535
+#, c-format
+msgid "msiexec.exe launch succeeded. For detailed information, see %s file."
+msgstr ""
+"Zagon msiexec.exe je uspel. Za podrobnejše informacije glejte datoteko %s."
+
+#: src/chkthread.cpp:538
+#, c-format
+msgid "msiexec.exe launch failed. ShellExecute returned %i."
+msgstr "Zagon msiexec.exe ni uspel. ShellExecute je vrnil %i."

Updater/src/chkthread.cpp

@@ -0,0 +1,531 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#include "pch.h"
+
+//////////////////////////////////////////////////////////////////////////
+// wxEVT_UPDATER_CHECK_COMPLETE
+//////////////////////////////////////////////////////////////////////////
+
+wxDEFINE_EVENT(wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEvent);
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxUpdCheckThread
+//////////////////////////////////////////////////////////////////////////
+
+wxUpdCheckThread::wxUpdCheckThread(const wxString &langId, wxEvtHandler *parent) :
+    m_parent(parent),
+    m_ok(true),
+    m_abort(false),
+    m_langId(langId),
+    m_config(wxT(PRODUCT_CFG_APPLICATION) wxT("\\Updater"), wxT(PRODUCT_CFG_VENDOR)),
+    m_cs(NULL),
+    m_ck(NULL),
+    m_version(0),
+    wxThread(wxTHREAD_JOINABLE)
+{
+    m_path = wxFileName::GetTempDir();
+    if (!wxEndsWithPathSeparator(m_path))
+        m_path += wxFILE_SEP_PATH;
+
+    if (!wxDirExists(m_path))
+        wxMkdir(m_path);
+
+    m_cs = new wxCryptoSessionRSAAES();
+    wxCHECK2_MSG(m_cs, { m_ok = false; return; }, wxT("wxCryptoSessionRSAAES creation failed"));
+
+    // Import public key.
+    HRSRC res = ::FindResource(g_hInstance, MAKEINTRESOURCE(UPDATER_IDR_KEY_PUBLIC), RT_RCDATA);
+    wxCHECK2_MSG(res, { m_ok = false; return; }, wxT("public key not found"));
+    HGLOBAL res_handle = ::LoadResource(g_hInstance, res);
+    wxCHECK2_MSG(res_handle, { m_ok = false; return; }, wxT("loading resource failed"));
+
+    m_ck = new wxCryptoKey();
+    wxCHECK2_MSG(m_ck, { m_ok = false; return; }, wxT("wxCryptoKey creation failed"));
+    wxCHECK2(m_ck->ImportPublic(*m_cs, ::LockResource(res_handle), ::SizeofResource(g_hInstance, res)), { m_ok = false; return; });
+}
+
+
+wxUpdCheckThread::~wxUpdCheckThread()
+{
+    if (m_ck) delete m_ck;
+    if (m_cs) delete m_cs;
+}
+
+
+wxThread::ExitCode wxUpdCheckThread::Entry()
+{
+    wxResult result = DoCheckForUpdate();
+
+    if (m_parent) {
+        // Signal the event handler that this thread is going to be destroyed.
+        // NOTE: here we assume that using the m_parent pointer is safe,
+        //       (in this case this is assured by the wxZRColaCharSelect destructor)
+        wxThreadEvent *e = new wxThreadEvent(wxEVT_UPDATER_CHECK_COMPLETE);
+        e->SetInt(static_cast<int>(result));
+        wxQueueEvent(m_parent, e);
+    }
+
+    return reinterpret_cast<wxThread::ExitCode>(static_cast<intptr_t>(result) & 0xffffffff);
+}
+
+
+bool wxUpdCheckThread::TestDestroy()
+{
+    return m_abort || wxThread::TestDestroy();
+}
+
+
+wxUpdCheckThread::wxResult wxUpdCheckThread::DoCheckForUpdate()
+{
+    if (!m_ok)
+        return wxResult::Uninitialized;
+
+    // Download update catalogue.
+    if (TestDestroy()) return wxResult::Aborted;
+    wxScopedPtr<wxXmlDocument> doc(GetCatalogue());
+    if (doc) {
+        // Parse the update catalogue to check for an update package availability.
+        if (TestDestroy()) return wxResult::Aborted;
+        if (ParseCatalogue(*doc)) {
+            // Save update package meta-information for the next time.
+            if (TestDestroy()) return wxResult::Aborted;
+            WriteUpdatePackageMeta();
+        } else {
+            wxLogStatus(_("Update check complete. Your product is up to date."));
+            WriteUpdatePackageMeta();
+            return wxResult::UpToDate;
+        }
+    } else {
+        // Update download catalogue failed, or repository database didn't change. Read a cached version of update package meta-information?
+        if (TestDestroy()) return wxResult::Aborted;
+        if (!ReadUpdatePackageMeta()) {
+            // Reset CatalogueLastModified to force update catalogue download next time.
+            m_config.DeleteEntry(wxT("CatalogueLastModified"), false);
+            return wxResult::RepoUnavailable;
+        }
+
+        if (m_version <= PRODUCT_VERSION) {
+            wxLogStatus(_("Update check complete. Your product is up to date."));
+            return wxResult::UpToDate;
+        }
+    }
+
+    m_fileName  = m_path;
+    m_fileName += wxT("Updater-") wxT(PRODUCT_CFG_APPLICATION) wxT("-");
+    m_fileName += m_versionStr;
+    m_fileName += wxT(".msi");
+
+    if (TestDestroy()) return wxResult::Aborted;
+    if (!DownloadUpdatePackage())
+        return wxResult::PkgUnavailable;
+
+    return wxResult::UpdateAvailable;
+}
+
+
+wxXmlDocument* wxUpdCheckThread::GetCatalogue()
+{
+    wxLogStatus(_("Downloading repository catalogue..."));
+
+    wxString lastModified;
+    m_config.Read(wxT("CatalogueLastModified"), &lastModified, wxEmptyString);
+
+    for (const wxChar *server = wxT(UPDATER_HTTP_SERVER); server[0]; server += wcslen(server) + 1) {
+        if (TestDestroy()) return NULL;
+
+        wxLogStatus(_("Contacting repository at %s..."), server);
+
+        // Load repository database.
+        wxHTTP http;
+        http.SetHeader(wxS("User-Agent"), wxS("Updater-") wxT(PRODUCT_CFG_APPLICATION) wxS("/") wxS(PRODUCT_VERSION_STR));
+        if (!lastModified.IsEmpty())
+            http.SetHeader(wxS("If-Modified-Since"), lastModified);
+        if (!http.Connect(server, UPDATER_HTTP_PORT)) {
+            wxLogWarning(_("Error resolving %s server name."), server);
+            continue;
+        }
+        wxScopedPtr<wxInputStream> httpStream(http.GetInputStream(wxS(UPDATER_HTTP_PATH)));
+        const int status = http.GetResponse();
+        if (status == 304) {
+            wxLogStatus(_("Repository did not change since the last time."));
+            return NULL;
+        } else if (status != 200) {
+            wxLogWarning(_("%u status received from server %s (port %u) requesting %s."), status, server, UPDATER_HTTP_PORT, UPDATER_HTTP_PATH);
+            continue;
+        } else if (!httpStream) {
+            wxLogWarning(_("Error response received from server %s (port %u) requesting %s."), server, UPDATER_HTTP_PORT, UPDATER_HTTP_PATH);
+            continue;
+        } else if (TestDestroy())
+            return NULL;
+
+        // wxXmlDocument::Load() fails reading from wxInputStream directly (in non-main threads).
+        // Therefore, save the repository catalog to temporary file first.
+        wxString fileName(m_path);
+        fileName += wxT("Updater-catalog.xml");
+        wxFFile file(fileName, wxT("wb"));
+        if (!file.IsOpened()) {
+            wxLogError(_("Can not open/create %s file for writing."), fileName.c_str());
+            return NULL;
+        }
+        wxMemoryBuffer buf(4*1024);
+        char *data = static_cast<char*>(buf.GetData());
+        const size_t nBlock = buf.GetBufSize();
+        do {
+            if (TestDestroy()) return NULL;
+
+            httpStream->Read(data, nBlock);
+            const size_t nRead = httpStream->LastRead();
+            file.Write(data, nRead);
+            if (file.Error()) {
+                wxLogError(_("Can not write to %s file."), fileName.c_str());
+                return NULL;
+            }
+        } while (httpStream->IsOk());
+        file.Close();
+
+        // Read the repository catalog.
+        wxScopedPtr<wxXmlDocument> doc(new wxXmlDocument());
+        if (!doc->Load(fileName, "UTF-8", wxXMLDOC_KEEP_WHITESPACE_NODES)) {
+            wxLogWarning(_("Error loading repository catalogue."));
+            continue;
+        }
+        m_config.Write(wxT("CatalogueLastModified"), http.GetHeader(wxT("Last-Modified")));
+        wxRemoveFile(fileName);
+
+        wxLogStatus(_("Verifying repository catalogue signature..."));
+
+        // Find the (first) signature.
+        if (TestDestroy()) return NULL;
+        wxXmlNode *document = doc->GetDocumentNode();
+        wxMemoryBuffer sig;
+        for (wxXmlNode *prolog = document->GetChildren(); prolog; prolog = prolog->GetNext()) {
+            #pragma warning(suppress: 26812) // wxXmlNodeType is unscoped.
+            if (prolog->GetType() == wxXML_COMMENT_NODE) {
+                wxString content = prolog->GetContent();
+                const size_t content_len = content.length();
+                if (content_len >= _countof(wxS(UPDATER_SIGNATURE_MARK)) - 1 &&
+                    memcmp((const wxStringCharType*)content, wxS(UPDATER_SIGNATURE_MARK), sizeof(wxStringCharType)*(_countof(wxS(UPDATER_SIGNATURE_MARK)) - 1)) == 0)
+                {
+                    // Read the signature.
+                    const size_t signature_len = content_len - (_countof(wxS(UPDATER_SIGNATURE_MARK)) - 1);
+                    const size_t len = wxBase64DecodedSize(signature_len);
+                    const size_t res = wxBase64Decode(sig.GetWriteBuf(len), len, content.Right(signature_len), wxBase64DecodeMode_SkipWS);
+                    if (res != wxCONV_FAILED) {
+                        sig.SetDataLen(res);
+
+                        // Remove the signature as it is not a part of the validation check.
+                        document->RemoveChild(prolog);
+                        wxDELETE(prolog);
+                        break;
+                    } else
+                        sig.Clear();
+                }
+            }
+        }
+
+        if (sig.IsEmpty()) {
+            wxLogWarning(_("Signature not found in the repository catalogue."));
+            continue;
+        }
+
+        // Hash the content.
+        if (TestDestroy()) return NULL;
+        wxUpdaterHashChk ch(*m_cs);
+        if (!wxXmlHashNode(ch, document))
+            continue;
+
+        // We have the hash, we have the signature, we have the public key. Now verify.
+        if (TestDestroy()) return NULL;
+        if (!wxCryptoVerifySignature(ch, sig, *m_ck)) {
+            wxLogWarning(_("Repository catalogue signature does not match its content, or signature verification failed."));
+            continue;
+        }
+
+        // Verify document type (root element).
+        const wxString &nameRoot = doc->GetRoot()->GetName();
+        if (nameRoot != wxT("Packages")) {
+            wxLogWarning(_("Invalid root element in repository catalogue (actual: %s, expected: %s)."), nameRoot.c_str(), wxT("Packages"));
+            continue;
+        }
+
+        // The downloaded repository database passed all checks.
+        return doc.release();
+    }
+
+    // No repository database downloaded successfully.
+    return NULL;
+}
+
+
+bool wxUpdCheckThread::ParseCatalogue(const wxXmlDocument &doc)
+{
+    bool found = false;
+
+    wxLogStatus(_("Parsing repository catalogue..."));
+
+    // Iterate over packages.
+    for (wxXmlNode *elPackage = doc.GetRoot()->GetChildren(); elPackage; elPackage = elPackage->GetNext()) {
+        if (TestDestroy()) return false;
+
+        if (elPackage->GetType() == wxXML_ELEMENT_NODE && elPackage->GetName() == wxT("Package")) {
+            // Get package version.
+            wxUint32 version = 0;
+            wxString versionStr;
+            for (wxXmlNode *elVersion = elPackage->GetChildren(); elVersion; elVersion = elVersion->GetNext()) {
+                if (elVersion->GetType() == wxXML_ELEMENT_NODE && elVersion->GetName() == wxT("Version")) {
+                    for (wxXmlNode *elVersionNote = elVersion->GetChildren(); elVersionNote; elVersionNote = elVersionNote->GetNext()) {
+                        if (elVersionNote->GetType() == wxXML_ELEMENT_NODE) {
+                            const wxString &name = elVersionNote->GetName();
+                            if (name == wxT("hex"))
+                                version = _tcstoul(elVersionNote->GetNodeContent(), NULL, 16);
+                            else if (name == wxT("desc"))
+                                versionStr = elVersionNote->GetNodeContent();
+                        }
+                    }
+                }
+            }
+            if (version <= PRODUCT_VERSION || version < m_version) {
+                // This package is older than currently installed product or the superseeded package found already.
+                continue;
+            }
+
+            // Get package download URL for our platform and language.
+            wxString platformId;
+#if defined(__WINDOWS__)
+            platformId += wxT("win");
+#endif
+#if defined(_M_AMD64)
+            platformId += wxT("-amd64");
+#elif defined(_M_ARM64)
+            platformId += wxT("-arm64");
+#else
+            platformId += wxT("-x86");
+#endif
+            wxArrayString urls;
+            wxMemoryBuffer hash;
+            for (wxXmlNode *elDownloads = elPackage->GetChildren(); elDownloads; elDownloads = elDownloads->GetNext()) {
+                if (elDownloads->GetType() == wxXML_ELEMENT_NODE && elDownloads->GetName() == wxT("Downloads")) {
+                    for (wxXmlNode *elPlatform = elDownloads->GetChildren(); elPlatform; elPlatform = elPlatform->GetNext()) {
+                        if (elPlatform->GetType() == wxXML_ELEMENT_NODE) {
+                            if (elPlatform->GetName() == wxT("Platform") && elPlatform->GetAttribute(wxT("id")) == platformId) {
+                                // Get language.
+                                for (wxXmlNode *elLocale = elPlatform->GetChildren(); elLocale; elLocale = elLocale->GetNext()) {
+                                    if (elLocale->GetType() == wxXML_ELEMENT_NODE && elLocale->GetName() == wxT("Localization") && elLocale->GetAttribute(wxT("lang")) == m_langId) {
+                                        for (wxXmlNode *elLocaleNote = elLocale->GetChildren(); elLocaleNote; elLocaleNote = elLocaleNote->GetNext()) {
+                                            if (elLocaleNote->GetType() == wxXML_ELEMENT_NODE) {
+                                                const wxString &name = elLocaleNote->GetName();
+                                                if (name == wxT("url"))
+                                                    urls.Add(elLocaleNote->GetNodeContent());
+                                                else if (name == wxT("hash")) {
+                                                    // Read the hash.
+                                                    wxString content(elLocaleNote->GetNodeContent());
+                                                    const size_t len = wxHexDecodedSize(content.length());
+                                                    const size_t res = wxHexDecode(hash.GetWriteBuf(len), len, content, wxHexDecodeMode::SkipWS);
+                                                    if (res != wxCONV_FAILED)
+                                                        hash.SetDataLen(res);
+                                                    else
+                                                        hash.Clear();
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (urls.empty() || hash.IsEmpty()) {
+                // This package is for different architecture and/or language.
+                // ... or missing URL and/or hash.
+                continue;
+            }
+
+            // Save found package info.
+            m_version    = version;
+            m_versionStr = versionStr;
+            m_urls       = urls;
+            m_hash       = hash;
+            found        = true;
+
+            wxLogMessage(_("Update package found (version: %s)."), m_versionStr.c_str());
+        }
+    }
+
+    return found;
+}
+
+
+bool wxUpdCheckThread::WriteUpdatePackageMeta()
+{
+    // Concatenate URLs.
+    wxString urls;
+    for (size_t i = 0, n = m_urls.GetCount(); i < n; i++) {
+        if (i) urls += wxT('\n');
+        urls += m_urls[i];
+    }
+
+    bool result = true;
+    if (!m_config.Write(wxT("PackageVersion"    ), m_version          )) result = false;
+    if (!m_config.Write(wxT("PackageVersionDesc"), m_versionStr       )) result = false;
+    if (!m_config.Write(wxT("PackageURLs"       ), urls               )) result = false;
+    if (!m_config.Write(wxT("PackageHash"       ), wxHexEncode(m_hash))) result = false;
+
+    return result;
+}
+
+
+bool wxUpdCheckThread::ReadUpdatePackageMeta()
+{
+    long lng;
+    if (m_config.Read(wxT("PackageVersion"), &lng)) {
+        m_version = lng;
+        if (m_config.Read(wxT("PackageVersionDesc"), &m_versionStr)) {
+            wxString str;
+            if (m_config.Read(wxT("PackageURLs"), &str)) {
+                // Split URLs
+                m_urls.Clear();
+                const wxStringCharType *buf = str;
+                for (size_t i = 0, j = 0, n = str.Length(); i < n;) {
+                    for (; j < n && buf[j] != wxT('\n'); j++);
+                    m_urls.Add(str.SubString(i, j - 1));
+                    i = ++j;
+                }
+
+                if (m_config.Read(wxT("PackageHash"), &str)) {
+                    // Convert to binary.
+                    const size_t len = wxHexDecodedSize(str.length());
+                    const size_t res = wxHexDecode(m_hash.GetWriteBuf(len), len, str, wxHexDecodeMode::SkipWS);
+                    if (res != wxCONV_FAILED) {
+                        m_hash.SetDataLen(res);
+                        return true;
+                    } else
+                        m_hash.Clear();
+                }
+            }
+        }
+    }
+
+    wxLogWarning(_("Reading update package meta-information from cache failed or incomplete."));
+    m_version = 0;
+    m_versionStr.Clear();
+    m_urls.Clear();
+    m_hash.Clear();
+
+    return false;
+}
+
+
+bool wxUpdCheckThread::DownloadUpdatePackage()
+{
+    if (wxFileExists(m_fileName)) {
+        // Calculate file hash.
+        wxUpdaterHashChk ch(*m_cs);
+        if (ch.HashFile(m_fileName)) {
+            wxMemoryBuffer buf;
+            ch.GetValue(buf);
+
+            if (buf.GetDataLen() == m_hash.GetDataLen() &&
+                memcmp(buf.GetData(), m_hash.GetData(), buf.GetDataLen()) == 0)
+            {
+                // Update package file exists and its hash is correct.
+                wxLogStatus(_("Update package file already downloaded and ready to install."));
+                return true;
+            }
+        }
+    }
+
+    wxFFile file(m_fileName, wxT("wb"));
+    if (!file.IsOpened()) {
+        wxLogError(_("Can not open/create %s file for writing."), m_fileName.c_str());
+        return false;
+    }
+
+    // Download update package file.
+    for (size_t i = 0, n = m_urls.GetCount(); i < n; i++) {
+        if (TestDestroy()) return false;
+
+        wxURL url(m_urls[i]);
+        if (!url.IsOk())
+            continue;
+
+        if (url.HasScheme()) {
+            const wxString scheme = url.GetScheme();
+            if (scheme == wxT("http") || scheme == wxT("https")) {
+                wxHTTP &http = (wxHTTP&)url.GetProtocol();
+                http.SetHeader(wxS("User-Agent"), wxS("Updater-") wxT(PRODUCT_CFG_APPLICATION) wxS("/") wxS(PRODUCT_VERSION_STR));
+            }
+        }
+
+        wxLogStatus(_("Downloading update package %s..."), m_urls[i].c_str());
+        wxScopedPtr<wxInputStream> stream(url.GetInputStream());
+        if (!stream) {
+            wxLogWarning(_("Error response received."));
+            continue;
+        }
+
+        // Save update package to file, and calculate hash.
+        wxUpdaterHashChk ch(*m_cs);
+        wxMemoryBuffer buf(4*1024);
+        char *data = static_cast<char*>(buf.GetData());
+        const size_t nBlock = buf.GetBufSize();
+        do {
+            if (TestDestroy()) return false;
+
+            stream->Read(data, nBlock);
+            const size_t nRead = stream->LastRead();
+            file.Write(data, nRead);
+            if (file.Error()) {
+                wxLogError(_("Can not write to %s file."), m_fileName.c_str());
+                return false;
+            }
+            ch.Hash(data, nRead);
+        } while (stream->IsOk());
+        ch.GetValue(buf);
+
+        if (buf.GetDataLen() == m_hash.GetDataLen() &&
+            memcmp(buf.GetData(), m_hash.GetData(), buf.GetDataLen()) == 0)
+        {
+            // Update package file downloaded and its hash is correct.
+            wxLogStatus(_("Update package downloaded and ready to install."));
+            return true;
+        } else
+            wxLogWarning(_("Update package file corrupt."));
+    }
+
+    return false;
+}
+
+
+bool wxUpdCheckThread::LaunchUpdate(WXHWND hParent, bool headless)
+{
+    wxLogStatus(_("Launching update..."));
+
+    wxString param(headless ? wxT("/qn /norestart ") : wxEmptyString);
+
+    // Package
+    param += wxT("/i \"");
+    param += m_fileName;
+    param += wxT("\"");
+
+    // Logging
+    wxString fileNameLog(m_path);
+    fileNameLog += wxT("Updater-") wxT(PRODUCT_CFG_APPLICATION) wxT("-msiexec.log");
+
+    param += wxT(" /l* \"");
+    param += fileNameLog;
+    param += wxT("\"");
+
+    const intptr_t result = reinterpret_cast<intptr_t>(::ShellExecute(hParent, NULL, wxT("msiexec.exe"), param, NULL, SW_SHOWNORMAL));
+    if (result > 32) {
+        wxLogStatus(_("msiexec.exe launch succeeded. For detailed information, see %s file."), fileNameLog.c_str());
+        return true;
+    } else {
+        wxLogError(_("msiexec.exe launch failed. ShellExecute returned %i."), result);
+        return false;
+    }
+}

Updater/src/main.cpp

@@ -0,0 +1,26 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#include "pch.h"
+
+
+///
+/// Module instance
+///
+HINSTANCE g_hInstance = NULL;
+
+
+///
+/// Main function
+///
+BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved) noexcept
+{
+    UNREFERENCED_PARAMETER(lpvReserved);
+
+    if (fdwReason == DLL_PROCESS_ATTACH)
+        g_hInstance = hinstDLL;
+
+    return TRUE;
+}

Updater/src/pch.cpp

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

Updater/src/pch.h

@@ -0,0 +1,26 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2022 Amebis
+*/
+
+#pragma once
+
+#include "../include/Updater/chkthread.h"
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/base64.h>
+#include <wx/buffer.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+#include <wx/protocol/http.h>
+#include <wx/url.h>
+#pragma warning(pop)
+
+#include <wxex/hex.h>
+#include <wxex/xml.h>
+
+//
+// Private data declaration
+//
+extern HINSTANCE g_hInstance;

include/Updater.h

@@ -1,50 +0,0 @@
-/*
-    Copyright 2016 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-//
-// Product version as a single DWORD
-// Note: Used for version comparison within C/C++ code.
-//
-#define UPDATER_VERSION         0x01000000
-
-//
-// Product version by components
-// Note: Resource Compiler has limited preprocessing capability,
-// thus we need to specify major, minor and other version components
-// separately.
-//
-#define UPDATER_VERSION_MAJ     1
-#define UPDATER_VERSION_MIN     0
-#define UPDATER_VERSION_REV     0
-#define UPDATER_VERSION_BUILD   0
-
-//
-// Human readable product version and build year for UI
-//
-#define UPDATER_VERSION_STR     "1.0"
-#define UPDATER_BUILD_YEAR_STR  "2016"
-
-
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
-
-#define UPDATER_SIGNATURE_MARK  "SHA1SIGN:"
-
-#endif // !defined(RC_INVOKED) && !defined(MIDL_PASS)