size optimization
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5127 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
cdf33703be
commit
8a8844bcb8
3 changed files with 9 additions and 11 deletions
|
@ -132,14 +132,8 @@ static char * NSISCALL GetStringFromParm(int id_)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
|
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
|
||||||
REGSAM NSISCALL AlterRegistrySAM(REGSAM sam)
|
|
||||||
{
|
#define AlterRegistrySAM(sam) (sam | g_exec_flags.alter_reg_view)
|
||||||
if (g_exec_flags.alter_reg_view)
|
|
||||||
{
|
|
||||||
return sam | KEY_WOW64_64KEY;
|
|
||||||
}
|
|
||||||
return sam;
|
|
||||||
}
|
|
||||||
|
|
||||||
// based loosely on code from Tim Kosse
|
// based loosely on code from Tim Kosse
|
||||||
// in win9x this isn't necessary (RegDeleteKey() can delete a tree of keys),
|
// in win9x this isn't necessary (RegDeleteKey() can delete a tree of keys),
|
||||||
|
|
|
@ -904,9 +904,10 @@ struct MGA_FUNC MGA_FUNCS[] = {
|
||||||
|
|
||||||
void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func)
|
void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func)
|
||||||
{
|
{
|
||||||
HMODULE hModule = GetModuleHandle(MGA_FUNCS[func].dll);
|
const char *dll = MGA_FUNCS[func].dll;
|
||||||
|
HMODULE hModule = GetModuleHandle(dll);
|
||||||
if (!hModule)
|
if (!hModule)
|
||||||
hModule = LoadLibrary(MGA_FUNCS[func].dll);
|
hModule = LoadLibrary(dll);
|
||||||
if (!hModule)
|
if (!hModule)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -3566,7 +3566,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
||||||
// "64" results in setting the flag to 1 which alters the view
|
// "64" results in setting the flag to 1 which alters the view
|
||||||
int k=line.gettoken_enum(1,"32\0" "64\0");
|
int k=line.gettoken_enum(1,"32\0" "64\0");
|
||||||
if (k<0) PRINTHELP()
|
if (k<0) PRINTHELP()
|
||||||
ent.offsets[1]=add_intstring(k);
|
if (k == 0) // 32
|
||||||
|
ent.offsets[1]=add_intstring(0);
|
||||||
|
else if (k == 1) // 64
|
||||||
|
ent.offsets[1]=add_intstring(KEY_WOW64_64KEY);
|
||||||
SCRIPT_MSG("SetRegView: %s\n",line.gettoken_str(1));
|
SCRIPT_MSG("SetRegView: %s\n",line.gettoken_str(1));
|
||||||
}
|
}
|
||||||
return add_entry(&ent);
|
return add_entry(&ent);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue