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

Only RegDLL and UnRegDLL will change the current directory so plug-ins will now work as before

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1975 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-12-18 20:22:35 +00:00
parent ff5553fa65
commit 2f8b7032c0
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/exehead/exec.c
View file

@ -937,11 +937,6 @@ static int NSISCALL ExecuteEntry(entry *entry_)
char *buf0=process_string_fromparm_tobuf(0x00); char *buf0=process_string_fromparm_tobuf(0x00);
char *buf1=process_string_fromparm_tobuf(0x11); char *buf1=process_string_fromparm_tobuf(0x11);
// suggested by Kevin Gadd (janusfury)
mystrcpy(buf3, buf0);
trimslashtoend(buf3);
SetCurrentDirectory(buf3);
h=LoadLibrary(buf0); h=LoadLibrary(buf0);
if (h) if (h)
{ {
@ -952,8 +947,16 @@ static int NSISCALL ExecuteEntry(entry *entry_)
if (parm2) if (parm2)
{ {
char *buf2=process_string_fromparm_tobuf(0x22); char *buf2=process_string_fromparm_tobuf(0x22);
// suggested by Kevin Gadd (janusfury)
mystrcpy(buf3, buf0);
trimslashtoend(buf3);
SetCurrentDirectory(buf3);
update_status_text(buf2,buf0); update_status_text(buf2,buf0);
if (funke()) exec_errorflag++; if (funke()) exec_errorflag++;
SetCurrentDirectory(state_exe_directory);
} }
else else
{ {
@ -980,7 +983,6 @@ static int NSISCALL ExecuteEntry(entry *entry_)
update_status_text_from_lang(LANG_COULDNOTLOAD,buf0); update_status_text_from_lang(LANG_COULDNOTLOAD,buf0);
log_printf2("Error registering DLL: Could not load %s",buf0); log_printf2("Error registering DLL: Could not load %s",buf0);
} }
SetCurrentDirectory(state_exe_directory);
OleUninitialize(); OleUninitialize();
} }
else else