From 1343d4d1e16cffe39661d91a1313c8cb83d28beb Mon Sep 17 00:00:00 2001 From: anders_k Date: Thu, 26 Feb 2015 18:44:15 +0000 Subject: [PATCH] Fixed CreateShortcut /NoWorkingDir token parsing bug git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6581 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/history.but | 2 ++ Source/tokens.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Docs/src/history.but b/Docs/src/history.but index 59d206ce..f3bf556f 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -20,6 +20,8 @@ Released on ?, 201? \b Windows 10 support +\b Fixed CreateShortcut /NoWorkingDir parsing bug (\W{http://sf.net/p/nsis/bugs/1110/}{bug #1110}) + \H{v3.0b1} 3.0 Beta 1 Released on October 6th, 2014 diff --git a/Source/tokens.cpp b/Source/tokens.cpp index acac9551..51e9bfbb 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -58,7 +58,7 @@ static tokenType tokenlist[TOK__LAST] = {TOK_CRCCHECK,_T("CRCCheck"),1,0,_T("(on|force|off)"),TP_GLOBAL}, {TOK_CREATEDIR,_T("CreateDirectory"),1,0,_T("directory_name"),TP_CODE}, {TOK_CREATEFONT,_T("CreateFont"),2,5,_T("$(user_var: handle output) face_name [height weight /ITALIC /UNDERLINE /STRIKE]"),TP_CODE}, -{TOK_CREATESHORTCUT,_T("CreateShortcut"),2,6,_T("[/NoWorkingDir] shortcut_name.lnk shortcut_target [parameters [icon_file [icon index [showmode [hotkey [comment]]]]]]\n showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED)\n hotkey=(ALT|CONTROL|EXT|SHIFT)|(F1-F24|A-Z)"),TP_CODE}, +{TOK_CREATESHORTCUT,_T("CreateShortcut"),2,7,_T("[/NoWorkingDir] shortcut_name.lnk shortcut_target [parameters [icon_file [icon index [showmode [hotkey [comment]]]]]]\n showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED)\n hotkey=(ALT|CONTROL|EXT|SHIFT)|(F1-F24|A-Z)"),TP_CODE}, {TOK_DBOPTIMIZE,_T("SetDatablockOptimize"),1,0,_T("(off|on)"),TP_ALL}, {TOK_DELETEINISEC,_T("DeleteINISec"),2,0,_T("ini_file section_name"),TP_CODE}, {TOK_DELETEINISTR,_T("DeleteINIStr"),3,0,_T("ini_file section_name entry_name"),TP_CODE},