fdo#52296 put ShellNew files to program's folder

Change-Id: I501d08fb0be65c7191b807e1d6d6f20026e14860

5 files changed, 4 insertions, 25 deletions

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index e4cee55ec155..bee3d0d24288 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -185,7 +185,6 @@ BEGIN
     $ooodownloadfilename = "";
     $downloadfilename = "";
     $downloadfileextension = "";
-    $shellnewfilesadded = 0;
     %multilingual_only_modules = ();
     %application_modules = ();
 
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 555c99cdb0f4..4d52b9036103 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -121,16 +121,6 @@ sub get_file_component_directory
 
     if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
 
-    if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ )   # special handling for shellnew files
-    {
-        return $installer::globals::templatefolder;
-    }
-
-    if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
-    {
-        return "WindowsShellNewFolder";
-    }
-
     my $destination = $onefile->{'destination'};
 
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -237,9 +227,9 @@ sub get_file_component_attributes
         $attributes = 0;    # Assembly files cannot run from source
     }
 
-    if (( $onefile->{'Dir'} =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
+    if ( $onefile->{'needs_user_registry_key'} )
     {
-        $attributes = 4;    # Files in shellnew dir and in non advertised startmenu entries must have user registry key as KeyPath
+        $attributes = 4;    # Files in non advertised startmenu entries must have user registry key as KeyPath
     }
 
     # Setting msidbComponentAttributes64bit, if this is a 64 bit installation set.
@@ -375,8 +365,6 @@ sub get_component_keypath
         }
     }
 
-    # Special handling for components in PREDEFINED_OSSHELLNEWDIR. These components
-    # need as KeyPath a RegistryItem in HKCU
     if ( $oneitem->{'userregkeypath'} ) { $keypath = $oneitem->{'userregkeypath'}; }
 
     # saving it in the file and registry collection
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index a9c34324e82e..fd947d090902 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -451,9 +451,6 @@ sub add_root_directories
     $oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
     push(@{$directorytableref}, $oneline);
 
-    $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
-    push(@{$directorytableref}, $oneline);
-
     $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
     push(@{$directorytableref}, $oneline);
 
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index f5449ce8ce09..e0e4372a8c99 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -1016,12 +1016,10 @@ sub create_files_table
         # This is used for better performance in "save_packorder"
         $installer::globals::uniquefilenamesequence{$onefile->{'uniquename'}} = $onefile->{'sequencenumber'};
 
-        # Special handling for files in PREDEFINED_OSSHELLNEWDIR. These components
-        # need as KeyPath a RegistryItem in HKCU
         my $destdir = "";
         if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
 
-        if (( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
+        if ( $onefile->{'needs_user_registry_key'} )
         {
             my $keypath = generate_registry_keypath($onefile);
             $onefile->{'userregkeypath'} = $keypath;
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 29e0e8a47ee2..2580d541a070 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -326,7 +326,6 @@ sub add_userregs_to_registry_table
         $registry{'Root'} = "1";  # always HKCU
         $registry{'Key'} = "Software\\$allvariables->{'MANUFACTURER'}\\$allvariables->{'PRODUCTNAME'} $allvariables->{'PRODUCTVERSION'}\\";
         if ( $onefile->{'needs_user_registry_key'} ) { $registry{'Key'} = $registry{'Key'} . "StartMenu"; }
-        else { $registry{'Key'} = $registry{'Key'} . "ShellNew"; }
         $registry{'Name'} = $onefile->{'Name'};
         $registry{'Value'} = "1";
         $registry{'Component_'} = $onefile->{'componentname'};
@@ -412,9 +411,7 @@ sub create_registry_table
 
         # If there are added user registry keys for files collected in
         # @installer::globals::userregistrycollector (file.pm), then
-        # this registry keys have to be added now. This is necessary for
-        # files in PREDEFINED_OSSHELLNEWDIR, because their component
-        # needs as KeyPath a RegistryItem in HKCU.
+        # this registry keys have to be added now.
 
         if ( $installer::globals::addeduserregitrykeys ) { add_userregs_to_registry_table(\@registrytable, $allvariableshashref); }