dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor typo and indentation fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6510 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-02 20:03:18 +00:00
parent 47eadad506
commit 7ee1a114a9
8 changed files with 68 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/build.h
View file

@ -319,7 +319,7 @@ class CEXEBuild {
* it will get the LanguageTable of the last used language or more
* correctly, the last Language ID that generated a valid return value
* (not NULL).
*
*
* @param lang [in/out] Language ID reference. If LANG_NEUTRAL, it gets
* set to thelast used language ID.
* @param create Create a new LanguageTable? Default = true.
@ -327,22 +327,22 @@ class CEXEBuild {
*/
LanguageTable *GetLangTable(LANGID &lang, bool create = true);
/**
* Get the language name as a TCHAR* and the code page value via an
* out parameter. It will look for a LanguageTable to get the values.
* If not found, then it will set the codepage to English for ANSI
* or Unicode for Unicode version of NSIS. The language name is looked
* up via the LanguageTable if it exists, otherwise, it returns "???" except
* a hardcoded check for 1033 (english). It really should fall back to
* calling GetLocaleInfo() with the LANGID to get the string.
*
* This function is not thread-safe! For a thread-safe version, the
* parameter must include the buffer to write to.
*
* @param lang The language ID
* @param codepage [out] The code page referred to by the language ID.
* @return The language string in English.
*/
/**
* Get the language name as a TCHAR* and the code page value via an
* out parameter. It will look for a LanguageTable to get the values.
* If not found, then it will set the codepage to English for ANSI
* or Unicode for Unicode version of NSIS. The language name is looked
* up via the LanguageTable if it exists, otherwise, it returns "???" except
* a hardcoded check for 1033 (english). It really should fall back to
* calling GetLocaleInfo() with the LANGID to get the string.
*
* This function is not thread-safe! For a thread-safe version, the
* parameter must include the buffer to write to.
*
* @param lang The language ID
* @param codepage [out] The code page referred to by the language ID.
* @return The language string in English.
*/
const TCHAR *GetLangNameAndCP(LANGID lang, unsigned int *codepage = NULL);
const TCHAR *GetLangNameAndCPForVersionResource(LANGID &lang, unsigned int *codepage = NULL, bool deflangfallback = true);
@ -450,7 +450,7 @@ class CEXEBuild {
build_allowskipfiles; // Added by ramon 23 May 2003
header build_header, build_uninst, *cur_header;
int uninstall_mode; // Are we in uinstall mode? Acts like a bool.
int uninstall_mode; // Are we in uninstall mode? Acts like a bool.
int uninstall_size,uninstall_size_full;
int uninstaller_writes_used;
@ -483,7 +483,7 @@ class CEXEBuild {
section *build_cursection; // The section we are defining, NULL if not in section.
// This could be a function or a section.
// The ubuild prefixed objects / variables are for the uinstall versions
// The ubuild prefixed objects / variables are for the uninstall versions
// of the code. The cur prefix objects are what the current objects that
// need to be referenced should be. What is pointed to by the cur* objects
// are determined by whether or not we are in uninstall mode or not.

5
Source/makenssi.cpp
View file

@ -172,7 +172,7 @@ static void print_usage()
_T(" ") OPT_STR _T("Ofile specifies a text file to log compiler output (default is stdout)\n")
_T(" ") OPT_STR _T("PAUSE pauses after execution\n")
_T(" ") OPT_STR _T("NOCONFIG disables inclusion of <path to makensis.exe>") PLATFORM_PATH_SEPARATOR_STR _T("nsisconf.nsh\n")
_T(" ") OPT_STR _T("NOCD disabled the current directory change to that of the .nsi file\n")
_T(" ") OPT_STR _T("NOCD disables the current directory change to that of the .nsi file\n")
_T(" ") OPT_STR _T("INPUTCHARSET <") TSTR_INPUTCHARSET _T(">\n")
#ifdef _WIN32
_T(" ") OPT_STR _T("OUTPUTCHARSET <") TSTR_OUTPUTCHARSET _T(">\n")
@ -554,7 +554,8 @@ static inline int makensismain(int argc, TCHAR **argv)
#else
main_conf = PosixBug_CtoTString(PREFIX_CONF);
#endif
else main_conf = env_var;
else
main_conf = env_var;
main_conf += PLATFORM_PATH_SEPARATOR_STR;
main_conf += _T("nsisconf.nsh");
if (process_config(build, main_conf))

2
Source/tokens.cpp
View file

@ -40,7 +40,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_ADDBRANDINGIMAGE,_T("AddBrandingImage"),2,1,_T("(top|left|bottom|right) (height|width) [padding]"),TP_GLOBAL},
{TOK_ADDSIZE,_T("AddSize"),1,0,_T("size_to_add_to_section_in_kb"),TP_SEC},
{TOK_AUTOCLOSE,_T("AutoCloseWindow"),1,0,_T("(false|true)"),TP_GLOBAL},
{TOK_BGFONT,_T("BGFont"),0,6,_T("[font_face [height [wieght] [/ITALIC] [/UNDERLINE] [/STRIKE]]]"),TP_GLOBAL},
{TOK_BGFONT,_T("BGFont"),0,6,_T("[font_face [height [weight] [/ITALIC] [/UNDERLINE] [/STRIKE]]]"),TP_GLOBAL},
{TOK_BGGRADIENT,_T("BGGradient"),0,3,_T("(off | [top_color [bottom_color [text_color]]])"),TP_GLOBAL},
{TOK_BRANDINGTEXT,_T("BrandingText"),1,1,_T("[/TRIM(LEFT|RIGHT|CENTER)] installer_text"),TP_GLOBAL},
{TOK_BRINGTOFRONT,_T("BringToFront"),0,0,_T(""),TP_CODE},