Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

9 files changed, 122 insertions, 2 deletions

diff --git a/resources/install/windows/Microsoft.Windows.Build.Signing.mssign32.dll.manifest b/resources/install/windows/Microsoft.Windows.Build.Signing.mssign32.dll.manifest
new file mode 100644
index 0000000..422623c
--- /dev/null
+++ b/resources/install/windows/Microsoft.Windows.Build.Signing.mssign32.dll.manifest
@@ -0,0 +1,11 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+<assemblyIdentity
+    name="Microsoft.Windows.Build.Signing.mssign32.dll"
+    version="0.0.0.0"
+/>
+
+  <file name="mssign32.dll">
+  </file>
+
+</assembly>
diff --git a/resources/install/windows/Microsoft.Windows.Build.Signing.wintrust.dll.manifest b/resources/install/windows/Microsoft.Windows.Build.Signing.wintrust.dll.manifest
new file mode 100644
index 0000000..651475f
--- /dev/null
+++ b/resources/install/windows/Microsoft.Windows.Build.Signing.wintrust.dll.manifest
@@ -0,0 +1,11 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+<assemblyIdentity
+    name="Microsoft.Windows.Build.Signing.wintrust.dll"
+    version="0.0.0.0"
+/>
+
+  <file name="wintrust.dll">
+  </file>
+
+</assembly>
diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index cf07c53..36069de 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -20,6 +20,31 @@
 

 <Fragment>

 <ComponentGroup Id="ComponentGroup_RegistryEntries">

+  <Component

+      Id="Component_UrlCapabilities"

+      Directory="TARGETDIR"

+      Guid="5798BE9D-AEA5-4DA8-992E-EEAD03D7E4CB"

+      Win64="no">

+    <RegistryKey Key="Software\Jitsi\Capabilities" Root="HKLM">

+      <RegistryValue Name="ApplicationDescription" Type="string" Value="Jitsi, the Open Source VoIP and Instant Messaging client." />

+    </RegistryKey>

+    <RegistryKey Key="Software\RegisteredApplications" Root="HKLM">

+      <RegistryValue Name="Jitsi" Type="string" Value="Software\Jitsi\Capabilities" />

+    </RegistryKey>

+    <RegistryKey Key="Software\Jitsi\Capabilities\UrlAssociations" Root="HKLM">

+      <RegistryValue Name="callto" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="sip" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="tel" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="xmpp" Type="string" Value="Jitsi.Url" />

+    </RegistryKey>

+    <RegistryKey Key="Software\Classes\Jitsi.Url" Root="HKLM">

+      <RegistryValue

+          Key="shell\open\command"

+          KeyPath="yes"

+          Type="string"

+          Value='"[INSTALLDIR]@APP_LAUNCHER_NAME@.exe" "%1"' />

+    </RegistryKey>

+  </Component>

 

   <Component

       Id="Component_SipRegistryEntries"

@@ -93,7 +118,7 @@
     </RegistryKey>

   	<RegistryKey

         Key="SOFTWARE\IM Providers\@APP_NAME@"

-        Root="HKLM" Action="createAndRemoveOnUninstall">

+        Root="HKLM">

       <RegistryValue

           Name="FriendlyName"

           Type="string"

@@ -143,6 +168,32 @@
   

 <?if $(var.Platform) = x64 ?>

   <Component

+      Id="Component_UrlCapabilities64"

+      Directory="TARGETDIR"

+      Guid="3de76b6b-90b9-403d-82ac-51d841ea95af"

+      Win64="yes">

+    <RegistryKey Key="Software\Jitsi\Capabilities" Root="HKLM">

+      <RegistryValue Name="ApplicationDescription" Type="string" Value="Jitsi, the Open Source VoIP and Instant Messaging client." />

+    </RegistryKey>

+    <RegistryKey Key="Software\RegisteredApplications" Root="HKLM">

+      <RegistryValue Name="Jitsi" Type="string" Value="Software\Jitsi\Capabilities" />

+    </RegistryKey>

+    <RegistryKey Key="Software\Jitsi\Capabilities\UrlAssociations" Root="HKLM">

+      <RegistryValue Name="callto" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="sip" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="tel" Type="string" Value="Jitsi.Url" />

+      <RegistryValue Name="xmpp" Type="string" Value="Jitsi.Url" />

+    </RegistryKey>

+    <RegistryKey Key="Software\Classes\Jitsi.Url" Root="HKLM">

+      <RegistryValue

+          Key="shell\open\command"

+          KeyPath="yes"

+          Type="string"

+          Value='"[INSTALLDIR]@APP_LAUNCHER_NAME@.exe" "%1"' />

+    </RegistryKey>

+  </Component>

+

+  <Component

       Id="Component_MsOfficeCommRegistryEntries_X64"

       Directory="TARGETDIR"

       Guid="ce3c9a0f-1876-470e-823c-a29d7b7fcb26"

@@ -159,7 +210,7 @@
     </RegistryKey>

     <RegistryKey

         Key="SOFTWARE\IM Providers\@APP_NAME@"

-        Root="HKLM" Action="createAndRemoveOnUninstall">

+        Root="HKLM">

         <RegistryValue

           Name="FriendlyName"

           Type="string"

diff --git a/resources/install/windows/makecat.exe b/resources/install/windows/makecat.exe
new file mode 100755
index 0000000..d232107
--- /dev/null
+++ b/resources/install/windows/makecat.exe
diff --git a/resources/install/windows/makecat.exe.manifest b/resources/install/windows/makecat.exe.manifest
new file mode 100644
index 0000000..4db4536
--- /dev/null
+++ b/resources/install/windows/makecat.exe.manifest
@@ -0,0 +1,21 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity
+        name=" "
+        version="0.0.0.0"
+    />
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                name="Microsoft.Windows.Build.Signing.wintrust.dll"
+                version="0.0.0.0"
+            />
+        </dependentAssembly>
+    </dependency>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/resources/install/windows/mssign32.dll b/resources/install/windows/mssign32.dll
new file mode 100755
index 0000000..9905900
--- /dev/null
+++ b/resources/install/windows/mssign32.dll
diff --git a/resources/install/windows/signtool.exe b/resources/install/windows/signtool.exe
index e631c35..f2aa67e 100755
--- a/resources/install/windows/signtool.exe
+++ b/resources/install/windows/signtool.exe
diff --git a/resources/install/windows/signtool.exe.manifest b/resources/install/windows/signtool.exe.manifest
new file mode 100644
index 0000000..78e470d
--- /dev/null
+++ b/resources/install/windows/signtool.exe.manifest
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+
+    <assemblyIdentity
+        name=" "
+        version="0.0.0.0"
+    />
+
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                name="Microsoft.Windows.Build.Signing.mssign32.dll"
+                version="0.0.0.0"
+            />
+        </dependentAssembly>
+    </dependency>
+
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                name="Microsoft.Windows.Build.Signing.wintrust.dll"
+                version="0.0.0.0"
+            />
+        </dependentAssembly>
+    </dependency>
+</assembly>
diff --git a/resources/install/windows/wintrust.dll b/resources/install/windows/wintrust.dll
new file mode 100755
index 0000000..ad0c061
--- /dev/null
+++ b/resources/install/windows/wintrust.dll