minor tweaks

dinhngtu · Aug 14, 2022 · 83306f7 · 83306f7
1 parent a645c50
commit 83306f7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/VietTypeATL/Register.cpp b/VietTypeATL/Register.cpp
@@ -97,7 +97,7 @@ static HRESULT SetSettingsKeyAcl() {
     ea[1].Trustee.ptstrName = reinterpret_cast<LPWCH>(&sid[0]);
 
     PACL pNewAcl;
-    err = SetEntriesInAcl(ea.size(), ea.data(), dacl, &pNewAcl);
+    err = SetEntriesInAcl(static_cast<ULONG>(ea.size()), ea.data(), dacl, &pNewAcl);
     WINERROR_CHECK_RETURN_HRESULT(err, L"%s", L"SetEntriesInAcl failed");
     std::unique_ptr<ACL, decltype(&LocalFree)> newAcl(pNewAcl, &LocalFree);
 

diff --git a/VietTypeConfig/Form1.Designer.cs b/VietTypeConfig/Form1.Designer.cs
diff --git a/VietTypeSetup/Product.wxs b/VietTypeSetup/Product.wxs
@@ -86,11 +86,6 @@ SPDX-License-Identifier: GPL-3.0-only
         </File>
       </Component>
 
-      <Component Win64="no" Directory="INSTALLFOLDER">
-        <File Source="$(var.SolutionDir)\VietTypeConfig\bin\$(var.Configuration)\VietTypeConfig.exe" />
-        <Shortcut Id="ConfigShortcut" Directory="ShortcutFolder" Name="VietType Settings" WorkingDirectory="INSTALLFOLDER" Advertise="yes" />
-      </Component>
-
       <?if $(var.Platform) = x64 ?>
       <Component Id="VietTypeATL64.dll" Win64="yes" Directory="INSTALLFOLDER64">
         <File Source="$(var.SolutionDir)\x64\$(var.Configuration)\VietTypeATL64.dll">
@@ -99,6 +94,15 @@ SPDX-License-Identifier: GPL-3.0-only
       </Component>
       <?endif ?>
 
+      <Component Win64="no" Directory="INSTALLFOLDER">
+        <File Source="$(var.SolutionDir)\VietTypeConfig\bin\$(var.Configuration)\VietTypeConfig.exe" />
+        <Shortcut Id="ConfigShortcut" Directory="ShortcutFolder" Name="VietType Settings" WorkingDirectory="INSTALLFOLDER" Advertise="yes" />
+      </Component>
+      <Component Win64="no" Directory="INSTALLFOLDER">
+        <File Source="$(var.SolutionDir)\VietTypeConfig\bin\$(var.Configuration)\VietTypeConfig.exe.config"
+              DefaultLanguage="!(bind.fileLanguage.VietTypeConfig.exe)" DefaultVersion="!(bind.fileVersion.VietTypeConfig.exe)" />
+      </Component>
+
       <Component Win64="no" Directory="INSTALLFOLDER">
         <File Source="$(var.SolutionDir)\LICENSE" DefaultLanguage="1033" DefaultVersion="$(var.productVersion)" />
       </Component>