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

implemented feature request #1159701 - "RTLREADING" flag support in the "MessageBox"

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3922 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-03-17 20:44:31 +00:00
parent 14836bb4a6
commit 38b94f19a5
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -3245,7 +3245,7 @@ again:
// error // error
if (add_label("Initialize_____Plugins_error")) return PS_ERROR; if (add_label("Initialize_____Plugins_error")) return PS_ERROR;
// error message box // error message box
ret=add_entry_direct(EW_MESSAGEBOX, MB_OK|MB_ICONSTOP|(IDOK<<20), add_string("Error! Can't initialize plug-ins directory. Please try again later.")); ret=add_entry_direct(EW_MESSAGEBOX, MB_OK|MB_ICONSTOP|(IDOK<<21), add_string("Error! Can't initialize plug-ins directory. Please try again later."));
if (ret != PS_OK) return ret; if (ret != PS_OK) return ret;
// Quit // Quit
ret=add_entry_direct(EW_QUIT); ret=add_entry_direct(EW_QUIT);

2
Source/exehead/Main.c
View file

@ -261,7 +261,7 @@ end:
if (m_Err) if (m_Err)
{ {
my_MessageBox(m_Err, MB_OK | MB_ICONSTOP | (IDOK << 20)); my_MessageBox(m_Err, MB_OK | MB_ICONSTOP | (IDOK << 21));
ExitProcess(2); ExitProcess(2);
return 0; return 0;
} }

6
Source/exehead/exec.c
View file

@ -496,7 +496,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
GetNSISString(buf0,LANG_ERRORDECOMPRESSING); GetNSISString(buf0,LANG_ERRORDECOMPRESSING);
} }
log_printf2("%s",buf0); log_printf2("%s",buf0);
my_MessageBox(buf0,MB_OK|MB_ICONSTOP|(IDOK<<20)); my_MessageBox(buf0,MB_OK|MB_ICONSTOP|(IDOK<<21));
return EXEC_ERROR; return EXEC_ERROR;
} }
} }
@ -667,7 +667,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
if (!s) if (!s)
{ {
log_printf2("Exch: stack < %d elements",parm2); log_printf2("Exch: stack < %d elements",parm2);
my_MessageBox(GetNSISStringTT(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP|(IDOK<<20)); my_MessageBox(GetNSISStringTT(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP|(IDOK<<21));
return EXEC_ERROR; return EXEC_ERROR;
} }
mystrcpy(buf0,s->text); mystrcpy(buf0,s->text);
@ -1069,7 +1069,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
case EW_REBOOT: case EW_REBOOT:
if (parm0!=0xbadf00d) if (parm0!=0xbadf00d)
{ {
my_MessageBox(GetNSISStringTT(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP|(IDOK<<20)); my_MessageBox(GetNSISStringTT(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP|(IDOK<<21));
return EXEC_ERROR; return EXEC_ERROR;
} }

6
Source/exehead/util.c
View file

@ -78,11 +78,11 @@ int NSISCALL my_GetDialogItemText(UINT idx, char *val)
} }
int NSISCALL my_MessageBox(const char *text, UINT type) { int NSISCALL my_MessageBox(const char *text, UINT type) {
int _type = type & 0x000FFFFF; int _type = type & 0x001FFFFF;
#ifdef NSIS_CONFIG_SILENT_SUPPORT #ifdef NSIS_CONFIG_SILENT_SUPPORT
// default for silent installers // default for silent installers
if (g_exec_flags.silent && type >> 20) if (g_exec_flags.silent && type >> 21)
return type >> 20; return type >> 21;
#endif #endif
// no silent or no default, just show // no silent or no default, just show
if (g_exec_flags.rtl) if (g_exec_flags.rtl)

8
Source/script.cpp
View file

@ -3558,7 +3558,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{ {
int k=line.gettoken_enum(4,retstr); int k=line.gettoken_enum(4,retstr);
if (k <= 0) PRINTHELP(); if (k <= 0) PRINTHELP();
ent.offsets[0]|=rettab[k]<<20; ent.offsets[0]|=rettab[k]<<21;
a=5; a=5;
} }
else if (line.getnumtokens() > 7) else if (line.getnumtokens() > 7)
@ -5477,7 +5477,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
DefineInnerLangString(NLF_CANT_WRITE); DefineInnerLangString(NLF_CANT_WRITE);
ent.offsets[0]=1; // overwrite off ent.offsets[0]=1; // overwrite off
ent.offsets[0]|=(MB_RETRYCANCEL|MB_ICONSTOP|(IDCANCEL<<20))<<3; ent.offsets[0]|=(MB_RETRYCANCEL|MB_ICONSTOP|(IDCANCEL<<21))<<3;
ent.offsets[1]=add_string(tempDLL); ent.offsets[1]=add_string(tempDLL);
ent.offsets[2]=data_handle; ent.offsets[2]=data_handle;
ent.offsets[3]=0xffffffff; ent.offsets[3]=0xffffffff;
@ -5887,13 +5887,13 @@ int CEXEBuild::add_file(const string& dir, const string& file, int attrib, const
{ {
mb = MB_ABORTRETRYIGNORE | MB_ICONSTOP; mb = MB_ABORTRETRYIGNORE | MB_ICONSTOP;
// default for silent installers // default for silent installers
mb |= IDIGNORE << 20; mb |= IDIGNORE << 21;
} }
else else
{ {
mb = MB_RETRYCANCEL | MB_ICONSTOP; mb = MB_RETRYCANCEL | MB_ICONSTOP;
// default for silent installers // default for silent installers
mb |= IDCANCEL << 20; mb |= IDCANCEL << 21;
} }
ent.offsets[0] |= mb << 3; ent.offsets[0] |= mb << 3;