Merge pull request #3032 from NaterGator/nsis-linkfix

Demote safe mode links so they don't confuse users of a fresh install

.appveyor.yml

@@ -17,7 +17,7 @@ install:
   - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
   - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.5\msvc2013\bin;%PATH%
   - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
-  - if "%CONFIG%" EQU "installer" ( cinst nsis.install -y -installArgs /D="%programfiles(x86)%\NSIS" )
+  - if "%CONFIG%" EQU "installer" ( cinst nsis.install -pre -y -installArgs /D="%programfiles(x86)%\NSIS" )
 
 build_script:
   - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro

deploy/qgroundcontrol_installer.nsi

 !include "MUI2.nsh"
+!include LogicLib.nsh
+!include Win\COM.nsh
+!include Win\Propkey.nsh
+
+!macro DemoteShortCut target
+    !insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 ""
+    ${If} $0 <> 0
+            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+            ${If} $1 P<> 0
+                    ${IPersistFile::Load} $1 '("${target}",1)'
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::QueryInterface} $0 '("${IID_IPropertyStore}",.r1)'
+            ${If} $1 P<> 0
+                    System::Call '*${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_StartPinOption})p.r2'
+                    System::Call '*${SYSSTRUCT_PROPVARIANT}(${VT_UI4},,&i4 ${APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL})p.r3'
+                    ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+                    ; Reuse the PROPERTYKEY & PROPVARIANT buffers to set another property
+                    System::Call '*$2${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_ExcludeFromShowInNewInstall})'
+                    System::Call '*$3${SYSSTRUCT_PROPVARIANT}(${VT_BOOL},,&i2 ${VARIANT_TRUE})'
+                    ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+                    System::Free $2
+                    System::Free $3
+                    ${IPropertyStore::Commit} $1 ""
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+            ${If} $1 P<> 0
+                    ${IPersistFile::Save} $1 '("${target}",1)'
+                    ${IUnknown::Release} $1 ""
+            ${EndIf}
+            ${IUnknown::Release} $0 ""
+    ${EndIf}
+!macroend
 
 Name "QGroundcontrol"
 Var StartMenuFolder
@@ -19,6 +55,17 @@ InstallDir $PROGRAMFILES\qgroundcontrol
 !insertmacro MUI_LANGUAGE "English"
 
 Section
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" "UninstallString"
+  StrCmp $R0 "" doinstall
+
+  ExecWait "$R0 /S"
+  IntCmp $0 0 doinstall
+
+  MessageBox MB_OK|MB_ICONEXCLAMATION \
+        "Could not remove a previously installed QGroundControl version.$\n$\nPlease remove it before continuing."
+  Abort
+
+doinstall:
   SetOutPath $INSTDIR
   File /r build_windows_install\release\*.*
   File deploy\px4driver.msi
@@ -71,15 +118,8 @@ Section "create Start Menu Shortcuts"
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Compatibility Mode).lnk" "$INSTDIR\qgroundcontrol.exe" "-angle" "$INSTDIR\qgroundcontrol.exe" 0
+  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Compatibility Mode).lnk"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Safe Mode).lnk" "$INSTDIR\qgroundcontrol.exe" "-swrast" "$INSTDIR\qgroundcontrol.exe" 0
+  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl (GPU Safe Mode).lnk"
 SectionEnd
 
-Function .onInit
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" "UninstallString"
-  StrCmp $R0 "" done
- 
-  MessageBox MB_OK|MB_ICONEXCLAMATION \
-  	"QGroundControl is already installed. $\n$\nYou must uninstall the previous version before installing a new one."
-  Abort
-done: 
-FunctionEnd