nsis-commits — SVN commit list

[NSIS-commits] SF.net SVN: nsis:[7391] NSIS/trunk/Examples/makensis.nsi

[<and...@us...>]

Revision: 7391
          http://sourceforge.net/p/nsis/code/7391
Author:   anders_k
Date:     2023-05-21 19:22:39 +0000 (Sun, 21 May 2023)
Log Message:
-----------
Installer header image on the right

Modified Paths:
--------------
    NSIS/trunk/Examples/makensis.nsi

Modified: NSIS/trunk/Examples/makensis.nsi
===================================================================
--- NSIS/trunk/Examples/makensis.nsi	2023-05-21 17:24:55 UTC (rev 7390)
+++ NSIS/trunk/Examples/makensis.nsi	2023-05-21 19:22:39 UTC (rev 7391)
@@ -71,7 +71,8 @@
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis3-branding.bmp"
+!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis3-branding-r.bmp"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nsis3-branding.bmp"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7390] NSIS/trunk/Source

[<and...@us...>]

Revision: 7390
          http://sourceforge.net/p/nsis/code/7390
Author:   anders_k
Date:     2023-05-21 17:24:55 +0000 (Sun, 21 May 2023)
Log Message:
-----------
Added internal pragma to dump compiler state

Modified Paths:
--------------
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/build.h
    NSIS/trunk/Source/scriptpp.cpp

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2023-05-21 16:27:44 UTC (rev 7389)
+++ NSIS/trunk/Source/build.cpp	2023-05-21 17:24:55 UTC (rev 7390)
@@ -3462,6 +3462,24 @@
       int succ, num = line.gettoken_intx(4, &succ);SCRIPT_MSG(_T("%#x %d\n"),num,succ);
       return ((succ ? definedlist.set_si32(name, num) : definedlist.set(name, _T(""))), rvSucc);
     }
+    if (line.gettoken_enum(2, _T("dump\0")) == 0)
+    {
+      if (line.gettoken_enum(3, _T("defines\0")) == 0)
+      {
+        for (UINT i = 0, c = definedlist.getnum(); i < c; ++i)
+          SCRIPT_MSG(_T("%") NPRIs _T("=%") NPRIs _T("\n"), definedlist.getname(i), definedlist.getvalue(i));
+      }
+      else if (line.gettoken_enum(3, _T("macros\0")) == 0)
+      {
+        const TCHAR *mnam;
+        for (size_t i = 0; (mnam = GetMacro(i)) != 0; ++i)
+          SCRIPT_MSG(_T("%") NPRIs _T("\n"), mnam);
+      }
+      else
+      {
+        SCRIPT_MSG(_T("V=%d\n"), get_verbosity());
+      }
+    }
     return rvErr;
   }
 

Modified: NSIS/trunk/Source/build.h
===================================================================
--- NSIS/trunk/Source/build.h	2023-05-21 16:27:44 UTC (rev 7389)
+++ NSIS/trunk/Source/build.h	2023-05-21 17:24:55 UTC (rev 7390)
@@ -332,6 +332,7 @@
     int parseScript();
     int includeScript(const TCHAR *f, NStreamEncoding&enc);
     TCHAR* GetMacro(const TCHAR *macroname, TCHAR**macroend = 0);
+    TCHAR* GetMacro(size_t idx);
     bool MacroExists(const TCHAR *macroname) { return !!GetMacro(macroname); }
     LANGID ParseLangIdParameter(const LineParser&line, int token);
     int LoadLicenseFile(const TCHAR *file, TCHAR** pdata, const TCHAR *cmdname, WORD AnsiCP);

Modified: NSIS/trunk/Source/scriptpp.cpp
===================================================================
--- NSIS/trunk/Source/scriptpp.cpp	2023-05-21 16:27:44 UTC (rev 7389)
+++ NSIS/trunk/Source/scriptpp.cpp	2023-05-21 17:24:55 UTC (rev 7390)
@@ -259,6 +259,21 @@
   return 0;
 }
 
+TCHAR* CEXEBuild::GetMacro(size_t idx)
+{
+  TCHAR *t = (TCHAR*)m_macros.get(), *mbeg, *mbufbeg = t;
+  for (size_t i = 0, cbAll = m_macros.getlen(); t && *t; ++t)
+  {
+    if ((size_t)t - (size_t)mbufbeg >= cbAll) break;
+    if (i++ == idx) return t;
+    t += _tcslen(t) + 1; // advance over macro name
+    while (*t) t += _tcslen(t) + 1; // advance over parameters
+    t++; // Separator between parameters and data
+    while (*t) t += _tcslen(t) + 1; // advance over data
+  }
+  return 0;
+}
+
 int CEXEBuild::pp_macro(LineParser&line)
 {
   const TCHAR*const macroname = line.gettoken_str(1), *tokstr;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7389] NSIS/trunk

[<and...@us...>]

Revision: 7389
          http://sourceforge.net/p/nsis/code/7389
Author:   anders_k
Date:     2023-05-21 16:27:44 +0000 (Sun, 21 May 2023)
Log Message:
-----------
Fixed mingw-w64 12 warnings (patch #310)

Modified Paths:
--------------
    NSIS/trunk/Contrib/Makensisw/utils.h
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/exehead/exec.c

Modified: NSIS/trunk/Contrib/Makensisw/utils.h
===================================================================
--- NSIS/trunk/Contrib/Makensisw/utils.h	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Contrib/Makensisw/utils.h	2023-05-21 16:27:44 UTC (rev 7389)
@@ -84,8 +84,8 @@
 void SetDialogFocus(HWND hDlg, HWND hCtl); // Use this and not SetFocus()!
 #define DlgRet(hDlg, val) ( SetWindowLongPtr((hDlg), DWLP_MSGRESULT, (val)) | TRUE )
 HWND GetComboEdit(HWND hCB);
-#define DisableItems(hwnd) EnableDisableItems(((hwnd), 0))
-#define EnableItems(hwnd) EnableDisableItems(((hwnd), 1))
+#define DisableItems(hwnd) EnableDisableItems(((void)(hwnd), 0))
+#define EnableItems(hwnd) EnableDisableItems(((void)(hwnd), 1))
 void EnableDisableItems(int on);
 bool OpenRegSettingsKey(HKEY &hKey, bool create = false);
 #define CreateRegSettingsKey(refhkey) OpenRegSettingsKey((refhkey), true)

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Docs/src/history.but	2023-05-21 16:27:44 UTC (rev 7389)
@@ -40,7 +40,7 @@
 
 \b Fixed halibut \#{fprintf format security}compiler warnings (\W{http://sf.net/p/nsis/patches/304}{patch #304})
 
-\b Fixed various issues with very old and new GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275}, \W{http://sf.net/p/nsis/patches/307}{patch #307})
+\b Fixed various issues with very old and new GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275}, \W{http://sf.net/p/nsis/patches/307}{patch #307}, \W{http://sf.net/p/nsis/patches/310}{patch #310})
 
 \b Disable stub relocations in newer GCC (\W{http://sf.net/p/nsis/bugs/1283}{bug #1283})
 

Modified: NSIS/trunk/Source/exehead/exec.c
===================================================================
--- NSIS/trunk/Source/exehead/exec.c	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Source/exehead/exec.c	2023-05-21 16:27:44 UTC (rev 7389)
@@ -271,7 +271,14 @@
   //var4 = g_usrvars[parm4];
   //var5 = g_usrvars[parm5];
 
+#if __GNUC__ >= 12
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
   g_parms = lent.offsets;
+#if __GNUC__ >= 12
+#pragma GCC diagnostic pop
+#endif
 
   switch (which)
   {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7388] NSIS/trunk

[<and...@us...>]

Revision: 7388
          http://sourceforge.net/p/nsis/code/7388
Author:   anders_k
Date:     2023-05-21 16:15:16 +0000 (Sun, 21 May 2023)
Log Message:
-----------
Use isolated uninstaller temp directory

Modified Paths:
--------------
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/exehead/Main.c
    NSIS/trunk/Source/exehead/util.c

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2023-04-06 17:12:28 UTC (rev 7387)
+++ NSIS/trunk/Docs/src/history.but	2023-05-21 16:15:16 UTC (rev 7388)
@@ -10,6 +10,10 @@
 
 \S1{v3.09-cl} Changelog
 
+\S2{} Major Changes
+
+\b Use isolated uninstaller directory for every instance
+
 \S2{} Minor Changes
 
 \b Added \R{assert}{!assert}

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2023-04-06 17:12:28 UTC (rev 7387)
+++ NSIS/trunk/Source/build.cpp	2023-05-21 16:15:16 UTC (rev 7388)
@@ -2326,8 +2326,8 @@
 #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
   if (uninstall_mode)
   {
-    cur_header->str_uninstchild = add_asciistring(_T("$TEMP\\Un_$1.exe"));
-    cur_header->str_uninstcmd = add_asciistring(_T("\"$TEMP\\Un_$1.exe\" $0 _?=$INSTDIR\\"));
+    cur_header->str_uninstchild = add_asciistring(_T("$TEMP\\Un.exe"));
+    cur_header->str_uninstcmd = add_asciistring(_T("\"$TEMP\\Un.exe\" $0 _?=$INSTDIR\\"));
   }
 #endif//NSIS_CONFIG_UNINSTALL_SUPPORT
 #ifdef NSIS_SUPPORT_MOVEONREBOOT

Modified: NSIS/trunk/Source/exehead/Main.c
===================================================================
--- NSIS/trunk/Source/exehead/Main.c	2023-04-06 17:12:28 UTC (rev 7387)
+++ NSIS/trunk/Source/exehead/Main.c	2023-05-21 16:15:16 UTC (rev 7388)
@@ -348,60 +348,69 @@
     }
     else
     {
-      int x, admin = UserIsAdminGrpMember();
+      int admin = UserIsAdminGrpMember();
+      WORD tries; // 0xfffe attempts or bust
+      size_t cchtmpslash = mystrlen(state_temp_dir);
+      LPTSTR unexe = g_usrvars[5], unexecmd = g_usrvars[6];
 
-      mystrcat(state_temp_dir,_T("~nsu"));
-      if (admin) mystrcat(state_temp_dir,_T("A")); // Don't lock down the directory used by non-admins
-      mystrcat(state_temp_dir,_T(".tmp"));
-
-      // check if already running from uninstaller temp dir
-      // this prevents recursive uninstaller calls
-      if (!lstrcmpi(state_temp_dir,state_exe_directory))
-        goto end;
-
-      admin ? CreateRestrictedDirectory(state_temp_dir) : CreateNormalDirectory(state_temp_dir);
-      SetCurrentDirectory(state_temp_dir);
-
+      mystrcpy(g_usrvars[0], realcmds);
       if (!(*state_install_directory))
-        mystrcpy(state_install_directory,state_exe_directory);
+      {
+        mystrcpy(state_install_directory, state_exe_directory);
+      }
 
-      mystrcpy(g_usrvars[0], realcmds);
-      SET2CHAR(g_usrvars[1], _T("A\0"));
-
-      for (x = 0; x < 26; x ++)
+      for (tries = 0; ++tries != 0;)
       {
-        static TCHAR buf2[NSIS_MAX_STRLEN];
+        DWORD retry = 0, ec;
+retry_un_dir:
+        wsprintf(state_temp_dir + cchtmpslash, _T("~nsu%X.tmp"), tries);
+        GetNSISString(unexe, g_header->str_uninstchild); // '$TEMP\Un.exe'
+        if (admin)
+        {
+          ec = CreateRestrictedDirectory(state_temp_dir);
+        }
+        else
+        {
+          ec = CreateNormalDirectory(state_temp_dir);
+        }
 
-        GetNSISString(buf2,g_header->str_uninstchild); // $TEMP\Un_$1.exe
-
-        DeleteFile(buf2); // clean up after all the other ones if they are there
-
-        if (m_Err) // not done yet
+        if (ec)
         {
-          // copy file
-          if (CopyFile(state_exe_path,buf2,TRUE))
+          // Delete previous uninstaller
+          if (DeleteFile(unexe))
           {
-            HANDLE hProc;
+            myDelete(state_temp_dir, DEL_DIR|DEL_RECURSE);
+            if (!retry++) goto retry_un_dir;
+          }
+        }
+        else
+        {
+          HANDLE hProc;
+          SetCurrentDirectory(state_temp_dir);
 #ifdef NSIS_SUPPORT_MOVEONREBOOT
-            MoveFileOnReboot(buf2,NULL);
+          MoveFileOnReboot(state_temp_dir, NULL);
 #endif
-            GetNSISString(buf2,g_header->str_uninstcmd); // '"$TEMP\Un_$1.exe" $0 _?=$INSTDIR\'
-            hProc=myCreateProcess(buf2);
+          if (CopyFile(state_exe_path, unexe, TRUE))
+          {
+#ifdef NSIS_SUPPORT_MOVEONREBOOT
+            MoveFileOnReboot(unexe, NULL);
+#endif
+            GetNSISString(unexecmd, g_header->str_uninstcmd); // '"$TEMP\Un.exe" $0 _?=$INSTDIR\'
+            hProc = myCreateProcess(unexecmd);
             if (hProc)
             {
               CloseHandle(hProc);
-              // success
-              m_Err = 0;
+              m_Err = 0; // Success
             }
+            else if (!retry++ && !file_exists(unexe))
+            {
+              // Another instance deleted us between CopyFile and CreateProcess
+              goto retry_un_dir;
+            }
           }
+          break; // We called CreateProcess; success or failure, we are done.
         }
-        (*(((NSIS_STRING *)g_usrvars)[1]))++;
       }
-
-#ifdef NSIS_SUPPORT_MOVEONREBOOT
-      MoveFileOnReboot(state_temp_dir,NULL);
-#endif
-
       goto end;
     }
   }

Modified: NSIS/trunk/Source/exehead/util.c
===================================================================
--- NSIS/trunk/Source/exehead/util.c	2023-04-06 17:12:28 UTC (rev 7387)
+++ NSIS/trunk/Source/exehead/util.c	2023-05-21 16:15:16 UTC (rev 7388)
@@ -68,14 +68,10 @@
 
 DWORD NSISCALL CreateRestrictedDirectory(LPCTSTR path)
 {
-  const SECURITY_INFORMATION si = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION|PROTECTED_DACL_SECURITY_INFORMATION;
   PSID admingrpsid = GetAdminGrpSid();
   SECURITY_DESCRIPTOR sd = { 1, 0, SE_DACL_PRESENT, admingrpsid, admingrpsid, NULL, GetAdminGrpAcl() };
   SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), &sd, FALSE };
-  DWORD ec = CreateDirectory(path, &sa) ? ERROR_SUCCESS : GetLastError();
-  if (ERROR_ALREADY_EXISTS == ec)
-    ec = SetFileSecurity(path, si, &sd) ? ERROR_SUCCESS : GetLastError();
-  return ec;
+  return CreateDirectory(path, &sa) ? ERROR_SUCCESS : GetLastError();
 }
 DWORD NSISCALL CreateNormalDirectory(LPCTSTR path)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7387] NSIS/trunk/.github/workflows/build.yml

[<ki...@us...>]

Revision: 7387
          http://sourceforge.net/p/nsis/code/7387
Author:   kichik
Date:     2023-04-06 17:12:28 +0000 (Thu, 06 Apr 2023)
Log Message:
-----------
Windows 2022 can't find VC

Modified Paths:
--------------
    NSIS/trunk/.github/workflows/build.yml

Modified: NSIS/trunk/.github/workflows/build.yml
===================================================================
--- NSIS/trunk/.github/workflows/build.yml	2023-04-06 16:49:21 UTC (rev 7386)
+++ NSIS/trunk/.github/workflows/build.yml	2023-04-06 17:12:28 UTC (rev 7387)
@@ -10,7 +10,7 @@
     strategy:
       matrix:
         python-version: ['2.x', '3.x']
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
+        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019]  # TODO fails to find VC windows-2022
         log: [yes, no]
         include:
           - nightly: nightly

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7386] NSIS/trunk/.github/workflows/build.yml

[<ki...@us...>]

Revision: 7386
          http://sourceforge.net/p/nsis/code/7386
Author:   kichik
Date:     2023-04-06 16:49:21 +0000 (Thu, 06 Apr 2023)
Log Message:
-----------
Remove deprecated runners

Modified Paths:
--------------
    NSIS/trunk/.github/workflows/build.yml

Modified: NSIS/trunk/.github/workflows/build.yml
===================================================================
--- NSIS/trunk/.github/workflows/build.yml	2023-04-06 16:38:03 UTC (rev 7385)
+++ NSIS/trunk/.github/workflows/build.yml	2023-04-06 16:49:21 UTC (rev 7386)
@@ -10,7 +10,7 @@
     strategy:
       matrix:
         python-version: ['2.x', '3.x']
