From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 6440F384F012; Wed, 14 Jul 2021 17:39:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6440F384F012 To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.909 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 70fc13d3bab5c29591dd0d8d020dbef27a7e2caf X-Git-Newrev: 77e4675a9603cdd5757152a744f9ff7e53bdbafc Message-Id: <20210714173943.6440F384F012@sourceware.org> Date: Wed, 14 Jul 2021 17:39:43 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 17:39:43 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=77e4675a9603cdd5757152a744f9ff7e53bdbafc commit 77e4675a9603cdd5757152a744f9ff7e53bdbafc Author: Jon Turney Date: Wed Jul 14 15:39:09 2021 +0100 Fix a crash in ListView StringCache Fix a sporadic crash in chooser introduced in f34a20e7. Limit the mempcy() to fill StringCache to the size of the string we are putting in the cache, not the the size of the cache (which will fault if it happens to over-run into a inaccessible page). https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=0632357a0ea02e43c5b3c4befdaf5c4e5ad3e200 commit 0632357a0ea02e43c5b3c4befdaf5c4e5ad3e200 Author: Jon Turney Date: Wed Jun 2 14:25:24 2021 +0100 Cancel search timer after 'clear' button pressed https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=39f23652f1f508ef9cad722f22ac753063399795 commit 39f23652f1f508ef9cad722f22ac753063399795 Author: Jon Turney Date: Wed May 12 15:16:59 2021 +0100 Make 'Clear' button on IDD_CHOOSE less snug https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=4692ab82a324fe226b1341e5f4778a2235501388 commit 4692ab82a324fe226b1341e5f4778a2235501388 Author: Jon Turney Date: Fri May 7 19:36:12 2021 +0100 Simplify uninstall-only warning Simplify uninstall-only warning when running in 'Install from Local Directory' mode with a non-existent package directory. Strictly, this is wrong as written, since is_64 reflects the --arch option setting, not the arch of the executable. In any case, mentioning the executable name seems to just distract from the warning we are trying to deliver here. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=2f7caeaf0499bc7d32ef55baa1699db5c5b632df commit 2f7caeaf0499bc7d32ef55baa1699db5c5b632df Author: Jon Turney Date: Wed May 12 13:50:42 2021 +0100 Fix which column we size to accomodate action labels This wasn't actually operating on the right column (due to a typo in ce9f6dd0), but fortunately that was benign (as the longest version is probably longer than any action). Diff: --- ListView.cc | 2 +- PickView.cc | 2 +- choose.cc | 1 + localdir.cc | 3 +-- res.rc | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ListView.cc b/ListView.cc index db99d98a..9966fbd9 100644 --- a/ListView.cc +++ b/ListView.cc @@ -275,7 +275,7 @@ public: cache_size = s.length() + 1; cache = (char_type *)realloc(cache, cache_size * sizeof(char_type)); } - memcpy(cache, s.c_str(), cache_size * sizeof(char_type)); + memcpy(cache, s.c_str(), (s.length() + 1) * sizeof(char_type)); return *this; } operator char_type *() const diff --git a/PickView.cc b/PickView.cc index 6d7d83dc..ac07687a 100644 --- a/PickView.cc +++ b/PickView.cc @@ -299,7 +299,7 @@ PickView::init_headers (void) const char *captions[] = { "Uninstall", "Skip", "Reinstall", "Retrieve", "Source", "Keep", NULL }; for (int i = 0; captions[i]; i++) - listview->noteColumnWidth (cat_col, captions[i]); + listview->noteColumnWidth (new_col, captions[i]); listview->noteColumnWidthEnd(); listview->resizeColumns(); diff --git a/choose.cc b/choose.cc index bcff57b9..51d7197e 100644 --- a/choose.cc +++ b/choose.cc @@ -501,6 +501,7 @@ ChooserPage::OnMessageCmd (int id, HWND hwndctl, UINT code) { std::string value; eset (GetHWND (), IDC_CHOOSE_SEARCH_EDIT, value); + KillTimer (GetHWND (), timer_id); chooser->SetPackageFilter (value); chooser->refresh (); } diff --git a/localdir.cc b/localdir.cc index 0561a305..fd49634d 100644 --- a/localdir.cc +++ b/localdir.cc @@ -284,8 +284,7 @@ LocalDirPage::OnNext () LoadString (hinstance, IDS_NO_LOCALDIR, msgText, sizeof (msgText)); char msg[1000 + local_dir.size ()]; - snprintf (msg, sizeof (msg), msgText, local_dir.c_str (), - is_64bit ? "x86_64" : "x86"); + snprintf (msg, sizeof (msg), msgText, local_dir.c_str ()); int ret = MessageBox (h, msg, 0, MB_ICONEXCLAMATION | MB_OKCANCEL); if (ret == IDCANCEL) return -1; diff --git a/res.rc b/res.rc index 8739278d..5fc8f243 100644 --- a/res.rc +++ b/res.rc @@ -330,7 +330,7 @@ END #define SETUP_SEARCHTEXT_X (SETUP_SEARCH_X + SETUP_SEARCH_W + 2) #define SETUP_SEARCHTEXT_W (60) #define SETUP_CLEAR_X (SETUP_SEARCHTEXT_X + SETUP_SEARCHTEXT_W + 2) -#define SETUP_CLEAR_W (22) +#define SETUP_CLEAR_W (30) IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | @@ -602,7 +602,7 @@ BEGIN "downloaded installation files." IDS_MAYBE_MKDIR "Directory %s does not exist, would you like me to create it?" IDS_CANT_MKDIR "Couldn't create directory %s, sorry. (Is drive full or read-only?)" - IDS_NO_LOCALDIR "Local package directory %s not found.\nYou can still use setup-%s.exe to remove installed\npackages, but there " + IDS_NO_LOCALDIR "Local package directory %s not found.\nYou can still remove installed\npackages, but there " "will be nothing to install.\n\nPress OK if that's what you wanted\nor Cancel to choose a different directory." IDS_ELEVATED "Hand installation over to elevated child process." IDS_INSTALLEDB_VERSION "Unknown INSTALLED.DB version"