From 7cd38f2367dd6ce9fc41ae69a57cf6bef7e10ac1 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 21 Jun 2012 23:13:05 +0000
Subject: [PATCH] System plugin: Try harder to find dll export function

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6243 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/System/Source/System.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Contrib/System/Source/System.c b/Contrib/System/Source/System.c
index 81e3dc07..f1e1a864 100644
--- a/Contrib/System/Source/System.c
+++ b/Contrib/System/Source/System.c
@@ -818,7 +818,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
 
                 // Get proc address
                 proc->Proc = NSISGetProcAddress(proc->Dll, proc->ProcName);
-                if (UsedTString)
+                if (UsedTString || !proc->Proc)
                 {
                     FARPROC tproc;
                     TCHAR*ProcName = proc->ProcName; // This buffer has room for us to party on
@@ -829,9 +829,11 @@ SystemProc *PrepareProc(BOOL NeedForCall)
                     STRSET2CH(ProcName+cch, _T('A'), _T('\0'));
 #endif
                     tproc = NSISGetProcAddress(proc->Dll, ProcName);
-                    if (tproc) proc->Proc = tproc;
+                    if (tproc)
+                        proc->Proc = tproc;
+                    else
+                        proc->ProcResult = PR_ERROR;
                 }
-                if (!proc->Proc) proc->ProcResult = PR_ERROR;
             }
             break;
         case PT_STRUCT: