Some more fixups towards the MsiShortcutProperty table

Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71

2 files changed, 21 insertions, 26 deletions

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 76ba4100bf05..76884c355dff 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 d15cb46af599..019adbd28253 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);
-            $msishortcutproperty{'PropertyKey'} = get_msishortcutproperty_propertykey($onelink);
-            $msishortcutproperty{'PropVariantValue'} = get_msishortcutproperty_propvariantvalue($onelink);
+        $msishortcutproperty{'MsiShortcutProperty'} = get_msishortcutproperty_identifier($onelink);
+        $msishortcutproperty{'Shortcut_'} = get_msishorcutproperty_shortcut($onelink, $folderitemsref);
+        $msishortcutproperty{'PropertyKey'} = get_msishortcutproperty_propertykey($onelink);
+        $msishortcutproperty{'PropVariantValue'} = get_msishortcutproperty_propvariantvalue($onelink);
 
-            my $oneline = $msishortcutproperty{'MsiShortcutProperty'} . "\t" . $msishortcutproperty{'Shortcut_'} . "\t"
-                        . $msishortcutproperty{'PropertyKey'} . "\t" . $msishortcutproperty{'PropVariantValue'} . "\n";
+        my $oneline = $msishortcutproperty{'MsiShortcutProperty'} . "\t" . $msishortcutproperty{'Shortcut_'} . "\t"
+                    . $msishortcutproperty{'PropertyKey'} . "\t" . $msishortcutproperty{'PropVariantValue'} . "\n";
 
-            push(@msishortcutpropertytable, $oneline);
-        }
+        push(@msishortcutpropertytable, $oneline);
+    }
 
-        # Saving the file
+    # Saving the file
 
-        my $msishortcutpropertytablename = $basedir . $installer::globals::separator . "MsiShortcutProperty.idt" . "." . $onelanguage;
-        installer::files::save_file($msishortcutpropertytablename ,\@msishortcutpropertytable);
-        my $infoline = "Created idt file: $msishortcutpropertytablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
+    my $msishortcutpropertytablename = $basedir . $installer::globals::separator . "MsiShorP.idt";
+    installer::files::save_file($msishortcutpropertytablename ,\@msishortcutpropertytable);
+    my $infoline = "Created idt file: $msishortcutpropertytablename\n";
+    push(@installer::globals::logfileinfo, $infoline);
 }