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

fixed plug-in system's SetDetailsPrint usage

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5277 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-09-18 22:02:44 +00:00
parent d9d6a9da51
commit 266267ba61
4 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -3216,7 +3216,7 @@ again:
zero_offset=add_string("$0"); zero_offset=add_string("$0");
// SetDetailsPrint none // 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; if (ret != PS_OK) return ret;
// StrCmp $PLUGINSDIR "" // StrCmp $PLUGINSDIR ""

1
Source/exehead/Ui.c
View file

@ -264,6 +264,7 @@ FORCE_INLINE int NSISCALL ui_doinstall(void)
// initialize status update (SetDetailsPrint) flag // initialize status update (SetDetailsPrint) flag
g_exec_flags.status_update = 6; g_exec_flags.status_update = 6;
g_exec_flags_last_used.status_update = 6;
// set default language // set default language
set_language(); set_language();

1
Source/exehead/exec.h
View file

@ -18,6 +18,7 @@
#define _EXEC_H_ #define _EXEC_H_
extern exec_flags g_exec_flags; 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 ExecuteCodeSegment(int pos, HWND hwndProgress); // returns 0 on success
int NSISCALL ExecuteCallbackFunction(int num); // returns 0 on success int NSISCALL ExecuteCallbackFunction(int num); // returns 0 on success

12
Source/script.cpp
View file

@ -5709,11 +5709,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
} }
// SetDetailsPrint lastused // SetDetailsPrint lastused
ent.which=EW_UPDATETEXT; ret=add_entry_direct(EW_SETFLAG, FLAG_OFFSET(status_update), 0, 1);
ent.offsets[0]=0;
ent.offsets[1]=0;
ent.offsets[2]=1; // lastused
ret=add_entry(&ent);
if (ret != PS_OK) { if (ret != PS_OK) {
return ret; return ret;
} }
@ -5781,11 +5777,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ret=add_entry(&ent); ret=add_entry(&ent);
if (ret != PS_OK) return ret; if (ret != PS_OK) return ret;
// SetDetailsPrint lastused // SetDetailsPrint lastused
ent.which=EW_UPDATETEXT; ret=add_entry_direct(EW_SETFLAG, FLAG_OFFSET(status_update), 0, 1);
ent.offsets[0]=0;
ent.offsets[1]=0;
ent.offsets[2]=1; // lastused
ret=add_entry(&ent);
if (ret != PS_OK) return ret; if (ret != PS_OK) return ret;
} }
return PS_OK; return PS_OK;