[PATCH 1/2] include: Add else cases for __cdecl

[André Hentschel]

Signed-off-by: André Hentschel 
---
 include/msvcrt/corecrt.h | 2 ++
 include/windef.h         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index c98b72f7d35..ad46c56591c 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -100,6 +100,8 @@
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__)
 #  define __cdecl __attribute__((ms_abi))
+# else
+#  define __cdecl
 # endif
 #endif /* __cdecl */

diff --git a/include/windef.h b/include/windef.h
index 7ece7c8628b..521c3ab4512 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -93,7 +93,7 @@ extern "C" {
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__)
 #  define __cdecl __attribute__((ms_abi))
-# elif !defined(_MSC_VER)
+# else
 #  define __cdecl
 # endif
 #endif /* __cdecl */

[PATCH 2/2] include: Define PCONTEXT for all architectures

[André Hentschel]

Signed-off-by: André Hentschel 
---
 include/winnt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/winnt.h b/include/winnt.h
index 863b19eae58..e1cf78420a6 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2133,7 +2133,7 @@ typedef struct _CONTEXT

DWORD ContextFlags;
     DWORD Fill[2];
-} CONTEXT;
+} CONTEXT, *PCONTEXT;

#endif  /* _MIPS_ */

@@ -2245,7 +2245,7 @@ typedef struct
     DWORD Dr5;
     DWORD Dr6;
     DWORD Dr7;
-} CONTEXT;
+} CONTEXT, *PCONTEXT;

typedef struct _STACK_FRAME_HEADER
 {

[Jacek Caban]

Hi André,

On 17.06.2020 15:09, André Hentschel wrote:
> Signed-off-by: André Hentschel
>
> include/msvcrt/corecrt.h | 2 ++
>   include/windef.h         | 2 +-
>   2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
> index c98b72f7d35..ad46c56591c 100644
> --- a/include/msvcrt/corecrt.h
> +++ b/include/msvcrt/corecrt.h
> @@ -100,6 +100,8 @@
>   #   define __cdecl __attribute__((pcs("aapcs-vfp")))
>   # elif defined(__aarch64__) && defined (__GNUC__)
>   #  define __cdecl __attribute__((ms_abi))
> +# else
> +#  define __cdecl
>   # endif
>   #endif /* __cdecl */
>
> diff --git a/include/windef.h b/include/windef.h
> index 7ece7c8628b..521c3ab4512 100644
> --- a/include/windef.h
> +++ b/include/windef.h
> @@ -93,7 +93,7 @@ extern "C" {
>   #   define __cdecl __attribute__((pcs("aapcs-vfp")))
>   # elif defined(__aarch64__) && defined (__GNUC__)
>   #  define __cdecl __attribute__((ms_abi))
> -# elif !defined(_MSC_VER)
> +# else
>   #  define __cdecl
>   # endif
>   #endif /* __cdecl */

I think __cdecl is a keyword on MSVC, so !defined(_MSC_VER) seems right.

Thanks,

Jacek

[André Hentschel]

Am 17.06.20 um 15:49 schrieb Jacek Caban:
> Hi André,
>
> On 17.06.2020 15:09, André Hentschel wrote:
> > Signed-off-by: André Hentschel
> >
> > include/msvcrt/corecrt.h | 2 ++
> >   include/windef.h         | 2 +-
> >   2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
> > index c98b72f7d35..ad46c56591c 100644
> > --- a/include/msvcrt/corecrt.h
> > +++ b/include/msvcrt/corecrt.h
> > @@ -100,6 +100,8 @@
> >   #   define __cdecl __attribute__((pcs("aapcs-vfp")))
> >   # elif defined(__aarch64__) && defined (__GNUC__)
> >   #  define __cdecl __attribute__((ms_abi))
> > +# else
> > +#  define __cdecl
> >   # endif
> >   #endif /* __cdecl */
> >   diff --git a/include/windef.h b/include/windef.h
> > index 7ece7c8628b..521c3ab4512 100644
> > --- a/include/windef.h
> > +++ b/include/windef.h
> > @@ -93,7 +93,7 @@ extern "C" {
> >   #   define __cdecl __attribute__((pcs("aapcs-vfp")))
> >   # elif defined(__aarch64__) && defined (__GNUC__)
> >   #  define __cdecl __attribute__((ms_abi))
> > -# elif !defined(_MSC_VER)
> > +# else
> >   #  define __cdecl
> >   # endif
> >   #endif /* __cdecl */
>
> I think __cdecl is a keyword on MSVC, so !defined(_MSC_VER) seems right.

Hi Jacek,

both changes are inside a block of:
#if !defined(_MSC_VER) && !defined(__cdecl)

Maybe I should have added more context...

[Jacek Caban]

On 17.06.2020 17:18, André Hentschel wrote:
> Am 17.06.20 um 15:49 schrieb Jacek Caban:
> > Hi André,
> >
> > On 17.06.2020 15:09, André Hentschel wrote:
> > > Signed-off-by: André Hentschel
> > >
> > > include/msvcrt/corecrt.h | 2 ++
> > >    include/windef.h         | 2 +-
> > >    2 files changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
> > > index c98b72f7d35..ad46c56591c 100644
> > > --- a/include/msvcrt/corecrt.h
> > > +++ b/include/msvcrt/corecrt.h
> > > @@ -100,6 +100,8 @@
> > >    #   define __cdecl __attribute__((pcs("aapcs-vfp")))
> > >    # elif defined(__aarch64__) && defined (__GNUC__)
> > >    #  define __cdecl __attribute__((ms_abi))
> > > +# else
> > > +#  define __cdecl
> > >    # endif
> > >    #endif /* __cdecl */
> > >    diff --git a/include/windef.h b/include/windef.h
> > > index 7ece7c8628b..521c3ab4512 100644
> > > --- a/include/windef.h
> > > +++ b/include/windef.h
> > > @@ -93,7 +93,7 @@ extern "C" {
> > >    #   define __cdecl __attribute__((pcs("aapcs-vfp")))
> > >    # elif defined(__aarch64__) && defined (__GNUC__)
> > >    #  define __cdecl __attribute__((ms_abi))
> > > -# elif !defined(_MSC_VER)
> > > +# else
> > >    #  define __cdecl
> > >    # endif
> > >    #endif /* __cdecl */
> >
> > I think __cdecl is a keyword on MSVC, so !defined(_MSC_VER) seems right.
>
> Hi Jacek,
>
> both changes are inside a block of:
> #if !defined(_MSC_VER) && !defined(__cdecl)
>
> Maybe I should have added more context...

Oh, right, looks good then.

Thanks,

Jacek