subject:"\[Libreoffice\-commits\] core.git\: instsetoo_native\/inc

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2022-03-25 Thread Michael Weghorn (via logerrit)

 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6ea4b8ffce91d7956cea0267c95ca69e208db24
Author: Michael Weghorn 
AuthorDate: Fri Mar 25 08:37:37 2022 +0100
Commit: Michael Weghorn 
CommitDate: Fri Mar 25 12:06:37 2022 +0100

Depend on 64-bit packages for aarch64 as well

As Christian Lohmaier pointed out in [1]:

> When building packages using the epm method, the dependency gets added
> by instsetoo_native/inc_openoffice/unix/find-requires-x11.sh - and it
> looks like it should also add the ()(64bit) marker to the dependency
> when PLATFORMID is linux_aarch64 and not only for linux_x86_64
>
> check with rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 whether
> it provides "libXinerama.so.1()(64bit)"

The reply of 2022-03-25T10:41 (public mailing list version
probably still pending in some moderator queue)
shows it does:

> [root@1 rpm2]# `rpm -q --provides
> > ^CbXinerama-1.1.3-2.1.el7.aarch64
> [root@1 rpm2]# rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64
> libXinerama = 1.1.3-2.1.el7
> libXinerama(aarch-64) = 1.1.3-2.1.el7
> libXinerama.so.1()(64bit)

[1] 
https://lists.freedesktop.org/archives/libreoffice/2022-March/088637.html

Change-Id: I1b9a4025399d82ac5f5e51ea5523417e3e6cf395
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132094
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 6808b3631d73..9fec571f5f99 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -18,7 +18,7 @@
 #
 
 cat > /dev/null
