From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28681 invoked by alias); 9 Nov 2017 09:47:48 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 28405 invoked by uid 89); 9 Nov 2017 09:47:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=BEGIN, Window X-HELO: rgout04.bt.lon5.cpcloud.co.uk Received: from rgout0401.bt.lon5.cpcloud.co.uk (HELO rgout04.bt.lon5.cpcloud.co.uk) (65.20.0.214) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 Nov 2017 09:47:37 +0000 X-OWM-Source-IP: 86.162.230.154 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2017.11.9.93615:17:7.944,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __FROM_DOMAIN_IN_ANY_CC1, __ANY_URI, __HTTPS_URI, __URI_WITH_PATH, URI_ENDS_IN_HTML, __URI_NO_MAILTO, __URI_NO_WWW, __CP_URI_IN_BODY, __SUBJ_ALPHA_NEGATE, __URI_IN_BODY, __URI_NOT_IMG, __NO_HTML_TAG_RAW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_P1, __MIME_TEXT_ONLY, __URI_NS, HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, __FROM_DOMAIN_IN_RCPT, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, __SINGLE_URI_TEXT, SINGLE_URI_IN_BODY, __MIME_TEXT_P, BODY_SIZE_7000_LESS, URI_WITH_PATH_ONLY Received: from localhost.localdomain (86.162.230.154) by rgout04.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58482DA2230E14E6; Thu, 9 Nov 2017 09:47:34 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup] Don't fatal() on unexpected early window messages Date: Thu, 09 Nov 2017 09:47:00 -0000 Message-Id: <20171109094723.108768-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-11/txt/msg00030.txt.bz2 There's no good reason for this to be immediately fatal, and we have at least one report of this happening [1], so don't fatal(), just warn. [1] https://cygwin.com/ml/cygwin/2017-07/msg00428.html --- res.rc | 1 - resource.h | 1 - window.cc | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res.rc b/res.rc index 40e464b..09b3fc0 100644 --- a/res.rc +++ b/res.rc @@ -528,7 +528,6 @@ BEGIN IDS_INSTALL_INCOMPLETE "Installation incomplete. Check %s for details" IDS_CORRUPT_PACKAGE "Package file %s has a corrupt local copy, please remove and retry." IDS_SKIP_PACKAGE "%s\nDo you want to skip this package ?" - IDS_WINDOW_INIT_BADMSG "Fatal Error: Unexpected windows message %u received too early in window initialization." IDS_UNCAUGHT_EXCEPTION "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s" IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s\nAppErrNo: %d" IDS_TRUSTKEEP_TOOLTIP "Sets all packages to their currently installed " diff --git a/resource.h b/resource.h index b6685e5..fdebc8f 100644 --- a/resource.h +++ b/resource.h @@ -20,7 +20,6 @@ #define IDS_REBOOT_REQUIRED 118 #define IDS_CORRUPT_PACKAGE 119 #define IDS_INSTALL_ERROR 120 -#define IDS_WINDOW_INIT_BADMSG 121 #define IDS_UNCAUGHT_EXCEPTION 122 #define IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO 123 #define IDS_SKIP_PACKAGE 124 diff --git a/window.cc b/window.cc index d97ef6a..c4006d6 100644 --- a/window.cc +++ b/window.cc @@ -79,7 +79,9 @@ Window::FirstWindowProcReflector (HWND hwnd, UINT uMsg, WPARAM wParam, else { // Should never get here. - fatal(NULL, IDS_WINDOW_INIT_BADMSG, uMsg); + Log (LOG_PLAIN) << "Warning: Unexpected windows message " << uMsg + << "received early in window initialization." + << endLog; } return wnd->WindowProc (uMsg, wParam, lParam); -- 2.15.0