From 2041fc6495d9c9a20a5624a3bd9a698b1154df4c Mon Sep 17 00:00:00 2001
From: Amrsatrio <satrionareswara@yahoo.com>
Date: Tue, 7 Jan 2025 01:33:19 +0700
Subject: [PATCH 1/2] Add ARM64 support

---
 LGTV Companion Console/Console.vcxproj        |  86 ++++++++++-
 .../LGTV Companion Service.vcxproj            |  83 +++++++++-
 LGTV Companion Service/companion.cpp          |   4 +-
 .../LGTV Companion Setup.wixproj              |  46 +-----
 LGTV Companion Setup/Product.wxs              | 144 +++++++++---------
 LGTV Companion UI/LGTV Companion UI.vcxproj   |  76 ++++++++-
 LGTV Companion UI/lgtv_companion_ui.cpp       |   4 +-
 .../LGTV Companion User.vcxproj               |  90 ++++++++++-
 LGTVCompanion.sln                             |  30 +++-
 9 files changed, 440 insertions(+), 123 deletions(-)

diff --git a/LGTV Companion Console/Console.vcxproj b/LGTV Companion Console/Console.vcxproj
index 28b94db..a3ff330 100644
--- a/LGTV Companion Console/Console.vcxproj	
+++ b/LGTV Companion Console/Console.vcxproj	
@@ -17,6 +17,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -53,6 +61,19 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -70,6 +91,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>LGTVcli</TargetName>
@@ -77,18 +104,34 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>LGTVcli</TargetName>
   </PropertyGroup>
-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <TargetName>LGTVcli</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <TargetName>LGTVcli</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
   </PropertyGroup>
+  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <VcpkgTriplet>arm64-windows-static</VcpkgTriplet>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <VcpkgTriplet>arm64-windows-static</VcpkgTriplet>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -103,6 +146,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -119,6 +163,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -136,6 +181,43 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/LGTV Companion Service/LGTV Companion Service.vcxproj b/LGTV Companion Service/LGTV Companion Service.vcxproj
index b187d6f..c51c150 100644
--- a/LGTV Companion Service/LGTV Companion Service.vcxproj	
+++ b/LGTV Companion Service/LGTV Companion Service.vcxproj	
@@ -17,6 +17,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -25,6 +33,7 @@
     <RootNamespace>LGTVCompanionService</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
+    <VcpkgTriplet Condition="'$(Platform)'=='ARM64'">arm64-windows-static</VcpkgTriplet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -53,6 +62,19 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -70,6 +92,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -85,8 +113,16 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>LGTVsvc</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>LGTVsvc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>LGTVsvc</TargetName>
+  </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>false</VcpkgEnableManifest>
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -94,6 +130,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +145,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -125,7 +163,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/bigobj /utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -145,6 +183,47 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/bigobj /utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/LGTV Companion Service/companion.cpp b/LGTV Companion Service/companion.cpp
index a8d0500..5c5e777 100644
--- a/LGTV Companion Service/companion.cpp	
+++ b/LGTV Companion Service/companion.cpp	
@@ -684,7 +684,7 @@ void Companion::Impl::ipcCallback(std::wstring message)
 	}
 	// hack to allow for escaped double quotes in arguments
 	tools::replaceAllInPlace(temp, "\\\"", "*#*#*#");
-	tools::replaceAllInPlace(temp, "\"", "%¤%¤%¤");
+	tools::replaceAllInPlace(temp, "\"", "%�%�%�");
 	// split into separate command lines and process each
 	std::vector <std::string> commands = extractSeparateCommands(temp);
 	if (commands.size() == 0)
