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

6
Source/exehead/Main.c
View file

@ -278,9 +278,9 @@ end:
BOOL (WINAPI *OPT)(HANDLE, DWORD,PHANDLE); BOOL (WINAPI *OPT)(HANDLE, DWORD,PHANDLE);
BOOL (WINAPI *LPV)(LPCTSTR,LPCTSTR,PLUID); BOOL (WINAPI *LPV)(LPCTSTR,LPCTSTR,PLUID);
BOOL (WINAPI *ATP)(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); BOOL (WINAPI *ATP)(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
OPT=myGetProcAddress("ADVAPI32.dll","OpenProcessToken"); OPT=myGetProcAddress("ADVAPI32","OpenProcessToken");
LPV=myGetProcAddress("ADVAPI32.dll","LookupPrivilegeValueA"); LPV=myGetProcAddress("ADVAPI32","LookupPrivilegeValueA");
ATP=myGetProcAddress("ADVAPI32.dll","AdjustTokenPrivileges"); ATP=myGetProcAddress("ADVAPI32","AdjustTokenPrivileges");
if (OPT && LPV && ATP) if (OPT && LPV && ATP)
{ {
HANDLE hToken; HANDLE hToken;

8
Source/exehead/Ui.c
View file

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

2
Source/exehead/exec.c
View file

@ -158,7 +158,7 @@ static LONG NSISCALL myRegDeleteKeyEx(HKEY thiskey, LPCTSTR lpSubKey, int onlyif
{ {
typedef LONG (WINAPI * RegDeleteKeyExAPtr)(HKEY, LPCTSTR, REGSAM, DWORD); typedef LONG (WINAPI * RegDeleteKeyExAPtr)(HKEY, LPCTSTR, REGSAM, DWORD);
RegDeleteKeyExAPtr RDKE = (RegDeleteKeyExAPtr) RegDeleteKeyExAPtr RDKE = (RegDeleteKeyExAPtr)
myGetProcAddress("ADVAPI32.dll","RegDeleteKeyExA"); myGetProcAddress("ADVAPI32","RegDeleteKeyExA");
if (RDKE) if (RDKE)
retval=RDKE(thiskey,lpSubKey,AlterRegistrySAM(0),0); retval=RDKE(thiskey,lpSubKey,AlterRegistrySAM(0),0);

2
Source/exehead/util.c
View file

@ -422,7 +422,7 @@ void NSISCALL MoveFileOnReboot(LPCTSTR pszExisting, LPCTSTR pszNew)
BOOL fOk = 0; BOOL fOk = 0;
typedef BOOL (WINAPI *mfea_t)(LPCSTR lpExistingFileName,LPCSTR lpNewFileName,DWORD dwFlags); typedef BOOL (WINAPI *mfea_t)(LPCSTR lpExistingFileName,LPCSTR lpNewFileName,DWORD dwFlags);
mfea_t mfea; mfea_t mfea;
mfea=(mfea_t) myGetProcAddress("KERNEL32.dll","MoveFileExA"); mfea=(mfea_t) myGetProcAddress("KERNEL32","MoveFileExA");
if (mfea) if (mfea)
{ {
fOk=mfea(pszExisting, pszNew, MOVEFILE_DELAY_UNTIL_REBOOT|MOVEFILE_REPLACE_EXISTING); fOk=mfea(pszExisting, pszNew, MOVEFILE_DELAY_UNTIL_REBOOT|MOVEFILE_REPLACE_EXISTING);