From aec58509b4da1fc2dba187a1a440251c7f8eaece Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 20 Jan 2017 21:15:49 +0000 Subject: [PATCH] Fixed unbalanced push/pop in MUI_UNGETLANGUAGE (MUI v1) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6836 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 3 ++- Source/exehead/Main.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 7407abe5..a80e14ba 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -2192,7 +2192,8 @@ Var MUI_TEMP2 !macro MUI_UNGETLANGUAGE - !verbose pop + !verbose push + !verbose ${MUI_VERBOSE} !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c index 121ca91f..d5eb0686 100644 --- a/Source/exehead/Main.c +++ b/Source/exehead/Main.c @@ -119,6 +119,9 @@ EXTERN_C void NSISWinMainNOCRT() "CRYPTBASE\0" // Win7 without KB2533623: OleInitialize ... RPCRT4.UuidCreate ... RPCRT4.GenerateRandomNumber "OLEACC\0" // Vista: SHFileOperation ... SHELL32.CProgressDialogUI::_Setup ... SHELL32.GetRoleTextW "CLBCATQ\0" // XP.SP2&SP3: SHAutoComplete ... OLE32!InitializeCatalogIfNecessary ... OLE32!CComCatalog::TryToLoadCLB +#ifndef NSIS_SUPPORT_GETDLLVERSION + "VERSION\0" +#endif ; const char *dll; for (dll = preload; dll[0]; dll += lstrlenA(dll) + 1)