@@ -694,7 +694,7 @@ void Companion::Impl::ipcCallback(std::wstring message)
 	}
 	for (auto& commandline : commands)
 	{
-		tools::replaceAllInPlace(commandline, "%¤%¤%¤", "\"");
+		tools::replaceAllInPlace(commandline, "%�%�%�", "\"");
 		std::string log_message = "";
 		// split command line into words
 		std::vector <std::string> words = tools::stringsplit(commandline, " ");
diff --git a/LGTV Companion Setup/LGTV Companion Setup.wixproj b/LGTV Companion Setup/LGTV Companion Setup.wixproj
index a108559..87d1bda 100644
--- a/LGTV Companion Setup/LGTV Companion Setup.wixproj	
+++ b/LGTV Companion Setup/LGTV Companion Setup.wixproj	
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>415e4596-6599-42bc-9c2f-7adae529354c</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>LGTV Companion Setup</OutputName>
-    <OutputType>Package</OutputType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+<Project Sdk="WixToolset.Sdk/5.0.2">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LGTV Companion Service\LGTV Companion Service.vcxproj">
       <Name>LGTV Companion Service</Name>
@@ -41,26 +24,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
 </Project>
\ No newline at end of file
diff --git a/LGTV Companion Setup/Product.wxs b/LGTV Companion Setup/Product.wxs
index 1c8e2a8..ce4c76e 100644
--- a/LGTV Companion Setup/Product.wxs	
+++ b/LGTV Companion Setup/Product.wxs	
@@ -1,85 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- When publishing updated version, make sure to update "Product Id" GUID and "Version" -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define LGTV Companion Service_TargetDir=$(var.LGTV Companion Service.TargetDir)?><?define LGTV Companion UI_TargetDir=$(var.LGTV Companion UI.TargetDir)?>
-	<Product Id="D5C39AE3-DB37-44A1-9F76-B516E733D81C" Name="LGTV Companion" Language="1033" Version="4.1.0" Manufacturer="J Persson" UpgradeCode="0BA17E5B-11CE-491D-B1A1-05DD2D9F610A">
-		<Package Id="*" InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform='x64' Description="LGTV Companion installer" InstallPrivileges="elevated" AdminImage="yes"/>
+<!-- When publishing updated version, make sure to update "ProductCode" GUID and "Version" -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <Package Name="LGTV Companion" Language="1033" Version="4.1.0" Manufacturer="J Persson" UpgradeCode="0BA17E5B-11CE-491D-B1A1-05DD2D9F610A" InstallerVersion="500" ProductCode="D5C39AE3-DB37-44A1-9F76-B516E733D81C">
+    <SummaryInformation Description="LGTV Companion installer" />
     <Media Id="1" Cabinet="LGTVapp.cab" EmbedCab="yes" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of LGTV Companion is already installed." />
 
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramMenuFolder" Name="Programs" />
-      <Directory Id="StartupFolder" Name="Startup" />
-
-      <Directory Id="ProgramFiles64Folder">
-        <Directory Id="INSTALLFOLDER" Name="LGTV Companion" >
-          <Component Id="LGTVService" Guid="5949e7ba-212c-4cfc-8489-ee8b81daa541" Win64="yes">
-            <File Id="LGTVsvcEXE" Name="LGTVsvc.exe" Source="$(var.LGTV Companion Service_TargetDir)LGTVsvc.exe" Vital="yes" KeyPath='yes' />
-            <ServiceControl Id="StopService"  Stop="both" Remove="uninstall" Name="LGTVsvc" Wait="yes" />
-          </Component>
-          <Component Id="LGTVCompanionUI" Guid="08090141-ca74-4529-927e-ce4b7e1d95c6" Win64="yes">
-           <File Id="LGTVCompanionEXE" Name="LGTV Companion.exe" Source="$(var.LGTV Companion UI_TargetDir)LGTV Companion.exe" KeyPath='yes'   >
-            <Shortcut Id="startmenuicon" Directory="ProgramMenuFolder" Name="LGTV Companion" WorkingDirectory='INSTALLDIR' Icon="LGTVCompanion.exe" IconIndex="0" Advertise="yes" />
-           </File>
-          </Component>
-          <Component Id="LGTVCompanionDaemon" Guid="3C10ADE5-5D3E-4F5A-A31F-86D29D8317A6" Win64="yes">
-            <File Id="LGTVdaemonEXE" Name="LGTVdaemon.exe" Source="$(var.LGTV Companion UI_TargetDir)LGTVdaemon.exe" KeyPath='yes'   />
-              <Shortcut Id="daemonstart" Directory="StartupFolder" Name="LGTV Companion (Daemon)" Arguments="-hide" Icon="LGTVdaemon.exe" IconIndex="0" Advertise="yes" />
-          </Component>
-          <Component Id="LGTVcli" Guid="D7F686C9-0AC3-4ADC-8428-B41C77ACEB05" Win64="yes">
-            <File Id="LGTVcliEXE" Name="LGTVcli.exe" Source="$(var.LGTV Companion UI_TargetDir)LGTVcli.exe" KeyPath='yes' />
-          </Component>
-          <Component Id="LGTVCompanionIcon" Guid="4720E7B3-AC16-41F4-B961-148D4EFFB28A" Win64="yes">
-            <File Id="mainicon" Name="mainicon.ico" Source="$(var.LGTV Companion UI_TargetDir)mainicon.ico" KeyPath='yes'   />
-          </Component>
-        </Directory>         
-      </Directory>
+    <!--
+    This will set the WIX_NATIVE_MACHINE property, for which:
+    34404 = 0x8664 = IMAGE_FILE_MACHINE_AMD64
+    43620 = 0xAA64 = IMAGE_FILE_MACHINE_ARM64
+    -->
+    <util:QueryNativeMachine />
 
+    <?if $(sys.BUILDARCH) = "x64" ?>
+    <Launch
+      Condition="WIX_NATIVE_MACHINE = 34404"
+      Message="This application requires Windows for x64 processors." />
+    <?endif ?>
 
-      <!--
-      <Directory Id="CommonAppDataFolder" >
-        <Directory Id="DataDir" Name="LGTV Companion">
-          <Component Id="RemoveOrphanFiles" Guid="3B1B816B-471B-4D3B-B73B-B97802405A47" Win64="yes">
-            <RemoveFile Id='LogFile' On='uninstall' Name='Log.txt' />
-            <RemoveFile Id='ConfigFile' On='uninstall' Name='Config.json' />
-            <RemoveFolder Id='RemoveDataDir' On='uninstall' />
+    <?if $(sys.BUILDARCH) = "arm64" ?>
+    <Launch
+      Condition="WIX_NATIVE_MACHINE = 43620"
+      Message="This application requires Windows for Arm64 processors." />
+    <?endif ?>
 
-          </Component>
-        </Directory>
- 
-      </Directory>
-      -->
-      
-    </Directory>
+    <CustomAction Id="EXECUTE_BEFORE_FINALIZE_INSTALL" Execute="deferred" Impersonate="no" Return="ignore" ExeCommand="-install" FileRef="LGTVsvcEXE" />
+    <CustomAction Id="EXECUTE_AFTER_FINALIZE" Execute="immediate" Impersonate="no" Return="asyncNoWait" ExeCommand="-firstrun" FileRef="LGTVdaemonEXE" />
+    <util:CloseApplication Id="StopDaemon" CloseMessage="yes" Target="LGTVdaemon.exe" RebootPrompt="no" />
 
-    <CustomAction Id="EXECUTE_BEFORE_FINALIZE_INSTALL" Execute="deferred" Impersonate="no"  Return="ignore"  FileKey="LGTVsvcEXE" ExeCommand="-install" />
-    <CustomAction Id="EXECUTE_AFTER_FINALIZE" Execute="immediate" Impersonate="no"  Return="asyncNoWait" FileKey="LGTVdaemonEXE" ExeCommand="-firstrun" />
-    <util:CloseApplication Id="StopDaemon" CloseMessage="yes" Target="LGTVdaemon.exe" RebootPrompt="no"/>
-   
     <InstallExecuteSequence>
-      <Custom Action="WixCloseApplications" Before="InstallValidate"/>
-      <Custom Action="EXECUTE_BEFORE_FINALIZE_INSTALL" Before="InstallFinalize">NOT Installed</Custom>
-      <Custom Action="EXECUTE_AFTER_FINALIZE" After="InstallFinalize">NOT Installed</Custom>     
+      <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="InstallValidate" />
+      <Custom Action="EXECUTE_BEFORE_FINALIZE_INSTALL" Before="InstallFinalize" Condition="NOT Installed" />
+      <Custom Action="EXECUTE_AFTER_FINALIZE" After="InstallFinalize" Condition="NOT Installed" />
     </InstallExecuteSequence>
-      <Feature Id="MainProgram" Title="LGTV Companion Setup" Level="1" ConfigurableDirectory='INSTALLFOLDER'>
-        <ComponentRef Id='LGTVService' />
-        <ComponentRef Id='LGTVCompanionUI' />
-        <ComponentRef Id='LGTVCompanionDaemon' />
-        <ComponentRef Id='LGTVCompanionIcon' />
-        <ComponentRef Id='LGTVcli' />
 
-        <!--       <ComponentRef Id='RemoveOrphanFiles' /> -->
-      </Feature>
-  
-    <Icon Id="LGTVCompanion.exe" SourceFile="$(var.LGTV Companion UI_TargetDir)LGTV Companion.exe" />
-    <Icon Id="LGTVdaemon.exe" SourceFile="$(var.LGTV Companion UI_TargetDir)LGTVdaemon.exe" />
+    <Feature Id="MainProgram" Title="LGTV Companion Setup" Level="1" ConfigurableDirectory="INSTALLFOLDER">
+      <ComponentRef Id="LGTVService" />
+      <ComponentRef Id="LGTVCompanionUI" />
+      <ComponentRef Id="LGTVCompanionDaemon" />
+      <ComponentRef Id="LGTVCompanionIcon" />
+      <ComponentRef Id="LGTVcli" />
+      <!--<ComponentRef Id='RemoveOrphanFiles' />-->
+    </Feature>
+
+    <Icon Id="LGTVCompanion.exe" SourceFile="LGTV Companion.exe" />
+    <Icon Id="LGTVdaemon.exe" SourceFile="LGTVdaemon.exe" />
 
     <Property Id="ARPPRODUCTICON" Value="LGTVCompanion.exe" />
     <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
-    <UIRef Id="WixUI_InstallDir" />
+    <ui:WixUI Id="WixUI_InstallDir" />
     <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />
-  </Product>
+
+    <StandardDirectory Id="ProgramMenuFolder" />
+    <StandardDirectory Id="StartupFolder" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLFOLDER" Name="LGTV Companion">
+        <Component Id="LGTVService" Guid="5949e7ba-212c-4cfc-8489-ee8b81daa541" Bitness="always64">
+          <File Id="LGTVsvcEXE" Name="LGTVsvc.exe" Source="LGTVsvc.exe" Vital="yes" KeyPath="yes" />
+          <ServiceControl Id="StopService" Stop="both" Remove="uninstall" Name="LGTVsvc" Wait="yes" />
+        </Component>
+        <Component Id="LGTVCompanionUI" Guid="08090141-ca74-4529-927e-ce4b7e1d95c6" Bitness="always64">
+          <File Id="LGTVCompanionEXE" Name="LGTV Companion.exe" Source="LGTV Companion.exe" KeyPath="yes">
+            <Shortcut Id="startmenuicon" Directory="ProgramMenuFolder" Name="LGTV Companion" WorkingDirectory="INSTALLFOLDER" Icon="LGTVCompanion.exe" IconIndex="0" Advertise="yes" />
+          </File>
+        </Component>
+        <Component Id="LGTVCompanionDaemon" Guid="3C10ADE5-5D3E-4F5A-A31F-86D29D8317A6" Bitness="always64">
+          <File Id="LGTVdaemonEXE" Name="LGTVdaemon.exe" Source="LGTVdaemon.exe" KeyPath="yes" />
+          <Shortcut Id="daemonstart" Directory="StartupFolder" Name="LGTV Companion (Daemon)" Arguments="-hide" Icon="LGTVdaemon.exe" IconIndex="0" Advertise="yes" />
+        </Component>
+        <Component Id="LGTVcli" Guid="D7F686C9-0AC3-4ADC-8428-B41C77ACEB05" Bitness="always64">
+          <File Id="LGTVcliEXE" Name="LGTVcli.exe" Source="LGTVcli.exe" KeyPath="yes" />
+        </Component>
+        <Component Id="LGTVCompanionIcon" Guid="4720E7B3-AC16-41F4-B961-148D4EFFB28A" Bitness="always64">
+          <File Id="mainicon" Name="mainicon.ico" Source="mainicon.ico" KeyPath="yes" />
+        </Component>
+      </Directory>
+    </StandardDirectory>
+
+    <!--<StandardDirectory Id="CommonAppDataFolder">
+      <Directory Id="DataDir" Name="LGTV Companion">
+        <Component Id="RemoveOrphanFiles" Guid="3B1B816B-471B-4D3B-B73B-B97802405A47" Bitness="always64">
+          <RemoveFile Id='LogFile' On='uninstall' Name='Log.txt' />
+          <RemoveFile Id='ConfigFile' On='uninstall' Name='Config.json' />
+          <RemoveFolder Id='RemoveDataDir' On='uninstall' />
+        </Component>
+      </Directory>
+    </StandardDirectory>-->
+  </Package>
 </Wix>
diff --git a/LGTV Companion UI/LGTV Companion UI.vcxproj b/LGTV Companion UI/LGTV Companion UI.vcxproj
index 2cc40a6..93f3516 100644
--- a/LGTV Companion UI/LGTV Companion UI.vcxproj	
+++ b/LGTV Companion UI/LGTV Companion UI.vcxproj	
@@ -17,6 +17,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -25,6 +33,7 @@
     <RootNamespace>LGTVCompanionUI</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
+    <VcpkgTriplet Condition="'$(Platform)'=='ARM64'">arm64-windows-static</VcpkgTriplet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -53,6 +62,19 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -70,6 +92,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -85,8 +113,16 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>LGTV Companion</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>LGTV Companion</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>LGTV Companion</TargetName>
+  </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>false</VcpkgEnableManifest>
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -94,6 +130,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -108,6 +145,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -124,6 +162,7 @@
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -140,6 +179,41 @@
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/LGTV Companion UI/lgtv_companion_ui.cpp b/LGTV Companion UI/lgtv_companion_ui.cpp
index 466704a..514d0a5 100644
--- a/LGTV Companion UI/lgtv_companion_ui.cpp	
+++ b/LGTV Companion UI/lgtv_companion_ui.cpp	
@@ -46,7 +46,7 @@ INSTALLATION, USAGE ETC
 	https://github.com/JPersson77/LGTVCompanion
 
 LICENSE
-	Copyright (c) 2021-2024 Jörgen Persson
+	Copyright (c) 2021-2024 Jörgen Persson
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
 	files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -61,7 +61,7 @@ LICENSE
 	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 COPYRIGHT
-	Copyright (c) 2021-2024 Jörgen Persson
+	Copyright (c) 2021-2024 Jörgen Persson
 */
 
 #include "targetver.h"
diff --git a/LGTV Companion User/LGTV Companion User.vcxproj b/LGTV Companion User/LGTV Companion User.vcxproj
index 64c36c1..001e65d 100644
--- a/LGTV Companion User/LGTV Companion User.vcxproj	
+++ b/LGTV Companion User/LGTV Companion User.vcxproj	
@@ -17,6 +17,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -26,6 +34,7 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>LGTV Companion Daemon</ProjectName>
     <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
+    <VcpkgTriplet Condition="'$(Platform)'=='ARM64'">arm64-windows-static</VcpkgTriplet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -54,6 +63,19 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -71,6 +93,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -86,8 +114,16 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>LGTVdaemon</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>LGTVdaemon</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>LGTVdaemon</TargetName>
+  </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>false</VcpkgEnableManifest>
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -95,6 +131,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -109,6 +146,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -127,6 +165,7 @@
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -150,6 +189,55 @@
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy /Y "$(ProjectDir)mainicon.ico*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy /Y "$(ProjectDir)mainicon.ico*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/LGTVCompanion.sln b/LGTVCompanion.sln
index 0c65d9e..bb0c055 100644
--- a/LGTVCompanion.sln
+++ b/LGTVCompanion.sln
@@ -21,50 +21,72 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Debug|ARM64 = Debug|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|x64.ActiveCfg = Debug|x64
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|x64.Build.0 = Debug|x64
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|x86.ActiveCfg = Debug|Win32
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|x86.Build.0 = Debug|Win32
+		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|x64.ActiveCfg = Release|x64
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|x64.Build.0 = Release|x64
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|x86.ActiveCfg = Release|Win32
 		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|x86.Build.0 = Release|Win32
+		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D44C1E2C-666D-4193-8D7D-C0663A4DF277}.Release|ARM64.Build.0 = Release|ARM64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|x64.ActiveCfg = Debug|x64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|x64.Build.0 = Debug|x64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|x86.ActiveCfg = Debug|Win32
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|x86.Build.0 = Debug|Win32
+		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FD236504-E0D5-44BF-A119-41634EABD159}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|x64.ActiveCfg = Release|x64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|x64.Build.0 = Release|x64
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|x86.ActiveCfg = Release|Win32
 		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|x86.Build.0 = Release|Win32
