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

- extended maximum binary data for WriteRegBin to 3 * NSIS_MAX_STRLEN

Browse source 
- fixed FileRead setting the error flag when a null character is the first character it reads
- made File /nonfatal always produce a warning if the file can't be found
- some size optimizations


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3577 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-06-25 19:53:05 +00:00
parent d1f241e6c8
commit 5d8517c328
3 changed files with 107 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/build.cpp
View file

@ -3045,10 +3045,14 @@ extern FILE *g_output;
void CEXEBuild::warning(const char *s, ...)
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
m_warnings.add(buf,0);
notify(MAKENSIS_NOTIFY_WARNING,buf);
@ -3061,10 +3065,14 @@ void CEXEBuild::warning(const char *s, ...)
void CEXEBuild::warning_fl(const char *s, ...)
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
sprintf(buf+strlen(buf)," (%s:%d)",curfilename,linecnt);
m_warnings.add(buf,0);
@ -3084,10 +3092,14 @@ void CEXEBuild::ERROR_MSG(const char *s, ...)
if (display_errors)
#endif
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
notify(MAKENSIS_NOTIFY_ERROR,buf);
if (display_errors)
@ -3102,12 +3114,10 @@ void CEXEBuild::SCRIPT_MSG(const char *s, ...)
{
if (display_script)
{
char buf[NSIS_MAX_STRLEN*4];
va_list val;
va_start(val,s);
vsprintf(buf,s,val);
vfprintf(g_output,s,val);
va_end(val);
fprintf(g_output,"%s",buf);
fflush(g_output);
}
}
@ -3116,12 +3126,10 @@ void CEXEBuild::INFO_MSG(const char *s, ...)
{
if (display_info)
{
char buf[NSIS_MAX_STRLEN*4];
va_list val;
va_start(val,s);
vsprintf(buf,s,val);
vfprintf(g_output,s,val);
va_end(val);
fprintf(g_output,"%s",buf);
fflush(g_output);
}
}

132
Source/exehead/exec.c
View file

