Changeset 434 for trunk/installer/MainFormUnit.pas

Timestamp:

May 23, 2019, 1:46:22 AM (6 years ago)

Author:

ataylor

Message:

Try to avoid relocating an existing NewView icon when installing.

File:

• trunk/installer/MainFormUnit.pas (modified) (6 diffs)

trunk/installer/MainFormUnit.pas

@@ -23 +23 @@
   Description = 'NewView Install';
 
-  Version =        'V1.10.1'; // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '1.10.1'; // Embedded for IBM BLDLEVEL tool
+  Version =        'V1.10.2'; // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '1.10.2'; // Embedded for IBM BLDLEVEL tool
 
   // BLDLevel - compatible - mostly
@@ -199 +199 @@
 
   ECSNewViewObjectID = '<ECS_NEWVIEW>';
+  WPNewViewObjectID = '<WP_NEWVIEW>';
   NewViewObjectID = '<NEWVIEW>';
   IPFFiles = '*.INF,*.HLP'; // NOTE: PM is case sensitive here
@@ -848 +849 @@
                      Description,
                      szSetupString, // setup string
+                     '<WP_TOOLS>',
+                     CO_UPDATEIFEXISTS );
+
+  if Result <> NULLHANDLE then
+  begin
+    // OK
+    WinCreateObject( 'WPShadow',        // class
+                     Description,
+                     'SHADOWID=' + ID,  // setup string
                      '<WP_DESKTOP>',
-                     CO_REPLACEIFEXISTS );
-
-  if Result <> NULLHANDLE then
-    // OK
-    exit;
+                     CO_UPDATEIFEXISTS );
+    exit;
+  end;
 
   // error
@@ -865 +873 @@
                   'Unable to create desktop icon:' + StrCRLF
                   + IntToHex( PMError, 8 )
-                  + ': The desktop is not correctly installed '
-                  + '(<WP_DESKTOP> missing). ' );
+                  + ': The target folder is not correctly installed '
+                  + '(<WP_TOOLS> missing). ' );
 
     WPERR_NOT_WORKPLACE_CLASS:
@@ -880 +888 @@
                   + ': There may be some problem with the desktop.' );
   end;
+
 end;
 
@@ -1375 +1384 @@
       ObjectID := ECSNewViewObjectID
     else
-      // no, create our own
-      ObjectID := NewViewObjectID;
+    begin
+      ProgramObjectHandle :=
+        WinQueryObject( WPNewViewObjectID );
+      if ProgramObjectHandle <> NULLHANDLE then
+        ObjectID := WPNewViewObjectID
+      else
+        ObjectID := NewViewObjectID;
+    end;
 
     if CreateDesktopIcon( FAppInstallPath,