-        os: [ubuntu-18.04, macos-10.15, windows-2019]
+        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
         log: [yes, no]
         include:
           - nightly: nightly

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7385] NSIS/trunk/.github/workflows/copy-svn.yml

[<ki...@us...>]

Revision: 7385
          http://sourceforge.net/p/nsis/code/7385
Author:   kichik
Date:     2023-04-06 16:38:03 +0000 (Thu, 06 Apr 2023)
Log Message:
-----------
Fix GitHub Actions deprecations

Modified Paths:
--------------
    NSIS/trunk/.github/workflows/copy-svn.yml

Modified: NSIS/trunk/.github/workflows/copy-svn.yml
===================================================================
--- NSIS/trunk/.github/workflows/copy-svn.yml	2023-02-15 17:10:02 UTC (rev 7384)
+++ NSIS/trunk/.github/workflows/copy-svn.yml	2023-04-06 16:38:03 UTC (rev 7385)
@@ -8,7 +8,7 @@
   workflow_dispatch:
     inputs:
       force:
-        description: 'Force push (CAREFUL!)'     
+        description: 'Force push (CAREFUL!)'
         required: false
   schedule:
     - cron:  '4 10 * * *'
@@ -15,7 +15,7 @@
 
 jobs:
   copy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
@@ -37,14 +37,14 @@
             git rm -rf --cached .
             git add .github/workflows/*
             git commit -m "Empty cache"
-            echo '::set-output name=cache-hit::false'
+            echo "cache-hit=false" >> $GITHUB_OUTPUT
           fi
           
           if [ -f svn2git-cache.tar.gz ]; then
             tar xzf svn2git-cache.tar.gz
-            echo '::set-output name=cache-hit::true'
+            echo "cache-hit=true" >> $GITHUB_OUTPUT
           else
-            echo '::set-output name=cache-hit::false'
+            echo "cache-hit=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Initial SVN clone
@@ -79,14 +79,14 @@
           git for-each-ref --format="%(refname:short) %(objectname)" refs/remotes/origin/tags \
           | while read BRANCH REF
             do
-                  TAG_NAME=`echo $BRANCH | cut -d / -f 3-`
-                  BODY="$(git log -1 --format=format:%B $REF)"
-                  echo "ref=$REF parent=$(git rev-parse $REF^) tagname=$TAG_NAME body=$BODY" >&2
-                  if [ $(git tag -l "$TAG_NAME") ]; then
-                    echo tag already exists
-                  else
-                    git tag -a -m "$BODY" $TAG_NAME $REF^
-                  fi
+              TAG_NAME=`echo $BRANCH | cut -d / -f 3-`
+              BODY="$(git log -1 --format=format:%B $REF)"
+              echo "ref=$REF parent=$(git rev-parse $REF^) tagname=$TAG_NAME body=$BODY" >&2
+              if [ $(git tag -l "$TAG_NAME") ]; then
+                echo tag already exists
+              else
+                git tag -a -m "$BODY" $TAG_NAME $REF^
+              fi
             done
 
       - name: Setup GitHub access

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7384] nsisweb/trunk/mediawiki/extensions

[<ki...@us...>]

Revision: 7384
          http://sourceforge.net/p/nsis/code/7384
Author:   kichik
Date:     2023-02-15 17:10:02 +0000 (Wed, 15 Feb 2023)
Log Message:
-----------
More 1.35 fixes

Modified Paths:
--------------
    nsisweb/trunk/mediawiki/extensions/ForumRSS.php
    nsisweb/trunk/mediawiki/extensions/NSISDev.php
    nsisweb/trunk/mediawiki/extensions/NewsRSS.php

Modified: nsisweb/trunk/mediawiki/extensions/ForumRSS.php
===================================================================
--- nsisweb/trunk/mediawiki/extensions/ForumRSS.php	2023-02-03 06:07:55 UTC (rev 7383)
+++ nsisweb/trunk/mediawiki/extensions/ForumRSS.php	2023-02-15 17:10:02 UTC (rev 7384)
@@ -9,7 +9,7 @@
 
 function ForumRSS() {
 	global $wgParser;
-	$wgParser->disableCache();
+	$wgParser->getOutput()->updateCacheExpiry(0);
 	return file_get_contents('/home/project-web/nsis/forum.rss.html');
 }
 

Modified: nsisweb/trunk/mediawiki/extensions/NSISDev.php
===================================================================
--- nsisweb/trunk/mediawiki/extensions/NSISDev.php	2023-02-03 06:07:55 UTC (rev 7383)
+++ nsisweb/trunk/mediawiki/extensions/NSISDev.php	2023-02-15 17:10:02 UTC (rev 7384)
@@ -11,7 +11,7 @@
 
 function getTimeStamp($file) {
 	global $wgParser;
-	$wgParser->disableCache();
+	$wgParser->getOutput()->updateCacheExpiry(0);
 	return gmdate('D, d M Y, H:i', filemtime($file)) . ' GMT';
 }
 
@@ -32,7 +32,7 @@
 	$wgThisLink = $wgTitle->getText();
 
 	// Disable cache
-	$wgParser->disableCache();
+	$wgParser->getOutput()->updateCacheExpiry(0);
 
 	// Initialize output
 	$output = '';

Modified: nsisweb/trunk/mediawiki/extensions/NewsRSS.php
===================================================================
--- nsisweb/trunk/mediawiki/extensions/NewsRSS.php	2023-02-03 06:07:55 UTC (rev 7383)
+++ nsisweb/trunk/mediawiki/extensions/NewsRSS.php	2023-02-15 17:10:02 UTC (rev 7384)
@@ -9,7 +9,7 @@
 
 function NewsRSS() {
 	global $wgParser;
-	$wgParser->disableCache();
+	$wgParser->getOutput()->updateCacheExpiry(0);
 	return file_get_contents('/home/project-web/nsis/news.rss.html');
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7383] nsisweb/trunk/mediawiki

[<ki...@us...>]

Revision: 7383
          http://sourceforge.net/p/nsis/code/7383
Author:   kichik
Date:     2023-02-03 06:07:55 +0000 (Fri, 03 Feb 2023)
Log Message:
-----------
MediaWiki 1.35.9

Modified Paths:
--------------
    nsisweb/trunk/mediawiki/LocalSettings.php
    nsisweb/trunk/mediawiki/extensions/Twitter.php
    nsisweb/trunk/mediawiki/skins/nsis/NSIS.php

Modified: nsisweb/trunk/mediawiki/LocalSettings.php
===================================================================
--- nsisweb/trunk/mediawiki/LocalSettings.php	2023-01-26 13:51:19 UTC (rev 7382)
+++ nsisweb/trunk/mediawiki/LocalSettings.php	2023-02-03 06:07:55 UTC (rev 7383)
@@ -54,8 +54,10 @@
 $wgFileExtensions   = array( 'png', 'gif', 'jpg', 'jpeg', 'zip', '7z', 'nsi', 'nsh' );
 
 $wgEmergencyContact = "ki...@us...";
-$wgPasswordSender	= "ki...@us...";
+$wgPasswordSender   = "ki...@us...";
 
+$wgServer           = "https://nsis.sourceforge.io";
+
 require_once("/home/project-web/nsis/nsisweb.cfg.php");
 
 

Modified: nsisweb/trunk/mediawiki/extensions/Twitter.php
===================================================================
--- nsisweb/trunk/mediawiki/extensions/Twitter.php	2023-01-26 13:51:19 UTC (rev 7382)
+++ nsisweb/trunk/mediawiki/extensions/Twitter.php	2023-02-03 06:07:55 UTC (rev 7383)
@@ -9,7 +9,7 @@
 
 function Twitter($input) {
         global $wgParser;
-        $wgParser->disableCache();
+        $wgParser->getOutput()->updateCacheExpiry(0);
         if (!is_numeric($input))
                 return '';
         return '<a class="twitter-timeline" href="https://twitter.com/nsis_tweets" data-widget-id="' . $input . '">Tweets by @nsis_tweets</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>';

Modified: nsisweb/trunk/mediawiki/skins/nsis/NSIS.php
===================================================================
--- nsisweb/trunk/mediawiki/skins/nsis/NSIS.php	2023-01-26 13:51:19 UTC (rev 7382)
+++ nsisweb/trunk/mediawiki/skins/nsis/NSIS.php	2023-02-03 06:07:55 UTC (rev 7383)
@@ -130,7 +130,7 @@
    */
   function execute() {
 		// Suppress warnings to prevent notices about missing indexes in $this->data
-		wfSuppressWarnings();
+		Wikimedia\AtEase\AtEase::suppressWarnings();
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php 
@@ -308,7 +308,7 @@
   </body>
 </html>
 <?php
-	wfRestoreWarnings();
+	Wikimedia\AtEase\AtEase::suppressWarnings($end=true);
 	}
 }
 ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7382] NSIS/trunk

[<and...@us...>]

Revision: 7382
          http://sourceforge.net/p/nsis/code/7382
Author:   anders_k
Date:     2023-01-26 13:51:19 +0000 (Thu, 26 Jan 2023)
Log Message:
-----------
(C) 2023

Modified Paths:
--------------
    NSIS/trunk/COPYING
    NSIS/trunk/Contrib/ExDLL/nsis_tchar.h
    NSIS/trunk/Contrib/InstallOptions/Readme.html
    NSIS/trunk/Contrib/Makensisw/lookup.cpp
    NSIS/trunk/Contrib/Makensisw/makensisw.h
    NSIS/trunk/Contrib/Makensisw/wndspy.cpp
    NSIS/trunk/Contrib/Modern UI/License.txt
    NSIS/trunk/Contrib/Modern UI/Readme.html
    NSIS/trunk/Contrib/Modern UI/System.nsh
    NSIS/trunk/Contrib/Modern UI 2/License.txt
    NSIS/trunk/Contrib/Modern UI 2/MUI2.nsh
    NSIS/trunk/Contrib/Modern UI 2/Readme.html
    NSIS/trunk/Contrib/MultiUser/MultiUser.nsh
    NSIS/trunk/Contrib/SubStart/substart.c
    NSIS/trunk/Contrib/System/Source/Call-amd64.S
    NSIS/trunk/Contrib/System/Source/Call.S
    NSIS/trunk/Contrib/System/System.html
    NSIS/trunk/Contrib/nsExec/nsexec.c
    NSIS/trunk/Docs/src/config.but
    NSIS/trunk/Include/LangFile.nsh
    NSIS/trunk/Include/VB6RunTime.nsh
    NSIS/trunk/Source/7zip/7zGuids.cpp
    NSIS/trunk/Source/7zip/7zip/Common/InBuffer.cpp
    NSIS/trunk/Source/7zip/7zip/Common/InBuffer.h
    NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.cpp
    NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.h
    NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.cpp
    NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
    NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMA.h
    NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
    NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
    NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
    NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
    NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
    NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
    NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
    NSIS/trunk/Source/7zip/7zip/ICoder.h
    NSIS/trunk/Source/7zip/7zip/IStream.h
    NSIS/trunk/Source/7zip/Common/Alloc.cpp
    NSIS/trunk/Source/7zip/Common/Alloc.h
    NSIS/trunk/Source/7zip/Common/CRC.cpp
    NSIS/trunk/Source/7zip/Common/CRC.h
    NSIS/trunk/Source/7zip/Common/Defs.h
    NSIS/trunk/Source/7zip/Common/MyCom.h
    NSIS/trunk/Source/7zip/Common/MyGuidDef.h
    NSIS/trunk/Source/7zip/Common/MyUnknown.h
    NSIS/trunk/Source/7zip/Common/MyWindows.h
    NSIS/trunk/Source/7zip/Common/StdAfx.h
    NSIS/trunk/Source/7zip/Common/Types.h
    NSIS/trunk/Source/7zip/LZMADecode.c
    NSIS/trunk/Source/7zip/LZMADecode.h
    NSIS/trunk/Source/BinInterop.cpp
    NSIS/trunk/Source/BinInterop.h
    NSIS/trunk/Source/DialogTemplate.cpp
    NSIS/trunk/Source/DialogTemplate.h
    NSIS/trunk/Source/Platform.h
    NSIS/trunk/Source/Plugins.cpp
    NSIS/trunk/Source/Plugins.h
    NSIS/trunk/Source/ResourceEditor.cpp
    NSIS/trunk/Source/ResourceEditor.h
    NSIS/trunk/Source/ResourceVersionInfo.cpp
    NSIS/trunk/Source/ResourceVersionInfo.h
    NSIS/trunk/Source/ShConstants.cpp
    NSIS/trunk/Source/ShConstants.h
    NSIS/trunk/Source/afxres.h
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/build.h
    NSIS/trunk/Source/bzip2/blocksort.c
    NSIS/trunk/Source/bzip2/bzlib.c
    NSIS/trunk/Source/bzip2/bzlib.h
    NSIS/trunk/Source/bzip2/compress.c
    NSIS/trunk/Source/bzip2/decompress.c
    NSIS/trunk/Source/bzip2/huffman.c
    NSIS/trunk/Source/cbzip2.h
    NSIS/trunk/Source/clzma.cpp
    NSIS/trunk/Source/clzma.h
    NSIS/trunk/Source/compressor.h
    NSIS/trunk/Source/crc32.c
    NSIS/trunk/Source/crc32.h
    NSIS/trunk/Source/czlib.h
    NSIS/trunk/Source/dirreader.cpp
    NSIS/trunk/Source/dirreader.h
    NSIS/trunk/Source/exehead/Main.c
    NSIS/trunk/Source/exehead/Ui.c
    NSIS/trunk/Source/exehead/afxres.h
    NSIS/trunk/Source/exehead/api.h
    NSIS/trunk/Source/exehead/bgbg.c
    NSIS/trunk/Source/exehead/components.c
    NSIS/trunk/Source/exehead/components.h
    NSIS/trunk/Source/exehead/config.h
    NSIS/trunk/Source/exehead/exec.c
    NSIS/trunk/Source/exehead/exec.h
    NSIS/trunk/Source/exehead/fileform.c
    NSIS/trunk/Source/exehead/fileform.h
    NSIS/trunk/Source/exehead/lang.h
    NSIS/trunk/Source/exehead/plugin.c
    NSIS/trunk/Source/exehead/plugin.h
    NSIS/trunk/Source/exehead/state.h
    NSIS/trunk/Source/exehead/ui.h
    NSIS/trunk/Source/exehead/util.c
    NSIS/trunk/Source/exehead/util.h
    NSIS/trunk/Source/fileform.cpp
    NSIS/trunk/Source/fileform.h
    NSIS/trunk/Source/growbuf.cpp
    NSIS/trunk/Source/growbuf.h
    NSIS/trunk/Source/icon.cpp
    NSIS/trunk/Source/icon.h
    NSIS/trunk/Source/lang.cpp
    NSIS/trunk/Source/lang.h
    NSIS/trunk/Source/lineparse.cpp
    NSIS/trunk/Source/lineparse.h
    NSIS/trunk/Source/makenssi.cpp
    NSIS/trunk/Source/manifest.cpp
    NSIS/trunk/Source/manifest.h
    NSIS/trunk/Source/mmap.cpp
    NSIS/trunk/Source/mmap.h
    NSIS/trunk/Source/script.cpp
    NSIS/trunk/Source/scriptpp.cpp
    NSIS/trunk/Source/strlist.cpp
    NSIS/trunk/Source/strlist.h
    NSIS/trunk/Source/tchar.h
    NSIS/trunk/Source/tokens.cpp
    NSIS/trunk/Source/tokens.h
    NSIS/trunk/Source/tstring.cpp
    NSIS/trunk/Source/tstring.h
    NSIS/trunk/Source/uservars.h
    NSIS/trunk/Source/utf.cpp
    NSIS/trunk/Source/utf.h
    NSIS/trunk/Source/util.cpp
    NSIS/trunk/Source/util.h
    NSIS/trunk/Source/validateunicode.cpp
    NSIS/trunk/Source/validateunicode.h
    NSIS/trunk/Source/winchar.cpp
    NSIS/trunk/Source/winchar.h
    NSIS/trunk/Source/writer.cpp
    NSIS/trunk/Source/writer.h
    NSIS/trunk/Source/zlib/INFBLOCK.C
    NSIS/trunk/Source/zlib/ZCONF.H
    NSIS/trunk/Source/zlib/ZLIB.H
    NSIS/trunk/Source/zlib/ZUTIL.H

Modified: NSIS/trunk/COPYING
===================================================================
--- NSIS/trunk/COPYING	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/COPYING	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1999-2022 Contributors
+Copyright (C) 1999-2023 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 

