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)