[setup - the official Cygwin setup program] branch master, updated. release_2.936-4-gb6851835

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 gui/GuiHashCheckFeedback.cc |  2 +-
 gui/GuiParseFeedback.cc     |  4 ++--
 ini.cc                      | 10 ++++++----
 splash.cc                   |  2 +-
 threebar.cc                 |  4 ++--
 threebar.h                  |  5 +++--
 win32.h                     |  4 ++++
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/gui/GuiHashCheckFeedback.cc b/gui/GuiHashCheckFeedback.cc
index a0b4c57a..71529be6 100644
--- a/gui/GuiHashCheckFeedback.cc
+++ b/gui/GuiHashCheckFeedback.cc
@@ -23,7 +23,7 @@ GuiFeedback::hash_init(const char *hashalg, const std::string 
&shortname)
   std::wstring fmt = LoadStringW(IDS_PROGRESS_CHECKING_HASH);
   std::wstring s = format(fmt, hashalg, shortname.c_str());
   Progress.SetText1(s.c_str());
-  Progress.SetText4(IDS_PROGRESS_PROGRESS);
+  Progress.SetBarLabel1(IDS_PROGRESS_PROGRESS);
   Progress.SetBar1(0);
 }
 
diff --git a/gui/GuiParseFeedback.cc b/gui/GuiParseFeedback.cc
index 6a2b7bc5..9873aa78 100644
--- a/gui/GuiParseFeedback.cc
+++ b/gui/GuiParseFeedback.cc
@@ -30,7 +30,7 @@ GuiFeedback::parse_init ()
   Progress.SetText1 (IDS_PROGRESS_PARSING);
   Progress.SetText2 ("");
   Progress.SetText3 ("");
-  Progress.SetText4 (IDS_PROGRESS_PROGRESS);
+  Progress.SetBarLabel1 (IDS_PROGRESS_PROGRESS);
 
   lastpct = 0;
   yyerror_count = 0;
@@ -42,7 +42,7 @@ GuiFeedback::parse_finish ()
 {
   Progress.SetText2 ("");
   Progress.SetText3 ("");
-  Progress.SetText4 (IDS_PROGRESS_PACKAGE);
+  Progress.SetBarLabel1 (IDS_PROGRESS_PACKAGE);
   Progress.SetBar1 (0);
 }
 
diff --git a/ini.cc b/ini.cc
index 371d2675..ebacbd05 100644
--- a/ini.cc
+++ b/ini.cc
@@ -217,7 +217,7 @@ do_local_ini (Feedback &myFeedback)
 static bool
 do_remote_ini (Feedback &myFeedback)
 {
-  bool ini_error = false;
+  int ini_count = 0;
   io_stream *ini_file = NULL, *ini_sig_file;
 
   /* FIXME: Get rid of this io_stream pointer travesty.  The need to
@@ -252,7 +252,6 @@ do_remote_ini (Feedback &myFeedback)
        {
          // no setup found or signature invalid
          note (myFeedback.owner(), IDS_SETUPINI_MISSING, SetupBaseName().c_str 
(), n->url.c_str ());
-         ini_error = true;
        }
       else
        {
@@ -264,7 +263,6 @@ do_remote_ini (Feedback &myFeedback)
          if (yyparse () || myFeedback.has_errors())
            {
              myFeedback.show_errors ();
-             ini_error = true;
            }
          else
            {
@@ -280,6 +278,7 @@ do_remote_ini (Feedback &myFeedback)
                    io_stream::remove (fp);
                  delete out;
                }
+               ini_count++;
            }
          if (aBuilder.timestamp > setup_timestamp)
            {
@@ -290,7 +289,10 @@ do_remote_ini (Feedback &myFeedback)
          ini_file = NULL;
        }
     }
-  return ini_error;
+
+  // report an error if we didn't manage to fetch and parse at least one ini
+  // file.
+  return (ini_count == 0);
 }
 
 bool
diff --git a/splash.cc b/splash.cc
index 107d979f..2309c389 100644
--- a/splash.cc
+++ b/splash.cc
@@ -21,7 +21,7 @@
 #include "splash.h"
 
 #define SPLASH_URL "https://cygwin.com";
-#define SPLASH_COPYRIGHT L"Copyright © 2000-2025"
+#define SPLASH_COPYRIGHT L"Copyright © 2000-2026"
 #define SPLASH_TRANSLATE_URL "https://cygwin.com/setup/translate";
 
 static ControlAdjuster::ControlInfo SplashControlsInfo[] = {
diff --git a/threebar.cc b/threebar.cc
index 16430bb5..9bc64a0d 100644
--- a/threebar.cc
+++ b/threebar.cc
@@ -100,7 +100,7 @@ ThreeBarProgressPage::SetText3 (const TCHAR * t)
 }
 
 void
-ThreeBarProgressPage::SetText4 (const TCHAR * t)
+ThreeBarProgressPage::SetBarLabel1 (const TCHAR * t)
 {
   ::SetWindowText (ins_bl_package, t);
 }
@@ -124,7 +124,7 @@ ThreeBarProgressPage::SetText3 (unsigned int id)
 }
 
 void
-ThreeBarProgressPage::SetText4 (unsigned int id)
+ThreeBarProgressPage::SetBarLabel1 (unsigned int id)
 {
   ::SetWindowTextW (ins_bl_package, LoadStringW(id).c_str());
 }
diff --git a/threebar.h b/threebar.h
index d7944e5e..c6219bd0 100644
--- a/threebar.h
+++ b/threebar.h
@@ -73,17 +73,18 @@ public:
   void SetText2 (const wchar_t * t);
   void SetText2 (const TCHAR * t);
   void SetText3 (const TCHAR * t);
-  void SetText4 (const TCHAR * t);
 
   void SetText1 (unsigned int id);
   void SetText2 (unsigned int id);
   void SetText3 (unsigned int id);
-  void SetText4 (unsigned int id);
 
   void SetBar1 (off_t progress, off_t max = 100);
   void SetBar2 (off_t progress, off_t max = 100);
   void SetBar3 (off_t progress, off_t max = 100);
 
+  void SetBarLabel1 (const TCHAR * t);
+  void SetBarLabel1 (unsigned int id);
+
   void SetActivateTask (int t)
   {
     task = t;
diff --git a/win32.h b/win32.h
index b60d8e21..ec7d0262 100644
--- a/win32.h
+++ b/win32.h
@@ -56,6 +56,10 @@
 #define _access access
 #endif
 
+/* A replacement version of GetFileAttributesW */
+#define GetFileAttributesW GetFileAttributesWithBackupIntentW
+extern "C" DWORD WINAPI GetFileAttributesW (LPCWSTR wpath);
+
 /* When we have to check for a path delimiter, check for both, slash and
    backslash. */
 #define isdirsep(ch) \