Modified: NSIS/trunk/Contrib/ExDLL/nsis_tchar.h
===================================================================
--- NSIS/trunk/Contrib/ExDLL/nsis_tchar.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/ExDLL/nsis_tchar.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.

Modified: NSIS/trunk/Contrib/InstallOptions/Readme.html
===================================================================
--- NSIS/trunk/Contrib/InstallOptions/Readme.html	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/InstallOptions/Readme.html	2023-01-26 13:51:19 UTC (rev 7382)
@@ -885,7 +885,7 @@
         <pre>
 Original version Copyright &copy; 2001 Michael Bishop
 DLL version 1 Copyright &copy; 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright &copy; 2003-2022 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright &copy; 2003-2023 Amir Szekely, Joost Verburg, Dave Laundon
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

Modified: NSIS/trunk/Contrib/Makensisw/lookup.cpp
===================================================================
--- NSIS/trunk/Contrib/Makensisw/lookup.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Makensisw/lookup.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Anders Kjersem
+// Copyright (C) 2020-2023 Anders Kjersem
 //
 // This file is a part of NSIS.
 //

Modified: NSIS/trunk/Contrib/Makensisw/makensisw.h
===================================================================
--- NSIS/trunk/Contrib/Makensisw/makensisw.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Makensisw/makensisw.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-  Unicode support by Jim Park -- 08/10/2007
 */
 #ifndef MAKENSIS_H
 #define MAKENSIS_H

Modified: NSIS/trunk/Contrib/Makensisw/wndspy.cpp
===================================================================
--- NSIS/trunk/Contrib/Makensisw/wndspy.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Makensisw/wndspy.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Anders Kjersem
+// Copyright (C) 2018-2023 Anders Kjersem
 //
 // This file is a part of NSIS.
 //

Modified: NSIS/trunk/Contrib/Modern UI/License.txt
===================================================================
--- NSIS/trunk/Contrib/Modern UI/License.txt	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI/License.txt	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,4 +1,4 @@
-Copyright 2002-2022 Joost Verburg
+Copyright 2002-2023 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 

Modified: NSIS/trunk/Contrib/Modern UI/Readme.html
===================================================================
--- NSIS/trunk/Contrib/Modern UI/Readme.html	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI/Readme.html	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1132,7 +1132,7 @@
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2022 Joost Verburg
+Copyright &copy; 2002-2023 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

Modified: NSIS/trunk/Contrib/Modern UI/System.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI/System.nsh	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI/System.nsh	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 1.81
-Copyright 2002-2022 Joost Verburg
+Copyright 2002-2023 Joost Verburg
 
 */
 
@@ -10,7 +10,7 @@
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "1.81"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2022 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2023 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3

Modified: NSIS/trunk/Contrib/Modern UI 2/License.txt
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/License.txt	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI 2/License.txt	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,4 +1,4 @@
-Copyright \xA9 2002-2022 Joost Verburg
+Copyright \xA9 2002-2023 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 

Modified: NSIS/trunk/Contrib/Modern UI 2/MUI2.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/MUI2.nsh	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI 2/MUI2.nsh	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 2.1
-Copyright 2002-2022 Joost Verburg
+Copyright 2002-2023 Joost Verburg
 Contributors: Amir Szekely, Anders Kjersem
 
 */
@@ -11,7 +11,7 @@
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "2.1"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2022 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2023 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3

Modified: NSIS/trunk/Contrib/Modern UI 2/Readme.html
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/Readme.html	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/Modern UI 2/Readme.html	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1134,7 +1134,7 @@
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2022 Joost Verburg
+Copyright &copy; 2002-2023 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

Modified: NSIS/trunk/Contrib/MultiUser/MultiUser.nsh
===================================================================
--- NSIS/trunk/Contrib/MultiUser/MultiUser.nsh	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/MultiUser/MultiUser.nsh	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
 
 Installer configuration for multi-user Windows environments
 
-Copyright 2008-2022 Joost Verburg
+Copyright 2008-2023 Joost Verburg
 
 */
 

Modified: NSIS/trunk/Contrib/SubStart/substart.c
===================================================================
--- NSIS/trunk/Contrib/SubStart/substart.c	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/SubStart/substart.c	2023-01-26 13:51:19 UTC (rev 7382)
@@ -2,7 +2,7 @@
  * substart.c - This app runs the executable of the same name in the 'Bin' 
  *              sub-folder and passes along the command line options.
  *
- * Copyright (c) 2013-2022 Anders Kjersem
+ * Copyright (c) 2013-2023 Anders Kjersem
  *
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Contrib/System/Source/Call-amd64.S
===================================================================
--- NSIS/trunk/Contrib/System/Source/Call-amd64.S	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/System/Source/Call-amd64.S	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,7 +1,7 @@
 ;# 
 ;# This file is a part of NSIS.
 ;#
-;# Copyright (C) 2014-2022 Anders Kjersem
+;# Copyright (C) 2014-2023 Anders Kjersem
 ;#
 ;# Licensed under the zlib/libpng license (the "License");
 ;# you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Contrib/System/Source/Call.S
===================================================================
--- NSIS/trunk/Contrib/System/Source/Call.S	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/System/Source/Call.S	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,5 +1,5 @@
 ;# Copyright (c) 2008 Thomas Gaugler <th...@da...>
-;# Copyright (c) 2008-2022 NSIS Contributors
+;# Copyright (c) 2008-2023 NSIS Contributors
 ;#
 ;# Permission is hereby granted, free of charge, to any person
 ;# obtaining a copy of this software and associated documentation

Modified: NSIS/trunk/Contrib/System/System.html
===================================================================
--- NSIS/trunk/Contrib/System/System.html	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/System/System.html	2023-01-26 13:51:19 UTC (rev 7382)
@@ -29,7 +29,7 @@
 <body>
 <h1>NSIS System Plug-in</h1>
 <p>
-<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2022 NSIS Contributors</i>
+<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2023 NSIS Contributors</i>
 </p>
 
 <h2>Table of Contents</h2>

Modified: NSIS/trunk/Contrib/nsExec/nsexec.c
===================================================================
--- NSIS/trunk/Contrib/nsExec/nsexec.c	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Contrib/nsExec/nsexec.c	2023-01-26 13:51:19 UTC (rev 7382)
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2002 Robert Rainwater <rra...@ya...>
-Copyright (C) 2002-2022 Nullsoft and Contributors
+Copyright (C) 2002-2023 Nullsoft and Contributors
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages

Modified: NSIS/trunk/Docs/src/config.but
===================================================================
--- NSIS/trunk/Docs/src/config.but	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Docs/src/config.but	2023-01-26 13:51:19 UTC (rev 7382)
@@ -8,7 +8,7 @@
 
 \cfg{html-append-meta}{name="viewport" content="width=device-width, initial-scale=1"}
 
-\define{NsisCopyright} Copyright (C) 1999-2022 Contributors
+\define{NsisCopyright} Copyright (C) 1999-2023 Contributors
 
 \copyright \NsisCopyright
 

Modified: NSIS/trunk/Include/LangFile.nsh
===================================================================
--- NSIS/trunk/Include/LangFile.nsh	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Include/LangFile.nsh	2023-01-26 13:51:19 UTC (rev 7382)
@@ -5,7 +5,7 @@
 Header file to create language files that can be
 included with a single command.
 
-Copyright 2008-2022 Joost Verburg, Anders Kjersem
+Copyright 2008-2023 Joost Verburg, Anders Kjersem
 
 * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT
   can be called from the script to include a language file.

Modified: NSIS/trunk/Include/VB6RunTime.nsh
===================================================================
--- NSIS/trunk/Include/VB6RunTime.nsh	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Include/VB6RunTime.nsh	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
 
 Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update
 
-Copyright 2008-2022 Joost Verburg
+Copyright 2008-2023 Joost Verburg
 
 To obtain the run-time files, download and extract
 https://nsis.sourceforge.io/vb6runtime.zip

Modified: NSIS/trunk/Source/7zip/7zGuids.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zGuids.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zGuids.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/InBuffer.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/InBuffer.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/InBuffer.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/InBuffer.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/InBuffer.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/InBuffer.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/OutBuffer.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Common/StreamUtils.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/IMatchFinder.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/IMatchFinder.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZInWindow.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZ/LZOutWindow.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMA.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMA.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMA.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/ICoder.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/ICoder.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/ICoder.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/7zip/IStream.h
===================================================================
--- NSIS/trunk/Source/7zip/7zip/IStream.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/7zip/IStream.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/Alloc.cpp
===================================================================
--- NSIS/trunk/Source/7zip/Common/Alloc.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/Alloc.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/Alloc.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/Alloc.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/Alloc.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/CRC.cpp
===================================================================
--- NSIS/trunk/Source/7zip/Common/CRC.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/CRC.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/CRC.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/CRC.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/CRC.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/Defs.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/Defs.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/Defs.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/MyCom.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/MyCom.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/MyCom.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/MyGuidDef.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/MyGuidDef.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/MyGuidDef.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/MyUnknown.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/MyUnknown.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/MyUnknown.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/MyWindows.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/MyWindows.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/MyWindows.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/StdAfx.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/StdAfx.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/StdAfx.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/Common/Types.h
===================================================================
--- NSIS/trunk/Source/7zip/Common/Types.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/Common/Types.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/LZMADecode.c
===================================================================
--- NSIS/trunk/Source/7zip/LZMADecode.c	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/LZMADecode.c	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/7zip/LZMADecode.h
===================================================================
--- NSIS/trunk/Source/7zip/LZMADecode.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/7zip/LZMADecode.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2022 Amir Szekely <ki...@ne...>
+ * Modifications Copyright (C) 2003-2023 Amir Szekely <ki...@ne...>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/BinInterop.cpp
===================================================================
--- NSIS/trunk/Source/BinInterop.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/BinInterop.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2017-2022 Anders Kjersem
+ * Copyright (C) 2017-2023 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/BinInterop.h
===================================================================
--- NSIS/trunk/Source/BinInterop.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/BinInterop.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2017-2022 Anders Kjersem
+ * Copyright (C) 2017-2023 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/DialogTemplate.cpp
===================================================================
--- NSIS/trunk/Source/DialogTemplate.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/DialogTemplate.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2022 Amir Szekely <ki...@ne...> and Contributors
+ * Copyright (C) 2002-2023 Amir Szekely <ki...@ne...> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/DialogTemplate.h
===================================================================
--- NSIS/trunk/Source/DialogTemplate.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/DialogTemplate.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2022 Amir Szekely <ki...@ne...> and Contributors
+ * Copyright (C) 2002-2023 Amir Szekely <ki...@ne...> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/Platform.h
===================================================================
--- NSIS/trunk/Source/Platform.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/Platform.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/Plugins.cpp
===================================================================
--- NSIS/trunk/Source/Plugins.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/Plugins.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/Plugins.h
===================================================================
--- NSIS/trunk/Source/Plugins.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/Plugins.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ResourceEditor.cpp
===================================================================
--- NSIS/trunk/Source/ResourceEditor.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ResourceEditor.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2022 Amir Szekely <ki...@us...>
+ * Copyright (C) 2002-2023 Amir Szekely <ki...@us...>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ResourceEditor.h
===================================================================
--- NSIS/trunk/Source/ResourceEditor.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ResourceEditor.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2022 Amir Szekely <ki...@us...>
+ * Copyright (C) 2002-2023 Amir Szekely <ki...@us...>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ResourceVersionInfo.cpp
===================================================================
--- NSIS/trunk/Source/ResourceVersionInfo.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ResourceVersionInfo.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ResourceVersionInfo.h
===================================================================
--- NSIS/trunk/Source/ResourceVersionInfo.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ResourceVersionInfo.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ShConstants.cpp
===================================================================
--- NSIS/trunk/Source/ShConstants.cpp	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ShConstants.cpp	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/ShConstants.h
===================================================================
--- NSIS/trunk/Source/ShConstants.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/ShConstants.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -4,7 +4,7 @@
  * This file is a part of NSIS.
  * 
  * Copyright (C) 2003 Ramon
- * Copyright (C) 2003-2022 NSIS Contributors
+ * Copyright (C) 2003-2023 NSIS Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.

Modified: NSIS/trunk/Source/afxres.h
===================================================================
--- NSIS/trunk/Source/afxres.h	2022-12-19 20:19:34 UTC (rev 7381)
+++ NSIS/trunk/Source/afxres.h	2023-01-26 13:51:19 UTC (rev 7382)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2022 Nullsoft and Contributors
+ * Copyright (C) 1999-2023 Nulls...
 
[truncated message content]

[NSIS-commits] SF.net SVN: nsis:[7381] NSIS/trunk

[<and...@us...>]

Revision: 7381
          http://sourceforge.net/p/nsis/code/7381
Author:   anders_k
Date:     2022-12-19 20:19:34 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Updated Ukrainian (patch 308)

Modified Paths:
--------------
    NSIS/trunk/Contrib/Language files/Ukrainian.nlf
    NSIS/trunk/Contrib/Language files/Ukrainian.nsh
    NSIS/trunk/Docs/src/history.but

