X-Recipient: archive-cygwin AT delorie DOT com
X-Original-To: cygwin AT cygwin DOT com
Delivered-To: cygwin AT cygwin DOT com
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 794D33856DF0
Authentication-Results: sourceware.org;
 dmarc=fail (p=none dis=none) header.from=nifty.ne.jp
Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=nifty.ne.jp
DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-05.nifty.com 26SELe6t013452
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.ne.jp;
 s=dec2015msa; t=1659018101;
 bh=SzTPOSxtIMmgD4mVQeXHhZxWpxxWs+G5vF23w4G2AwM=;
 h=Date:From:To:Subject:From;
 b=yDCplhf6eOCC3I1L0Q1ysC247XKD0kMDfK1qYPPs5HPDH+/9umGlVvs7UfUWV59kX
 u+oJp09sen1OjW/z5fzeBJIlNzA+KNLaSLaZGIfsN4oMMLG01hjz5wYpX5xgaX51jP
 2J8Bax63QbcmRBouTqqzZdaXXvlUmxBGatLgAKTbmnypvM81X1hwYiS4gh5yGWnLhJ
 IRa1ZszlkIfIYHZIMDzEupkXgVevuZNOXM7bkShOsscnogNNwAD0TFONVrKObl2NC6
 XpzmPUR/lC0vkFPWNaUFrHqwK5JoG98fafUt4k/5TvwjsjIv/AL0YHyerDPJbQHxcT
 +9Re1VAOYOOTA==
X-Nifty-SrcIP: [119.150.44.95]
Date: Thu, 28 Jul 2022 23:21:40 +0900
From: Takashi Yano <takashi DOT yano AT nifty DOT ne DOT jp>
To: cygwin AT cygwin DOT com
Subject: cygwin on git master fails to start.
Message-Id: <20220728232140.f781ed71cbe1794e337ca369@nifty.ne.jp>
X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.30; i686-pc-mingw32)
Mime-Version: 1.0
X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED,
 DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE,
 SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
 server2.sourceware.org
X-BeenThere: cygwin AT cygwin DOT com
X-Mailman-Version: 2.1.29
List-Id: General Cygwin discussions and problem reports <cygwin.cygwin.com>
List-Archive: <https://cygwin.com/pipermail/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-request AT cygwin DOT com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin>,
 <mailto:cygwin-request AT cygwin DOT com?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Cygwin" <cygwin-bounces+archive-cygwin=delorie DOT com AT cygwin DOT com>

Hi Corinna,

After the following commit, cygwin fails to start in my
environment.

commit e46f15c2d168abea34b4d880b4eba38d750c7066
Author: Corinna Vinschen <corinna AT vinschen DOT de>
Date:   Thu Jul 14 20:06:09 2022 +0200

    Cygwin: hookapi: drop handling i386 targets
    
    Signed-off-by: Corinna Vinschen <corinna AT vinschen DOT de>

diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
index fbf13ce90..3ce1e0fb2 100644
--- a/winsup/cygwin/hookapi.cc
+++ b/winsup/cygwin/hookapi.cc
@@ -39,12 +39,10 @@ PEHeaderFromHModule (HMODULE hModule, bool &is_64bit)
     {
       pNTHeader = PIMAGE_NT_HEADERS (PBYTE (hModule)
 				     + PIMAGE_DOS_HEADER (hModule) ->e_lfanew);
-      if (pNTHeader->Signature != IMAGE_NT_SIGNATURE)
+      if (pNTHeader->Signature == IMAGE_NT_SIGNATURE)
 	pNTHeader = NULL;
       else if (pNTHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
 	is_64bit = true;
-      else if (pNTHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_I386)
-	is_64bit = false;
       else
 	pNTHeader = NULL;
     }


Is this the right thing?
-      if (pNTHeader->Signature != IMAGE_NT_SIGNATURE)
+      if (pNTHeader->Signature == IMAGE_NT_SIGNATURE)
 	pNTHeader = NULL;

-- 
Takashi Yano <takashi DOT yano AT nifty DOT ne DOT jp>

-- 
Problem reports:      https://cygwin.com/problems.html
FAQ:                  https://cygwin.com/faq/
Documentation:        https://cygwin.com/docs.html
Unsubscribe info:     https://cygwin.com/ml/#unsubscribe-simple