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

Logging build now prints EW_SETFLAG changes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6876 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-06-23 12:59:44 +00:00
parent 2553c6e550
commit 88e2fd42d0
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -363,7 +363,7 @@ CEXEBuild::CEXEBuild(signed char pponly) :
m_ShellConstants.add(_T("NETHOOD"), CSIDL_NETHOOD, CSIDL_NETHOOD); m_ShellConstants.add(_T("NETHOOD"), CSIDL_NETHOOD, CSIDL_NETHOOD);
m_ShellConstants.add(_T("FONTS"), CSIDL_FONTS, CSIDL_FONTS); m_ShellConstants.add(_T("FONTS"), CSIDL_FONTS, CSIDL_FONTS);
m_ShellConstants.add(_T("TEMPLATES"), CSIDL_TEMPLATES, CSIDL_COMMON_TEMPLATES); m_ShellConstants.add(_T("TEMPLATES"), CSIDL_TEMPLATES, CSIDL_COMMON_TEMPLATES);
m_ShellConstants.add(_T("APPDATA"), CSIDL_APPDATA, CSIDL_COMMON_APPDATA); m_ShellConstants.add(_T("APPDATA"), CSIDL_APPDATA, CSIDL_COMMON_APPDATA); // Note: There is no all-users roaming appdata folder.
m_ShellConstants.add(_T("LOCALAPPDATA"), CSIDL_LOCAL_APPDATA, CSIDL_COMMON_APPDATA); m_ShellConstants.add(_T("LOCALAPPDATA"), CSIDL_LOCAL_APPDATA, CSIDL_COMMON_APPDATA);
m_ShellConstants.add(_T("PRINTHOOD"), CSIDL_PRINTHOOD, CSIDL_PRINTHOOD); m_ShellConstants.add(_T("PRINTHOOD"), CSIDL_PRINTHOOD, CSIDL_PRINTHOOD);
//m_ShellConstants.add(_T("ALTSTARTUP"), CSIDL_ALTSTARTUP, CSIDL_COMMON_ALTSTARTUP); //m_ShellConstants.add(_T("ALTSTARTUP"), CSIDL_ALTSTARTUP, CSIDL_COMMON_ALTSTARTUP);

28
Source/exehead/api.h
View file

@ -40,20 +40,20 @@ typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM);
// besides the stack, variables and HWND passed on to plug-ins. // besides the stack, variables and HWND passed on to plug-ins.
typedef struct typedef struct
{ {
int autoclose; int autoclose; // SetAutoClose
int all_user_var; // SetShellVarContext: User context = 0, Machine context = 1 int all_user_var; // SetShellVarContext: User context = 0, Machine context = 1
int exec_error; // IfErrors int exec_error; // IfErrors
int abort; // IfAbort int abort; // IfAbort
int exec_reboot; // NSIS_SUPPORT_REBOOT int exec_reboot; // IfRebootFlag (NSIS_SUPPORT_REBOOT)
int reboot_called; // NSIS_SUPPORT_REBOOT int reboot_called; // NSIS_SUPPORT_REBOOT
int XXX_cur_insttype; // Deprecated int XXX_cur_insttype; // Deprecated
int plugin_api_version; // See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed) int plugin_api_version; // Plug-in ABI. See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed)
int silent; // NSIS_CONFIG_SILENT_SUPPORT int silent; // IfSilent (NSIS_CONFIG_SILENT_SUPPORT)
int instdir_error; int instdir_error; // GetInstDirError
int rtl; int rtl; // 1 if $LANGUAGE is a RTL language
int errlvl; // SetErrorLevel int errlvl; // SetErrorLevel
int alter_reg_view; // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY) int alter_reg_view; // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY)
int status_update; // SetDetailsPrint int status_update; // SetDetailsPrint
} exec_flags_t; } exec_flags_t;
#ifndef NSISCALL #ifndef NSISCALL

3
Source/exehead/exec.c
View file

@ -284,7 +284,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
return ExecuteCodeSegment(v,NULL); return ExecuteCodeSegment(v,NULL);
} }
case EW_UPDATETEXT: case EW_UPDATETEXT:
log_printf2(_T("detailprint: %s"),GetStringFromParm(0x00)); log_printf2(_T("DetailPrint: %s"),GetStringFromParm(0x00));
update_status_text(parm0,0); update_status_text(parm0,0);
break; break;
case EW_SLEEP: case EW_SLEEP:
@ -305,6 +305,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{ {
FIELDN(g_exec_flags_last_used,parm0)=FIELDN(g_exec_flags,parm0); FIELDN(g_exec_flags_last_used,parm0)=FIELDN(g_exec_flags,parm0);
FIELDN(g_exec_flags,parm0)=GetIntFromParm(1); FIELDN(g_exec_flags,parm0)=GetIntFromParm(1);
log_printf3(_T("SetFlag: %d=%d"),parm0,FIELDN(g_exec_flags,parm0));
} }
else else
{ {