Merge pull request #16 from Grisu-NOE/feature/32bit-browser-support

Feature/32bit browser support
Grisu-NOE · Apr 6, 2021 · 8ed957b · 8ed957b
2 parents 770b262 + 4dd66a8
commit 8ed957b
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 381 deletions.
diff --git a/src/Gui/FullscreenBrowser/FullscreenBrowser.csproj b/src/Gui/FullscreenBrowser/FullscreenBrowser.csproj
@@ -18,6 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Geckofx60.32" Version="60.0.55" GeneratePathProperty="true">
+      <PrivateAssets>All</PrivateAssets>
+      <ExcludeAssets>All</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="Geckofx60.64" Version="60.0.55" GeneratePathProperty="true" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
@@ -57,6 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="$(PkgGeckofx60_32)\content\Firefox\**\*" Link="Firefox32\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="$(PkgGeckofx60_64)\content\Firefox\**\*" Link="Firefox64\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/src/Gui/FullscreenBrowser/GeckoBrowser.cs b/src/Gui/FullscreenBrowser/GeckoBrowser.cs
@@ -360,7 +360,17 @@ private void Initialize(bool force = false)
             if (!Xpcom.IsInitialized)
             {
                 PromptFactory.PromptServiceCreator = () => new FilteredPromptService();
-                Xpcom.Initialize(Path.GetFullPath(browserConfig.Runtime));
+                var browserConfigRuntime = browserConfig.Runtime;
+                if (Environment.Is64BitProcess)
+                {
+                    browserConfigRuntime += "64";
+                }
+                else
+                {
+                    browserConfigRuntime += "32";
+                }
+
+                Xpcom.Initialize(Path.GetFullPath(browserConfigRuntime));
             }
 
             if (browserConfig.ClearCookiesAtStartup)
@@ -404,7 +414,7 @@ private void Initialize(bool force = false)
                         {
                             case BrowserRegistryType.Boolean:
                                 bool parsedBool;
-                                if (! bool.TryParse(item.Value.ToString(), out parsedBool))
+                                if (!bool.TryParse(item.Value.ToString(), out parsedBool))
                                 {
                                     throw new InvalidDataException("Value could not be parsed as boolean");
                                 }

diff --git a/src/Gui/FullscreenBrowser/windowConfig.xml b/src/Gui/FullscreenBrowser/windowConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <BrowserConfig>
-  <Runtime>Firefox64</Runtime>
+  <Runtime>Firefox</Runtime>
   <PrintSettings>
     <!--URL zum Infoscreen-Depeschen-Druckservice - nicht verändern!-->
     <PrintUrl>https://infoscreen.florian10.info/ows/infoscreen/einsatz.ashx</PrintUrl>

diff --git a/src/Gui/MaterialConfig/App.xaml b/src/Gui/MaterialConfig/App.xaml
diff --git a/src/Gui/MaterialConfig/App.xaml.cs b/src/Gui/MaterialConfig/App.xaml.cs
diff --git a/src/Gui/MaterialConfig/MainWindow.xaml b/src/Gui/MaterialConfig/MainWindow.xaml
diff --git a/src/Gui/MaterialConfig/MainWindow.xaml.cs b/src/Gui/MaterialConfig/MainWindow.xaml.cs
diff --git a/src/Gui/MaterialConfig/MaterialConfig.csproj b/src/Gui/MaterialConfig/MaterialConfig.csproj
diff --git a/src/Gui/MaterialConfig/Properties/Resources.Designer.cs b/src/Gui/MaterialConfig/Properties/Resources.Designer.cs