From f8f497b5781da97567077bff81bd75123b5bc3f4 Mon Sep 17 00:00:00 2001
From: "saumya.jain" <saumya.jain@ultimaker.com>
Date: Wed, 20 Dec 2023 10:05:01 +0100
Subject: [PATCH 1/3] url registry entry for msi

CURA-11435
---
 packaging/msi/UltiMaker-Cura.wxs.jinja | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index a183a97d5f..c6ec5dbd63 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -33,6 +33,21 @@
             />
         </Upgrade>
 
+        <Property Id="ASSOCIATE_URL_PROTOCOLS">
+            <RegistrySearch Id="CheckCuraProtocolHandler"
+                Type="raw"
+                Root="HKCR"
+                Key="cura"
+                Name="URL Protocol"
+            />
+            <RegistrySearch Id="CheckSlicerProtocolHandler"
+                Type="raw"
+                Root="HKCR"
+                Key="slicer"
+                Name="URL Protocol"
+            />
+        </Property>
+
         {% if "Enterprise" in app_name %}
         <Property Id="PREVIOUS_413_INSTALLED" Secure="yes" />
         <Upgrade Id="53C603BB-2B17-4206-A609-29C2E0D0B0AE">
@@ -144,11 +159,32 @@
             </Component>
         </DirectoryRef>
 
+        <!--Url Scheme-->
+        <Component Id="CuraRegistration" Guid="*" Directory="APPLICATIONFOLDER">
+            <RegistryKey Root="HKCR" Key="cura">
+                <RegistryValue Type="string" Value="URL:Cura Protocol"/>
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Key="DefaultIcon" Value="$[APPLICATIONFOLDER]\{{ main_app }},1"/>
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;$[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
+            </RegistryKey>
+        </Component>
+
+        <Component Id="SlicerRegistration" Guid="*" Directory="APPLICATIONFOLDER">
+            <RegistryKey Root="HKCR" Key="slicer">
+                <RegistryValue Type="string" Value="URL:Slicer Protocol"/>
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Key="DefaultIcon" Value="$[APPLICATIONFOLDER]\{{ main_app }},1"/>
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;$[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
+            </RegistryKey>
+        </Component>
+
         <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
             <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
             <ComponentRef Id="CMP_CuraEngine_exe" />
             <ComponentGroupRef Id="NewFilesGroup" />
             <ComponentRef Id="CMP_Shortcuts" />
+            <ComponentRef Id="CuraRegistration"/>
+            <ComponentRef Id="SlicerRegistration"/>
         </Feature>
         <Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 0 }}" Description="..."/>
     </Product>

From 76f86081c63c48652949d11d5c6aea62c5a4fd8b Mon Sep 17 00:00:00 2001
From: "saumya.jain" <saumya.jain@ultimaker.com>
Date: Wed, 20 Dec 2023 10:50:57 +0100
Subject: [PATCH 2/3] fixing the register entry

CURA-11435
---
 packaging/msi/UltiMaker-Cura.wxs.jinja | 41 ++++++++++++++++++++------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index c6ec5dbd63..3dcb9ef2ee 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -160,24 +160,47 @@
         </DirectoryRef>
 
         <!--Url Scheme-->
-        <Component Id="CuraRegistration" Guid="*" Directory="APPLICATIONFOLDER">
+
+        <Component Id="CuraRegistration" Directory="APPLICATIONFOLDER" Guid="*">
+        <File Id="FILE_UltiMaker_Cura_exe" KeyPath="yes" Source="$(var.CuraDir)\{{ main_app }}" />
+
+        <ProgId Id="Cura" Description="{{ app_name }}" Icon="ICO_Cura" Advertise="yes">
+            <ProgId Id="3mf" Advertise="yes">
+                <Extension Id="3mf" ContentType="application/3mf">
+                    <Verb Id="open_3mf" Command="Open" Argument='"%1"' />
+                    <MIME Advertise="yes" ContentType="application/3mf" Default="yes" />
+                </Extension>
+            </ProgId>
+            <ProgId Id="stl" Advertise="yes">
+                <Extension Id="stl" ContentType="application/stl">
+                    <Verb Id="open_stl" Command="Open" Argument='"%1"' />
+                    <MIME Advertise="yes" ContentType="application/stl" Default="yes" />
+                </Extension>
+            </ProgId>
+        </ProgId>
+
+            <fw:FirewallException Id="FirewallExceptLocalFrontend" Name="Cura (Frontend) Connection (LocalHost)" File="FILE_UltiMaker_Cura_exe" IgnoreFailure="yes">
+                <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
+            </fw:FirewallException>
+        </Component>
+
+        <Component Id="CuraRegistration" Guid="*">
             <RegistryKey Root="HKCR" Key="cura">
                 <RegistryValue Type="string" Value="URL:Cura Protocol"/>
                 <RegistryValue Type="string" Name="URL Protocol" Value=""/>