-		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x64.ActiveCfg = Debug|x86
-		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x64.Build.0 = Debug|x86
+		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FD236504-E0D5-44BF-A119-41634EABD159}.Release|ARM64.Build.0 = Release|ARM64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x64.ActiveCfg = Debug|x64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x64.Build.0 = Debug|x64
 		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x86.ActiveCfg = Debug|x86
 		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|x86.Build.0 = Debug|x86
-		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x64.ActiveCfg = Release|x86
-		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x64.Build.0 = Release|x86
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x64.ActiveCfg = Release|x64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x64.Build.0 = Release|x64
 		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x86.ActiveCfg = Release|x86
 		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|x86.Build.0 = Release|x86
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{415E4596-6599-42BC-9C2F-7ADAE529354C}.Release|ARM64.Build.0 = Release|ARM64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|x64.ActiveCfg = Debug|x64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|x64.Build.0 = Debug|x64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|x86.ActiveCfg = Debug|Win32
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|x86.Build.0 = Debug|Win32
+		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|x64.ActiveCfg = Release|x64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|x64.Build.0 = Release|x64
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|x86.ActiveCfg = Release|Win32
 		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|x86.Build.0 = Release|Win32
+		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5611232A-E1D4-42F8-B182-F7BD8ACF1D82}.Release|ARM64.Build.0 = Release|ARM64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|x64.ActiveCfg = Debug|x64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|x64.Build.0 = Debug|x64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|x86.ActiveCfg = Debug|Win32
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|x86.Build.0 = Debug|Win32
+		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Debug|ARM64.Build.0 = Debug|ARM64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|x64.ActiveCfg = Release|x64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|x64.Build.0 = Release|x64
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|x86.ActiveCfg = Release|Win32
 		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|x86.Build.0 = Release|Win32