-[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
+[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] 
&& mark64="()(64bit)"
 if [[ "${OS}" == "AIX" ]]; then
   echo "libfreetype.a(libfreetype.so.6${mark64})"
 else

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2022-03-02 Thread Andras Timar (via logerrit)

 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 09d86496f05c979da5a1c8c09af448d74683fad0
Author: Andras Timar 
AuthorDate: Wed Mar 2 09:49:51 2022 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 2 17:47:12 2022 +0100

Do not pull in X11 dependencies when the build is configured for LOKit

Change-Id: I44a1782cf523bbf0e0d564f36c7ed495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130783
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 0fe0b1d27dde..6808b3631d73 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -23,5 +23,7 @@ if [[ "${OS}" == "AIX" ]]; then
   echo "libfreetype.a(libfreetype.so.6${mark64})"
 else
   echo "libfreetype.so.6${mark64}"
-  echo "libXinerama.so.1${mark64}"
+  if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then
+echo "libXinerama.so.1${mark64}"
+  fi
 fi

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2021-10-13 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8a1187fc262ccb4c6489b2ca830f230400c5b82
Author: Roman Kuznetsov 
AuthorDate: Tue Oct 12 14:45:24 2021 +0200
Commit: Roman Kuznetsov 
CommitDate: Wed Oct 13 08:41:29 2021 +0200

tdf#143686 increase a radiobutton's area size

Change-Id: Ib8b6d8b47934a7a2cf68f8977f03ced5f80f6452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123409
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 43b77f1e8c0c..eee5c4e8cd48 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -183,7 +183,7 @@ MsiRMFilesInUse DlgDesc Text21  23  372 
25  196611  OOO_CONTROL_322
 MsiRMFilesInUseBannerLine  Line0   44  474 0   
1   
 MsiRMFilesInUseDlgText Text21  51  426 43  3   
OOO_CONTROL_323 
 MsiRMFilesInUseListListBox 21  95  432 85  7   
FileInUseProcess
-MsiRMFilesInUseShutdownOption  RadioButtonGroup26  190 
305 45  3   MsiUIRMOption   OK  
+MsiRMFilesInUseShutdownOption  RadioButtonGroup26  190 
422 45  3   MsiUIRMOption   OK  
 MsiRMFilesInUseDlgLine Line0   234 474 0   1   

 MsiRMFilesInUseOK  PushButton  330 243 66  17  
3   OOO_CONTROL_326 Cancel  
 MsiRMFilesInUseCancel  PushButton  401 243 66  17  
3   OOO_CONTROL_325 ShutdownOption

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2021-08-04 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af0437d7b1d9cc5a00b7d01a6510e5ba40ca1a12
Author: Roman Kuznetsov 
AuthorDate: Tue Aug 3 19:29:01 2021 +0200
Commit: Roman Kuznetsov 
CommitDate: Wed Aug 4 18:30:07 2021 +0200

tdf#143686 Increase a width of the label

Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
index 680c97605409..9061f160e1cd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
@@ -10,5 +10,5 @@ AgreeToLicense1   No  0   15  295 
15  OOO_RADIOBUTTON_6
 AgreeToLicense 2   Yes 0   0   295 15  
OOO_RADIOBUTTON_7   
 ApplicationUsers   1   AllUsers1   7   290 14  
OOO_RADIOBUTTON_8   
 ApplicationUsers   2   OnlyCurrentUser 1   23  290 14  
OOO_RADIOBUTTON_9   
-MsiUIRMOption  1   UseRM   0   0   420 16  
OOO_RADIOBUTTON_10  
-MsiUIRMOption  2   DontUseRM   0   20  420 16  
OOO_RADIOBUTTON_11  
+MsiUIRMOption  1   UseRM   0   0   460 16  
OOO_RADIOBUTTON_10  
+MsiUIRMOption  2   DontUseRM   0   20  460 16  
OOO_RADIOBUTTON_11

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2021-04-20 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6045232d352d2031252a086855b78fd94d9ffe3d
Author: Roman Kuznetsov 
AuthorDate: Tue Apr 20 12:00:16 2021 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Tue Apr 20 14:25:04 2021 +0200

tdf#141760 Increase a label box in Windows installer dialog

Change-Id: I6a58e0977381c620a795b77df56c24dab37cc327
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114281
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index a573077997f6..43b77f1e8c0c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -215,7 +215,7 @@ ReadyToInstall  DlgTitle2   Text13  6   
380 25  65538   OOO_CONTROL_171
 ReadyToInstall DlgTitle3   Text13  6   380 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  330 243 66  17  
3   OOO_CONTROL_173 Cancel  
 ReadyToInstall DesktopLink CheckBox21  100 300 15  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
-ReadyToInstall EnableQuickstartCheckBox21  130 300 
15  3   QUICKSTART  OOO_CONTROL_321 Back
+ReadyToInstall EnableQuickstartCheckBox21  130 400 
15  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  264 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   474 44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  474 0   1   

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2020-06-11 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eaf30f98597f12c53d734935d62a84501cb201b4
Author: Roman Kuznetsov 
AuthorDate: Tue Jun 9 16:25:00 2020 +0200
Commit: Roman Kuznetsov 
CommitDate: Thu Jun 11 16:56:33 2020 +0200

increase a radiobutton text area in Windows installer dialog

Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
index c0425876b93f..680c97605409 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
@@ -10,5 +10,5 @@ AgreeToLicense1   No  0   15  295 
15  OOO_RADIOBUTTON_6
 AgreeToLicense 2   Yes 0   0   295 15  
OOO_RADIOBUTTON_7   
 ApplicationUsers   1   AllUsers1   7   290 14  
OOO_RADIOBUTTON_8   
 ApplicationUsers   2   OnlyCurrentUser 1   23  290 14  
OOO_RADIOBUTTON_9   
-MsiUIRMOption  1   UseRM   0   0   295 16  
OOO_RADIOBUTTON_10  
-MsiUIRMOption  2   DontUseRM   0   20  295 16  
OOO_RADIOBUTTON_11  
+MsiUIRMOption  1   UseRM   0   0   420 16  
OOO_RADIOBUTTON_10  
+MsiUIRMOption  2   DontUseRM   0   20  420 16  
OOO_RADIOBUTTON_11  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2020-03-16 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e6d008f131c7ca532a9e8410b424b3323d581978
Author: Roman Kuznetsov 
AuthorDate: Mon Mar 16 08:58:08 2020 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 16 15:36:13 2020 +0100

tdf#128281 Increase a checkbox height in Windows installer

Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 41708a651b5a..a573077997f6 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -214,8 +214,8 @@ ReadyToInstall  DlgTitleText13  6   
380 25  65538   OOO_CONTROL_170
 ReadyToInstall DlgTitle2   Text13  6   380 25  65538   
OOO_CONTROL_171 
 ReadyToInstall DlgTitle3   Text13  6   380 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  330 243 66  17  
3   OOO_CONTROL_173 Cancel  
-ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
-ReadyToInstall EnableQuickstartCheckBox21  125 300 
15  3   QUICKSTART  OOO_CONTROL_321 Back
+ReadyToInstall DesktopLink CheckBox21  100 300 15  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
+ReadyToInstall EnableQuickstartCheckBox21  130 300 
15  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  264 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   474 44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  474 0   1   

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2020-03-14 Thread Mike Kaganski (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |2 +-
 instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f101283b01223c766505a941130bd66a7b3d08d0
Author: Mike Kaganski 
AuthorDate: Sat Mar 14 11:27:22 2020 +0100
Commit: Mike Kaganski 
CommitDate: Sat Mar 14 12:12:53 2020 +0100

tdf#130460: clarify the option some more

Change-Id: I4f1de2d3b112c5a4d3ba795bd944aa21add037a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90396
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index fe6cb7d5fac4..18bb8fccacdc 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -689,7 +689,7 @@ en-US = "Load [ProductName] during system start-up"
 en-US = "Some files that need to be updated are currently in use."
 
 [OOO_CONTROL_323]
-en-US = "The following applications are using files that need to be updated by 
this setup. You can let Installation Wizard close them and attempt to restart 
them or reboot the machine later."
+en-US = "The following applications are using files that need to be updated by 
this setup. You can let Installation Wizard close them and attempt to restart 
them, or reboot the system later to complete the setup."
 
 [OOO_CONTROL_324]
 en-US = "{}Files in Use"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index 59f9c497736e..e8b2e6b88950 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -47,5 +47,5 @@ en-US = "Only for  ([USERNAME])"
 en-US = " the applications and attempt to restart them."
 
 [OOO_RADIOBUTTON_11]
-en-US = " not close applications. A reboot will be required."
+en-US = " not close applications. A reboot will be required to complete the 
setup."
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice setup_native/source

2020-02-03 Thread Mike Kaganski (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
|4 
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
|4 
 setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx 
|   78 +-
 3 files changed, 42 insertions(+), 44 deletions(-)

New commits:
commit 61e23146987b49617af29c745b427905752e0b16
Author: Mike Kaganski 
AuthorDate: Mon Feb 3 14:48:21 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Feb 3 21:51:37 2020 +0100

Set INSTALLLOCATION in one single place

It used to be set both in AppSearch action (using RegLocator table),
and in MigrateInstallPath custom action. This would overwrite value
of INSTALLLOCATION taken from user, and read on the previous step,
with values taken on the next step.

Only migrating the install location in one single place - in custom
action MigrateInstallPath - makes the process controllable. Also it
allows to easily see all the various places in registry we read.

Change-Id: Ib7e04c26e71ba92c6a62a0511971bfb3bdb7db72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87867
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index cb0ca0c1ccbb..0a5b68ed4186 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -1,9 +1,5 @@
 Property   Signature_
 s72s72
 AppSearch  PropertySignature_
-INSTALLLOCATIONinstalluser
-INSTALLLOCATIONinstalluser_
-INSTALLLOCATIONinstallmachine
-INSTALLLOCATIONinstallmachine_
 WIN81S14   win81s14
 WINMAJORVERWinMajorVer
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 7788815d3a6e..59aed91a014d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,8 +1,4 @@
 Signature_ RootKey NameType
 s72i2  s255S255I2
 RegLocator Signature_
-installuser1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
-installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
-installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
-installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 WinMajorVer2   Software\Microsoft\Windows NT\CurrentVersion
CurrentMajorVersionNumber   2
diff --git 
a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
 
b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index ad34bad8c744..10c817169a27 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -24,65 +24,71 @@
 
 extern "C" __declspec(dllexport) UINT __stdcall MigrateInstallPath(MSIHANDLE 
handle)
 {
+std::wstring sInstDir = GetMsiPropertyW(handle, L"INSTALLLOCATION");
+if (!sInstDir.empty())
+return ERROR_SUCCESS; // Don't overwrite explicitly set value
+
 auto RegValue = [](HKEY hRoot, const WCHAR* sKey, const WCHAR* sVal) {
 std::wstring sResult;
-
-if (HKEY hKey; RegOpenKeyW(hRoot, sKey, ) == ERROR_SUCCESS)
-{
-WCHAR buf[32767]; // max longpath
-DWORD bufsize = sizeof(buf); // yes, it is the number of bytes
-if (RegQueryValueExW(hKey, sVal, nullptr, nullptr, 
reinterpret_cast(buf),
- )
-== ERROR_SUCCESS)
-{
-buf[std::min(SAL_N_ELEMENTS(buf) - 1, bufsize / 
sizeof(*buf))] = 0;
-sResult = buf;
-}
-RegCloseKey(hKey);
-}
+WCHAR buf[32767]; // max longpath
+DWORD bufsize = sizeof(buf); // yes, it is the number of bytes
+if (RegGetValueW(hRoot, sKey, sVal, RRF_RT_REG_SZ, nullptr, buf, 
) == ERROR_SUCCESS)
+sResult = buf; // RegGetValueW null-terminates strings
 
 return sResult;
 };
 
-std::wstring   sManufacturer = GetMsiPropertyW( handle, L"Manufacturer" );
-std::wstring   sDefinedName = GetMsiPropertyW( handle, L"DEFINEDPRODUCT" );
-std::wstring   sUpdateVersion = GetMsiPropertyW( handle, L"DEFINEDVERSION" 
);
-std::wstring   sUpgradeCode = GetMsiPropertyW( handle, L"UpgradeCode" );
+const std::wstring sManufacturer = GetMsiPropertyW( handle, 
L"Manufacturer" );
+const std::wstring

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source

2019-11-11 Thread Samuel Mehrbrodt (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |2 +-
 scp2/source/ooo/module_langpack.ulf   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78689171ff2ae55a116f2857ca2323803904280a
Author: Samuel Mehrbrodt 
AuthorDate: Mon Nov 11 15:17:14 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Nov 11 16:11:34 2019 +0100

User interface languages: At least one is required

Reported here: https://twitter.com/erez/status/1193838467668697089

Change-Id: I96fdb82646e6b2e49b6032766195309a97da0fba
Reviewed-on: https://gerrit.libreoffice.org/82439
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 2517ec085a72..f870136beb02 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -596,7 +596,7 @@ en-US = "Cancel"
 en-US = "[ProductName] will be installed with the default components, 
including user interface languages and spelling dictionaries matching your 
current language settings."
 
 [OOO_CONTROL_256]
-en-US = "Choose which program features you want installed and where they will 
be installed. For example here you can select additional user interface 
languages and spelling dictionaries."
+en-US = "Choose which program features you want installed and where they will 
be installed. For example you can select user interface languages and spelling 
dictionaries."
 
 [OOO_CONTROL_257]
 en-US = "Choose the setup type that best suits your needs."
diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index c4ee1701f1c5..f35bf0144646 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -17,10 +17,10 @@
  */
 
 [STR_NAME_MODULE_ROOT_LANGPACK]
-en-US = "Additional user interface languages"
+en-US = "User interface languages"
 
 [STR_DESC_MODULE_ROOT_LANGPACK]
-en-US = "Additional user interface languages"
+en-US = "User interface languages"
 
 [STR_NAME_MODULE_LANGPACK_EN_US]
 en-US = "English (United States)"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2019-09-01 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ce360777a9c24db61d9f3c5469bd6265b6b7b5b
Author: Roman Kuznetsov 
AuthorDate: Sat Aug 31 17:36:49 2019 +0200
Commit: Mike Kaganski 
CommitDate: Sun Sep 1 08:07:29 2019 +0200

tdf#127240 Increase a height of checkbox's text in win installer

Change-Id: I0df5dc4cebb065c509df77b00f16597a28566345
Reviewed-on: https://gerrit.libreoffice.org/78355
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index ec6170099a48..41708a651b5a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -215,7 +215,7 @@ ReadyToInstall  DlgTitle2   Text13  6   
380 25  65538   OOO_CONTROL_171
 ReadyToInstall DlgTitle3   Text13  6   380 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  330 243 66  17  
3   OOO_CONTROL_173 Cancel  
 ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
-ReadyToInstall EnableQuickstartCheckBox21  125 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
+ReadyToInstall EnableQuickstartCheckBox21  125 300 
15  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  264 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   474 44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  474 0   1   

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2019-08-06 Thread Roman Kuznetsov (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf |   10 
+-
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ba465d3d4cfd43abdac63e67d582e166eae19fb6
Author: Roman Kuznetsov 
AuthorDate: Tue Aug 6 09:50:37 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Aug 6 11:53:51 2019 +0200

Fix some windows installer's dialog new fonts problem

Change-Id: Iabb1c04d27bba1a7b3b89be03d0af1ed15951ffc
Reviewed-on: https://gerrit.libreoffice.org/77003
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index 9bd6e440ab73..59f9c497736e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -17,19 +17,19 @@
  */
 
 [OOO_RADIOBUTTON_1]
-en-US = "{}"
+en-US = "{}"
 
 [OOO_RADIOBUTTON_2]
-en-US = "{}Re"
+en-US = "{}Re"
 
 [OOO_RADIOBUTTON_3]
-en-US = "{}"
+en-US = "{}"
 
 [OOO_RADIOBUTTON_4]
-en-US = "{}"
+en-US = "{}"
 
 [OOO_RADIOBUTTON_5]
-en-US = "{}Cu"
+en-US = "{}Cu"
 
 [OOO_RADIOBUTTON_6]
 en-US = "I  not accept the terms in the license agreement"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 38115f33f2c4..ec6170099a48 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -83,7 +83,7 @@ CustomSetupTips   DontInstallText Text60  167 
400 20  3   OOO_CONTROL_66
 CustomSetupTipsInstall Icon21  105 24  24  5242881 
InstallIco  
 CustomSetupTipsInstallPartial  Icon21  136 24  24  
5242881 InstallPartialIco   
 CustomSetupTipsInstallStateMenuIcon21  52  24  
24  5242881 InstallStateMenuIco 
-CustomSetupTipsInstallStateTextText21  88  400 
10  3   OOO_CONTROL_68  
+CustomSetupTipsInstallStateTextText21  88  400 
15  3   OOO_CONTROL_68  
 CustomSetupTipsInstallText Text60  105 400 20  
3   OOO_CONTROL_69  
 CustomSetupTipsMenuTextText50  52  400 36  
3   OOO_CONTROL_70  
 CustomSetupTipsOK  PushButton  401 243 66  17  
3   OOO_CONTROL_72  
@@ -312,7 +312,7 @@ SetupType   CustomIco   Icon34  154 24  
24  5242881 SetupPartialIco
 SetupType  CustTextText80  154 346 40  3   
OOO_CONTROL_256 
 SetupType  DlgDesc Text21  23  372 25  65539   
OOO_CONTROL_257 
 SetupType  DlgLine Line0   234 474 0   1   

-SetupType  DlgText Text21  51  426 10  3   
OOO_CONTROL_258 
+SetupType  DlgText Text21  51  426 15  3   
OOO_CONTROL_258 
 SetupType  DlgTitleText13  6   380 25  65539   
OOO_CONTROL_259 
 SetupType  NextPushButton  330 243 66  17  3   
OOO_CONTROL_260 Cancel  
 SetupType  RadioGroup  RadioButtonGroup21  79  364 
120 3   _IsSetupTypeMin Back
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source setup_native/source

2018-12-24 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf |2 
 scp2/source/ooo/ucrt.scp|   12 +-
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx   |   48 
++
 3 files changed, 40 insertions(+), 22 deletions(-)

New commits:
commit 20241d32bfee4a3675066da21a0e04591200cf92
Author: Mike Kaganski 
AuthorDate: Mon Dec 24 10:21:32 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 24 09:25:12 2018 +0100

tdf#122302: Set status message when installing KB2999226

Change-Id: I414959f0f278792c5cac0c58746faa6b7773e494
Reviewed-on: https://gerrit.libreoffice.org/65593
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index 315e35fe0b33..598cc7c0193e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -407,6 +407,6 @@ en-US = "This setup requires Internet Information Server 
4.0 or higher for confi
 en-US = "This setup requires Administrator privileges for configuring IIS 
Virtual Roots."
 
 [OOO_ERROR_131]
-en-US = "Installing a pre-requisite KB2999226 failed. You might need to 
manually install it from Microsoft site to be able to run the product. [2]"
+en-US = "Installing a pre-requisite [2] failed. You might need to manually 
install it from Microsoft site to be able to run the product.[3]"
 
 
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index 6df1d111f6fa..b945523fe961 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -92,7 +92,7 @@ WindowsCustomAction gid_Customaction_check_win7x64_ucrt
Name = "check_win7x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows61-KB2999226-x64msu";
+   Target = "KB2999226|Windows61-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
601 And VersionNT64", "FileCost");
Styles = "NO_FILE";
@@ -102,7 +102,7 @@ WindowsCustomAction gid_Customaction_check_win8x64_ucrt
Name = "check_win8x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows8-RT-KB2999226-x64msu";
+   Target = "KB2999226|Windows8-RT-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
602 And VersionNT64", "check_win7x64_ucrt");
Styles = "NO_FILE";
@@ -112,7 +112,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Name = "check_win81x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows81-KB2999226-x64msu";
+   Target = "KB2999226|Windows81-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And VersionNT64", 
"check_win8x64_ucrt");
Styles = "NO_FILE";
@@ -128,7 +128,7 @@ WindowsCustomAction gid_Customaction_check_win7x32_ucrt
Name = "check_win7x32_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows61-KB2999226-x86msu";
+   Target = "KB2999226|Windows61-KB2999226-x86msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
601 And Not VersionNT64", "check_win81x64_ucrt");
Styles = "NO_FILE";
@@ -138,7 +138,7 @@ WindowsCustomAction gid_Customaction_check_win8x32_ucrt
Name = "check_win8x32_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows8-RT-KB2999226-x86msu";
+   Target = "KB2999226|Windows8-RT-KB2999226-x86msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
602 And Not VersionNT64", "check_win7x32_ucrt");
Styles = "NO_FILE";
@@ -148,7 +148,7 @@ WindowsCustomAction gid_Customaction_check_win81x32_ucrt
Name = "check_win81x32_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "25000|Windows81-KB2999226-x86msu";
+   Target = "KB2999226|Windows81-KB2999226-x86msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And Not VersionNT64", 
"check_win8x32_ucrt");
Styles = "NO_FILE";
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx 
b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
index 5df2b26431d7..97394e76f3ce 100644
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
@@ -120,17 +120,34 @@ template  void WriteLog(MSIHANDLE 
hInst, const StrType&... ele

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source

2018-12-16 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |1 +
 scp2/source/ooo/ucrt.scp   |4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d87fa557ff58c3b9f5c9079a1d7595e095694111
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 00:23:24 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 05:22:36 2018 +0100

tdf#122134: use CurrentMajorVersionNumber to filter out Windows 10

On Windows 8.1, the one that is problematic to tell from Windows 10
(because the latter also exposes its version as 603 to the msiexec),
the registry value doesn't exist at
HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion
but let's play safe and also check for "#6" value just in case.

Reference:

https://stackoverflow.com/questions/31072543/reliable-way-to-get-windows-version-from-registry

Thanks to Mitchell  for the idea!

Change-Id: Ic907c4d992a7cb1d12e392686c19cd6fd6da3c7c
Reviewed-on: https://gerrit.libreoffice.org/65231
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 46ceccc26c60..cb0ca0c1ccbb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -6,3 +6,4 @@ INSTALLLOCATION installuser_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
 WIN81S14   win81s14
+WINMAJORVERWinMajorVer
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 1a7074acb7f8..b9b53a02e3ac 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
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index c082322086ad..7788815d3a6e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -5,3 +5,4 @@ installuser 1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
 installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
 installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
+WinMajorVer2   Software\Microsoft\Windows NT\CurrentVersion
CurrentMajorVersionNumber   2
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index 8cba6cfc3cd0..6df1d111f6fa 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -114,7 +114,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Source = "InstMSUBinary";
Target = "25000|Windows81-KB2999226-x64msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And VersionNT64", "check_win8x64_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And VersionNT64", 
"check_win8x64_ucrt");
Styles = "NO_FILE";
 End
 
@@ -150,7 +150,7 @@ WindowsCustomAction gid_Customaction_check_win81x32_ucrt
Source = "InstMSUBinary";
Target = "25000|Windows81-KB2999226-x86msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And Not VersionNT64", "check_win8x32_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And Not VersionNT64", 
"check_win8x32_ucrt");
Styles = "NO_FILE";
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source setup_native/source

2018-12-16 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt |1 
 scp2/source/ooo/ucrt.scp|   15 -
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx   |  114 
--
 4 files changed, 69 insertions(+), 64 deletions(-)

New commits:
commit 0b6884b9f1f60db48983de6c5bd53e25e1f68eeb
Author: Mike Kaganski 
AuthorDate: Mon Dec 10 16:20:42 2018 +0300
Commit: Mike Kaganski 
CommitDate: Sun Dec 16 15:10:47 2018 +0100

tdf#121987 follow-up: never fail MSU install; warn instead.

This replaces commit 53058090beede6a399e2f408f62c28a2921ff8ab. Now
not only failure to start WU service, but also other errors during
MSU installation won't break installation. E.g., running WU service
as Guest does not prevent the service from starting; but installing
updates fail, which makes previous solution incomplete.

Instead, show a warning in those rare cases when an error happens,
and continue. It will allow users to see the reason if they see
"api-ms-win-*.dll missing" message later after installation. Of
course, some small percentage of these warnings will be false, e.g.
those on Windows 10. But those false messages must be really small
minority, because only when (1) the installation fails (2) on a
system with the component already present, such a message would be
false. And it will not prevent the installation.

This will not block unattended installations, since in those cases,
MsiProcessMessage() will do nothing.

Change-Id: I3a9e681e9d6701d092bd5c18bb4b68b4f77170f3
Reviewed-on: https://gerrit.libreoffice.org/64874
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index a14f45e0cd54..315e35fe0b33 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -406,4 +406,7 @@ en-US = "This setup requires Internet Information Server 
4.0 or higher for confi
 [OOO_ERROR_130]
 en-US = "This setup requires Administrator privileges for configuring IIS 
Virtual Roots."
 
+[OOO_ERROR_131]
+en-US = "Installing a pre-requisite KB2999226 failed. You might need to 
manually install it from Microsoft site to be able to run the product. [2]"
+
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
index 2f3a5912817d..52cc797c643e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
@@ -131,3 +131,4 @@ i2  L0
 1932   OOO_ERROR_128
 1933   OOO_ERROR_129
 1934   OOO_ERROR_130
+25000  OOO_ERROR_131
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index ae2eb27a4dbe..8cba6cfc3cd0 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -85,11 +85,14 @@ WindowsCustomAction gid_Customaction_cleanup_msu
Assignment1 = ("InstallExecuteSequence", "Not Installed And 
cleanup_msu", "inst_msu");
 End
 
+/* The "InstMSUBinary" property contains an error message number and a binary 
name, separated by "|".
+   The former is used when installing the MSU fails.
+*/
 WindowsCustomAction gid_Customaction_check_win7x64_ucrt
Name = "check_win7x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows61-KB2999226-x64msu";
+   Target = "25000|Windows61-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
601 And VersionNT64", "FileCost");
Styles = "NO_FILE";
@@ -99,7 +102,7 @@ WindowsCustomAction gid_Customaction_check_win8x64_ucrt
Name = "check_win8x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows8-RT-KB2999226-x64msu";
+   Target = "25000|Windows8-RT-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
602 And VersionNT64", "check_win7x64_ucrt");
Styles = "NO_FILE";
@@ -109,7 +112,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Name = "check_win81x64_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows81-KB2999226-x64msu";
+   Target = "25000|Windows81-KB2999226-x64msu";
Inbinarytable = 0;
Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And VersionNT64", "check_win8x64_ucrt");
Styles = "NO_FILE";
@@ -125,7 +128,7 @@ WindowsCustomAction gid_Customaction_check_win7x32_ucrt
Name = "check_win7x32_ucrt";
Typ = "51";
Source = "InstMSUBinary";
-   Target = "Windows61-KB2999226-x86msu";
+

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-11-09 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b955e09401cf65607b9524fadc3abd16bae328f0
Author: Sophia Schröder 
AuthorDate: Thu Nov 8 11:39:21 2018 +0100
Commit: Olivier Hallot 
CommitDate: Fri Nov 9 11:44:59 2018 +0100

Related: tdf#121134: Changing http to https where possible

Change-Id: Iac627b2884d1cc77cf63ec3bd814f5601080e26f
Reviewed-on: https://gerrit.libreoffice.org/63079
Tested-by: Jenkins
Reviewed-by: Sophia Schröder 
Reviewed-by: Olivier Hallot 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 3ac0c5b012d4..d8927314f54f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -275,7 +275,7 @@ en-US = "< "
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by 
[Manufacturer]. For credits, see: http://www.documentfoundation.org;
+en-US = "Build contributed in collaboration with the community by 
[Manufacturer]. For credits, see: https://www.documentfoundation.org;
 
 [OOO_CONTROL_125]
 en-US = " >"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source

2018-09-20 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt |9 
---
 scp2/source/ooo/ucrt.scp   |   12 
+-
 5 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit 1882827320ed760de82211cf690b686f8d34ff74
Author: Mike Kaganski 
AuthorDate: Thu Sep 20 08:05:41 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Sep 20 09:16:32 2018 +0200

tdf#115405, tdf#119910: don't check if UCRT is already installed

There appears to be common situation that a system has *some* UCRT libraries
in System32, that were installed improperly (presumably by some applications
using simple copy).In these cases, our installer would detect the presence 
of
ucrtbase.dll, and not try to install UCRT on the system.

Unfortunately, it seems that oftentimes such improper UCRT installations 
miss
some parts of UCRT, which leads to LibreOffice failing to start with 
messages
like "The program can't start because api-ms-win-crt-string-l1-1-0.dll is
missing from your computer. Try reinstalling the program to fix this 
problem."
(the missing component varies).

This patch removes the check for UCRT presence. Installer will try to 
install
UCRT on applicable systems unconditionally. Since the proper outcomes in 
case
of already present UCRT are either WU_S_ALREADY_INSTALLED or 
WU_E_NOT_APPLICABLE
and both are treated as success in inst_msu action (see InstallMSU in
setup_native/source/win32/customactions/inst_msu/inst_msu.cxx), this should
only make this part more robust, and not bring new problems (yes, I know 
that
actually there will be new problems, as usual).

Change-Id: I22a3d357014d31a8e492ff8a15bcb477eeb79735
Reviewed-on: https://gerrit.libreoffice.org/60789
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

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_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
 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  PathDepth
 s72S72 S255I2
 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
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14
 SetupType  Typical
 SELECT_WORD0
 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.dll6.3.9600.17030  

-ucrt_detected  ucrtbase.dll10.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,

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-08-04 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b79d8de3af5edc731ea92fbd9f64d1937f533fd7
Author: Adolfo Jayme Barrientos 
AuthorDate: Sat Aug 4 21:22:18 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Aug 4 21:22:18 2018 -0500

Use proper Windows terminology here

Microsoft has never referred to desktop shortcuts as “start links”.
This change aligns our installer with almost every other installer
out there.

Change-Id: Ib5779e6cd44e719e52d1afeb6a44c7dc8f3624dc

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7f9eb7ee16c7..3ac0c5b012d4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -680,7 +680,7 @@ en-US = "No languages have been selected for installation. 
Click OK, then select
 en-US = "No applications have been selected for installation. Click OK, then 
select one or more applications for installation."
 
 [OOO_CONTROL_319]
-en-US = "Create a start link on desktop"
+en-US = "Create a shortcut on desktop"
 
 [OOO_CONTROL_321]
 en-US = "Load [ProductName] during system start-up"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-07-30 Thread Libreoffice Gerrit user

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec9b18b75c193c914691a29d3eb78bd81961fced
Author: Mike Kaganski 
AuthorDate: Mon Jul 30 14:46:41 2018 +0200
Commit: Mike Kaganski 
CommitDate: Mon Jul 30 16:37:01 2018 +0200

tdf#118869: mark some properties secure to pass them to elevated install

See also 
http://helpnet.flexerasoftware.com/installshield19helplib/helplibrary/ISBP10.htm

Change-Id: I217d68f98af8e56874af6c071bb7fa7354b3e4b4
Reviewed-on: https://gerrit.libreoffice.org/58326
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 32ada67082b4..302c4f281279 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
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-18 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 scp2/source/ooo/vc_redist.scp  |2 -
 solenv/bin/modules/installer/windows/upgrade.pm|   15 
+-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 606852089e32a2065ee5fc3224f7b2940e6b1323
Author: Mike Kaganski 
Date:   Wed Apr 18 07:05:04 2018 +0100

Revert two last changes to Upgrade table

This reverts commits 914f6385d98f8c898102c971a4d5b0eb9f075ef0 and
a6045159237419ce8fa49202c672e3895f0ab30a. A investigation required why
is the problem with them; meanwhile, they break builds.

Change-Id: I713b27dd64e8ac7beb2757c362765b60ce191f8d
Reviewed-on: https://gerrit.libreoffice.org/53078
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 326b70fcddc7..12ba10f300c9 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
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index c4750ff5ad69..921a9433e820 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
 Source = VCREDIST_EXE_NAME;
 Target = "/repair /norestart /passive";
 Inbinarytable = 1;
-Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
(VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST 
= 1", "behind_ExecuteAction");
+Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", 
"behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm 
b/solenv/bin/modules/installer/windows/upgrade.pm
index b008d010fb15..9e0d7ea79fb7 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -46,15 +46,16 @@ sub create_upgrade_table
 push(@upgradetable, $newline);
 
 # Detecting if VC Runtime is installed on system
-$newline = "{36F68A90-239C-34DF-B58C-64B30153CE35}" . "\t" . "14.0.24215" 
. "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED";
-push(@upgradetable, $newline);
-
-# 32-bit installer must also detect if 32-bit Runtime is installed
-if ( $installer::globals::cpuname ne 'X86_64' )
+$newline = "VCRUNTIME_UPGRADE_CODE" . "\t" . "14.0.24215" . "\t" . 
"15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
+if ( $installer::globals::cpuname eq 'X86_64' )
 {
-$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED_32";
-push(@upgradetable, $newline);
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{36F68A90-239C-34DF-B58C-64B30153CE35}/;
 }
+else
+{
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{65E5BD06-6392-3027-8C26-853107D3CF1A}/;
+}
+push(@upgradetable, $newline);
 
 # Saving the file
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-16 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 scp2/source/ooo/vc_redist.scp  |2 +-
 solenv/bin/modules/installer/windows/upgrade.pm|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a6045159237419ce8fa49202c672e3895f0ab30a
Author: Mike Kaganski 
Date:   Mon Apr 16 16:41:21 2018 +0100

Use different properties in Upgrade table

Change-Id: I7e2cc08a1312da629e4644be97ebc7ed40250702
Reviewed-on: https://gerrit.libreoffice.org/52995
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 2b633b8eb37a..fcdd9162d680 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
+SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 921a9433e820..c4750ff5ad69 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
 Source = VCREDIST_EXE_NAME;
 Target = "/repair /norestart /passive";
 Inbinarytable = 1;
-Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", 
"behind_ExecuteAction");
+Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
(VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST 
= 1", "behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm 
b/solenv/bin/modules/installer/windows/upgrade.pm
index cb54a794cbc5..b008d010fb15 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -52,7 +52,7 @@ sub create_upgrade_table
 # 32-bit installer must also detect if 32-bit Runtime is installed
 if ( $installer::globals::cpuname ne 'X86_64' )
 {
-$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED";
+$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED_32";
 push(@upgradetable, $newline);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-04-13 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 378c1576d2890625ebbd18ec9ccff560eeb1619f
Author: Mike Kaganski 
Date:   Fri Apr 13 18:58:48 2018 +0100

LaunchConditions may be specific to install modes

Those conditions that rely on AppSearch should only be checked when
not yet installed, since AppSearch is not performed in maintenance modes

Change-Id: Ie2c3fa8e8742a4c335f0cd8be571fa563a178a49
Reviewed-on: https://gerrit.libreoffice.org/52851
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 2d72ac2d05c4..629c3c5582e1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,5 +2,5 @@ Condition   Description
 s255   l255
 65001  LaunchCondition Condition
 Privileged OOO_LAUNCH_1
-VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber 
And ServicePackLevel >= WindowsMinSPNumber)OOO_LAUNCH_2
-VersionNT <> 603 Or WIN81S14   OOO_LAUNCH_3
+Installed Or VersionNT > WindowsMinVersionNumber Or (VersionNT = 
WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber)   
OOO_LAUNCH_2
+Installed Or VersionNT <> 603 Or WIN81S14  OOO_LAUNCH_3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-12 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |4 +--
 instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt |2 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt |9 
+++
 scp2/source/ooo/vc_redist.scp  |6 -
 solenv/bin/modules/installer/windows/upgrade.pm|   12 
++
 7 files changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 1f8a3657216e44796cb94087450552aa977ebdae
Author: Mike Kaganski 
Date:   Thu Apr 12 15:18:58 2018 +0300

tdf#108580 related: improve existing redist detection

This uses VC Runtime upgrade code (checked using Upgrade table) to
find installed redist, instead of checking registry keys that change
between versions (while the runtime is still compatible, as with 2015
and 2017).
Also, it checks if UCRT is present. Now, if either VC Runtime or UCRT
is absent, we try to install the redist. This would allow to install
UCRT in scenarios when first install was attempted on a system not
suitable for UCRT (like Win7 w/o SP1, or Win8.1 w/o April 2014 update
rollup), where VC Runtime gets installed, but UCRT is still missing.
We use the ucrtbase.dll version to check that; and as the expected
version is 10.x, we take into account that Win10 lies about versions.

Change-Id: I864dfc09cf1bdc775501729fa2a27dc98295588c
Reviewed-on: https://gerrit.libreoffice.org/52794
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 60793dd69ded..23c2a77c9f5d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -5,6 +5,6 @@ INSTALLLOCATION installuser
 INSTALLLOCATIONinstalluser_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
-VCREDISTINSTALLED_X86  VCREDISTINSTALLED_X86
-VCREDISTINSTALLED_X64  VCREDISTINSTALLED_X64
 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 589ab7c52806..399011e166ca 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
@@ -2,3 +2,5 @@ Signature_  Parent  PathDepth
 s72S72 S255I2
 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 f8eeaf25c105..2b633b8eb37a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 7e59ef3c6663..c082322086ad 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -5,5 +5,3 @@ installuser 1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
 installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
 installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
-VCREDISTINSTALLED_X86  2   
Software\Microsoft\VisualStudio\14.0\VC\Runtimes\x86Version 2
-VCREDISTINSTALLED_X64  2   
Software\Microsoft\VisualStudio\14.0\VC\Runtimes\x64Version 2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
index d5abd9769125..53615298dc6d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
+++

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice solenv/bin

2018-04-09 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |1 +
 solenv/bin/modules/installer/windows/property.pm   |4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea
Author: Mike Kaganski 
Date:   Mon Apr 9 09:33:20 2018 +0100

tdf#108580 related: Check for SP level of the minimal supported OS

Currently we support Win7 SP1 and later; so let installer fail on lower SP 
levels.

Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408
Reviewed-on: https://gerrit.libreoffice.org/52619
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 0a0d60f09832..722bb463629d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -69,4 +69,4 @@ ValidateProductID 300
 WriteEnvironmentStrings2500
 WriteIniValues 2450
 WriteRegistryValues2400
-WrongWindowsVersionVersionNT < WindowsMinVersionNumber 10
+WrongWindowsVersion(VersionNT < WindowsMinVersionNumber) OR ((VersionNT = 
WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 7a89cbcc756f..3bb2a5191d20 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -28,4 +28,4 @@ SetupProgress 800
 SetupResumeInstalled And (RESUME Or Preselected) And Not PATCH 700
 setUserProfile 510
 ValidateProductID  350
-WrongWindowsVersionVersionNT < WindowsMinVersionNumber 10
+WrongWindowsVersion(VersionNT < WindowsMinVersionNumber) OR ((VersionNT = 
WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index b16732079076..f8eeaf25c105 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -64,3 +64,4 @@ UpgradeCode   UPGRADECODETEMPLATE
 VC_REDIST  1
 WindowsMinVersionText  WINDOWSMINVERSIONTEXTTEMPLATE
 WindowsMinVersionNumberWINDOWSMINVERSIONNUMBERTEMPLATE
+WindowsMinSPNumber WINDOWSMINSPNUMBERTEMPLATE
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index baf8421ced97..a385e59a8c27 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -413,8 +413,9 @@ sub update_property_table
 my $productname = get_productname_for_property_table($language, 
$allvariables);
 my $productversion = get_productversion_for_property_table();
 my $quickstarterlinkname = 
get_quickstarterlinkname_for_property_table($language, $allvariables);
-my $windowsminversiontext = "Windows 7";
+my $windowsminversiontext = "Windows 7 SP1";
 my $windowsminversionnumber = "601";
+my $windowsminspnumber = "1";
 
 # Updating the values
 
@@ -430,6 +431,7 @@ sub update_property_table
 ${$propertyfile}[$i] =~ 
s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
 ${$propertyfile}[$i] =~ 
s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/;
 ${$propertyfile}[$i] =~ 
s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/;
+${$propertyfile}[$i] =~ 
s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/;
 if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 
1; }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-01-22 Thread Samuel Mehrbrodt

 instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 75f5d70d5d9f58a76e42d151f187c50bad50378c
Author: Samuel Mehrbrodt 
Date:   Tue Jan 23 08:09:23 2018 +0100

Revert "Windows installer: Use blank phone # instead of x-xxx-xxx-xxx"

Breaks windows installer

This reverts commit 7b129f55b4da9a20581fe805b7dacadcb6386252.

Change-Id: I21a5a6790eac1704da4bda41fb0969dc10b19d1c
Reviewed-on: https://gerrit.libreoffice.org/48369
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index 4109c906b648..a8764b0745e9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -23,7 +23,7 @@ en-US = "LibreOffice Community"
 en-US = "http://www.libreoffice.org/get-help;
 
 [OOO_ARPHELPTELEPHONETEMPLATE]
-en-US = ""
+en-US = "x-xxx-xxx-xxx"
 
 [OOO_ARPURLINFOABOUTTEMPLATE]
 en-US = "http://www.documentfoundation.org;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2018-01-22 Thread Samuel Mehrbrodt

 instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b129f55b4da9a20581fe805b7dacadcb6386252
Author: Samuel Mehrbrodt 
Date:   Mon Jan 22 11:24:24 2018 +0100

Windows installer: Use blank phone # instead of x-xxx-xxx-xxx

Change-Id: Ia90de861bc3aa02e8b0bf482f602ab1ea29aae00
Reviewed-on: https://gerrit.libreoffice.org/48304
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index a8764b0745e9..4109c906b648 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -23,7 +23,7 @@ en-US = "LibreOffice Community"
 en-US = "http://www.libreoffice.org/get-help;
 
 [OOO_ARPHELPTELEPHONETEMPLATE]
-en-US = "x-xxx-xxx-xxx"
+en-US = ""
 
 [OOO_ARPURLINFOABOUTTEMPLATE]
 en-US = "http://www.documentfoundation.org;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2017-09-13 Thread Matthias Seidel

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14164f75a5e8d4c803c6c9aeda1d0dd4c8930f0f
Author: Matthias Seidel 
Date:   Sun Sep 3 14:50:58 2017 +

Removed quotation marks that destroyed some strings for Pootle export

(cherry picked from commit 4e2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3)

Change-Id: I3d5e003a313228188119ee439c858c1ee505c9b0

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 121a7f49e486..7f9eb7ee16c7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -659,13 +659,13 @@ en-US = "The version specified in the folder below cannot 
be updated."
 en-US = "Check the destination folder."
 
 [OOO_CONTROL_305]
-en-US = "To continue, click "Next"."
+en-US = "To continue, click Next."
 
 [OOO_CONTROL_306]
-en-US = "To select a different version, click "Change". Otherwise click 
"Cancel" to abort the Installation Wizard."
+en-US = "To select a different version, click Change. Otherwise click Cancel 
to abort the Installation Wizard."
 
 [OOO_CONTROL_307]
-en-US = "To select a different folder, click "Change"."
+en-US = "To select a different folder, click Change."
 
 [OOO_CONTROL_308]
 en-US = "Install [ProductName] to:"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2017-08-25 Thread Matthias Seidel

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |   22 
+-
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 8e246b5cccadbac1e6d6c39fcd2a872727683f75
Author: Matthias Seidel 
Date:   Sun Jul 23 18:02:29 2017 +

Deleted whitespace

(cherry picked from commit 6b62e035d388ce14630da65d63db5a216e1848e7)

Change-Id: I7e0c7edf12a30daec35d9461f0be12b6d07fddc3
Reviewed-on: https://gerrit.libreoffice.org/41575
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 4d39022a8a27..121a7f49e486 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -53,7 +53,7 @@ en-US = "Cancel"
 en-US = "Specify a network location for the server image of the product."
 
 [OOO_CONTROL_20]
-en-US = "Enter the network location or click Change to browse to a location.  
Click Install to create a server image of [ProductName] at the specified 
network location or click Cancel to exit the wizard."
+en-US = "Enter the network location or click Change to browse to a location. 
Click Install to create a server image of [ProductName] at the specified 
network location or click Cancel to exit the wizard."
 
 [OOO_CONTROL_21]
 en-US = "{}Network Location"
@@ -368,7 +368,7 @@ en-US = " >"
 en-US = "{}Welcome to the Patch for [ProductName]"
 
 [OOO_CONTROL_162]
-en-US = "The Installation Wizard will install the Patch for [ProductName] on 
your computer.  To continue, click Update."
+en-US = "The Installation Wizard will install the Patch for [ProductName] on 
your computer. To continue, click Update."
 
 [OOO_CONTROL_163]
 en-US = "< "
@@ -500,7 +500,7 @@ en-US = " >"
 en-US = "{}Welcome to the Installation Wizard for [ProductName]"
 
 [OOO_CONTROL_218]
-en-US = "[ProductName] Setup is preparing the Installation Wizard which will 
guide you through the program setup process.  Please wait."
+en-US = "[ProductName] Setup is preparing the Installation Wizard which will 
guide you through the program setup process. Please wait."
 
 [OOO_CONTROL_219]
 en-US = "< "
@@ -668,7 +668,7 @@ en-US = "To select a different version, click "Change". 
Otherwise click "Cancel"
 en-US = "To select a different folder, click "Change"."
 
 [OOO_CONTROL_308]
-en-US  = "Install [ProductName] to:"
+en-US = "Install [ProductName] to:"
 
 [OOO_CONTROL_309]
 en-US = "If you are just trying out [ProductName], you probably don't want 
this to happen, so leave the boxes unchecked."
@@ -680,23 +680,23 @@ en-US = "No languages have been selected for 
installation. Click OK, then select
 en-US = "No applications have been selected for installation. Click OK, then 
select one or more applications for installation."
 
 [OOO_CONTROL_319]
-en-US  = "Create a start link on desktop"
+en-US = "Create a start link on desktop"
 
 [OOO_CONTROL_321]
-en-US  = "Load [ProductName] during system start-up"
+en-US = "Load [ProductName] during system start-up"
 
 [OOO_CONTROL_322]
-en-US  = "Some files that need to be updated are currently in use."
+en-US = "Some files that need to be updated are currently in use."
 
 [OOO_CONTROL_323]
-en-US  = "The following applications are using files that need to be updated 
by this setup. You can let Installation Wizard close them and attempt to 
restart them or reboot the machine later."
+en-US = "The following applications are using files that need to be updated by 
this setup. You can let Installation Wizard close them and attempt to restart 
them or reboot the machine later."
 
 [OOO_CONTROL_324]
-en-US  = "{}Files in Use"
+en-US = "{}Files in Use"
 
 [OOO_CONTROL_325]
-en-US  = "Cancel"
+en-US = "Cancel"
 
 [OOO_CONTROL_326]
-en-US  = "OK"
+en-US = "OK"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2016-08-17 Thread Mike Kaganski

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |   16 
++
 instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf |6 +++
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |   10 
++
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt   |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +
 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |2 +
 7 files changed, 40 insertions(+)

New commits:
commit 190f0685c866b6232564c9d207456d3292d7a551
Author: Mike Kaganski 
Date:   Tue Aug 16 23:53:51 2016 +1000

tdf#69066: use Restart Manager to restart processes during installation

The goal is to allow installer to automatically close and restart closed
applications, and thus diminish users frustration when they don't know
how to close explorer.exe, or how to start it again and bring desktop back.

Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/aa370379

Notes:
* A dialog MsiRMFilesInUse must be present in MSI.
* It will only be used when operating system's Windows Installer version
is >=4.0, and OS is Vista or newer. If system's Windows Installer is older,
then current FilesInUse dialog will be used.
* MSIRESTARTMANAGERCONTROL property has default value of 0, that enables
installer to use the Restart Manager. It is explicitly set in MSI just in 
case.
* Do not use Restart Manager and do reboot is selected by default.

Change-Id: If9d8be7cb478d81db03485ee912991ae9d568ed8
Reviewed-on: https://gerrit.libreoffice.org/28171
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f4293a5..4d39022 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -684,3 +684,19 @@ en-US  = "Create a start link on desktop"
 
 [OOO_CONTROL_321]
 en-US  = "Load [ProductName] during system start-up"
+
+[OOO_CONTROL_322]
+en-US  = "Some files that need to be updated are currently in use."
+
+[OOO_CONTROL_323]
+en-US  = "The following applications are using files that need to be updated 
by this setup. You can let Installation Wizard close them and attempt to 
restart them or reboot the machine later."
+
+[OOO_CONTROL_324]
+en-US  = "{}Files in Use"
+
+[OOO_CONTROL_325]
+en-US  = "Cancel"
+
+[OOO_CONTROL_326]
+en-US  = "OK"
+
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index e311558..9bd6e44 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -43,3 +43,9 @@ en-US = " who uses this computer (all users)"
 [OOO_RADIOBUTTON_9]
 en-US = "Only for  ([USERNAME])"
 
+[OOO_RADIOBUTTON_10]
+en-US = " the applications and attempt to restart them."
+
+[OOO_RADIOBUTTON_11]
+en-US = " not close applications. A reboot will be required."
+
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 11def31..f90d76f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -177,6 +177,16 @@ MaintenanceWelcome Image   Bitmap  0   0   122 
234 1   ImageBmp
 MaintenanceWelcome NextPushButton  230 243 66  17  
3   OOO_CONTROL_148 Cancel  
 MaintenanceWelcome TextLine1   Text135 8   225 45  
65539   OOO_CONTROL_149 
 MaintenanceWelcome TextLine2   Text135 55  228 50  
65539   OOO_CONTROL_150 
+MsiRMFilesInUseBanner  Bitmap  0   0   374 44  1   
BannerBmp   
+MsiRMFilesInUseDlgTitleText13  6   280 15  
196611  OOO_CONTROL_324 
+MsiRMFilesInUseDlgDesc Text21  23  272 25  196611  
OOO_CONTROL_322 
+MsiRMFilesInUseBannerLine  Line0   44  374 0   
1   
+MsiRMFilesInUseDlgText Text21  51  326 43  3   
OOO_CONTROL_323 
+MsiRMFilesInUseListListBox 21  95  332 85  7   
FileInUseProcess
+MsiRMFilesInUseShutdownOption  RadioButtonGroup

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2016-01-05 Thread Cor Nouws

 instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bca7a33548c3257e19c8838786c22af9528fb0e8
Author: Cor Nouws 
Date:   Mon Dec 28 00:28:30 2015 +0100

tdf#96636 - Text "Removing files" during installation is confusing..

Change-Id: Id3f9e17bf68ad5ca2d9a7571aed49f5a3d81b932
Reviewed-on: https://gerrit.libreoffice.org/20970
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
index 213f6df..d5ecd8d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
@@ -233,7 +233,7 @@ en-US = "Removing applications"
 en-US = "Application: [1], Command line: [2]"
 
 [OOO_ACTIONTEXT_73]
-en-US = "Removing files"
+en-US = "Removing files from previous installation"
 
 [OOO_ACTIONTEXT_74]
 en-US = "File: [1], Directory: [9]"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2015-03-10 Thread Christian Lohmaier

 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 441523b0df8983fb34409a5f4e25dde571be1af7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Mar 10 16:38:14 2015 +0100

tdf#53861 - add libGLU.so.1 and libXinerama.so.1 to rpm/deb requirements

only used for upstream packages/when epm is used (any auto-dependency
creation is disabled for those). Add two that might be missing in
barebone installations

Change-Id: I97c3af8cc8622c63ac831701e509097711822098

diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index b8463dc..9f13c85 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -23,4 +23,6 @@ if [[ ${OS} == AIX ]]; then
   echo libfreetype.a(libfreetype.so.6${mark64})
 else
   echo libfreetype.so.6${mark64}
+  echo libGLU.so.1${mark64}
+  echo libXinerama.so.1${mark64}
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2015-03-10 Thread Christian Lohmaier

 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5d970faf2e5444c35e9c614eb55d621b02b0289e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Mar 10 16:54:36 2015 +0100

libGLU actually is not required anymore for master

Change-Id: I543a561fc7fa1213c8e319f227b761f6328a6eaa

diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 9f13c85..0fe0b1d 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -23,6 +23,5 @@ if [[ ${OS} == AIX ]]; then
   echo libfreetype.a(libfreetype.so.6${mark64})
 else
   echo libfreetype.so.6${mark64}
-  echo libGLU.so.1${mark64}
   echo libXinerama.so.1${mark64}
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2014-11-20 Thread Christian Lohmaier

 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f18bd405831c31cd49190046f7bafd805a47d7d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu Nov 20 10:31:23 2014 +0100

fix Could not merge msm file into database

no idea why it fails with the typo-fix (or any change in that line for
that matter)...

Change-Id: I74c74e2080813ab60d4fcd48c62bb7f455046936

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 4f3830d..d937499 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -111,7 +111,7 @@ CreateFolderComponent_  N   
Component   1   Identifier  Foreign key into the Compone
 CreateFolder   Directory_  N   Directory   1   
Identifier  Primary key, could be foreign key into the Directory 
table.
 CustomAction   Action  N   Identifier  
Primary key, name of action, normally appears in sequence table unless 
private use.
 CustomAction   Source  Y   CustomSource
The table reference of the source of the code.
-CustomAction   Target  Y   Formatted   
Execution parameter, depends on the type of custom action
+CustomAction   Target  Y   Formatted   
Excecution parameter, depends on the type of custom action
 CustomAction   TypeN   1   32767   
The numeric custom action type, consisting of source location, code type, 
entry, option flags.
 Dialog Attributes  Y   0   2147483647  
A 32-bit word that specifies the attribute flags to be applied to this 
dialog.
 Dialog Control_Cancel  Y   Control 2   Identifier  
Defines the cancel control. Hitting escape or clicking on the close 
icon on the dialog is equivalent to pushing this button.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2014-06-25 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54c6f08c2061f1af1a545e6b50d447f14b806057
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jun 25 20:28:00 2014 +0200

fdo#80527 fix tab order on ReadyToInstall dialog

regression from 674db242c037020626050c8de06367808d94eaaa

Change-Id: Ia02321b7450b3f19ba02fa681a50430f78f12cfd

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index e05c835..11def31 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -195,7 +195,7 @@ PatchWelcomeTextLine2   Text135 54  
228 45  65539   OOO_CONTROL_162
 ReadyToInstall BackPushButton  164 243 66  17  3   
OOO_CONTROL_163 InstallNow  
 ReadyToInstall Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 ReadyToInstall BannerLine  Line0   44  374 0   1   

-ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 Back
+ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 DesktopLink 
 ReadyToInstall DlgDesc Text21  23  272 25  65539   
OOO_CONTROL_167 
 ReadyToInstall DlgLine Line0   234 374 0   1   

 ReadyToInstall DlgText Text21  51  326 20  3   
OOO_CONTROL_168 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2014-06-23 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bc07cce52470f08872bba75411d88543c4cbd0f
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Jun 23 16:10:11 2014 +0200

fdo#80332 followup fix

Change-Id: If44dd2ab33128c0432e6db655dfbc07f9be4ca51

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 64ab818..e05c835 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -204,7 +204,7 @@ ReadyToInstall  DlgTitleText13  6   
280 25  65538   OOO_CONTROL_170
 ReadyToInstall DlgTitle2   Text13  6   280 25  65538   
OOO_CONTROL_171 
 ReadyToInstall DlgTitle3   Text13  6   280 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  230 243 66  17  
3   OOO_CONTROL_173 Cancel  
-ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableATTools   
+ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
 ReadyToInstall EnableQuickstartCheckBox21  125 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  164 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   374 44  1   
BannerBmp   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source

2014-06-22 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |5 -
 scp2/source/ooo/registryitem_ooo.scp   |   38 
--
 4 files changed, 2 insertions(+), 45 deletions(-)

New commits:
commit 674db242c037020626050c8de06367808d94eaaa
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 11:00:07 2014 +0200

fdo#80332 remove Support assistive technology tools checkbox from 
installer

Revert fdo#39833 add Support assistive technology tools option to 
Windows installer

This reverts commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e.

Conflicts:

instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt

Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f2b6917..f4293a5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -682,8 +682,5 @@ en-US = No applications have been selected for 
installation. Click OK, then sel
 [OOO_CONTROL_319]
 en-US  = Create a start link on desktop
 
-[OOO_CONTROL_320]
-en-US  = Support assistive technology tools
-
 [OOO_CONTROL_321]
 en-US  = Load [ProductName] during system start-up
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index 85d191a..08463f4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -2,5 +2,4 @@ PropertyValue
 s72S64
 CheckBox   Property
 CREATEDESKTOPLINK  1
-ENABLEATTOOLS  1
 QUICKSTART 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index a9fc6d2..64ab818 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -195,7 +195,7 @@ PatchWelcomeTextLine2   Text135 54  
228 45  65539   OOO_CONTROL_162
 ReadyToInstall BackPushButton  164 243 66  17  3   
OOO_CONTROL_163 InstallNow  
 ReadyToInstall Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 ReadyToInstall BannerLine  Line0   44  374 0   1   

-ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 DesktopLink 
+ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 Back
 ReadyToInstall DlgDesc Text21  23  272 25  65539   
OOO_CONTROL_167 
 ReadyToInstall DlgLine Line0   234 374 0   1   

 ReadyToInstall DlgText Text21  51  326 20  3   
OOO_CONTROL_168 
@@ -205,8 +205,7 @@ ReadyToInstall  DlgTitle2   Text13  6   
280 25  65538   OOO_CONTROL_171
 ReadyToInstall DlgTitle3   Text13  6   280 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  230 243 66  17  
3   OOO_CONTROL_173 Cancel  
 ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableATTools   
-ReadyToInstall EnableATTools   CheckBox21  125 300 10  
3   ENABLEATTOOLS   OOO_CONTROL_320 EnableQuickstart
-ReadyToInstall EnableQuickstartCheckBox21  150 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
+ReadyToInstall EnableQuickstartCheckBox21  125 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  164 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  374 0   1   

diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index f5110ac..1c324d5 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -665,41 +665,3 @@ RegistryItem

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice solenv/bin

2013-07-24 Thread Fridrich Štrba

 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt |4 
 solenv/bin/modules/installer.pm|2 
 solenv/bin/modules/installer/windows/msishortcutproperty.pm|   45 
--
 3 files changed, 25 insertions(+), 26 deletions(-)

New commits:
commit 7137605eefb6b4efe80c89c4468e33591b1e474f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 24 16:29:56 2013 +0200

Some more fixups towards the MsiShortcutProperty table

Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 193873a..c5945ae 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -296,6 +296,10 @@ MsiFileHashHashPart2   N   
Size of file in bytes (long integer).
 MsiFileHashHashPart3   N   
Size of file in bytes (long integer).
 MsiFileHashHashPart4   N   
Size of file in bytes (long integer).
 MsiFileHashOptions N   0   32767   
Various options and attributes for this hash.
+MsiShortcutPropertyMsiShortcutProperty N   
Identifier  Unique identifier for this row of the 
MsiShortcutProperty table
+MsiShortcutPropertyShortcut_   N   
Identifier  A key into the Shortcut table that identifies the 
shortcut having a property set
+MsiShortcutPropertyPropertyKey N   
Formatted   A string value that provides information for the 
PROPERTYKEY structure
+MsiShortcutPropertyPropVariantValueN   
Formatted   A string value that provides information for 
the PROPVARIANT structure.
 ODBCAttribute  Attribute   N   Text
Name of ODBC driver attribute
 ODBCAttribute  Driver_ N   ODBCDriver  1   
Identifier  Reference to ODBC driver in ODBCDriver table
 ODBCAttribute  Value   Y   Text
Value for ODBC driver attribute
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 76ba410..76884c3 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1392,7 +1392,7 @@ sub run {
 
 installer::windows::upgrade::create_upgrade_table($newidtdir, 
$allvariableshashref);
 
-
installer::windows::msishortcutproperty::create_msishortcutproperty_table($folderitempropertiesinproductlanguageresolvedarrayref,
 $folderitemsinproductlanguageresolvedarrayref, $newidtdir);
+
installer::windows::msishortcutproperty::create_msishortcutproperty_table($folderitempropertiesinproductarrayref,
 $folderitemsinproductlanguageresolvedarrayref, $newidtdir);
 
 if (( ! $installer::globals::languagepack )  ( ! 
$installer::globals::helppack )) # the following tables not for language packs 
or help packs
 {
diff --git a/solenv/bin/modules/installer/windows/msishortcutproperty.pm 
b/solenv/bin/modules/installer/windows/msishortcutproperty.pm
index d15cb46..019adbd 100644
--- a/solenv/bin/modules/installer/windows/msishortcutproperty.pm
+++ b/solenv/bin/modules/installer/windows/msishortcutproperty.pm
@@ -109,39 +109,34 @@ sub create_msishortcutproperty_table
 {
 my ($folderitempropertiesref, $folderitemsref, $basedir) = @_;
 
-for ( my $m = 0; $m = $#{$languagesarrayref}; $m++ )
-{
-my @msishortcutpropertytable = ();
-
-
installer::windows::idtglobal::write_idt_header(\@msishortcutpropertytable, 
msishortcutproperty);
+my @msishortcutpropertytable = ();
 
-# The entries defined in scp as FolderItemProperties
-# These shortcuts will fill the icons table.
+
installer::windows::idtglobal::write_idt_header(\@msishortcutpropertytable, 
msishortcutproperty);
 
-for ( my $j = 0; $j = $#{$folderitempropertiesref}; $j++ )
-{
-my $onelink = ${$folderitempropertiesref}[$j];
+# The entries defined in scp as FolderItemProperties
 
-my %msishortcutproperty = ();
+for ( my $j = 0; $j = $#{$folderitempropertiesref}; $j++ )
+{
+my $onelink = ${$folderitempropertiesref}[$j];
+my %msishortcutproperty = ();
 
-$msishortcutproperty{'MsiShortcutProperty'} = 
get_msishortcutproperty_identifier($onelink);
-$msishortcutproperty{'Shortcut_'} = 
get_msishorcutproperty_shortcut($onelink, $folderitemsref);
-

37 matches

Mail list logo