-                <RegistryValue Type="string" Key="DefaultIcon" Value="$[APPLICATIONFOLDER]\{{ main_app }},1"/>
-                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;$[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
+                <RegistryValue Type="string" Key="DefaultIcon" Value="[APPLICATIONFOLDER]\{{ main_app }},1"/>
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
             </RegistryKey>
         </Component>
 
-        <Component Id="SlicerRegistration" Guid="*" Directory="APPLICATIONFOLDER">
+        <Component Id="SlicerRegistration" Guid="*">
             <RegistryKey Root="HKCR" Key="slicer">
-                <RegistryValue Type="string" Value="URL:Slicer Protocol"/>
-                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
-                <RegistryValue Type="string" Key="DefaultIcon" Value="$[APPLICATIONFOLDER]\{{ main_app }},1"/>
-                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;$[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
+                <RegistryValue Type="string" Value="URL:Slicer Protocol" />
+                <RegistryValue Type="string" Name="URL Protocol" Value="" />
+                <RegistryValue Type="string" Key="DefaultIcon" Value="[APPLICATIONFOLDER]\{{ main_app }},1" />
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;" />
             </RegistryKey>
         </Component>
-
         <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
             <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
             <ComponentRef Id="CMP_CuraEngine_exe" />

From e08d183b6c424d9ecc5c5e4668e7e379edf0cabf Mon Sep 17 00:00:00 2001
From: "saumya.jain" <saumya.jain@ultimaker.com>
Date: Wed, 20 Dec 2023 10:56:25 +0100
Subject: [PATCH 3/3] undo commit 76f8608

CURA-11435
---
 packaging/msi/UltiMaker-Cura.wxs.jinja | 37 +++++---------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index 3dcb9ef2ee..21f017c813 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -160,31 +160,7 @@
         </DirectoryRef>
 
         <!--Url Scheme-->
-
-        <Component Id="CuraRegistration" Directory="APPLICATIONFOLDER" Guid="*">
-        <File Id="FILE_UltiMaker_Cura_exe" KeyPath="yes" Source="$(var.CuraDir)\{{ main_app }}" />
-
-        <ProgId Id="Cura" Description="{{ app_name }}" Icon="ICO_Cura" Advertise="yes">
-            <ProgId Id="3mf" Advertise="yes">
-                <Extension Id="3mf" ContentType="application/3mf">
-                    <Verb Id="open_3mf" Command="Open" Argument='"%1"' />
-                    <MIME Advertise="yes" ContentType="application/3mf" Default="yes" />
-                </Extension>
-            </ProgId>
-            <ProgId Id="stl" Advertise="yes">
-                <Extension Id="stl" ContentType="application/stl">
-                    <Verb Id="open_stl" Command="Open" Argument='"%1"' />
-                    <MIME Advertise="yes" ContentType="application/stl" Default="yes" />
-                </Extension>
-            </ProgId>
-        </ProgId>
-
-            <fw:FirewallException Id="FirewallExceptLocalFrontend" Name="Cura (Frontend) Connection (LocalHost)" File="FILE_UltiMaker_Cura_exe" IgnoreFailure="yes">
-                <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
-            </fw:FirewallException>
-        </Component>
-
-        <Component Id="CuraRegistration" Guid="*">
+        <Component Id="CuraRegistration" Guid="*" Directory="APPLICATIONFOLDER">
             <RegistryKey Root="HKCR" Key="cura">
                 <RegistryValue Type="string" Value="URL:Cura Protocol"/>
                 <RegistryValue Type="string" Name="URL Protocol" Value=""/>
@@ -193,14 +169,15 @@
             </RegistryKey>
         </Component>
 
-        <Component Id="SlicerRegistration" Guid="*">
+        <Component Id="SlicerRegistration" Guid="*" Directory="APPLICATIONFOLDER">
             <RegistryKey Root="HKCR" Key="slicer">
-                <RegistryValue Type="string" Value="URL:Slicer Protocol" />
-                <RegistryValue Type="string" Name="URL Protocol" Value="" />
-                <RegistryValue Type="string" Key="DefaultIcon" Value="[APPLICATIONFOLDER]\{{ main_app }},1" />
-                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;" />
+                <RegistryValue Type="string" Value="URL:Slicer Protocol"/>
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Key="DefaultIcon" Value="[APPLICATIONFOLDER]\{{ main_app }},1"/>
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
             </RegistryKey>
         </Component>
+
         <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
             <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
             <ComponentRef Id="CMP_CuraEngine_exe" />