Modified: NSIS/trunk/Contrib/Language files/Ukrainian.nlf
===================================================================
--- NSIS/trunk/Contrib/Language files/Ukrainian.nlf	2022-12-19 19:59:33 UTC (rev 7380)
+++ NSIS/trunk/Contrib/Language files/Ukrainian.nlf	2022-12-19 20:19:34 UTC (rev 7381)
@@ -1,192 +1,192 @@
-# Header, don't edit
-NLF v6
-# Language ID
-1058
-# Font and size - dash (-) means default
--
--
-# Codepage - dash (-) means ASCII code page
-1251
-# RTL - anything else than RTL means LTR
--
-# Translation by Yuri Holubow, Nash-Soft.com <http://www.Nash-Soft.com>
-# Corrections by Dmitriy Kononchuk [http://gri3ly.kiev.ua]
-# New corrections by Osidach Vitaly
-# ^Branding
-Nullsoft Install System %s
-# ^SetupCaption
-$(^Name) Встановлення
-# ^UninstallCaption
-$(^Name) Видалення
-# ^LicenseSubCaption
-: Ліцензійна угода
-# ^ComponentsSubCaption
-: Опції встановлення
-# ^DirSubCaption
-: Тека встановлення
-# ^InstallingSubCaption
-: Копіювання файлів
-# ^CompletedSubCaption
-: Завершено
-# ^UnComponentsSubCaption
-: Опції видалення
-# ^UnDirSubCaption
-: Тека видалення
-# ^ConfirmSubCaption
-: Підтверждення
-# ^UninstallingSubCaption
-: Видалення файлів
-# ^UnCompletedSubCaption
-: Завершено
-# ^BackBtn
-< &Назад
-# ^NextBtn
-&Далі >
-# ^AgreeBtn
-&Згоден
-# ^AcceptBtn
-Я &приймаю умови Ліцензійної угоди
-# ^DontAcceptBtn
-Я &не приймаю умови Ліцензійної угоди
-# ^InstallBtn
-&Встановити
-# ^UninstallBtn
-Видалити
-# ^CancelBtn
-Скасувати
-# ^CloseBtn
-&Закрити
-# ^BrowseBtn
-О&гляд...
-# ^ShowDetailsBtn
-Подробиці
-# ^ClickNext
-Натисніть Далі щоб продовжити
-# ^ClickInstall
-Натисніть Встановити для початку процессу встановлення
-# ^ClickUninstall
-Натисніть Видалить для початку процессу видалення
-# ^Name
-Ім'я
-# ^Completed
-Завершено
-# ^LicenseText
-Прочитайте умови ліцензійної угоди перед встановленням $(^NameDA). Якщо Ви приймаєте умови угоди, натисніть на кнопку Згоден.
-# ^LicenseTextCB
-Прочитайте умови ліцензійної угоди перед встановленням $(^NameDA). Якщо Ви приймаєте умови угоди, встановіть відмітку у квадратику нижче. $_CLICK
-# ^LicenseTextRB
-Прочитайте умови ліцензійної угоди перед встановленням $(^NameDA). Якщо Ви приймаєте умови угоди, виберіть перший варіант. $_CLICK
-# ^UnLicenseText
-Прочитайте умови ліцензійної угоди перед встановленням $(^NameDA). Якщо Ви приймаєте умови ліцензійної угоди, натисніть на кнопку Згоден.
-# ^UnLicenseTextCB
-Прочитайте умови ліцензійної угоди перед встановленням $(^NameDA). Якщо Ви приймаєте умови угоди, встановіть відмітку у квадратику нижче. $_CLICK
-# ^UnLicenseTextRB
-Прочитайте умови ліцензійної угоди перед видаленням $(^NameDA). Якщо Ви приймаєте умови угоди, виберіть перший варіант. $_CLICK
-# ^Custom
-По вибору
-# ^ComponentsText
-Виберіть які компоненти програми Ви бажаєте встановити. $_CLICK
-# ^ComponentsSubText1
-Виберіть тип встановлення:
-# ^ComponentsSubText2_NoInstTypes
-Виберіть компоненти для встановлення:
-# ^ComponentsSubText2
-Чи, виберіть вручну компоненти, які Ви хочете встановити:
-# ^UnComponentsText
-Виберіть які компоненти Ви бажаєте видалити. Відмітьте компоненти для видалення і зніміть відмітку з тих, які Ви видаляти не бажаєте. $_CLICK
-# ^UnComponentsSubText1
-Виберіть тип видалення:
-# ^UnComponentsSubText2_NoInstTypes
-Вибір компонентів для видалення:
-# ^UnComponentsSubText2
-Чи виберіть компоненти програми для видалення по своєму бажанні:
-# ^DirText
-Программа встановить $(^NameDA) у вказану теку. Для того, щоб встановити программу в іншу теку, натисніть Огляд і вкажіть потрібну теку. $_CLICK
-# ^DirSubText
-Каталог призначення
-# ^DirBrowseText
-Виберіть теку для встановлення $(^NameDA):
-# ^UnDirText
-Программа встановлення видалить $(^NameDA) із вказанної теки. Для того, щоб провести видалення з іншої теки, натисніть Огляд і вкажіть потрібну теку. $_CLICK
-# ^UnDirSubText
-""
-# ^UnDirBrowseText
-Виберіть теку, з якої Ви бажаєте видалити $(^NameDA):
-# ^SpaceAvailable
-"Доступно місця: "
-# ^SpaceRequired
-"Необхідно місця: "
-# ^UninstallingText
-$(^NameDA) буде видаленно з вказаного каталогу. $_CLICK
-# ^UninstallingSubText
-Видалення з:
-# ^FileError
-Неможливо відкрити файл для запису: \r\n\t"$0"\r\nНатисніть Перервати для того, щоб перервати встановлення,\r\nПовторити для того, щоб повторити спробу запису у файл, чи\r\nІгнорувати для того, щоб пропустити цю дію
-# ^FileError_NoIgnore
-Неможливо відкрити файл для запису: \r\n\t"$0"\r\nНатисніть Повторити для того, щоб повторити спробу запису у файл, чи\r\nСкасувати для того, щоб перервати встановлення
-# ^CantWrite
-"Неможливо записати: "
-# ^CopyFailed
-Не вдалося копіювати
-# ^CopyTo
-"Копіювання в "
-# ^Registering
-"Реєстрація: "
-# ^Unregistering
-"Видалення реєстрації: "
-# ^SymbolNotFound
-"Неможливо знайти символ: "
-# ^CouldNotLoad
-"Неможливо завантажити: "
-# ^CreateFolder
-"Створення теки: "
-# ^CreateShortcut
-"Створення ярлика: "
-# ^CreatedUninstaller
-"Створення програми видалення: "
-# ^Delete
-"Видалення файлу: "
-# ^DeleteOnReboot
-"Видалення після перезавантаження: "
-# ^ErrorCreatingShortcut
-"Помилка створення ярлика: "
-# ^ErrorCreating
-"Помилка створення: "
-# ^ErrorDecompressing
-Неможливо витягнути дані. Можливо пошкоджений дистрибутив.
-# ^ErrorRegistering
-Неможливо зареєструвати бібліотеку (DLL)
-# ^ExecShell
-"Виконання команди оболонки: "
-# ^Exec
-"Виконання: "
-# ^Extract
-"Витягнення: "
-# ^ErrorWriting
-"Витягнення: помилка запису файла"
-# ^InvalidOpcode
-Дистрибутив пошкоджений: помилковий код відповіді
-# ^NoOLE
-"Немає OLE для: "
-# ^OutputFolder
-"Тека призначення: "
-# ^RemoveFolder
-"Видалення теки: "
-# ^RenameOnReboot
-"Переіменування після перезаванаження: "
-# ^Rename
-"Перейменування: "
-# ^Skipped
-"Пропущено: "
-# ^CopyDetails
-Копіювати деталі у буфер обміну
-# ^LogInstall
-Записувати в лог процес встновлення
-# byte
-б
-# kilo
- К
-# mega
- М
-# giga
- Г
+# Header, don't edit
+NLF v6
+# Language ID
+1058
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1251
+# RTL - anything else than RTL means LTR
+-
+
+# Translation by Yuri Holubow, Nash-Soft.com, Dmitriy Kononchuk [gri3ly.kiev.ua], Osidach Vitaly and others
+
+# ^Branding
+Система встановлення Nullsoft %s
+# ^SetupCaption
+Встановлення $(^Name)
+# ^UninstallCaption
+Видалення $(^Name)
+# ^LicenseSubCaption
+: Ліцензійна угода
+# ^ComponentsSubCaption
+: Опції встановлення
+# ^DirSubCaption
+: Тека встановлення
+# ^InstallingSubCaption
+: Триває встановлення
+# ^CompletedSubCaption
+: Завершено
+# ^UnComponentsSubCaption
+: Опції видалення
+# ^UnDirSubCaption
+: Тека видалення
+# ^ConfirmSubCaption
+: Підтвердження
+# ^UninstallingSubCaption
+: Триває видалення
+# ^UnCompletedSubCaption
+: Завершено
+# ^BackBtn
+< &Назад
+# ^NextBtn
+&Далі >
+# ^AgreeBtn
+&Погоджуюся
+# ^AcceptBtn
+Я &приймаю умови Ліцензійної угоди
+# ^DontAcceptBtn
+Я &не приймаю умови Ліцензійної угоди
+# ^InstallBtn
+&Встановити
+# ^UninstallBtn
+&Видалити
+# ^CancelBtn
+Скасувати
+# ^CloseBtn
+&Закрити
+# ^BrowseBtn
+О&гляд...
+# ^ShowDetailsBtn
+&Подробиці
+# ^ClickNext
+Натисніть «Далі» для продовження.
+# ^ClickInstall
+Натисніть «Встановити», щоб запустити процес встановлення.
+# ^ClickUninstall
+Натисніть «Видалити», щоб запустити процес видалення.
+# ^Name
+Назва
+# ^Completed
+Завершено
+# ^LicenseText
+Ознайомтеся з ліцензійною угодою перед встановленням $(^NameDA). Якщо ви згодні з усіма умовами угоди, натисніть «Погоджуюся».
+# ^LicenseTextCB
+Ознайомтеся з ліцензійною угодою перед встановленням $(^NameDA). Якщо ви приймаєте умови угоди, встановіть прапорець нижче. $_CLICK
+# ^LicenseTextRB
+Ознайомтеся з ліцензійною угодою перед встановленням $(^NameDA). Якщо ви приймаєте умови угоди, оберіть перший варіант нижче. $_CLICK
+# ^UnLicenseText
+Ознайомтеся з ліцензійною угодою перед видаленням $(^NameDA). Якщо ви згодні з усіма умовами угоди, натисніть «Погоджуюся».
+# ^UnLicenseTextCB
+Ознайомтеся з ліцензійною угодою перед видаленням $(^NameDA). Якщо ви приймаєте умови угоди, встановіть прапорець нижче. $_CLICK
+# ^UnLicenseTextRB
+Ознайомтеся з ліцензійною угодою перед видаленням $(^NameDA). Якщо ви приймаєте умови угоди, оберіть перший варіант нижче. $_CLICK
+# ^Custom
+Власний вибір
+# ^ComponentsText
+Позначте компоненти, які ви хочете встановити, та приберіть позначки з непотрібних. $_CLICK
+# ^ComponentsSubText1
+Виберіть тип встановлення:
+# ^ComponentsSubText2_NoInstTypes
+Виберіть компоненти для встановлення:
+# ^ComponentsSubText2
+Або виберіть необов'язкові компоненти, які ви бажаєте встановити:
+# ^UnComponentsText
+Позначте компоненти, які ви хочете видалити, та приберіть позначки з тих, що потрібно залишити. $_CLICK
+# ^UnComponentsSubText1
+Виберіть тип видалення:
+# ^UnComponentsSubText2_NoInstTypes
+Виберіть компоненти для видалення:
+# ^UnComponentsSubText2
+Або виберіть необов'язкові компоненти, які ви бажаєте видалити:
+# ^DirText
+Програму $(^NameDA) буде встановлено в зазначену теку. Щоб встановити в іншу теку, натисніть «Огляд» і вкажіть потрібну теку. $_CLICK
+# ^DirSubText
+Тека призначення
+# ^DirBrowseText
+Виберіть теку для встановлення $(^NameDA):
+# ^UnDirText
+Програму $(^NameDA) буде видалено із зазначеної теки. Щоб виконати видалення з іншої теки, натисніть «Огляд» і вкажіть потрібну теку. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Виберіть теку, з якої потрібно видалити $(^NameDA):
+# ^SpaceAvailable
+"Доступно місця: "
+# ^SpaceRequired
+"Потрібно місця: "
+# ^UninstallingText
+$(^NameDA) буде видалено з вказаної теки. $_CLICK
+# ^UninstallingSubText
+Видалення з:
+# ^FileError
+Помилка під час відкриття файлу для запису: \r\n\r\n$0\r\n\r\nНатисніть «Перервати», щоб зупинити встановлення,\r\n«Повторити», щоб спробувати знову, або\r\n«Ігнорувати», щоб пропустити цей файл.
+# ^FileError_NoIgnore
+Помилка під час відкриття файлу для запису: \r\n\r\n$0\r\n\r\nНатисніть «Повторити», щоб спробувати знову, або\r\n«Скасувати», щоб зупинити встановлення.
+# ^CantWrite
+"Неможливо записати: "
+# ^CopyFailed
+Не вдалося копіювати
+# ^CopyTo
+"Копіювати до "
+# ^Registering
+"Реєстрація: "
+# ^Unregistering
+"Скасування реєстрації: "
+# ^SymbolNotFound
+"Неможливо знайти символ: "
+# ^CouldNotLoad
+"Неможливо завантажити: "
+# ^CreateFolder
+"Створення теки: "
+# ^CreateShortcut
+"Створення ярлика: "
+# ^CreatedUninstaller
+"Створення програми видалення: "
+# ^Delete
+"Видалення файлу: "
+# ^DeleteOnReboot
+"Видалення після перезавантаження: "
+# ^ErrorCreatingShortcut
+"Помилка створення ярлика: "
+# ^ErrorCreating
+"Помилка створення: "
+# ^ErrorDecompressing
+Помилка розпакування даних! Можливо, пошкоджений файл встановлення.
+# ^ErrorRegistering
+Помилка реєстрації бібліотеки (DLL)
+# ^ExecShell
+"Виконання команди оболонки: "
+# ^Exec
+"Виконання: "
+# ^Extract
+"Розпакування: "
+# ^ErrorWriting
+"Розпакування: помилка запису даних у файл "
+# ^InvalidOpcode
+Пошкоджений файл встановлення: неприпустимий код відповіді
+# ^NoOLE
+"Немає OLE для: "
+# ^OutputFolder
+"Тека призначення: "
+# ^RemoveFolder
+"Видалення теки: "
+# ^RenameOnReboot
+"Перейменувати після перезавантаження: "
+# ^Rename
+"Перейменування: "
+# ^Skipped
+"Пропущено: "
+# ^CopyDetails
+Копіювати подробиці до буфера обміну
+# ^LogInstall
+Зберегти журнал процесу встановлення
+# ^Byte
+Б
+# ^Kilo
+  К
+# ^Mega
+  М
+# ^Giga
+  Г

Modified: NSIS/trunk/Contrib/Language files/Ukrainian.nsh
===================================================================
--- NSIS/trunk/Contrib/Language files/Ukrainian.nsh	2022-12-19 19:59:33 UTC (rev 7380)
+++ NSIS/trunk/Contrib/Language files/Ukrainian.nsh	2022-12-19 20:19:34 UTC (rev 7381)
@@ -1,130 +1,130 @@
 ;Language: Ukrainian (1058)
-;By Yuri Holubow, http://www.Nash-Soft.com
-;Correct by Osidach Vitaly (Vit_Os2)
+;By Yuri Holubow, Nash-Soft.com
+;Corrections by Osidach Vitaly (Vit_Os2) and others
 
 !insertmacro LANGFILE "Ukrainian" = "Українська" "Ukrayins'ka"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ласкаво просимо до Майстра Встановлення $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Дана програма встановить $(^NameDA) на Ваш комп'ютер.$\r$\n$\r$\nРекомендовано закрити всі програми перед початком інсталяції. Це дозволить програмі встановлення оновити системні файли без перезавантаження системи.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ласкаво просимо до встановлення $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ця програма допоможе вам встановити $(^NameDA).$\r$\n$\r$\nРадимо закрити всі інші програми, перш ніж почати встановлення. Завдяки цьому будуть оновлені відповідні системні файли без потреби перезапускати комп’ютер.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ласкаво просимо до Майстра Видалення $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Даний майстер допоможе видалити $(^NameDA).$\r$\n$\r$\nПеред початком видалення, перевірте, чи не запущено $(^NameDA).$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ласкаво просимо до видалення $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ця програма допоможе вам видалити $(^NameDA).$\r$\n$\r$\nПеред початком видалення обов’язково закрийте $(^NameDA).$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ліцензійна Угода"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Перегляньте ліцензію перед встановленням $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Якщо Ви приймаєте всі умови Угоди, натисніть на кнопку Згоден. Ви повинні прийняти умови Угоди для встановлення $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Якщо Ви приймаєте всі умови Угоди, встановіть відмітку у квадратику нижче. Ви повинні прийняти умови Угоди для встановлення $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Якщо Ви приймаєте всі умови Угоди, виберіть перший варіант з тих що нижче. Ви повинні прийняти умови Угоди для встановлення $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ліцензійна угода"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ознайомтеся з умовами ліцензійної угоди перед встановленням $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Якщо ви згодні з умовами угоди, натисніть кнопку «Погоджуюся», щоб продовжити. Ви маєте погодитися з угодою для встановлення $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Якщо ви згодні з умовами угоди, встановіть позначку нижче. Ви маєте погодитися з угодою для встановлення $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Якщо ви згодні з умовами угоди, виберіть перший варіант нижче. Ви маєте погодитися з угодою для встановлення $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ліцензійна угода"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Прочитайте умови ліцензійної угоди перед видаленням $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Якщо Ви приймаєте всі умови Угоди, натисніть на кнопку Згоден. Ви повинні прийняти умови Угоди для видалення $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Якщо Ви приймаєте всі умови Угоди, встановіть відмітку у квадратику нижче. Ви повинні прийняти умови Угоди для видалення $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Якщо Ви приймаєте всі умови Угоди, виберіть перший варіант з тих, що нижче. Ви повинні прийняти умови Угоди для видалення $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ознайомтеся з умовами ліцензійної угоди перед видаленням $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Якщо ви згодні з умовами угоди, натисніть «Погоджуюся» для продовження. Ви маєте погодитися з угодою для видалення $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Якщо ви згодні з умовами угоди, встановіть позначку нижче. Ви маєте погодитися з угодою для видалення $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Якщо ви згодні з умовами угоди, виберіть перший варіант нижче. Ви маєте погодитися з угодою для видалення $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Натисніть PageDown щоб переміститись вниз угоди."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Натисніть клавішу PageDown, щоб переглянути угоду далі."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Оберіть компоненти"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Оберіть компоненти $(^NameDA) які Ви бажаєте встановити."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Оберіть, які компоненти $(^NameDA) ви хочете встановити."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Компоненти програми"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Оберіть які компоненти $(^NameDA) Ви бажаєте видалити."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Оберіть компоненти"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Оберіть, які компоненти $(^NameDA) ви хочете видалити."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Опис"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Підведіть вашу мишку до компонента, щоб побачити його опис."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Наведіть мишу на компонент, щоб побачити його опис."
   !else
