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

Load system modules with full paths

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6647 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-11-29 13:54:35 +00:00
parent 3e416abd5c
commit 726bf760cd
5 changed files with 53 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/exehead/Ui.c
View file

@ -388,17 +388,17 @@ FORCE_INLINE int NSISCALL ui_doinstall(void)
#ifdef NSIS_CONFIG_LICENSEPAGE
{ // load richedit DLL
static const TCHAR riched20[]=_T("RichEd20");
static const TCHAR riched32[]=_T("RichEd32");
static const CHAR riched20[]=("RichEd20");
static const CHAR riched32[]=("RichEd32");
#ifdef UNICODE
static const TCHAR richedit20t[]=_T("RichEdit20W");
#else
static const TCHAR richedit20t[]=_T("RichEdit20A");
#endif
static const TCHAR richedit[]=_T("RichEdit");
if (!LoadLibrary(riched20))
if (!LoadSystemLibrary(riched20))
{
LoadLibrary(riched32); // Win95 only ships with v1.0, NT4 has v2.0: web.archive.org/web/20030607222419/http://msdn.microsoft.com/library/en-us/shellcc/platform/commctls/richedit/richeditcontrols/aboutricheditcontrols.asp
LoadSystemLibrary(riched32); // Win95 only ships with v1.0, NT4 has v2.0: web.archive.org/web/20030607222419/http://msdn.microsoft.com/library/en-us/shellcc/platform/commctls/richedit/richeditcontrols/aboutricheditcontrols.asp
}
// make richedit20a/w point to RICHEDIT