More installler related updates and further changes to the code that …

…determines where the Export.lua file is written to. Installer now also places a copy of Iris into the user's data directory.
BlueFinBima · Mar 18, 2019 · 12fcd28 · 12fcd28
1 parent 3759f64
commit 12fcd28
Show file tree

Hide file tree

Showing 7 changed files with 332 additions and 265 deletions.
diff --git a/Control Center/Control Center.csproj b/Control Center/Control Center.csproj
@@ -24,8 +24,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>330</ApplicationRevision>
-    <ApplicationVersion>1.4.2019.0330</ApplicationVersion>
+    <ApplicationRevision>317</ApplicationRevision>
+    <ApplicationVersion>1.4.2019.0317</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>

diff --git a/Control Center/Properties/AssemblyInfo.cs b/Control Center/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2019.0330")]
-[assembly: AssemblyFileVersion("1.4.2019.0330")]
+[assembly: AssemblyVersion("1.4.2019.0317")]
+[assembly: AssemblyFileVersion("1.4.2019.0317")]
diff --git a/Helios/Interfaces/DCS/Common/DCSConfigurator.cs b/Helios/Interfaces/DCS/Common/DCSConfigurator.cs
@@ -269,27 +269,42 @@ public string ExportAppPath
                 if (_allowDCSWorld)
                 {
                     RegistryKey pathKey = Registry.CurrentUser.OpenSubKey(@"Software\Eagle Dynamics\DCS World");
+
+                    // We attempt to get the Saved Games known folder from the native method to cater for situations
+                    // when the locale of the installation has the folder name in non-English.
+
+                    String path;
+                    IntPtr pathPtr;
+                    int hr = NativeMethods.SHGetKnownFolderPath(ref FolderSavedGames, 0, IntPtr.Zero, out pathPtr);
+                    if (hr == 0)
+                    {
+                        path = Marshal.PtrToStringUni(pathPtr);
+                        Marshal.FreeCoTaskMem(pathPtr);
+                    } else
+                    {
+                        path = Environment.GetEnvironmentVariable("userprofile") + "Saved Games";
+                    }
+
                     if (pathKey != null)
                     {
                         pathKey.Close();
-                            return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "Saved Games", "DCS.openbeta");
-                        return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "DCS");
+                        return System.IO.Path.Combine(path, "DCS");
                     }
                     else
                     {
                         pathKey = Registry.CurrentUser.OpenSubKey(@"Software\Eagle Dynamics\DCS World OpenBeta");
                         if (pathKey != null)
                         {
                             pathKey.Close();
-                            return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "Saved Games", "DCS.openbeta");
+                            return System.IO.Path.Combine(path, "DCS.openbeta");
                         }
                         else
                         {
                             pathKey = Registry.CurrentUser.OpenSubKey(@"Software\Eagle Dynamics\DCS World OpenAlpha");
                             if (pathKey != null)
                             {
                                 pathKey.Close();
-                                return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"),"Saved Games", "DCS.openalpha");
+                                return System.IO.Path.Combine(path, "DCS.openalpha");
                             }
                         }
                     }

diff --git a/Helios/Properties/AssemblyInfo.cs b/Helios/Properties/AssemblyInfo.cs
@@ -45,5 +45,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2019.0330")]
-[assembly: AssemblyFileVersion("1.4.2019.0330")]
+[assembly: AssemblyVersion("1.4.2019.0317")]
+[assembly: AssemblyFileVersion("1.4.2019.0317")]