From 68907347f586be3ee7b1c2f5c558079250592ad1 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 14 Apr 2007 16:05:43 +0000
Subject: [PATCH] don't pass ".dll" to myGetProcAddress as GetModuleHandle and
 LoadLibrary add that automatically

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5076 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/Main.c | 6 +++---
 Source/exehead/Ui.c   | 8 ++++----
 Source/exehead/exec.c | 2 +-
 Source/exehead/util.c | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index f8ea9121..4353b240 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -278,9 +278,9 @@ end:
     BOOL (WINAPI *OPT)(HANDLE, DWORD,PHANDLE);
     BOOL (WINAPI *LPV)(LPCTSTR,LPCTSTR,PLUID);
     BOOL (WINAPI *ATP)(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
-    OPT=myGetProcAddress("ADVAPI32.dll","OpenProcessToken");
-    LPV=myGetProcAddress("ADVAPI32.dll","LookupPrivilegeValueA");
-    ATP=myGetProcAddress("ADVAPI32.dll","AdjustTokenPrivileges");
+    OPT=myGetProcAddress("ADVAPI32","OpenProcessToken");
+    LPV=myGetProcAddress("ADVAPI32","LookupPrivilegeValueA");
+    ATP=myGetProcAddress("ADVAPI32","AdjustTokenPrivileges");
     if (OPT && LPV && ATP)
     {
       HANDLE hToken;
diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index 0170341c..2ec5d0db 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -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;
diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index a5dbe72c..f7c6f401 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -158,7 +158,7 @@ static LONG NSISCALL myRegDeleteKeyEx(HKEY thiskey, LPCTSTR lpSubKey, int onlyif
     {
       typedef LONG (WINAPI * RegDeleteKeyExAPtr)(HKEY, LPCTSTR, REGSAM, DWORD);
       RegDeleteKeyExAPtr RDKE = (RegDeleteKeyExAPtr)
-        myGetProcAddress("ADVAPI32.dll","RegDeleteKeyExA");
+        myGetProcAddress("ADVAPI32","RegDeleteKeyExA");
 
       if (RDKE)
         retval=RDKE(thiskey,lpSubKey,AlterRegistrySAM(0),0);
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index 1b6d6d0d..ae9eefbe 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -422,7 +422,7 @@ void NSISCALL MoveFileOnReboot(LPCTSTR pszExisting, LPCTSTR pszNew)
   BOOL fOk = 0;
   typedef BOOL (WINAPI *mfea_t)(LPCSTR lpExistingFileName,LPCSTR lpNewFileName,DWORD dwFlags);
   mfea_t mfea;
-  mfea=(mfea_t) myGetProcAddress("KERNEL32.dll","MoveFileExA");
+  mfea=(mfea_t) myGetProcAddress("KERNEL32","MoveFileExA");
   if (mfea)
   {
     fOk=mfea(pszExisting, pszNew, MOVEFILE_DELAY_UNTIL_REBOOT|MOVEFILE_REPLACE_EXISTING);