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

64bit fixes and optimizations

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6486 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-05-19 22:03:09 +00:00
parent 0bcb8f40ed
commit 36deb84820
14 changed files with 74 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/System/Source/Plugin.c
View file

@ -7,6 +7,8 @@
HWND g_hwndParent;
#define isvalidnsisvarindex(varnum) ( ((unsigned int)(varnum)) < (__INST_LAST) )
TCHAR *AllocString()
{
return (TCHAR*) GlobalAlloc(GPTR,g_stringsize*sizeof(TCHAR));
@ -46,14 +48,14 @@ TCHAR *system_pushstring(TCHAR *str)
TCHAR *system_getuservariable(int varnum)
{
if (varnum < 0 || varnum >= __INST_LAST) return AllocString();
if (!isvalidnsisvarindex(varnum)) return AllocString();
return AllocStr(g_variables+varnum*g_stringsize);
}
TCHAR *system_setuservariable(int varnum, TCHAR *var)
{
if (var != NULL && varnum >= 0 && varnum < __INST_LAST) {
lstrcpy (g_variables + varnum*g_stringsize, var);
if (var && isvalidnsisvarindex(varnum)) {
lstrcpy(g_variables + varnum*g_stringsize, var);
}
return var;
}

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

@ -379,18 +379,25 @@ PLUGINFUNCTION(Call)
PLUGINFUNCTIONSHORT(Int64Op)
{
__int64 i1, i2 = 0, i3, i4;
TCHAR *op, *o1, *o2;
TCHAR buf[128];
TCHAR *op;
#ifndef _WIN64
TCHAR buf[25], *o1, *o2;
#endif
// Get strings
o1 = system_popstring(); op = system_popstring();
i1 = myatoi64(o1); // convert first arg to int64
// Get parameters: <num1> <op> [num2]
#ifdef _WIN64
i1 = system_popintptr();
#else
o1 = system_popstring(), i1 = myatoi64(o1);
#endif
op = system_popstring();
if ((*op != _T('~')) && (*op != _T('!')))
{
// get second arg, convert it, free it
o2 = system_popstring();
i2 = myatoi64(o2);
GlobalFree(o2);
#ifdef _WIN64
i2 = system_popintptr();
#else
o2 = system_popstring(), i2 = myatoi64(o2), GlobalFree(o2);
#endif
}
// operation
@ -418,9 +425,12 @@ PLUGINFUNCTIONSHORT(Int64Op)
}
// Output and freedom
myitoa64(i1, buf);
system_pushstring(buf);
GlobalFree(o1); GlobalFree(op);
#ifdef _WIN64
system_pushintptr(i1);
#else
myitoa64(i1, buf), system_pushstring(buf), GlobalFree(o1);
#endif
GlobalFree(op);
} PLUGINFUNCTIONEND
__int64 GetIntFromString(TCHAR **p)