-    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Оберіть компонент, щоб побачити його опис."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Оберіть теку встановлення"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Оберіть теку для встановлення $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Оберіть теку, в яку потрібно встановити $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Вибір теки для видалення"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Оберіть теку, з якої Ви бажаєте видалити $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Оберіть теку видалення"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Оберіть теку, з якої потрібно видалити $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Копіювання файлів"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Зачекайте, доки програма встановлення скопіює всі необхідні файли $(^NameDA)."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Встановлення"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Будь ласка, зачекайте поки триває встановлення $(^NameDA)."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Встановлення завершено"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Встановлення успішно завершено."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Встановлення перервана"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Встановлення не було успішно завершено."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Встановлення перервано"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Встановлення не було завершено."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Видалення"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Зачекайте, йде видалення файлів $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Будь ласка, зачекайте поки триває видалення $(^NameDA)."
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Видалення завершено"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Видалення програми було успішно завершено."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Видалення успішно завершено."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Видалення перервано"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Видалення не було виконано повністю."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Видалення не було завершено."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Завершення майстра встановлення $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) встановлено на ваш комп'ютер.$\r$\n$\r$\nНатисніть Кінець для виходу."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Для того, щоб завершити встановлення $(^NameDA) Ваш комп'ютер повинен перезавантажитися. Зробити це зараз?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Завершення встановлення $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) встановлено на ваш комп’ютер.$\r$\n$\r$\nНатисніть «Завершити» для виходу."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Щоб завершити встановлення $(^NameDA), потрібно перезапустити комп’ютер. Хочете перезапустити зараз?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Завершення Майстра Видалення $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) видалений з вашого комп'ютера.$\r$\n$\r$\nНатисніть Вихід, щоб закрити Майстра."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Для того, щоб закінчити видалення $(^NameDA) ваш комп'ютер повинен перезавантажитися. Ви бажаєте зробити це зараз?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Завершення видалення $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) видалено з вашого комп’ютера.$\r$\n$\r$\nНатисніть «Завершити» для виходу."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Щоб завершити видалення $(^NameDA), потрібно перезапустити комп’ютер. Хочете перезапустити зараз?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Перезавантажитися зараз"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Я хочу перезавантажитися власноруч пізніше"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Перезапустити"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Я хочу перезапустити власноруч згодом"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Запустити $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Показати інформацію про програму"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Кінець"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Завершити"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Тека в меню Пуск"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Оберіть теку в меню Пуск для ярликів програми."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Оберіть теку в меню Пуск в яку будуть поміщені ярлики для встановленої програми. Ви також можете ввести інше ім'я для створення нової теки."
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Оберіть «Тека в меню Пуск» для ярликів програми $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Оберіть теку в меню Пуск, в якій ви бажаєте створити ярлики для встановленої програми. Можна також ввести назву для створення нової теки."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Не створювати ярлики"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Видалення $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Видалення $(^NameDA) з вашого комп'ютера."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Видалення $(^NameDA) з вашого комп’ютера."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ви впевнені, що бажаєте покинути встановлення $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ви дійсно хочете вийти з встановлення $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ви впевнені що бажаєте покинути Майстер Видалення $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ви дійсно хочете вийти з видалення $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Виберіть користувачів"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Виберіть користувачів, для яких слід встановити $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Визначтеся, слід встановити $(^NameDA) лише для вашого користувача, чи для усіх користувачів цієї операційної системи. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Встановити для усіх у цій системі"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Встановити лише для вас"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Оберіть користувачів"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Оберіть користувачів, для яких потрібно встановити $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Оберіть, чи хочете ви встановити $(^NameDA) лише для себе, чи для всіх користувачів цього комп’ютера. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Встановити для всіх користувачів цього комп’ютера"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Встановити лише для мене"
 !endif
\ No newline at end of file

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2022-12-19 19:59:33 UTC (rev 7380)
+++ NSIS/trunk/Docs/src/history.but	2022-12-19 20:19:34 UTC (rev 7381)
@@ -30,6 +30,8 @@
 
 \b Updated Brazilian Portuguese (\W{http://sf.net/p/nsis/bugs/1269}{bug #1269})
 
+\b Updated Ukrainian (\W{http://sf.net/p/nsis/patches/308}{patch #308})
+
 \S2{} Build System
 
 \b Fixed halibut \#{fprintf format security}compiler warnings (\W{http://sf.net/p/nsis/patches/304}{patch #304})

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7380] NSIS/trunk/Source/makenssi.cpp

[<and...@us...>]

Revision: 7380
          http://sourceforge.net/p/nsis/code/7380
Author:   anders_k
Date:     2022-12-19 19:59:33 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Use full path for the default output path

Modified Paths:
--------------
    NSIS/trunk/Source/makenssi.cpp

Modified: NSIS/trunk/Source/makenssi.cpp
===================================================================
--- NSIS/trunk/Source/makenssi.cpp	2022-12-16 20:14:38 UTC (rev 7379)
+++ NSIS/trunk/Source/makenssi.cpp	2022-12-19 19:59:33 UTC (rev 7380)
@@ -622,12 +622,12 @@
               return 1;
             }
           }
+          build.set_default_output_filename(remove_file_extension(get_full_path(nsifile))+_T(".exe"));
           if (do_cd)
           {
             if (change_to_script_dir(build, nsifile))
               return 1;
           }
-          build.set_default_output_filename(remove_file_extension(nsifile)+_T(".exe"));
         }
 
         build.notify(MakensisAPI::NOTIFY_SCRIPT,nsifile.c_str());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7379] NSIS/trunk/Include/WinVer.nsh

[<and...@us...>]

Revision: 7379
          http://sourceforge.net/p/nsis/code/7379
Author:   anders_k
Date:     2022-12-16 20:14:38 +0000 (Fri, 16 Dec 2022)
Log Message:
-----------
Added October 2022

Modified Paths:
--------------
    NSIS/trunk/Include/WinVer.nsh

Modified: NSIS/trunk/Include/WinVer.nsh
===================================================================
--- NSIS/trunk/Include/WinVer.nsh	2022-12-14 22:46:32 UTC (rev 7378)
+++ NSIS/trunk/Include/WinVer.nsh	2022-12-16 20:14:38 UTC (rev 7379)
@@ -679,7 +679,8 @@
   !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"        "May 2020 Update" ; 19041.264?
   !insertmacro WinVer_WaaS "${id}" 19042 20H2 "20H2"        "October 2020 Update" ; 19042.572? A.K.A. 2009
   !insertmacro WinVer_WaaS "${id}" 19043 21H1 "21H1"        "May 2021 Update" ; 19043.928
-  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"        "November 2021 Update"
+  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"        "November 2021 Update" ; 19044.1288
+  !insertmacro WinVer_WaaS "${id}" 19045 "?"  "?"           "October 2022 Update" ; 19045.2130 22H2
   !insertmacro WinVer_WaaS "${id}" 22000 "?"  "Sun Valley"  "Windows 11" ; 10.0.22000.194 21H2
   !insertmacro WinVer_WaaS "${id}" 22621 22H2 "Sun Valley 2" "2022 Update" ; 10.0.22621.521
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7378] NSIS/trunk/Examples/MultiUser.nsi

[<and...@us...>]

Revision: 7378
          http://sourceforge.net/p/nsis/code/7378
Author:   anders_k
Date:     2022-12-14 22:46:32 +0000 (Wed, 14 Dec 2022)
Log Message:
-----------
OutFile for CI

Modified Paths:
--------------
    NSIS/trunk/Examples/MultiUser.nsi

Modified: NSIS/trunk/Examples/MultiUser.nsi
===================================================================
--- NSIS/trunk/Examples/MultiUser.nsi	2022-12-13 18:10:31 UTC (rev 7377)
+++ NSIS/trunk/Examples/MultiUser.nsi	2022-12-14 22:46:32 UTC (rev 7378)
@@ -1,4 +1,5 @@
 Name "MultiUser example"
+OutFile "MultiUser.exe"
 
 !define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${UNINSTKEY}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7377] NSIS/trunk/Examples

[<and...@us...>]

Revision: 7377
          http://sourceforge.net/p/nsis/code/7377
Author:   anders_k
Date:     2022-12-13 18:10:31 +0000 (Tue, 13 Dec 2022)
Log Message:
-----------
Install MultiUser example

Modified Paths:
--------------
    NSIS/trunk/Examples/MultiUser.nsi
    NSIS/trunk/Examples/SConscript
    NSIS/trunk/Examples/makensis.nsi

Modified: NSIS/trunk/Examples/MultiUser.nsi
===================================================================
--- NSIS/trunk/Examples/MultiUser.nsi	2022-12-12 20:36:42 UTC (rev 7376)
+++ NSIS/trunk/Examples/MultiUser.nsi	2022-12-13 18:10:31 UTC (rev 7377)
@@ -1,11 +1,8 @@
-!define NAME "MultiUser example"
+Name "MultiUser example"
 
-Name "${NAME}"
-
-!define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+!define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${UNINSTKEY}"
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "CurrentUser"
-
 !define MULTIUSER_INSTALLMODE_INSTDIR "$(^Name)"
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL Highest
@@ -26,23 +23,35 @@
 !insertmacro MUI_LANGUAGE "English"
 
 Function .onInit
-    !insertmacro MULTIUSER_INIT
+  !insertmacro MULTIUSER_INIT
 FunctionEnd
 
 Function un.onInit
-    !insertmacro MULTIUSER_UNINIT
+  !insertmacro MULTIUSER_UNINIT
 FunctionEnd
 
-Section 
-SetOutPath "$InstDir"
-WriteUninstaller "$InstDir\Uninstall.exe"
-WriteRegStr ShCtx "${UNINSTKEY}" DisplayName "$(^Name)"
-WriteRegStr ShCtx "${UNINSTKEY}" UninstallString '"$InstDir\Uninstall.exe"'
-WriteRegStr ShCtx "${UNINSTKEY}" $MultiUser.InstallMode 1 ; Write MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME so the correct context can be detected in the uninstaller.
+Section
+  SetOutPath "$InstDir"
+  WriteUninstaller "$InstDir\Uninstall.exe"
+  WriteRegStr ShCtx "${UNINSTKEY}" DisplayName "$(^Name)"
+  WriteRegStr ShCtx "${UNINSTKEY}" UninstallString '"$InstDir\Uninstall.exe"'
+  WriteRegStr ShCtx "${UNINSTKEY}" $MultiUser.InstallMode 1 ; Write MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME so the correct context can be detected in the uninstaller.
+
+  !tempfile APP
+  !makensis '-v2 "-DOUTFILE=${APP}" "-DNAME=NsisMultiUserExample" -DCOMPANY=Nullsoft "AppGen.nsi"' = 0
+  File "/oname=$InstDir\MyApp.exe" "${APP}" ; Pretend that we have a real application to install
+  !delfile "${APP}"
 SectionEnd
 
+Section "Start Menu shortcut"
+  CreateShortcut /NoWorkingDir "$SMPrograms\$(^Name).lnk" "$InstDir\MyApp.exe"
+SectionEnd
+
 Section "-Uninstall"
-DeleteRegKey ShCtx "${UNINSTKEY}"
-Delete "$InstDir\Uninstall.exe"
-RMDir $InstDir
+  Delete "$SMPrograms\$(^Name).lnk"
+
+  Delete "$InstDir\MyApp.exe"
+  Delete "$InstDir\Uninstall.exe"
+  DeleteRegKey ShCtx "${UNINSTKEY}"
+  RMDir $InstDir
 SectionEnd

Modified: NSIS/trunk/Examples/SConscript
===================================================================
--- NSIS/trunk/Examples/SConscript	2022-12-12 20:36:42 UTC (rev 7376)
+++ NSIS/trunk/Examples/SConscript	2022-12-13 18:10:31 UTC (rev 7377)
@@ -14,6 +14,7 @@
 	LogicLib.nsi
 	makensis.nsi
 	Memento.nsi
+	MultiUser.nsi
 	NSISMenu.nsi
 	one-section.nsi
 	primes.nsi

Modified: NSIS/trunk/Examples/makensis.nsi
===================================================================
--- NSIS/trunk/Examples/makensis.nsi	2022-12-12 20:36:42 UTC (rev 7376)
+++ NSIS/trunk/Examples/makensis.nsi	2022-12-13 18:10:31 UTC (rev 7377)
@@ -332,6 +332,7 @@
   File ..\Examples\WordFunc.ini
   File ..\Examples\WordFuncTest.nsi
   File ..\Examples\Memento.nsi
+  File ..\Examples\MultiUser.nsi
   File ..\Examples\unicode.nsi
   File ..\Examples\NSISMenu.nsi
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7376] NSIS/trunk/Source/util.cpp

[<and...@us...>]

Revision: 7376
          http://sourceforge.net/p/nsis/code/7376
Author:   anders_k
Date:     2022-12-12 20:36:42 +0000 (Mon, 12 Dec 2022)
Log Message:
-----------
Don't use _ environment variable because it is sometimes incorrect

Modified Paths:
--------------
    NSIS/trunk/Source/util.cpp

Modified: NSIS/trunk/Source/util.cpp
===================================================================
--- NSIS/trunk/Source/util.cpp	2022-12-12 20:07:17 UTC (rev 7375)
+++ NSIS/trunk/Source/util.cpp	2022-12-12 20:36:42 UTC (rev 7376)
@@ -853,34 +853,30 @@
   assert(rc == 0);
   return tstring(CtoTString(temp_buf));
 #else /* Linux/BSD/POSIX/etc */