@ -30,34 +30,6 @@ exec_flags g_exec_flags;
HRESULT g_hres;
#endif
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
// based loosely on code from Tim Kosse
// in win9x this isn't necessary (RegDeleteKey() can delete a tree of keys),
// but in win2k you need to do this manually.
static LONG NSISCALL myRegDeleteKeyEx(HKEY thiskey, LPCTSTR lpSubKey, int onlyifempty)
{
HKEY key;
int retval=RegOpenKeyEx(thiskey,lpSubKey,0,KEY_ENUMERATE_SUB_KEYS,&key);
if (retval==ERROR_SUCCESS)
{
// NB - don't change this to static (recursive function)
char buffer[MAX_PATH+1];
while (RegEnumKey(key,0,buffer,MAX_PATH+1)==ERROR_SUCCESS)
{
if (onlyifempty)
{
RegCloseKey(key);
return !ERROR_SUCCESS;
}
if ((retval=myRegDeleteKeyEx(key,buffer,0)) != ERROR_SUCCESS) break;
}
RegCloseKey(key);
retval=RegDeleteKey(thiskey,lpSubKey);
}
return retval;
}
#endif//NSIS_SUPPORT_REGISTRYFUNCTIONS
static int NSISCALL ExecuteEntry(entry *entry_);
#define resolveaddr(v) ((v<0) ? myatoi(g_usrvars[-(v+1)]) : v)
@ -116,6 +88,44 @@ static char * NSISCALL GetStringFromParm(int id_)
return result;
}
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
// based loosely on code from Tim Kosse
// in win9x this isn't necessary (RegDeleteKey() can delete a tree of keys),
// but in win2k you need to do this manually.
static LONG NSISCALL myRegDeleteKeyEx(HKEY thiskey, LPCTSTR lpSubKey, int onlyifempty)
{
HKEY key;
int retval=RegOpenKeyEx(thiskey,lpSubKey,0,KEY_ENUMERATE_SUB_KEYS,&key);
if (retval==ERROR_SUCCESS)
{
// NB - don't change this to static (recursive function)
char buffer[MAX_PATH+1];
while (RegEnumKey(key,0,buffer,MAX_PATH+1)==ERROR_SUCCESS)
{
if (onlyifempty)
{
RegCloseKey(key);
return !ERROR_SUCCESS;
}
if ((retval=myRegDeleteKeyEx(key,buffer,0)) != ERROR_SUCCESS) break;
}
RegCloseKey(key);
retval=RegDeleteKey(thiskey,lpSubKey);
}
return retval;
}
static HKEY NSISCALL myRegOpenKey(REGSAM samDesired)
{
HKEY hKey;
if (RegOpenKeyEx((HKEY) parms[1], GetStringFromParm(0x22), 0, samDesired, &hKey) == ERROR_SUCCESS)
{
return hKey;
}
return NULL;
}
#endif//NSIS_SUPPORT_REGISTRYFUNCTIONS
// returns EXEC_ERROR on error
// returns 0, advance position by 1
// otherwise, returns new_position+1
@ -788,11 +798,15 @@ static int NSISCALL ExecuteEntry(entry *entry_)
}
break;
case EW_SHOWWINDOW:
{
HWND hw=(HWND)GetIntFromParm(0);
int a=GetIntFromParm(1);
if (parm2) log_printf("HideWindow");
if (!parm3)
ShowWindow((HWND)GetIntFromParm(0),GetIntFromParm(1));
ShowWindow(hw,a);
else
EnableWindow((HWND)GetIntFromParm(0),GetIntFromParm(1));
EnableWindow(hw,a);
}
break;
#endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT
#endif//NSIS_SUPPORT_HWNDS
@ -1151,25 +1165,25 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
case EW_DELREG:
{
int rootkey=parm0;
char *buf3=GetStringFromParm(0x31);
exec_error++;
if (!parm3)
long res=!ERROR_SUCCESS;
if (!parm4)
{
HKEY hKey;
if (RegOpenKeyEx((HKEY)rootkey,buf3,0,KEY_SET_VALUE,&hKey) == ERROR_SUCCESS)
HKEY hKey=myRegOpenKey(KEY_SET_VALUE);
if (hKey)
{
char *buf0=GetStringFromParm(0x02);
log_printf4("DeleteRegValue: %d\\%s\\%s",rootkey,buf3,buf0);
if (RegDeleteValue(hKey,buf0) == ERROR_SUCCESS) exec_error--;
char *buf3=GetStringFromParm(0x33);
log_printf4("DeleteRegValue: %d\\%s\\%s",rootkey,buf2,buf3);
res = RegDeleteValue(hKey,buf3);
RegCloseKey(hKey);
}
}
else
{
log_printf3("DeleteRegKey: %d\\%s",rootkey,buf3);
if (myRegDeleteKeyEx((HKEY)rootkey,buf3,parm3&2) == ERROR_SUCCESS) exec_error--;
log_printf3("DeleteRegKey: %d\\%s",rootkey,buf2);
res = myRegDeleteKeyEx((HKEY)parm1,buf2,parm4&2);
}
if (res != ERROR_SUCCESS)
exec_error++;
}
break;
case EW_WRITEREG: // write registry value
@ -1178,10 +1192,10 @@ static int NSISCALL ExecuteEntry(entry *entry_)
int rootkey=parm0;
int type=parm4;
int rtype=parm5;
char *buf1=GetStringFromParm(0x12);
char *buf3=GetStringFromParm(0x31);
char *buf0=GetStringFromParm(0x02);
char *buf1=GetStringFromParm(0x11);
exec_error++;
if (RegCreateKey((HKEY)rootkey,buf3,&hKey) == ERROR_SUCCESS)
if (RegCreateKey((HKEY)rootkey,buf1,&hKey) == ERROR_SUCCESS)
{
LPBYTE data = (LPBYTE) buf2;
DWORD size = 0;
@ -1189,40 +1203,39 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{
GetStringFromParm(0x23);
size = mystrlen((char *) data) + 1;
log_printf5("WriteRegStr: set %d\\%s\\%s to %s",rootkey,buf3,buf1,buf2);
log_printf5("WriteRegStr: set %d\\%s\\%s to %s",rootkey,buf1,buf0,data);
}
if (type == REG_DWORD)
{
*(LPDWORD) data = GetIntFromParm(3);
size = sizeof(DWORD);
log_printf5("WriteRegDWORD: set %d\\%s\\%s to %d",rootkey,buf3,buf1,*(LPDWORD)data);
log_printf5("WriteRegDWORD: set %d\\%s\\%s to %d",rootkey,buf1,buf0,*(LPDWORD)data);
}
if (type == REG_BINARY)
{
size = GetCompressedDataFromDataBlockToMemory(parm3, data, NSIS_MAX_STRLEN);
log_printf5("WriteRegBin: set %d\\%s\\%s with %d bytes",rootkey,buf3,buf1,size);
// use buf2, buf3 and buf4
size = GetCompressedDataFromDataBlockToMemory(parm3, data, 3 * NSIS_MAX_STRLEN);
log_printf5("WriteRegBin: set %d\\%s\\%s with %d bytes",rootkey,buf1,buf0,size);
}
if (size >= 0 && RegSetValueEx(hKey,buf1,0,rtype,data,size) == ERROR_SUCCESS)
if (size >= 0 && RegSetValueEx(hKey,buf0,0,rtype,data,size) == ERROR_SUCCESS)
exec_error--;
RegCloseKey(hKey);
}
else { log_printf3("WriteReg: error creating key %d\\%s",rootkey,buf3); }
else { log_printf3("WriteReg: error creating key %d\\%s",rootkey,buf1); }
}
break;
case EW_READREGSTR: // read registry string
{
HKEY hKey;
HKEY hKey=myRegOpenKey(KEY_READ);
char *p=var0;
int rootkey=parm1;
char *buf0=GetStringFromParm(0x02); // buf0 == subkey
char *buf1=GetStringFromParm(0x13); // buf1 == key name
char *buf3=GetStringFromParm(0x33); // buf3 == key name
p[0]=0;
if (RegOpenKeyEx((HKEY)rootkey,buf0,0,KEY_READ,&hKey) == ERROR_SUCCESS)
if (hKey)
{
DWORD l = NSIS_MAX_STRLEN;
DWORD t;
if (RegQueryValueEx(hKey,buf1,NULL,&t,p,&l ) != ERROR_SUCCESS ||
if (RegQueryValueEx(hKey,buf3,NULL,&t,p,&l) != ERROR_SUCCESS ||
(t != REG_DWORD && t != REG_SZ && t != REG_EXPAND_SZ))
{
p[0]=0;
@ -1244,12 +1257,11 @@ static int NSISCALL ExecuteEntry(entry *entry_)
break;
case EW_REGENUM:
{
HKEY key;
HKEY key=myRegOpenKey(KEY_READ);
char *p=var0;
int b=GetIntFromParm(3);
char *buf1=GetStringFromParm(0x12);
p[0]=0;
if (RegOpenKeyEx((HKEY)parm1,buf1,0,KEY_READ,&key) == ERROR_SUCCESS)
if (key)
{
DWORD d=NSIS_MAX_STRLEN-1;
if (parm4) RegEnumKey(key,b,p,d);
@ -1328,7 +1340,6 @@ static int NSISCALL ExecuteEntry(entry *entry_)
myitoa(textout,(unsigned int)(unsigned char)c);
return 0;
}
if (!c) break;
if (lc == '\r' || lc == '\n')
{
if (lc == c || (c != '\r' && c != '\n')) SetFilePointer(h,-1,NULL,FILE_CURRENT);
@ -1337,6 +1348,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
}
textout[rpos++]=c;
lc=c;
if (!c) break;
}
}
textout[rpos]=0;

29
Source/script.cpp
View file

@ -2731,7 +2731,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("!error: %s\n",line.gettoken_str(1));
return PS_ERROR;
case TOK_P_WARNING:
warning_fl("!warning: %s\n",line.gettoken_str(1));
warning_fl("!warning: %s",line.gettoken_str(1));
return PS_OK;
case TOK_P_ECHO:
SCRIPT_MSG("%s (%s:%d)\n", line.gettoken_str(1),curfilename,linecnt);
@ -4026,8 +4026,15 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (v != PS_OK) return v;
if (!tf)
{
ERROR_MSG("%sFile: \"%s\" -> no files found.\n",(which_token == TOK_FILE)?"":"Reserve",t);
if (fatal) PRINTHELP()
if (fatal)
{
ERROR_MSG("%sFile: \"%s\" -> no files found.\n",(which_token == TOK_FILE)?"":"Reserve",t);
PRINTHELP();
}
else
{
warning_fl("%sFile: \"%s\" -> no files found.",(which_token == TOK_FILE)?"":"Reserve",t);
}
}
}
}
@ -4633,13 +4640,13 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
int a=1;
if (which_token==TOK_DELETEREGKEY)
{
ent.offsets[3]=1;
ent.offsets[4]=1;
char *s=line.gettoken_str(a);
if (s[0] == '/')
{
if (stricmp(s,"/ifempty")) PRINTHELP()
a++;
ent.offsets[3]=3;
ent.offsets[4]=3;
}
if (line.gettoken_str(a+2)[0]) PRINTHELP()
}
@ -4647,9 +4654,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (k == -1) k=line.gettoken_enum(a,rootkeys[1]);
if (k == -1) PRINTHELP()
ent.which=EW_DELREG;
ent.offsets[0]=(int)rootkey_tab[k];
ent.offsets[1]=add_string(line.gettoken_str(a+1));
ent.offsets[2]=(which_token==TOK_DELETEREGKEY)?0:add_string(line.gettoken_str(a+2));
ent.offsets[1]=(int)rootkey_tab[k];
ent.offsets[2]=add_string(line.gettoken_str(a+1));
ent.offsets[3]=(which_token==TOK_DELETEREGKEY)?0:add_string(line.gettoken_str(a+2));
if (line.gettoken_str(a+1)[0] == '\\')
warning_fl("%s: registry path name begins with \'\\\', may cause problems",line.gettoken_str(0));
if (which_token==TOK_DELETEREGKEY)
@ -4685,7 +4692,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
}
if (which_token == TOK_WRITEREGBIN)
{
char data[NSIS_MAX_STRLEN];
char data[3*NSIS_MAX_STRLEN];
char *p=line.gettoken_str(4);
int data_len=0;
while (*p)
@ -4704,9 +4711,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
else break;
p++;
c=(a<<4)|b;
if (data_len >= NSIS_MAX_STRLEN)
if (data_len >= 3*NSIS_MAX_STRLEN)
{
ERROR_MSG("WriteRegBin: %d bytes of data exceeded\n",NSIS_MAX_STRLEN);
ERROR_MSG("WriteRegBin: %d bytes of data exceeded\n",3*NSIS_MAX_STRLEN);
return PS_ERROR;
}
data[data_len++]=c;