cygwin on git master fails to start.

cygwin on git master fails to start.

[Takashi Yano]

Hi Corinna,

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

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

    Cygwin: hookapi: drop handling i386 targets
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.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.yano@nifty.ne.jp>

Re: cygwin on git master fails to start.

[Corinna Vinschen]

On Jul 28 23:21, Takashi Yano wrote:
> Hi Corinna,
> 
> After the following commit, cygwin fails to start in my
> environment.
> 
> commit e46f15c2d168abea34b4d880b4eba38d750c7066
> Author: Corinna Vinschen <corinna@vinschen.de>
> Date:   Thu Jul 14 20:06:09 2022 +0200
> 
>     Cygwin: hookapi: drop handling i386 targets
>     
>     Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Yeah, thanks for notifying me.  It looks like I pushed it before
I really finished it.  I now removed the is64bit flag entirely
and pushed the result, please have a look.


Thanks,
Corinna

Re: cygwin on git master fails to start.

[Takashi Yano]

On Thu, 28 Jul 2022 16:46:19 +0200
Corinna Vinschen wrote:
> On Jul 28 23:21, Takashi Yano wrote:
> > Hi Corinna,
> > 
> > After the following commit, cygwin fails to start in my
> > environment.
> > 
> > commit e46f15c2d168abea34b4d880b4eba38d750c7066
> > Author: Corinna Vinschen <corinna@vinschen.de>
> > Date:   Thu Jul 14 20:06:09 2022 +0200
> > 
> >     Cygwin: hookapi: drop handling i386 targets
> >     
> >     Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
> 
> Yeah, thanks for notifying me.  It looks like I pushed it before
> I really finished it.  I now removed the is64bit flag entirely
> and pushed the result, please have a look.

I confirmed the latest commit fixes the issue.
Thanks.

-- 
Takashi Yano <takashi.yano@nifty.ne.jp>