-  const TCHAR *envpath = _tgetenv(_T("_"));
-  if (envpath)
-    return get_full_path(envpath);
-  else {
-    char *path = NULL, *pathtmp;
-    size_t len = 100;
-    int nchars;
-    while(1){
-      pathtmp = (char*)realloc(path,len+1);
-      if (pathtmp == NULL) {
-        free(path);
-        return get_full_path(argv0);
-      }
-      path = pathtmp;
-      nchars = readlink("/proc/self/exe", path, len);
-      if (nchars == -1) {
-        free(path);
-        return get_full_path(argv0);
-      }
-      if (nchars < (int) len) {
-        path[nchars] = '\0';
-        tstring result;
-        result = CtoTString(path);
-        free(path);
-        return result;
-      }
-      len *= 2;
+  char *path = NULL, *pathtmp;
+  size_t len = 100;
+  int nchars;
+  while(1){
+    pathtmp = (char*)realloc(path,len+1);
+    if (!pathtmp) {
+basic:
+      free(path);
+      // Note: Not using _tgetenv(_T("_")) here because it is not always set correctly. !makensis instruction in SVN r7372 will execute "/usr/bin/scons"!
+      return get_full_path(argv0);
     }
+    path = pathtmp;
+    nchars = readlink("/proc/self/exe", path, len);
+    if (nchars == -1) {
+      goto basic;
+    }
+    if (nchars < (int) len) {
+      path[nchars] = '\0';
+      tstring result;
+      result = CtoTString(path);
+      free(path);
+      return result;
+    }
+    len *= 2;
   }
 #endif
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7375] NSIS/trunk/Source

[<and...@us...>]

Revision: 7375
          http://sourceforge.net/p/nsis/code/7375
Author:   anders_k
Date:     2022-12-12 20:07:17 +0000 (Mon, 12 Dec 2022)
Log Message:
-----------
!uninstfinalize big uninstaller fixes, part 2 (bug #1279)

Modified Paths:
--------------
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/mmap.cpp
    NSIS/trunk/Source/script.cpp

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2022-12-05 21:39:46 UTC (rev 7374)
+++ NSIS/trunk/Source/build.cpp	2022-12-12 20:07:17 UTC (rev 7375)
@@ -3333,7 +3333,7 @@
         ERROR_MSG(_T("Error: failed creating mmap of \"%") NPRIs _T("\"\n"), fpath);
         return PS_ERROR;
       }
-      if (add_db_data(&udata_in) < 0)
+      if (udata_size > NSIS_MAX_EXEFILESIZE || add_db_data(&udata_in) < 0)
         return PS_ERROR;
 
       assert(NSIS_MAX_EXEFILESIZE <= ~(UINT32)0);

Modified: NSIS/trunk/Source/mmap.cpp
===================================================================
--- NSIS/trunk/Source/mmap.cpp	2022-12-05 21:39:46 UTC (rev 7374)
+++ NSIS/trunk/Source/mmap.cpp	2022-12-12 20:07:17 UTC (rev 7375)
@@ -317,9 +317,9 @@
   if (hFile)
   {
     if (!setfile(hFile, size)) size = 0;
-    // NOTE: mmap() requires the file to stay open for get(), otherwise
-    // get() will fail with errno code EBADFD (bad file descriptor).
-    //fclose(hFile);
+    // NOTE: mmap() requires the file descriptor to stay open for get(), 
+    // otherwise get() will fail with errno code EBADFD (bad file descriptor).
+    m_hFile = hFile, m_bTempHandle = TRUE;
   }
 #endif
   return size;

Modified: NSIS/trunk/Source/script.cpp
===================================================================
--- NSIS/trunk/Source/script.cpp	2022-12-05 21:39:46 UTC (rev 7374)
+++ NSIS/trunk/Source/script.cpp	2022-12-12 20:07:17 UTC (rev 7375)
@@ -5322,13 +5322,13 @@
   MANAGE_WITH(hFile, fclose);
   const int fd = fileno(hFile);
 #endif
-  if (!mmap.setfile(hFile, filesize))
+  if (!mmap.setfile(hFile, filesize) && filesize)
   {
     ERROR_MSG(_T("%") NPRIs _T("File: failed creating mmap of \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
     return PS_ERROR;
   }
   DWORD len = (DWORD) filesize;
-  if (len != filesize) len = 0xffffffffUL;
+  if (len != filesize) len = 0xffffffffUL - 1024; // truncate_cast but as large as possible
 
   if (generatecode&1)
     section_add_size_kb((len+1023)/1024);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7374] NSIS/trunk/.github/workflows

[<ki...@us...>]

Revision: 7374
          http://sourceforge.net/p/nsis/code/7374
Author:   kichik
Date:     2022-12-05 21:39:46 +0000 (Mon, 05 Dec 2022)
Log Message:
-----------
Avoid node 12.x deprecation warnings

Modified Paths:
--------------
    NSIS/trunk/.github/workflows/build.yml
    NSIS/trunk/.github/workflows/copy-svn.yml

Modified: NSIS/trunk/.github/workflows/build.yml
===================================================================
--- NSIS/trunk/.github/workflows/build.yml	2022-12-04 19:06:31 UTC (rev 7373)
+++ NSIS/trunk/.github/workflows/build.yml	2022-12-05 21:39:46 UTC (rev 7374)
@@ -21,7 +21,7 @@
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Brew Dependencies
         run: |
           brew install scons mingw-w64 zlib
@@ -32,7 +32,7 @@
         run: sudo DEBIAN_FRONTEND=noninteractive apt-get install -y scons g++-mingw-w64-i686 binutils-mingw-w64-i686 zlib1g-dev libcppunit-dev
         if: startsWith(matrix.os, 'ubuntu')
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
         if: startsWith(matrix.os, 'windows')
@@ -72,7 +72,7 @@
           zip $zip build.log
         if: matrix.nightly == 'nightly' && github.ref == 'refs/heads/master'
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build.zip
           path: nsis-*.zip
@@ -84,7 +84,7 @@
     needs: [build]
     steps:
       - name: Download a single artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: build.zip
       - name: Upload to SourceForge

Modified: NSIS/trunk/.github/workflows/copy-svn.yml
===================================================================
--- NSIS/trunk/.github/workflows/copy-svn.yml	2022-12-04 19:06:31 UTC (rev 7373)
+++ NSIS/trunk/.github/workflows/copy-svn.yml	2022-12-05 21:39:46 UTC (rev 7374)
@@ -17,7 +17,7 @@
   copy:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install git-svn
         run: sudo add-apt-repository ppa:git-core/ppa && sudo apt update && sudo apt install git-svn

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7373] NSIS/trunk

[<and...@us...>]

Revision: 7373
          http://sourceforge.net/p/nsis/code/7373
Author:   anders_k
Date:     2022-12-04 19:06:31 +0000 (Sun, 04 Dec 2022)
Log Message:
-----------
Added MultiUser example

Modified Paths:
--------------
    NSIS/trunk/Contrib/MultiUser/Readme.html

Added Paths:
-----------
    NSIS/trunk/Examples/MultiUser.nsi

Modified: NSIS/trunk/Contrib/MultiUser/Readme.html
===================================================================
--- NSIS/trunk/Contrib/MultiUser/Readme.html	2022-12-04 18:52:18 UTC (rev 7372)
+++ NSIS/trunk/Contrib/MultiUser/Readme.html	2022-12-04 19:06:31 UTC (rev 7373)
@@ -32,7 +32,9 @@
     <ul>
         <li><a href="#introduction">Introduction</a></li>
         <li><a href="#executionlevel">Initialization and Execution Level</a>
-            <li><a href="#installationmode">Installation Mode</a></ul>
+        <li><a href="#installationmode">Installation Mode</a>
+		<li><a href="#examples">Example</a>
+    </ul>
     <h2><a name="introduction"></a>Introduction</h2>
     <p>
         Modern Windows versions support multiple users accounts on a single computer, each
@@ -254,7 +256,7 @@
         <p>
             Usually it's a good thing to give the user to choice between these options. For
             users of the Modern UI version 2, a page is provided that asks the user for the
-            installation mode. To use this page, define MULTIUSER_MUI before including User.nsh.
+            installation mode. To use this page, define MULTIUSER_MUI before including MultiUser.nsh.
             Then, the MULTIUSER_PAGE_INSTALLMODE macro can be used just like a normal Modern
             UI page (this page will automatically be skipped when running Windows 95/98/Me):</p>
         <pre><code>!define MULTIUSER_EXECUTIONLEVEL Highest
@@ -382,5 +384,8 @@
                     </td>
             </tr>
         </table>
+
+    <h2><a name="examples"></a>Example</h2>
+    Basic: <a href="../../Examples/MultiUser.nsi">MultiUser.nsi</a><br />
 </body>
 </html>

Added: NSIS/trunk/Examples/MultiUser.nsi
===================================================================
--- NSIS/trunk/Examples/MultiUser.nsi	                        (rev 0)
+++ NSIS/trunk/Examples/MultiUser.nsi	2022-12-04 19:06:31 UTC (rev 7373)
@@ -0,0 +1,48 @@
+!define NAME "MultiUser example"
+
+Name "${NAME}"
+
+!define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${UNINSTKEY}"
+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "CurrentUser"
+
+!define MULTIUSER_INSTALLMODE_INSTDIR "$(^Name)"
+!define MULTIUSER_INSTALLMODE_COMMANDLINE
+!define MULTIUSER_EXECUTIONLEVEL Highest
+!define MULTIUSER_MUI
+
+!include "LogicLib.nsh"
+!include "MultiUser.nsh"
+!include "MUI2.nsh"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+    !insertmacro MULTIUSER_INIT
+FunctionEnd
+
+Function un.onInit
+    !insertmacro MULTIUSER_UNINIT
+FunctionEnd
+
+Section 
+SetOutPath "$InstDir"
+WriteUninstaller "$InstDir\Uninstall.exe"
+WriteRegStr ShCtx "${UNINSTKEY}" DisplayName "$(^Name)"
+WriteRegStr ShCtx "${UNINSTKEY}" UninstallString '"$InstDir\Uninstall.exe"'
+WriteRegStr ShCtx "${UNINSTKEY}" $MultiUser.InstallMode 1 ; Write MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME so the correct context can be detected in the uninstaller.
+SectionEnd
+
+Section "-Uninstall"
+DeleteRegKey ShCtx "${UNINSTKEY}"
+Delete "$InstDir\Uninstall.exe"
+RMDir $InstDir
+SectionEnd

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7372] NSIS/trunk

[<and...@us...>]

Revision: 7372
          http://sourceforge.net/p/nsis/code/7372
Author:   anders_k
Date:     2022-12-04 18:52:18 +0000 (Sun, 04 Dec 2022)
Log Message:
-----------
Further !uninstfinalize big uninstaller fixes (bug #1279)

Modified Paths:
--------------
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/build.h
    NSIS/trunk/Source/mmap.cpp
    NSIS/trunk/Source/mmap.h
    NSIS/trunk/Source/script.cpp
    NSIS/trunk/Source/util.cpp
    NSIS/trunk/Source/util.h

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Docs/src/history.but	2022-12-04 18:52:18 UTC (rev 7372)
@@ -14,7 +14,7 @@
 
 \b Added \R{assert}{!assert}
 
-\b Fixed \cw{!uninstfinalize} bug on large uninstallers
+\b Fixed \cw{!uninstfinalize} bug on large uninstallers (\W{http://sf.net/p/nsis/bugs/1279}{bug #1279})
 
 \b Fixed creation of missing special folders on old Windows versions where SHGetFolderPath is not available.
 

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/build.cpp	2022-12-04 18:52:18 UTC (rev 7372)
@@ -228,7 +228,7 @@
 
   uninstall_mode=0;
   uninstall_size_full=0;
-  uninstall_size=-1;
+  uninstall_size=UINT_MAX;
 
   memset(&build_uninst,-1,sizeof(build_uninst));
 
@@ -2664,7 +2664,7 @@
 
   build_optimize_datablock=0;
 
-  int data_block_size_before_uninst = build_datablock.getlen();
+  UINT data_block_size_before_uninst = build_datablock.getlen();
 
   RET_UNLESS_OK( uninstall_generate() );
 
@@ -2880,7 +2880,7 @@
     unsigned int dbsize;
     UINT64 dbsizeu;
     dbsize = build_datablock.getlen();
-    if (uninstall_size>0) dbsize -= uninstall_size;
+    if (uninstall_size > 0 && uninstall_size < UINT_MAX) dbsize -= uninstall_size;
 
     if (build_compress_whole) {
       dbsizeu = dbsize;
@@ -2893,17 +2893,17 @@
       INFO_MSG(_T("Install data:             %10u%") NPRIs _T(" / %u%") NPRIs _T("\n"),
         cs.UInt(),cs.Scale(),us.UInt(),us.Scale()); // "123 / 456 bytes" or "123 KiB / 456 MiB"
     }
-    UINT future = (build_crcchk ? sizeof(int) : 0) + (uninstall_size > 0 ? uninstall_size_full : 0);
+    UINT future = (build_crcchk ? sizeof(int) : 0) + (uninstall_size > 0 && uninstall_size < UINT_MAX ? uninstall_size_full : 0);
     UINT maxsize = (~(UINT)0) - (total_usize + future), totsizadd = dbsizeu < maxsize ? (UINT)dbsizeu : maxsize;
     total_usize += totsizadd; // Might not be accurate, it is more important to not overflow the additions coming up
   }
 
-  if (uninstall_size>=0)
+  if (uninstall_size < UINT_MAX)
   {
     if (build_compress_whole)
-      INFO_MSG(_T("Uninstall code+data:                   (%d bytes)\n"),uninstall_size_full);
+      INFO_MSG(_T("Uninstall code+data:                   (%u bytes)\n"),uninstall_size_full);
     else
-      INFO_MSG(_T("Uninstall code+data:          %6d / %d bytes\n"),uninstall_size,uninstall_size_full);
+      INFO_MSG(_T("Uninstall code+data:      %10u / %u bytes\n"),uninstall_size,uninstall_size_full);
     total_usize += uninstall_size_full;
   }
 
@@ -3300,38 +3300,46 @@
     if (start_offset)
     {
       TCHAR* fpath;
-      unsigned long in_len;
       if (!(fpath = create_tempfile_path()))
       {
         ERROR_MSG(_T("Error: can't get temporary path\n"));
         return PS_ERROR;
       }
-      size_t ret_size = write_octets_to_file(fpath, (unsigned char*)udata.get(0, udata.getlen()), udata.getlen());
-      udata.release();
-      if ((size_t)udata.getlen() != ret_size)
+      MANAGE_WITH(fpath, free);
+      FILE *hfile = FOPEN(fpath, ("wb"));
+      if (!hfile)
       {
+        ERROR_MSG(_T("Error: failed opening file \"%") NPRIs _T("\"\n"), fpath);
+        return PS_ERROR;
+      }
+      int succ = udata.write_to_external_file(hfile);
+      fclose(hfile);
+      if (!succ)
+      {
         ERROR_MSG(_T("Error: can't write %d bytes to output\n"), udata.getlen());
-        free(fpath);
         return PS_ERROR;
       }
+      udata.clear();
+
       if (PS_OK != run_postbuild_cmds(postubuild_cmds, fpath, _T("UninstFinalize")))
       {
-        free(fpath);
         return PS_ERROR;
       }
-      BYTE* in_buf = alloc_and_read_file(fpath, in_len);
-      _tremove(fpath);
-      free(fpath);
-      if (!in_buf)
+
+      MMapFile udata_in;
+      UINT64 udata_size;
+      if (!(udata_size = udata_in.setfile(fpath)))
       {
-        ERROR_MSG(_T("Error: can't read %d bytes from input\n"), in_len);
+        ERROR_MSG(_T("Error: failed creating mmap of \"%") NPRIs _T("\"\n"), fpath);
         return PS_ERROR;
       }
-      int tmp_offset = add_db_data((char*) in_buf, truncate_cast(int,in_len));
-      free(in_buf);
-      if (tmp_offset < 0)
+      if (add_db_data(&udata_in) < 0)
         return PS_ERROR;
-      uninstall_size_full = in_len;
+
+      assert(NSIS_MAX_EXEFILESIZE <= ~(UINT32)0);
+      uninstall_size_full = (UINT32) udata_size;
+      udata_in.clear();
+      _tremove(fpath);
     }
     else
     {
@@ -3342,11 +3350,8 @@
       uninstall_size_full = fh.length_of_all_following_data+(int)m_unicon_size;
     }
 
-    udata.clear();
-
     // compressed size
     uninstall_size=build_datablock.getlen()-uninstdata_offset;
-
     SCRIPT_MSG(_T("Done!\n"));
   }
 #endif

Modified: NSIS/trunk/Source/build.h
===================================================================
--- NSIS/trunk/Source/build.h	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/build.h	2022-12-04 18:52:18 UTC (rev 7372)
@@ -619,7 +619,7 @@
 
     header build_header, build_uninst, *cur_header;
     int uninstall_mode; // Are we in uninstall mode?  Acts like a bool.
-    int uninstall_size,uninstall_size_full;
+    UINT32 uninstall_size,uninstall_size_full;
     int uninstaller_writes_used;
 
     TCHAR build_output_filename[1024];

Modified: NSIS/trunk/Source/mmap.cpp
===================================================================
--- NSIS/trunk/Source/mmap.cpp	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/mmap.cpp	2022-12-04 18:52:18 UTC (rev 7372)
@@ -28,6 +28,32 @@
 #endif
 #include "util.h"
 
+
+// =====
+// IMMap
+// =====
+
+bool IMMap::write_to_external_file(FILE*file, UINT64 size)
+{
+  if (~(size&0) == size) size = getsize();
+  if (getmaxoffset() < size)
+    return false;
+
+  UINT64 left = size, written = 0;
+  int offset = 0; // TODO: this will be removed after converting the mapping code to 64bit.
+  while (left > 0 && offset >= 0)
+  {
+    size_t chunksize = (size_t) STD_MIN(left, (UINT64) 1 << 20);
+    void *view = getmore(offset, chunksize);
+    written += fwrite(view, 1, chunksize, file);
+    release(view, chunksize);
+    left -= chunksize;
+    offset += (int)chunksize;
+  }
+  return written == size;
+}
+
+
 // ========
 // MMapFile
 // ========
@@ -34,6 +60,12 @@
 
 int MMapFile::m_iAllocationGranularity = 0;
 
+MMapFile::maxfilesizetype MMapFile::getmaxfilesize()
+{
+  assert((~(maxfilesizetype)0) > 0);
+  return (maxfilesizetype) STD_MIN((UINT64) (~(maxfilesizetype)0), (UINT64) Platform_GetMaxFileSize());
+}
+
 MMapFile::MMapFile()
 {
 #ifdef _WIN32
@@ -91,10 +123,11 @@
   m_bReadOnly = bRO;
 }
 
+// TODO: Convert to UINT64. Right now the mapping is still limited to 31 bits.
 #ifdef _WIN32
-int MMapFile::setfile(HANDLE hFile, DWORD dwSize)
+int MMapFile::internalsetfile(HANDLE hFile, DWORD dwSize)
 #else
-int MMapFile::setfile(int hFile, DWORD dwSize)
+int MMapFile::internalsetfile(int hFile, DWORD dwSize)
 #endif
 {
   clear();
@@ -227,17 +260,82 @@
   }
 }
 
