Apply [#26044] Windows thumbnails and improved filetype registration

submitted by Tom Edwards
Fix [#25473] 64bit Windows installer for version 2.56 is not working
patch submitted by Caleb (Dobz)

The thumbnail patch adds a thumb handler DLL that adds .blend thumbnail support in Windows Explorer. A -r option is added to do registration in background. The patch also improves icon building and metadata for blender.exe.

Caleb fixes and cleans up our installer to an acceptable state. The patch uses the new -r option to do the .blend extension and thumbnailer registration.

Thanks to both Caleb and Tom for their efforts!

1 files changed, 71 insertions, 56 deletions

diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index e5ebf8b2f64..68d884beb68 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -6,19 +6,20 @@
 ; Requires the MoreInfo plugin - http://nsis.sourceforge.net/MoreInfo_plug-in

 ;

 

+SetCompressor /SOLID lzma

+

+Name "Blender [VERSION]" 

+

+!define MULTIUSER_EXECUTIONLEVEL Admin

+

 !include "MUI.nsh"

 !include "WinVer.nsh"

 !include "FileFunc.nsh"

 !include "WordFunc.nsh"

 !include "nsDialogs.nsh"

+!include "MultiUser.nsh"

 !include "x64.nsh"

 

-RequestExecutionLevel user

-

-SetCompressor /SOLID lzma

-

-Name "Blender [VERSION]" 

-

 !define MUI_ABORTWARNING

 

 !define MUI_WELCOMEPAGE_TEXT  "This wizard will guide you through the installation of Blender. It is recommended that you close all other applications before starting Setup."

@@ -60,21 +61,17 @@ UninstallIcon "[RELDIR]\00.installer.ico"
 ;Language Strings

 

   ;Description

-  LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy all required files to the application folder."

-  LangString DESC_Section2 ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"

-  LangString DESC_Section3 ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."

-  LangString DESC_Section4 ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."

+  LangString DESC_InstallFiles ${LANG_ENGLISH} "Copy all required files to the application folder."

+  LangString DESC_StartMenu ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"

+  LangString DESC_DesktopShortcut ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."

+  LangString DESC_BlendRegister ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."

   LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Specify User Data Location"

 ;--------------------------------

 ;Data

 

 Caption "Blender [VERSION] Installer"

 OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"

-;InstallDir "$PROGRAMFILES[BITNESS]\Blender Foundation\Blender"

-; Install to user profile dir. While it is non-standard, it allows

-; users to install without having to have the installer run in elevated mode.

-InstallDir "$PROFILE\Blender Foundation\Blender"

-

+InstallDir $INSTDIR ; $INSTDIR is set inside .onInit

 BrandingText "Blender Foundation | http://www.blender.org"

 ComponentText "This will install Blender [VERSION] on your computer."

 

@@ -85,7 +82,7 @@ SilentUnInstall normal
 Var BLENDERHOME

 Var SHORTVERSION ; This is blender_version_decimal() from path_util.c

 

-; custom controls

+; Custom controls

 Var HWND

 

 Var HWND_APPDATA

@@ -94,7 +91,23 @@ Var HWND_HOMEDIR
 

 Function .onInit

   ClearErrors

+  !insertmacro MULTIUSER_INIT ; Checks if user has admin rights

   StrCpy $SHORTVERSION "[SHORTVERSION]"

+

+  ${If} ${RunningX64}

+    ${If} "[BITNESS]" == "32"

+    ${OrIf} "[BITNESS]" == "-mingw"

+      StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section

+    ${ElseIf} "[BITNESS]" == "64"

+      StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender"

+    ${EndIf}

+  ${Else}

+    StrCpy $INSTDIR "$PROGRAMFILES\Blender Foundation\Blender"

+  ${EndIf}

+FunctionEnd

+

+Function un.onInit

+  !insertmacro MULTIUSER_UNINIT

 FunctionEnd

 

 Function DataLocation

@@ -105,12 +118,12 @@ Function DataLocation
     Abort

   ${EndIf}

   

-  ${NSD_CreateLabel} 0 0 100% 12u "Please specify where you wish to install Blender's user data files."

-  ${NSD_CreateRadioButton} 0 20 100% 12u "Use the Application Data directory"

+  ${NSD_CreateLabel} 0 0 100% 24u "Please specify where you wish to install Blender's user data files. Be aware that if you choose to use your Application Data directory, your preferences and scripts will only be accessible by the current user account."

+  ${NSD_CreateRadioButton} 0 50 100% 12u "Use Application Data directory (recommended)"

   Pop $HWND_APPDATA

-  ${NSD_CreateRadioButton} 0 50 100% 12u "Use the installation directory (ie. location chosen to install blender.exe)."

+  ${NSD_CreateRadioButton} 0 80 100% 12u "Use installation directory"

   Pop $HWND_INSTDIR

-  ${NSD_CreateRadioButton} 0 80 100% 12u "I have defined a %HOME% variable, please install files here."

+  ${NSD_CreateRadioButton} 0 110 100% 12u "I have defined a %HOME% variable, please install files there"

   Pop $HWND_HOMEDIR

   

   ${If} ${AtMostWinME}

@@ -128,7 +141,9 @@ FunctionEnd
 Function DataLocationOnLeave

   ${NSD_GetState} $HWND_APPDATA $R0

   ${If} $R0 == "1"

+    SetShellVarContext current

     StrCpy $BLENDERHOME "$APPDATA\Blender Foundation\Blender"

+    SetShellVarContext all

   ${Else}

     ${NSD_GetState} $HWND_INSTDIR $R0

     ${If} $R0 == "1"

@@ -142,15 +157,15 @@ Function DataLocationOnLeave
   ${EndIf}

 FunctionEnd

 

-Section "Blender-[VERSION] (required)" SecCopyUI

+Section "Blender [VERSION] (required)" InstallFiles

   SectionIn RO

 

   ; Set output path to the installation directory.

   SetOutPath $INSTDIR

-  ; the contents of Blender installation root dir

+  ; The contents of Blender installation root dir

   [ROOTDIRCONTS]

   

-  ; all datafiles (python, scripts, config)

+  ; All datafiles (python, scripts, config)

   [DODATAFILES]

   

   SetOutPath $INSTDIR

@@ -162,13 +177,19 @@ Section "Blender-[VERSION] (required)" SecCopyUI
   WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"

   WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ShortVersion" "[SHORTVERSION]"

   ; Write the uninstall keys for Windows

-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender (remove only)"

-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender"

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "Publisher" "Blender Foundation"

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "URLInfoAbout" "http://www.blender.org/"

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayVersion" "[VERSION]"

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayIcon" "$INSTDIR\blender.exe"

+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'

+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoModify" 1

+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoRepair " 1

   WriteUninstaller "uninstall.exe"

 

 SectionEnd

 

-Section "Add Start Menu shortcuts" Section2

+Section "Add Start Menu Shortcuts" StartMenu

   SetShellVarContext all

   CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"

   CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0

@@ -176,45 +197,38 @@ Section "Add Start Menu shortcuts" Section2
   CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\readme.html" "" "" 0

   CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0

   CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0

+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons

 SectionEnd

 

-Section "Add Desktop Blender-[VERSION] shortcut" Section3

+Section "Add Desktop Shortcut" DesktopShortcut

   CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0

+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons

 SectionEnd

 

-Section "Open .blend files with Blender-[VERSION]" Section4

-  

-  ${If} ${RunningX64}

-    SetRegView 64

-  ${EndIf}

-  WriteRegStr HKCR ".blend" "" "blendfile"

-  WriteRegStr HKCR "blendfile" "" "Blender .blend File"

-  WriteRegStr HKCR "blendfile\shell" "" "open"

-  WriteRegStr HKCR "blendfile\DefaultIcon" "" $INSTDIR\blender.exe,1

-  WriteRegStr HKCR "blendfile\shell\open\command" "" \

-    '"$INSTDIR\blender.exe" "%1"'

-  

+Section "Open .blend files with Blender" BlendRegister

+ExecWait '"$INSTDIR\blender.exe" -r'

 SectionEnd

 

-UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit next to continue."

+UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."

 

 Section "Uninstall"

-  ; remove registry keys

+  ; Remove registry keys

   ${If} ${RunningX64}

     SetRegView 64

   ${EndIf}

+  

   ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"

   ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"

-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"

+  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Blender"

   DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"

+  DeleteRegKey HKCR ".blend"

+  DeleteRegKey HKCR "blendfile"

+  DeleteRegKey HKCR "CLSID\{D45F043D-F17F-4e8a-8435-70971D9FA46D}"

   SetShellVarContext all

  

-  ; remove files

+  ; Remove files

   [DELROOTDIRCONTS]

 

-  ; remove bundled python

-  RmDir /r $INSTDIR\$SHORTVERSION\python

-

   Delete "$INSTDIR\uninstall.exe"

 

   MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove

@@ -226,26 +240,27 @@ NextNoConfigRemove:
   MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove

   RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"

 NextNoPluginRemove:

-  ; try to remove dirs, but leave them if they contain anything

+  ; Try to remove dirs, but leave them if they contain anything

   RMDir "$BLENDERHOME\$SHORTVERSION\plugins"

   RMDir "$BLENDERHOME\$SHORTVERSION\config"

   RMDir "$BLENDERHOME\$SHORTVERSION\scripts"

   RMDir "$BLENDERHOME\$SHORTVERSION"

   RMDir "$BLENDERHOME"

-  ; remove shortcuts

+  ; Remove shortcuts

   Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"

   Delete "$DESKTOP\Blender.lnk"

-  ; remove all link related directories and files

-  RMDir "$SMPROGRAMS\Blender Foundation\Blender"

-  RMDir "$SMPROGRAMS\Blender Foundation"

+  ; Remove all link related directories and files

+  RMDir /r "$SMPROGRAMS\Blender Foundation"

   ; Clear out installation dir

-  RMDir "$INSTDIR"

+  RMDir /r "$INSTDIR"

+  

+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; Refresh icons

 SectionEnd

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)

-  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)

-  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

-  !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${InstallFiles} $(DESC_InstallFiles)

+  !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} $(DESC_StartMenu)

+  !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} $(DESC_DesktopShortcut)

+  !insertmacro MUI_DESCRIPTION_TEXT ${BlendRegister} $(DESC_BlendRegister)

 !insertmacro MUI_FUNCTION_DESCRIPTION_END