summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt9
4 files changed, 1 insertions, 14 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 23c2a77c9f5d..46ceccc26c60 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -6,5 +6,3 @@ INSTALLLOCATION installuser_
INSTALLLOCATION installmachine
INSTALLLOCATION installmachine_
WIN81S14 win81s14
-UCRT_DETECTED ucrt_detected
-UCRT_DETECTED ucrt_on_win10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
index 399011e166ca..589ab7c52806 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
@@ -2,5 +2,3 @@ Signature_ Parent Path Depth
s72 S72 S255 I2
DrLocator Signature_ Parent Path
win81s14 [SystemFolder]
-ucrt_detected [SystemFolder]
-ucrt_on_win10 [SystemFolder]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 302c4f281279..1a7074acb7f8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3 installs
Quickstarterlinkname QUICKSTARTERLINKNAMETEMPLATE
RebootYesNo Yes
ReinstallModeText omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14
SetupType Typical
SELECT_WORD 0
SELECT_EXCEL 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
index 53615298dc6d..d5abd9769125 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
@@ -5,12 +5,3 @@ Signature Signature
# language, and we need language-independent comparison, we use a value that is at
# least 1 less (see note at https://msdn.microsoft.com/en-us/library/aa371853).
win81s14 kernel32.dll 6.3.9600.17030
-ucrt_detected ucrtbase.dll 10.0.10240.0
-# The great feature of all recent Windows is that they make it incredibly hard to find their
-# actual versions. Win 10 makes the next step in that direction: not only it tells you that
-# its version is 6.3 (VersionNT is 603), but also it disallows you to get real version of a
-# file during installation, if the version is greater than 6.3. So, for ucrt DLLs versioned
-# by MS as 10.0.x.y, it returns 6.3.x.y, pretending to have a lower version than on Win8.1.
-# Here we check for this, knowing that we get a version below 7.0 for UCRT that never had a
-# version below 10.0, then it's Win10+ that is lying to us.
-ucrt_on_win10 ucrtbase.dll 7.0.0.0