From 266267ba61864a386e6e0375fbf7bf9a2cb4f3fb Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 18 Sep 2007 22:02:44 +0000 Subject: [PATCH] fixed plug-in system's SetDetailsPrint usage git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5277 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 2 +- Source/exehead/Ui.c | 1 + Source/exehead/exec.h | 1 + Source/script.cpp | 12 ++---------- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 7800ca74..dae78728 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -3216,7 +3216,7 @@ again: zero_offset=add_string("$0"); // SetDetailsPrint none - ret=add_entry_direct(EW_UPDATETEXT, 0, 16); + ret=add_entry_direct(EW_SETFLAG, FLAG_OFFSET(status_update), add_intstring(16)); if (ret != PS_OK) return ret; // StrCmp $PLUGINSDIR "" diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 7214e920..d1e9cda4 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -264,6 +264,7 @@ FORCE_INLINE int NSISCALL ui_doinstall(void) // initialize status update (SetDetailsPrint) flag g_exec_flags.status_update = 6; + g_exec_flags_last_used.status_update = 6; // set default language set_language(); diff --git a/Source/exehead/exec.h b/Source/exehead/exec.h index ae72793e..6af6603d 100644 --- a/Source/exehead/exec.h +++ b/Source/exehead/exec.h @@ -18,6 +18,7 @@ #define _EXEC_H_ extern exec_flags g_exec_flags; +extern exec_flags g_exec_flags_last_used; int NSISCALL ExecuteCodeSegment(int pos, HWND hwndProgress); // returns 0 on success int NSISCALL ExecuteCallbackFunction(int num); // returns 0 on success diff --git a/Source/script.cpp b/Source/script.cpp index a1cb43e9..90bb1ca7 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -5709,11 +5709,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) } // SetDetailsPrint lastused - ent.which=EW_UPDATETEXT; - ent.offsets[0]=0; - ent.offsets[1]=0; - ent.offsets[2]=1; // lastused - ret=add_entry(&ent); + ret=add_entry_direct(EW_SETFLAG, FLAG_OFFSET(status_update), 0, 1); if (ret != PS_OK) { return ret; } @@ -5781,11 +5777,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) ret=add_entry(&ent); if (ret != PS_OK) return ret; // SetDetailsPrint lastused - ent.which=EW_UPDATETEXT; - ent.offsets[0]=0; - ent.offsets[1]=0; - ent.offsets[2]=1; // lastused - ret=add_entry(&ent); + ret=add_entry_direct(EW_SETFLAG, FLAG_OFFSET(status_update), 0, 1); if (ret != PS_OK) return ret; } return PS_OK;