+#ifdef _WIN32
+bool MMapFile::setfile(HANDLE hFile, UINT64 size)
+{
+  maxfilesizetype maxsize = getmaxfilesize();
+  return size <= maxsize && internalsetfile(hFile, (maxfilesizetype) size);
+}
+
+HANDLE MMapFile::openfilehelper(const TCHAR*fpath, UINT64 &size)
+{
+  HANDLE hFile = CreateFile(fpath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+  if (hFile != INVALID_HANDLE_VALUE)
+  {
+    ULARGE_INTEGER size64;
+    if (GetFileSize64(hFile, size64))
+      size = size64.QuadPart;
+    else
+      CloseHandle(hFile), hFile = INVALID_HANDLE_VALUE;
+  }
+  return hFile;
+}
+#else
+bool MMapFile::setfile(FILE*hFile, UINT64 size)
+{
+  maxfilesizetype maxsize = getmaxfilesize();
+  return size <= maxsize && internalsetfile(fileno(hFile), (maxfilesizetype) size);
+}
+
+FILE* MMapFile::openfilehelper(const TCHAR*fpath, UINT64 &size)
+{
+  FILE *hFile = FOPEN(fpath, ("rb"));
+  if (hFile)
+  {
+    UINT64 size64 = get_file_size64(hFile);
+    if (size64 != invalid_file_size64)
+      size = size64;
+    else
+      fclose(hFile), hFile = 0;
+  }
+  return hFile;
+}
+#endif
+
+UINT64 MMapFile::setfile(const TCHAR*fpath)
+{
+  UINT64 size = 0;
+#ifdef _WIN32
+  HANDLE hFile = openfilehelper(fpath, size);
+  if (hFile != INVALID_HANDLE_VALUE)
+  {
+    if (!setfile(hFile, size)) size = 0;
+    CloseHandle(hFile);
+  }
+#else
+  FILE *hFile = openfilehelper(fpath, size);
+  if (hFile)
+  {
+    if (!setfile(hFile, size)) size = 0;
+    // NOTE: mmap() requires the file to stay open for get(), otherwise
+    // get() will fail with errno code EBADFD (bad file descriptor).
+    //fclose(hFile);
+  }
+#endif
+  return size;
+}
+
 int MMapFile::getsize() const
 {
   return m_iSize;
 }
 
-void *MMapFile::get(int offset, int size) const
+void *MMapFile::get(int offset, size_t size) const
 {
   return get(offset, &size);
 }
 
-void *MMapFile::get(int offset, int *sizep) const
+void *MMapFile::get(int offset, size_t *sizep) const
 {
   if (!sizep)
     return NULL;
@@ -244,9 +342,9 @@
 
   assert(!m_pView);
 
-  int size = *sizep;
+  size_t size = *sizep;
 
-  if (!m_iSize || offset + size > m_iSize)
+  if (!m_iSize || offset + (int)size > m_iSize) // TODO: once m_iSize and offset is converted to unsigned 64bit, this typecast will disappear
   {
     extern void quit(); extern int g_display_errors;
     if (g_display_errors) 
@@ -284,7 +382,7 @@
   return (void *)((char *)m_pView + offset - alignedoffset);
 }
 
-void *MMapFile::getmore(int offset, int size) const
+void *MMapFile::getmore(int offset, size_t size) const
 {
   void *pView;
   void *pViewBackup = m_pView;
@@ -313,7 +411,7 @@
   m_pView = NULL;
 }
 
-void MMapFile::release(void *pView, int size)
+void MMapFile::release(void *pView, size_t size)
 {
   if (!pView)
     return;
@@ -328,7 +426,7 @@
 #endif
 }
 
-void MMapFile::flush(int num)
+void MMapFile::flush(size_t num)
 {
   if (m_pView)
 #ifdef _WIN32
@@ -359,19 +457,19 @@
   return m_iSize;
 }
 
-void *MMapFake::get(int offset, int size) const
+void *MMapFake::get(int offset, size_t size) const
 {
   return get(offset, &size);
 }
 
-void *MMapFake::get(int offset, int *size) const
+void *MMapFake::get(int offset, size_t *size) const
 {
-  if (!size || (offset + *size > m_iSize))
+  if (!size || (offset + (int)*size > m_iSize)) // TODO: once m_iSize and offset is converted to unsigned 64bit, this typecast will disappear
     return NULL;
   return (void *)(m_pMem + offset);
 }
 
-void *MMapFake::getmore(int offset, int size) const
+void *MMapFake::getmore(int offset, size_t size) const
 {
   return get(offset, size);
 }
@@ -378,10 +476,10 @@
 
 void MMapFake::resize(int n) {}
 void MMapFake::release() {}
-void MMapFake::release(void *p, int size) {}
+void MMapFake::release(void *p, size_t size) {}
 void MMapFake::clear() {}
 void MMapFake::setro(BOOL b) {}
-void MMapFake::flush(BOOL b) {}
+void MMapFake::flush(size_t b) {}
 
 // =======
 // MMapBuf
@@ -458,15 +556,15 @@
   return get(0, m_alloc);
 }
 
-void *MMapBuf::get(int offset, int *sizep) const
+void *MMapBuf::get(int offset, size_t *sizep) const
 {
   if (!sizep)
     return NULL;
-  int size = *sizep;
+  size_t size = *sizep;
   return get(offset, size);
 }
 
-void *MMapBuf::get(int offset, int size) const
+void *MMapBuf::get(int offset, size_t size) const
 {
   if (m_gb_u)
     return m_fm.get(offset, size);
@@ -473,7 +571,7 @@
   return (void *) ((char *) m_gb.get() + offset);
 }
 
-void *MMapBuf::getmore(int offset, int size) const
+void *MMapBuf::getmore(int offset, size_t size) const
 {
   if (m_gb_u)
     return m_fm.getmore(offset, size);
@@ -486,7 +584,7 @@
     m_fm.release();
 }
 
-void MMapBuf::release(void *pView, int size)
+void MMapBuf::release(void *pView, size_t size)
 {
   if (m_gb_u)
     m_fm.release(pView, size);
@@ -498,7 +596,7 @@
     m_fm.clear();
 }
 
-void MMapBuf::flush(int num)
+void MMapBuf::flush(size_t num)
 {
   if (m_gb_u)
     m_fm.flush(num);

Modified: NSIS/trunk/Source/mmap.h
===================================================================
--- NSIS/trunk/Source/mmap.h	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/mmap.h	2022-12-04 18:52:18 UTC (rev 7372)
@@ -21,6 +21,7 @@
 
 #include "Platform.h"
 #include "growbuf.h"
+#include "tchar.h"
 
 #ifndef _WIN32
 #include <cstdio> // for FILE*
@@ -30,17 +31,22 @@
 class IMMap
 {
   public:
+    typedef DWORD maxfilesizetype; // TODO: Change to UINT64
+    static inline UINT64 getmaxoffset() { return INT_MAX; } // NSIS offset limit is 31 bits right now
+
     virtual void resize(int newlen)=0;
     virtual int  getsize() const=0;
-    virtual void *get(int offset, int size) const=0;
-    virtual void *get(int offset, int *size) const=0;
-    virtual void *getmore(int offset, int size) const=0;
+    virtual void *get(int offset, size_t size) const=0;
+    virtual void *get(int offset, size_t *size) const=0;
+    virtual void *getmore(int offset, size_t size) const=0;
     virtual void release()=0;
-    virtual void release(void *view, int size)=0;
+    virtual void release(void *view, size_t size)=0;
     virtual void clear()=0;
     virtual void setro(BOOL bRO)=0;
-    virtual void flush(int num)=0;
+    virtual void flush(size_t num)=0;
     virtual ~IMMap() {}
+
+    virtual bool write_to_external_file(FILE*file, UINT64 size = ~(UINT64)0);
 };
 
 class MMapFile : public IMMap
@@ -50,6 +56,8 @@
     void operator=(const MMapFile&);
 
   public:
+    static DWORD getmaxfilesize();
+
     MMapFile();
     virtual ~MMapFile();
 
@@ -68,7 +76,7 @@
      * Creates the memory mapping object of the file with a mapping size.
      *
      * @param hFile The handle to the opened file.
-     * @param dwSize The size of the memory mapped object.  You cannot set
+     * @param size The size of the memory mapped object. You cannot set
      * this value to zero like with CreateFileMapping() because it will
      * immediately return.  Most likely, you want to set it to the size
      * of the file unless you want to only map a part of the file on
@@ -76,11 +84,24 @@
      * @return Returns 1 on success, 0 on failure.
      */
 #ifdef _WIN32
-    int  setfile(HANDLE hFile, DWORD dwSize);
+    bool setfile(HANDLE hFile, UINT64 size);
+private:
+    int internalsetfile(HANDLE hFile, DWORD dwSize);
 #else
-    int  setfile(int hFile, DWORD dwSize);
+    bool setfile(FILE*hFile, UINT64 size);
+private:
+    int internalsetfile(int hFile, DWORD dwSize);
 #endif
 
+public:
+    UINT64 setfile(const TCHAR*fpath);
+
+#ifdef _WIN32
+    static HANDLE openfilehelper(const TCHAR*fpath, UINT64 &size);
+#else
+    static FILE* openfilehelper(const TCHAR*fpath, UINT64 &size);
+#endif
+
    /**
     * Resize the memory mapping of the file.  Used when the filesize has
     * changed.  When setfile has not been called previously, then it will
@@ -104,7 +125,7 @@
      * @param offset The offset from the beginning of the file.
      * @param size The size of the memory map window.
      */
-    void *get(int offset, int size) const;
+    void *get(int offset, size_t size) const;
 
     /**
      * Set the memory map to a particular offset in the file and return the
@@ -115,7 +136,7 @@
      * @param sizep [in/out] The size of the memory map window.  (In non-Win32
      * systems, the new size is written back out.)
      */
-    void *get(int offset, int *sizep) const;
+    void *get(int offset, size_t *sizep) const;
 
     /**
      * This function sets memory map and just hands you the pointer and
@@ -128,7 +149,7 @@
      * @param offset The offset from the beginning of the file.
      * @param size The size of the memory map window.
      */
-    void *getmore(int offset, int size) const;
+    void *getmore(int offset, size_t size) const;
 
     /**
      * Releases the memory map currently being used.  Calls UnMapViewOfFile().
@@ -147,7 +168,7 @@
      * @param pView The pointer to somewhere in a MemMapped object.
      * @param size The size of the object.  Used only in non-Win32 systems.
      */
-    void release(void *pView, int size);
+    void release(void *pView, size_t size);
 
     /**
      * Flushes the contents of the current memory map to disk.  Set size to 0
@@ -155,7 +176,7 @@
      *
      * @param num The number of bytes to flush.  0 for everything.
      */
-    void flush(int num);
+    void flush(size_t num);
 
   private:
 #ifdef _WIN32
@@ -183,16 +204,16 @@
 
     void set(const char *pMem, int iSize);
     int  getsize() const;
-    void *get(int offset, int size) const;
-    void *get(int offset, int *size) const;
-    void *getmore(int offset, int size) const;
+    void *get(int offset, size_t size) const;
+    void *get(int offset, size_t *size) const;
+    void *getmore(int offset, size_t size) const;
 
     void resize(int n);
     void release();
-    void release(void *p, int size);
+    void release(void *p, size_t size);
     void clear();
     void setro(BOOL b);
-    void flush(BOOL b);
+    void flush(size_t b);
 
   private:
     const char *m_pMem;
@@ -224,13 +245,13 @@
     int  getsize() const;
     int  getlen() const;
     void *get() const;
-    void *get(int offset, int *sizep) const;
-    void *get(int offset, int size) const;
-    void *getmore(int offset, int size) const;
+    void *get(int offset, size_t *sizep) const;
+    void *get(int offset, size_t size) const;
+    void *getmore(int offset, size_t size) const;
     void release();
-    void release(void *pView, int size);
+    void release(void *pView, size_t size);
     void clear();
-    void flush(int num);
+    void flush(size_t num);
 
   protected:
     static inline int getmodethreshold() { return 16 << 20; }

Modified: NSIS/trunk/Source/script.cpp
===================================================================
--- NSIS/trunk/Source/script.cpp	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/script.cpp	2022-12-04 18:52:18 UTC (rev 7372)
@@ -5302,18 +5302,10 @@
   const TCHAR *newfn = newfn_s.c_str();
   const TCHAR *filename = file.c_str();
   MMapFile mmap;
-  DWORD len;
+  UINT64 filesize;
 
 #ifdef _WIN32
-  HANDLE hFile = CreateFile(
-    newfn,
-    GENERIC_READ,
-    FILE_SHARE_READ,
-    NULL,
-    OPEN_EXISTING,
-    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN,
-    NULL
-  );
+  HANDLE hFile = mmap.openfilehelper(newfn, filesize);
   if (hFile == INVALID_HANDLE_VALUE)
   {
     ERROR_MSG(_T("%") NPRIs _T("File: failed opening file \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
@@ -5320,34 +5312,23 @@
     return PS_ERROR;
   }
   MANAGE_WITH(hFile, CloseHandle);
-
-  len = GetFileSize(hFile, NULL);
-  if (len && !mmap.setfile(hFile, len))
+#else
+  FILE *hFile = mmap.openfilehelper(newfn, filesize);
+  if (!hFile)
   {
-    ERROR_MSG(_T("%") NPRIs _T("File: failed creating mmap of \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
-    return PS_ERROR;
-  }
-#else // !_WIN32
-  int fd = OPEN(newfn, O_RDONLY);
-  if (fd == -1)
-  {
     ERROR_MSG(_T("%") NPRIs _T("File: failed opening file \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
     return PS_ERROR;
   }
-  MANAGE_WITH(fd, close); // Will auto-close(2) fd
-
-  struct stat s;
-  if (fstat(fd, &s)) {
-    ERROR_MSG(_T("%") NPRIs _T("File: failed stating file \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
-    return PS_ERROR;
-  }
-  len = (DWORD) s.st_size;
-  if (len && !mmap.setfile(fd, len))
+  MANAGE_WITH(hFile, fclose);
+  const int fd = fileno(hFile);
+#endif
+  if (!mmap.setfile(hFile, filesize))
   {
     ERROR_MSG(_T("%") NPRIs _T("File: failed creating mmap of \"%") NPRIs _T("\"\n"),generatecode?_T(""):_T("Reserve"),newfn);
     return PS_ERROR;
   }
-#endif // ~_WIN32
+  DWORD len = (DWORD) filesize;
+  if (len != filesize) len = 0xffffffffUL;
 
   if (generatecode&1)
     section_add_size_kb((len+1023)/1024);
@@ -5402,9 +5383,9 @@
     DWORD s=getcurdbsize()-last_build_datablock_used;
     if (s) s-=4;
     if (s != len)
-      SCRIPT_MSG(_T(" %d/%d bytes\n"),s,len);
+      SCRIPT_MSG(_T(" %u/%u bytes\n"),s,len);
     else
-      SCRIPT_MSG(_T(" %d bytes\n"),len);
+      SCRIPT_MSG(_T(" %u bytes\n"),len);
   }
 
   if (generatecode)

Modified: NSIS/trunk/Source/util.cpp
===================================================================
--- NSIS/trunk/Source/util.cpp	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/util.cpp	2022-12-04 18:52:18 UTC (rev 7372)
@@ -61,7 +61,6 @@
 
 
 #ifdef _WIN32
-bool GetFileSize64(HANDLE hFile, ULARGE_INTEGER &uli);
 static char* CreateMappedFileView(LPCTSTR Path, DWORD FAccess, DWORD FShare, DWORD FMode, DWORD PProtect, DWORD MAccess, size_t &FSize)
 {
   char *pView = NULL, restoreGLE = false, validSize;
@@ -641,28 +640,24 @@
   return f;
 }
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #if (defined(_MSC_VER) && (_MSC_VER >= 1200)) || defined(__MINGW32__)
 #include <io.h>
-static UINT64 get_file_size64(FILE *f)
+UINT64 get_file_size64(FILE *f)
 {
   INT64 s = _filelengthi64(_fileno(f)); // Could also use _get_osfhandle+GetFileSize64
   return (INT64) -1L != s ? s : invalid_file_size64;
 }
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-UINT32 get_file_size32(FILE *f)
+#else
+UINT64 get_file_size64(FILE *f)
 {
-  UINT32 result = invalid_file_size32;
-#if (defined(_MSC_VER) && (_MSC_VER >= 1200)) || defined(__MINGW32__)
-  UINT64 size64 = get_file_size64(f);
-  if (invalid_file_size64 != size64 && size64 <= 0xffffffffUL)
-    result = (UINT32) size64;
-#elif _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
+  UINT64 result = invalid_file_size64;
+  // 32bit plaforms require _FILE_OFFSET_BITS = 64 to correctly return the size
+#if _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
   struct stat st;
-  if (0 == fstat(fileno(f), &st) && st.st_size <= (sizeof(st.st_size) >= 8 ? (off_t)0xffffffffUL : LONG_MAX))
-    result = (UINT32) st.st_size;
+  if (0 == fstat(fileno(f), &st) && st.st_size <= (sizeof(st.st_size) >= 8 ? (off_t)0x7fffffffffffffffLL : LONG_MAX))
+    result = (UINT64) st.st_size;
 #else
   long cb, restoreseek = true;
   fpos_t orgpos;
@@ -674,7 +669,42 @@
 #endif
   return result;
 }
+#endif
 
+UINT32 get_file_size32(FILE *f)
+{
+  UINT32 result = invalid_file_size32;
+#if _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
+  struct stat st;
+  if (0 == fstat(fileno(f), &st) && st.st_size <= (sizeof(st.st_size) >= 8 ? (off_t)0xffffffffUL : LONG_MAX))
+    result = (UINT32) st.st_size;
+#else
+  UINT64 size64 = get_file_size64(f);
+  if (size64 <= 0xffffffffUL && invalid_file_size64 != size64)
+    result = (UINT32) size64;
+#endif
+  return result;
+}
+
+UINT64 Platform_GetMaxFileSize()
+{
+#ifdef _WIN32
+  return ~(UINT64)0;
+#elif _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
+  struct stat st;
+  if (sizeof(st.st_size) >= 8)
+  {
+#ifdef LLONG_MAX
+    return (UINT64)(off_t)LLONG_MAX;
+#endif
+    const UINT64 sixthree = (~(UINT64)0) >> 1;
+    return (off_t)sixthree > 0 ? sixthree : (UINT32)(off_t)0xffffffffUL;
+  }
+  return (UINT64)(off_t)LONG_MAX;
+#endif
+  return (UINT)INT_MAX;
+}
+
 BYTE* alloc_and_read_file(FILE *f, unsigned long &size)
 {
   BYTE *result = 0, *mem = 0;

Modified: NSIS/trunk/Source/util.h
===================================================================
--- NSIS/trunk/Source/util.h	2022-10-24 15:55:02 UTC (rev 7371)
+++ NSIS/trunk/Source/util.h	2022-12-04 18:52:18 UTC (rev 7372)
@@ -317,6 +317,7 @@
 #define OPEN(a, b) my_open(a, b)
 
 #else // _WIN32
+bool GetFileSize64(HANDLE hFile, ULARGE_INTEGER &uli);
 
 #define my_convert(x) (x)
 #define my_convert_free(x)
@@ -328,9 +329,11 @@
 FILE* my_fopen(const TCHAR *path, const char *mode);
 #define FOPEN(a, b) my_fopen((a), (b))
 
+UINT64 Platform_GetMaxFileSize();
 const UINT32 invalid_file_size32 = ~ (UINT32) 0;
 UINT32 get_file_size32(FILE *f);
 const UINT64 invalid_file_size64 = ~ (UINT64) 0;
+UINT64 get_file_size64(FILE *f);
 BYTE* alloc_and_read_file(FILE *f, unsigned long &size);
 BYTE* alloc_and_read_file(const TCHAR *filepath, unsigned long &size);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7371] NSIS/trunk

[<and...@us...>]

Revision: 7371
          http://sourceforge.net/p/nsis/code/7371
Author:   anders_k
Date:     2022-10-24 15:55:02 +0000 (Mon, 24 Oct 2022)
Log Message:
-----------
Fixed minor typos

Modified Paths:
--------------
    NSIS/trunk/Contrib/zip2exe/zlib/unzip.c
    NSIS/trunk/Contrib/zip2exe/zlib/unzip.h
    NSIS/trunk/Include/StrFunc.txt

Modified: NSIS/trunk/Contrib/zip2exe/zlib/unzip.c
===================================================================
--- NSIS/trunk/Contrib/zip2exe/zlib/unzip.c	2022-10-23 18:25:12 UTC (rev 7370)
+++ NSIS/trunk/Contrib/zip2exe/zlib/unzip.c	2022-10-24 15:55:02 UTC (rev 7371)
@@ -297,7 +297,7 @@
 #endif
 
 /*
-   Compare two filename (fileName1,fileName2).
+   Compare two filenames (fileName1,fileName2).
    If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
    If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                                                 or strcasecmp)

Modified: NSIS/trunk/Contrib/zip2exe/zlib/unzip.h
===================================================================
--- NSIS/trunk/Contrib/zip2exe/zlib/unzip.h	2022-10-23 18:25:12 UTC (rev 7370)
+++ NSIS/trunk/Contrib/zip2exe/zlib/unzip.h	2022-10-24 15:55:02 UTC (rev 7371)
@@ -127,7 +127,7 @@
                                                  const char* fileName2,
                                                  int iCaseSensitivity));
 /*
-   Compare two filename (fileName1,fileName2).
+   Compare two filenames (fileName1,fileName2).
    If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
    If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                 or strcasecmp)

Modified: NSIS/trunk/Include/StrFunc.txt
===================================================================
--- NSIS/trunk/Include/StrFunc.txt	2022-10-23 18:25:12 UTC (rev 7370)
+++ NSIS/trunk/Include/StrFunc.txt	2022-10-24 15:55:02 UTC (rev 7371)
@@ -660,7 +660,7 @@
 - Renamed header file to "StrFunc.nsh".
 - Added 1 function, StrLoc.
 - Modified StrStrAdv, removed some lines.
-- Fixed StrTok, 2 simple numbers made it loop everytime.
+- Fixed StrTok, 2 simple numbers made it loop every time.
 - Fixed some small issues on the header file.
 
 0.02 - 01/24/2004

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7370] NSIS/trunk

[<and...@us...>]

Revision: 7370
          http://sourceforge.net/p/nsis/code/7370
Author:   anders_k
Date:     2022-10-23 18:25:12 +0000 (Sun, 23 Oct 2022)
Log Message:
-----------
Fixed GCC12 binary_function warning (patch #307)

Modified Paths:
--------------
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/Plugins.h
    NSIS/trunk/Source/ResourceEditor.cpp

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2022-10-23 18:09:46 UTC (rev 7369)
+++ NSIS/trunk/Docs/src/history.but	2022-10-23 18:25:12 UTC (rev 7370)
@@ -34,7 +34,7 @@
 
 \b Fixed halibut \#{fprintf format security}compiler warnings (\W{http://sf.net/p/nsis/patches/304}{patch #304})
 
-\b Fixed issues with very old GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275})
+\b Fixed various issues with very old and new GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275}, \W{http://sf.net/p/nsis/patches/307}{patch #307})
 
 \b Disable stub relocations in newer GCC (\W{http://sf.net/p/nsis/bugs/1283}{bug #1283})
 

Modified: NSIS/trunk/Source/Plugins.h
===================================================================
--- NSIS/trunk/Source/Plugins.h	2022-10-23 18:09:46 UTC (rev 7369)
+++ NSIS/trunk/Source/Plugins.h	2022-10-23 18:25:12 UTC (rev 7370)
@@ -24,10 +24,17 @@
 
 namespace STL 
 {
+  template <class Arg1, class Arg2, class Result>
+  struct binary_function
+  {
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+  };
   template<class S, class C>
-  struct string_nocasecmpless : std::binary_function<S, S, bool> 
+  struct string_nocasecmpless : binary_function<S, S, bool> 
   {
-    struct cmp : public std::binary_function<C, C, bool> 
+    struct cmp : public binary_function<C, C, bool> 
     {
       bool operator() (const C&a, const C&b) const 
       {

Modified: NSIS/trunk/Source/ResourceEditor.cpp
===================================================================
--- NSIS/trunk/Source/ResourceEditor.cpp	2022-10-23 18:09:46 UTC (rev 7369)
+++ NSIS/trunk/Source/ResourceEditor.cpp	2022-10-23 18:25:12 UTC (rev 7370)
@@ -913,7 +913,7 @@
   }
 
   FILEVIEW &map = *(FILEVIEW*) &X.Map;
-  size_t datasize;
+  size_t datasize = 0;
   char *filedata = create_file_view_readonly(File, map), *data = 0, *dataalloc = 0;
   if (filedata) {
     if (resproto) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7369] NSIS/trunk

[<and...@us...>]

Revision: 7369
          http://sourceforge.net/p/nsis/code/7369
Author:   anders_k
Date:     2022-10-23 18:09:46 +0000 (Sun, 23 Oct 2022)
Log Message:
-----------
Use SHCloneSpecialIDList instead of SHGetSpecialFolderLocation so missing folders can be created on Win4.x

Modified Paths:
--------------
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/build.cpp
    NSIS/trunk/Source/exehead/util.c
    NSIS/trunk/Source/exehead/util.h

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2022-09-20 21:38:03 UTC (rev 7368)
+++ NSIS/trunk/Docs/src/history.but	2022-10-23 18:09:46 UTC (rev 7369)
@@ -16,6 +16,8 @@
 
 \b Fixed \cw{!uninstfinalize} bug on large uninstallers
 
+\b Fixed creation of missing special folders on old Windows versions where SHGetFolderPath is not available.
+
 \b Fixed plug-in call overwriting \cw{SetDetailsPrint lastused} (\W{http://sf.net/p/nsis/bugs/1271}{bug #1271})
 
 \b Fixed \cw{!appendfile} not writing to non-empty files with a BOM

Modified: NSIS/trunk/Source/build.cpp
===================================================================
--- NSIS/trunk/Source/build.cpp	2022-09-20 21:38:03 UTC (rev 7368)
+++ NSIS/trunk/Source/build.cpp	2022-10-23 18:09:46 UTC (rev 7369)
@@ -379,7 +379,7 @@
   m_ShellConstants.add(_T("CDBURN_AREA"), CSIDL_CDBURN_AREA, CSIDL_CDBURN_AREA);
 
   // Constants that are not affected by SetShellVarContext
-  m_ShellConstants.add(_T("USERAPPDATA"), CSIDL_APPDATA, CSIDL_APPDATA);
+  m_ShellConstants.add(_T("USERAPPDATA"), CSIDL_APPDATA, CSIDL_APPDATA|0x40); // 0x40 to differentiate it from $QUICKLAUNCH
   m_ShellConstants.add(_T("USERLOCALAPPDATA"), CSIDL_LOCAL_APPDATA, CSIDL_LOCAL_APPDATA);
   m_ShellConstants.add(_T("USERTEMPLATES"), CSIDL_TEMPLATES, CSIDL_TEMPLATES);
   m_ShellConstants.add(_T("USERSTARTMENU"), CSIDL_STARTMENU, CSIDL_STARTMENU);

Modified: NSIS/trunk/Source/exehead/util.c
===================================================================
--- NSIS/trunk/Source/exehead/util.c	2022-09-20 21:38:03 UTC (rev 7368)
+++ NSIS/trunk/Source/exehead/util.c	2022-10-23 18:09:46 UTC (rev 7369)
@@ -800,8 +800,9 @@
 const TCHAR SYSREGKEY[]   = _T("Software\\Microsoft\\Windows\\CurrentVersion");
 const TCHAR QUICKLAUNCH[] = _T("\\Microsoft\\Internet Explorer\\Quick Launch");
 
-typedef HRESULT (__stdcall * PFNSHGETFOLDERPATH)(HWND, int, HANDLE, DWORD, LPTSTR);
+typedef HRESULT (WINAPI* PFNSHGETFOLDERPATH)(HWND, int, HANDLE, DWORD, LPTSTR);
 extern void *g_SHGetFolderPath;
+typedef LPITEMIDLIST (WINAPI* PFNSHCLONESPECIALIDLIST)(HWND, int, BOOL);
 
 // Based on Dave Laundon's simplified process_string
 // The string actually has a lot of different data encoded into it.  This
@@ -903,16 +904,22 @@
 
         while (x--)
         {
+          PFNSHCLONESPECIALIDLIST SHCSILFunc;
+          int idandflags = fldrs[x] & ~0x40, create = idandflags & CSIDL_FLAG_CREATE;
+
           if (g_SHGetFolderPath && use_shfolder)
           {
             PFNSHGETFOLDERPATH SHGetFolderPathFunc = (PFNSHGETFOLDERPATH) g_SHGetFolderPath;
-            if (!SHGetFolderPathFunc(g_hwnd, fldrs[x], NULL, SHGFP_TYPE_CURRENT, out))
+            if (!SHGetFolderPathFunc(g_hwnd, idandflags, NULL, SHGFP_TYPE_CURRENT, out))
             {
               break;
             }
           }
-            
-          if (!SHGetSpecialFolderLocation(g_hwnd, fldrs[x], &idl))
+
+          // This function exists in 95 & NT4 but was undocumented back then so we have to import it by ordinal.
+          SHCSILFunc = (PFNSHCLONESPECIALIDLIST) myGetProcAddress(MGA_SHCloneSpecialIDList);
+          idl = SHCSILFunc(g_hwnd, LOBYTE(idandflags), create);
+          if (idl)
           {
             BOOL res = SHGetPathFromIDList(idl, out);
             CoTaskMemFree(idl);
@@ -1172,6 +1179,7 @@
   {"ADVAPI32", "InitiateShutdownW"},
   {"SHELL32", "SHGetKnownFolderPath"},
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
+  {"SHELL32", (CHAR*) 89}, // SHCloneSpecialIDList
 #ifndef _WIN64
   {"SHLWAPI", (CHAR*) 437}, // IsOS
 #endif
@@ -1191,6 +1199,7 @@
   {"ADVAPI32", "InitiateShutdownA"},
   {"SHELL32", "SHGetKnownFolderPath"},
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
+  {"SHELL32", (CHAR*) 89}, // SHCloneSpecialIDList
 #ifndef _WIN64
   {"SHLWAPI", (CHAR*) 437}, // IsOS
 #endif

Modified: NSIS/trunk/Source/exehead/util.h
===================================================================
--- NSIS/trunk/Source/exehead/util.h	2022-09-20 21:38:03 UTC (rev 7368)
+++ NSIS/trunk/Source/exehead/util.h	2022-10-23 18:09:46 UTC (rev 7369)
@@ -175,6 +175,7 @@
   MGA_InitiateShutdown,
   MGA_SHGetKnownFolderPath,
   MGA_IsUserAnAdmin,
+  MGA_SHCloneSpecialIDList,
 #ifndef _WIN64
   MGA_IsOS,
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7368] NSIS/trunk/Include/WinVer.nsh

[<and...@us...>]

Revision: 7368
          http://sourceforge.net/p/nsis/code/7368
Author:   anders_k
Date:     2022-09-20 21:38:03 +0000 (Tue, 20 Sep 2022)
Log Message:
-----------
Windows 11 2022 Update

Modified Paths:
--------------
    NSIS/trunk/Include/WinVer.nsh

Modified: NSIS/trunk/Include/WinVer.nsh
===================================================================
--- NSIS/trunk/Include/WinVer.nsh	2022-09-20 21:31:52 UTC (rev 7367)
+++ NSIS/trunk/Include/WinVer.nsh	2022-09-20 21:38:03 UTC (rev 7368)
@@ -679,9 +679,9 @@
   !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"        "May 2020 Update" ; 19041.264?
   !insertmacro WinVer_WaaS "${id}" 19042 20H2 "20H2"        "October 2020 Update" ; 19042.572? A.K.A. 2009
   !insertmacro WinVer_WaaS "${id}" 19043 21H1 "21H1"        "May 2021 Update" ; 19043.928
-  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"        "November 2021 Update "
+  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"        "November 2021 Update"
   !insertmacro WinVer_WaaS "${id}" 22000 "?"  "Sun Valley"  "Windows 11" ; 10.0.22000.194 21H2
-  !insertmacro WinVer_WaaS "${id}" 22621 22H2 "Sun Valley 2" "?"
+  !insertmacro WinVer_WaaS "${id}" 22621 22H2 "Sun Valley 2" "2022 Update" ; 10.0.22621.521
 
   !ifmacrodef WinVerExternal_WaaS_MapToBuild
     !insertmacro WinVerExternal_WaaS_MapToBuild ${op} "${id}" WinVer_WaaS_Build

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[NSIS-commits] SF.net SVN: nsis:[7367] NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh

[<and...@us...>]

Revision: 7367
          http://sourceforge.net/p/nsis/code/7367
Author:   anders_k
Date:     2022-09-20 21:31:52 +0000 (Tue, 20 Sep 2022)
Log Message:
-----------
Fixed NSD_ClearIcon (bug #1286)

Modified Paths:
--------------
    NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh

Modified: NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh
===================================================================
--- NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh	2022-09-20 21:29:38 UTC (rev 7366)
+++ NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh	2022-09-20 21:31:52 UTC (rev 7367)
@@ -1007,7 +1007,7 @@
 
 !define NSD_ClearImage `!insertmacro __NSD_ClearImage ${IMAGE_BITMAP} `
 !define NSD_ClearBitmap `${NSD_ClearImage} `
-!define NSD_ClearIcon  `!insertmacro __NSD_ClearImage ${IMAGE_ICON } `
+!define NSD_ClearIcon  `!insertmacro __NSD_ClearImage ${IMAGE_ICON} `
 !macro __NSD_ClearImage _IMGTYPE CONTROL
 	SendMessage ${CONTROL} ${STM_SETIMAGE} ${_IMGTYPE} 0
 !macroend

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.