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

Merging various fixes from latest Jim Park repository

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6096 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-28 14:09:08 +00:00
parent 23fe81e16e
commit 74ffaada4e
4 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -801,7 +801,26 @@ SystemProc *PrepareProc(BOOL NeedForCall)
}
// Get proc address
if ((proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName)) == NULL)
proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName);
#ifdef _UNICODE
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)
{
#ifdef _UNICODE
// automatic W discover