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

System plugin: Prefer A/W export when t type is used

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6220 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-03-06 00:26:12 +00:00
parent 70408e8ae4
commit 2132661644
2 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -415,6 +415,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
BOOL param_defined = FALSE; BOOL param_defined = FALSE;
SystemProc *proc = NULL; SystemProc *proc = NULL;
TCHAR *ibuf, *ib, *sbuf, *cbuf, *cb; TCHAR *ibuf, *ib, *sbuf, *cbuf, *cb;
unsigned int UsedTString = 0;
// Retrieve proc specs // Retrieve proc specs
cb = (cbuf = AllocString()); // Current String buffer cb = (cbuf = AllocString()); // Current String buffer
@ -612,7 +613,10 @@ SystemProc *PrepareProc(BOOL NeedForCall)
case _T('m'): case _T('m'):
case _T('M'): temp2 = PAT_STRING; break; case _T('M'): temp2 = PAT_STRING; break;
case _T('t'): case _T('t'):
case _T('T'): temp2 = PAT_TSTRING; break; case _T('T'):
temp2 = PAT_TSTRING;
++UsedTString;
break;
case _T('g'): case _T('g'):
case _T('G'): temp2 = PAT_GUID; break; case _T('G'): temp2 = PAT_GUID; break;
case _T('w'): case _T('w'):
@ -815,36 +819,20 @@ SystemProc *PrepareProc(BOOL NeedForCall)
// Get proc address // Get proc address
proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName); proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName);
#ifdef _UNICODE if (UsedTString)
if ((proc->Proc != NULL) &&
(proc->ProcName[0] == _T('l') &&
proc->ProcName[1] == _T('s') &&
proc->ProcName[2] == _T('t') &&
proc->ProcName[3] == _T('r')) &&
(lstrcmpi(_T("kernel32"), proc->DllName) == 0 || lstrcmpi(_T("kernel32.dll"), proc->DllName) == 0))
{
int lastCharIdx = lstrlen(proc->ProcName) - 1;
if (lastCharIdx > 1 &&
proc->ProcName[lastCharIdx] != _T('A') &&
proc->ProcName[lastCharIdx] != _T('W'))
{
proc->Proc = NULL; // force using W variant
}
}
#endif
if (proc->Proc == NULL)
{ {
FARPROC tproc;
TCHAR*ProcName = proc->ProcName; // This buffer has room for us to party on
unsigned int cch = lstrlen(ProcName);
#ifdef _UNICODE #ifdef _UNICODE
// automatic W discover STRSET2CH(ProcName+cch, _T('W'), _T('\0'));
lstrcat(proc->ProcName, _T("W"));
#else #else
// automatic A discover STRSET2CH(ProcName+cch, _T('A'), _T('\0'));
lstrcat(proc->ProcName, "A");
#endif #endif
if ((proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName)) == NULL) tproc = NSISGetProcAddress(proc->Dll, ProcName);
proc->ProcResult = PR_ERROR; if (tproc) proc->Proc = tproc;
} }
if (!proc->Proc) proc->ProcResult = PR_ERROR;
} }
break; break;
case PT_STRUCT: case PT_STRUCT:
@ -872,7 +860,9 @@ void ParamsIn(SystemProc *proc)
int i; int i;
HGLOBAL* place; HGLOBAL* place;
TCHAR *realbuf; TCHAR *realbuf;
#ifndef _UNICODE
LPWSTR wstr; LPWSTR wstr;
#endif
i = (proc->ParamCount > 0)?(1):(0); i = (proc->ParamCount > 0)?(1):(0);
while (TRUE) while (TRUE)

6
Contrib/System/Source/System.h
View file

@ -146,4 +146,10 @@ extern SystemProc *CallBack(SystemProc *proc);
extern SystemProc *RealCallBack(); extern SystemProc *RealCallBack();
extern void CallStruct(SystemProc *proc); extern void CallStruct(SystemProc *proc);
#ifdef _UNICODE
# define STRSET2CH(str, c1, c2) ( *(DWORD*)(str) = ((c1)|(c2)<<16) )
#else
# define STRSET2CH(str, c1, c2) ( *(WORD*)(str) = ((c1)|(c2)<<8) )
#endif
#endif #endif