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

don't pass ".dll" to myGetProcAddress as GetModuleHandle and LoadLibrary add that automatically

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5076 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-14 16:05:43 +00:00
parent ce5f73cdd2
commit 68907347f5
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/exehead/Ui.c
View file

@ -234,7 +234,7 @@ FORCE_INLINE int NSISCALL ui_doinstall(void)
LANGID (WINAPI *GUDUIL)();
static const char guduil[] = "GetUserDefaultUILanguage";
GUDUIL = myGetProcAddress("KERNEL32.dll", guduil);
GUDUIL = myGetProcAddress("KERNEL32", guduil);
if (GUDUIL)
{
// Windows ME/2000+
@ -374,7 +374,7 @@ FORCE_INLINE int NSISCALL ui_doinstall(void)
#ifdef NSIS_CONFIG_LICENSEPAGE
{ // load richedit DLL
static char str1[]="RichEd20.dll";
static char str1[]="RichEd20";
static char str2[]="RichEdit20A";
if (!LoadLibrary(str1))
{
@ -918,7 +918,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
{
typedef HRESULT (WINAPI *SHAutoCompletePtr)(HWND, DWORD);
SHAutoCompletePtr fSHAutoComplete;
static const char shlwapi[] = "shlwapi.dll";
static const char shlwapi[] = "shlwapi";
static const char shac[] = "SHAutoComplete";
fSHAutoComplete = (SHAutoCompletePtr) myGetProcAddress(shlwapi, shac);
if (fSHAutoComplete)
@ -994,7 +994,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
// Test for and use the GetDiskFreeSpaceEx API
{
BOOL (WINAPI *GDFSE)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER) =
myGetProcAddress("KERNEL32.dll", "GetDiskFreeSpaceExA");
myGetProcAddress("KERNEL32", "GetDiskFreeSpaceExA");
if (GDFSE)
{
ULARGE_INTEGER available64;