+		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{220383FE-FBC6-41C5-8F85-E4E709FD04BD}.Release|ARM64.Build.0 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 5b078b498eb05d603730b76d29070cbdb21532ac Mon Sep 17 00:00:00 2001
From: Amrsatrio <satrionareswara@yahoo.com>
Date: Tue, 7 Jan 2025 01:43:53 +0700
Subject: [PATCH 2/2] Revert VcpkgEnableManifest to false

---
 LGTV Companion Console/Console.vcxproj                | 2 +-
 LGTV Companion Service/LGTV Companion Service.vcxproj | 2 +-
 LGTV Companion UI/LGTV Companion UI.vcxproj           | 2 +-
 LGTV Companion User/LGTV Companion User.vcxproj       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LGTV Companion Console/Console.vcxproj b/LGTV Companion Console/Console.vcxproj
index a3ff330..ea37197 100644
--- a/LGTV Companion Console/Console.vcxproj	
+++ b/LGTV Companion Console/Console.vcxproj	
@@ -111,7 +111,7 @@
     <TargetName>LGTVcli</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
diff --git a/LGTV Companion Service/LGTV Companion Service.vcxproj b/LGTV Companion Service/LGTV Companion Service.vcxproj
index c51c150..54df39a 100644
--- a/LGTV Companion Service/LGTV Companion Service.vcxproj	
+++ b/LGTV Companion Service/LGTV Companion Service.vcxproj	
@@ -122,7 +122,7 @@
     <TargetName>LGTVsvc</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/LGTV Companion UI/LGTV Companion UI.vcxproj b/LGTV Companion UI/LGTV Companion UI.vcxproj
index 93f3516..f0778a4 100644
--- a/LGTV Companion UI/LGTV Companion UI.vcxproj	
+++ b/LGTV Companion UI/LGTV Companion UI.vcxproj	
@@ -122,7 +122,7 @@
     <TargetName>LGTV Companion</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/LGTV Companion User/LGTV Companion User.vcxproj b/LGTV Companion User/LGTV Companion User.vcxproj
index 001e65d..7bcf225 100644
--- a/LGTV Companion User/LGTV Companion User.vcxproj	
+++ b/LGTV Companion User/LGTV Companion User.vcxproj	
@@ -123,7 +123,7 @@
     <TargetName>LGTVdaemon</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>