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

48
Contrib/Dialer/dialer.c
View file

@ -9,7 +9,7 @@
#define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) {
return TRUE;
return TRUE;
}
/*************\
@ -44,12 +44,12 @@ NSISFunction(AutodialOnline) {
return;
}
EXDLL_INIT();
EXDLL_INIT();
if (pInternetAutodial(INTERNET_AUTODIAL_FORCE_ONLINE, 0))
pushstring(_T("online"));
else
pushstring(_T("offline"));
pushstring(_T("online"));
else
pushstring(_T("offline"));
FreeWinInet();
}
@ -62,12 +62,12 @@ NSISFunction(AutodialUnattended) {
return;
}
EXDLL_INIT();
EXDLL_INIT();
if (pInternetAutodial(INTERNET_AUTODIAL_FORCE_UNATTENDED , 0))
pushstring(_T("online"));
else
pushstring(_T("offline"));
if (pInternetAutodial(INTERNET_AUTODIAL_FORCE_UNATTENDED , 0))
pushstring(_T("online"));
else
pushstring(_T("offline"));
FreeWinInet();
}
@ -83,15 +83,15 @@ NSISFunction(AttemptConnect) {
EXDLL_INIT();
if (pInternetAttemptConnect(0) == ERROR_SUCCESS)
pushstring(_T("online"));
else
pushstring(_T("offline"));
pushstring(_T("online"));
else
pushstring(_T("offline"));
FreeWinInet();
}
NSISFunction(GetConnectedState) {
DWORD dwState;
DWORD dwState;
typedef BOOL (WINAPI *fGetConState)(LPDWORD, DWORD);
fGetConState pInternetGetConnectedState = (fGetConState) GetWinInetFunc("InternetGetConnectedState");
@ -100,12 +100,12 @@ NSISFunction(GetConnectedState) {
return;
}
EXDLL_INIT();
EXDLL_INIT();
if (pInternetGetConnectedState(&dwState, 0))
pushstring(_T("online"));
else
pushstring(_T("offline"));
if (pInternetGetConnectedState(&dwState, 0))
pushstring(_T("online"));
else
pushstring(_T("offline"));
FreeWinInet();
}
@ -118,12 +118,12 @@ NSISFunction(AutodialHangup) {
return;
}
EXDLL_INIT();
EXDLL_INIT();
if (pInternetAutodialHangup(0))
pushstring(_T("success"));
else
pushstring(_T("failure"));
if (pInternetAutodialHangup(0))
pushstring(_T("success"));
else
pushstring(_T("failure"));
FreeWinInet();
}

2
Contrib/ExDLL/exdll.c
View file

@ -37,5 +37,5 @@ void __declspec(dllexport) myFunction(HWND hwndParent, int string_size,
BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
{
g_hInstance=hInst;
return TRUE;
return TRUE;
}

4
Contrib/System/Source/Call.S
View file

@ -144,7 +144,7 @@ ENDIF
EXTERN __alloca_probe : PROC
EXTERN __imp__GlobalFree@4 : PROC
EXTERN __imp__GlobalFree@4 : PROC
EXTERN __imp__GetLastError@0 : PROC
IFDEF _UNICODE
@ -572,7 +572,7 @@ params_loop_done:
IFDEF SYSTEM_LOG_DEBUG
SYSTEM_LOG_INIT
SYSTEM_LOG_ADD offset LogBackFrom
;# LastProc->ProcName
;# LastProc->ProcName
call _GetProcNameOffset
mov ecx,dword ptr [_LastProc]
add eax,ecx

34
Contrib/System/Source/System.c
View file

@ -1334,7 +1334,7 @@ Returns size by which the stack should be expanded
*/
unsigned int GetNewStackSize(void)
{
return NEW_STACK_SIZE;
return NEW_STACK_SIZE;
}
/*
@ -1342,7 +1342,7 @@ Returns non-zero value if GENSTACK option is set
*/
unsigned int GetGenStackOption(SystemProc *proc)
{
return (proc->Options & POPT_GENSTACK);
return (proc->Options & POPT_GENSTACK);
}
/*
@ -1350,7 +1350,7 @@ Returns non-zero value if CDECL option is set
*/
unsigned int GetCDeclOption(SystemProc *proc)
{
return (proc->Options & POPT_CDECL);
return (proc->Options & POPT_CDECL);
}
/*
@ -1358,7 +1358,7 @@ Returns non-zero value if Error option is set
*/
unsigned int GetErrorOption(SystemProc *proc)
{
return (proc->Options & POPT_ERROR);
return (proc->Options & POPT_ERROR);
}
/*
@ -1366,7 +1366,7 @@ Returns offset for element Proc of SystemProc structure
*/
UINT_PTR GetProcOffset(void)
{
return (UINT_PTR)(&(((SystemProc *)0)->Proc));
return (UINT_PTR)(&(((SystemProc *)0)->Proc));
}
/*
@ -1374,7 +1374,7 @@ Returns offset for element Clone of SystemProc structure
*/
unsigned int GetCloneOffset(void)
{
return (unsigned int)(&(((SystemProc *)0)->Clone));
return (unsigned int)(&(((SystemProc *)0)->Clone));
}
/*
@ -1382,7 +1382,7 @@ Returns offset for element ProcName of SystemProc structure
*/
unsigned int GetProcNameOffset(void)
{
return (unsigned int)(&(((SystemProc *)0)->ProcName));
return (unsigned int)(&(((SystemProc *)0)->ProcName));
}
/*
@ -1390,7 +1390,7 @@ Returns offset for element ArgsSize of SystemProc structure
*/
unsigned int GetArgsSizeOffset(void)
{
return (unsigned int)(&(((SystemProc *)0)->ArgsSize));
return (unsigned int)(&(((SystemProc *)0)->ArgsSize));
}
/*
@ -1398,7 +1398,7 @@ Returns number of parameters
*/
unsigned int GetParamCount(SystemProc *proc)
{
return proc->ParamCount;
return proc->ParamCount;
}
/*
@ -1406,7 +1406,7 @@ Returns offset for element Params of SystemProc structure
*/
UINT_PTR GetParamsOffset(void)
{
return (UINT_PTR)(&(((SystemProc *)0)->Params));
return (UINT_PTR)(&(((SystemProc *)0)->Params));
}
/*
@ -1414,7 +1414,7 @@ Returns size of ProcParameter structure
*/
UINT_PTR GetSizeOfProcParam(void)
{
return (sizeof(ProcParameter));
return (sizeof(ProcParameter));
}
/*
@ -1422,7 +1422,7 @@ Returns offset for element Size of ProcParameter structure
*/
unsigned int GetSizeOffsetParam(void)
{
return (unsigned int)(&(((ProcParameter *)0)->Size));
return (unsigned int)(&(((ProcParameter *)0)->Size));
}
/*
@ -1430,7 +1430,7 @@ Returns offset for element Value of ProcParameter structure
*/
UINT_PTR GetValueOffsetParam(void)
{
return (UINT_PTR)(&(((ProcParameter *)0)->Value));
return (UINT_PTR)(&(((ProcParameter *)0)->Value));
}
#ifndef _WIN64
@ -1439,7 +1439,7 @@ Returns offset for element _value of ProcParameter structure
*/
unsigned int Get_valueOffsetParam(void)
{
return (unsigned int)(&(((ProcParameter *)0)->_value));
return (unsigned int)(&(((ProcParameter *)0)->_value));
}
#endif
@ -1448,7 +1448,7 @@ Sets "CLONE" option
*/
void SetCloneOption(SystemProc *proc)
{
proc->Options |= POPT_CLONE;
proc->Options |= POPT_CLONE;
}
/*
@ -1456,7 +1456,7 @@ Sets Result of procedure call to be "OK"
*/
void SetProcResultOk(SystemProc *proc)
{
proc->ProcResult = PR_OK;
proc->ProcResult = PR_OK;
}
/*
@ -1464,5 +1464,5 @@ Sets Result of procedure call to be "CALLBACK"
*/
void SetProcResultCallback(SystemProc *proc)
{
proc->ProcResult = PR_CALLBACK;
proc->ProcResult = PR_CALLBACK;
}

2
Docs/src/config_htmlsingle.but
View file

@ -7,7 +7,7 @@
\#SConscript will replace ---HTML:HEAD:STYLE:CSS--- with the CSS from style.css
\#To avoid a horizontal scrollbar for the whole document, pre blocks (code samples) use overflow:auto; and the extra padding is to prevent the scrollbar from obscuring single lines (In some versions on IE?) forums.winamp.com/showthread.php?t=365132
\#To avoid a horizontal scrollbar for the whole document, pre blocks (code samples) use overflow:auto; and the extra padding is to prevent the scrollbar from obscuring single lines (In some versions of IE?) forums.winamp.com/showthread.php?t=365132
\cfg{xhtml-head-end}{<style type='text/css'>---HTML:HEAD:STYLE:CSS--- pre\{overflow:auto;padding-top:0.35em;padding-bottom:0.35em;\}</style>}

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},