From 88e2fd42d008acaf99f3ab3366c8db5d32b364cb Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 23 Jun 2017 12:59:44 +0000 Subject: [PATCH] Logging build now prints EW_SETFLAG changes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6876 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 2 +- Source/exehead/api.h | 28 ++++++++++++++-------------- Source/exehead/exec.c | 3 ++- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 72c6a369..395a9a32 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -363,7 +363,7 @@ CEXEBuild::CEXEBuild(signed char pponly) : m_ShellConstants.add(_T("NETHOOD"), CSIDL_NETHOOD, CSIDL_NETHOOD); m_ShellConstants.add(_T("FONTS"), CSIDL_FONTS, CSIDL_FONTS); 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("PRINTHOOD"), CSIDL_PRINTHOOD, CSIDL_PRINTHOOD); //m_ShellConstants.add(_T("ALTSTARTUP"), CSIDL_ALTSTARTUP, CSIDL_COMMON_ALTSTARTUP); diff --git a/Source/exehead/api.h b/Source/exehead/api.h index 5678c58f..0ad9fe7c 100644 --- a/Source/exehead/api.h +++ b/Source/exehead/api.h @@ -40,20 +40,20 @@ typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM); // besides the stack, variables and HWND passed on to plug-ins. typedef struct { - int autoclose; - int all_user_var; // SetShellVarContext: User context = 0, Machine context = 1 - int exec_error; // IfErrors - int abort; // IfAbort - int exec_reboot; // NSIS_SUPPORT_REBOOT - int reboot_called; // NSIS_SUPPORT_REBOOT - int XXX_cur_insttype; // Deprecated - int plugin_api_version; // See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed) - int silent; // NSIS_CONFIG_SILENT_SUPPORT - int instdir_error; - int rtl; - int errlvl; // SetErrorLevel - int alter_reg_view; // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY) - int status_update; // SetDetailsPrint + int autoclose; // SetAutoClose + int all_user_var; // SetShellVarContext: User context = 0, Machine context = 1 + int exec_error; // IfErrors + int abort; // IfAbort + int exec_reboot; // IfRebootFlag (NSIS_SUPPORT_REBOOT) + int reboot_called; // NSIS_SUPPORT_REBOOT + int XXX_cur_insttype; // Deprecated + int plugin_api_version; // Plug-in ABI. See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed) + int silent; // IfSilent (NSIS_CONFIG_SILENT_SUPPORT) + int instdir_error; // GetInstDirError + int rtl; // 1 if $LANGUAGE is a RTL language + int errlvl; // SetErrorLevel + int alter_reg_view; // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY) + int status_update; // SetDetailsPrint } exec_flags_t; #ifndef NSISCALL diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c index 1a5bb895..1ef8f4e2 100644 --- a/Source/exehead/exec.c +++ b/Source/exehead/exec.c @@ -284,7 +284,7 @@ static int NSISCALL ExecuteEntry(entry *entry_) return ExecuteCodeSegment(v,NULL); } case EW_UPDATETEXT: - log_printf2(_T("detailprint: %s"),GetStringFromParm(0x00)); + log_printf2(_T("DetailPrint: %s"),GetStringFromParm(0x00)); update_status_text(parm0,0); break; 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,parm0)=GetIntFromParm(1); + log_printf3(_T("SetFlag: %d=%d"),parm0,FIELDN(g_exec_flags,parm0)); } else {