From 83306f75415619d6da6546389b3c5bbb68c09906 Mon Sep 17 00:00:00 2001
From: Tu Dinh <dinhngtu@users.noreply.github.com>
Date: Mon, 15 Aug 2022 01:56:10 +0200
Subject: [PATCH] minor tweaks

---
 VietTypeATL/Register.cpp         |  2 +-
 VietTypeConfig/Form1.Designer.cs | 11 ++++++-----
 VietTypeSetup/Product.wxs        | 14 +++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/VietTypeATL/Register.cpp b/VietTypeATL/Register.cpp
index fc8abdc..9ed4f38 100644
--- 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
index b376f37..c18ea8d 100644
--- a/VietTypeConfig/Form1.Designer.cs
+++ b/VietTypeConfig/Form1.Designer.cs
@@ -25,6 +25,7 @@ protected override void Dispose(bool disposing) {
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.cbDefaultEnabled = new System.Windows.Forms.CheckBox();
+            this.settingsBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.cbOaUy = new System.Windows.Forms.CheckBox();
             this.cbAcceptDd = new System.Windows.Forms.CheckBox();
             this.cbBackspaceInvalid = new System.Windows.Forms.CheckBox();
@@ -32,7 +33,6 @@ private void InitializeComponent() {
             this.btnOK = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnAbout = new System.Windows.Forms.Button();
-            this.settingsBindingSource = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.settingsBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
@@ -47,6 +47,10 @@ private void InitializeComponent() {
             this.cbDefaultEnabled.Text = "Enabled by de&fault";
             this.cbDefaultEnabled.UseVisualStyleBackColor = true;
             // 
+            // settingsBindingSource
+            // 
+            this.settingsBindingSource.DataSource = typeof(VietTypeConfig.Settings);
+            // 
             // cbOaUy
             // 
             this.cbOaUy.AutoSize = true;
@@ -123,10 +127,6 @@ private void InitializeComponent() {
             this.btnAbout.UseVisualStyleBackColor = true;
             this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click);
             // 
-            // settingsBindingSource
-            // 
-            this.settingsBindingSource.DataSource = typeof(VietTypeConfig.Settings);
-            // 
             // Form1
             // 
             this.AcceptButton = this.btnOK;
@@ -144,6 +144,7 @@ private void InitializeComponent() {
             this.Controls.Add(this.cbDefaultEnabled);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
+            this.MinimizeBox = false;
             this.Name = "Form1";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
diff --git a/VietTypeSetup/Product.wxs b/VietTypeSetup/Product.wxs
index 0356aaf..f188faa 100644
--- 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>