widl: Import Wine version wine-9.20.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>

mingw-w64-tools/widl/VERSION

@@ -1 +1 @@
-WIDL version 9.18
+WIDL version 9.20

mingw-w64-tools/widl/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for widl 9.18.
+# Generated by GNU Autoconf 2.71 for widl 9.20.
 #
 # Report bugs to <mingw-w64-public@lists.sourceforge.net>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='widl'
 PACKAGE_TARNAME='widl'
-PACKAGE_VERSION='9.18'
+PACKAGE_VERSION='9.20'
-PACKAGE_STRING='widl 9.18'
+PACKAGE_STRING='widl 9.20'
 PACKAGE_BUGREPORT='mingw-w64-public@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures widl 9.18 to adapt to many kinds of systems.
+\`configure' configures widl 9.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of widl 9.18:";;
+     short | recursive ) echo "Configuration of widl 9.20:";;
    esac
   cat <<\_ACEOF
 
@@ -1492,7 +1492,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-widl configure 9.18
+widl configure 9.20
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1904,7 +1904,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by widl $as_me 9.18, which was
+It was created by widl $as_me 9.20, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3294,7 +3294,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='widl'
- VERSION='9.18'
+ VERSION='9.20'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5761,7 +5761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by widl $as_me 9.18, which was
+This file was extended by widl $as_me 9.20, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5829,7 +5829,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-widl config.status 9.18
+widl config.status 9.20
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

mingw-w64-tools/widl/include/windef.h

@@ -64,42 +64,29 @@ extern "C" {
 #ifdef WINE_UNIX_LIB
 # define __stdcall
 # define __cdecl
-#elif defined(__GNUC__)
+#else
-# ifdef __i386__
+# if defined(__i386__) && defined(__GNUC__)
 #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
 #   define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
+#   define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
 #  else
 #   define __stdcall __attribute__((__stdcall__))
+#   define __cdecl __attribute__((__cdecl__))
 #  endif
-# elif defined(__x86_64__)
+# elif defined(__x86_64__) && defined(__GNUC__)
 #  if __has_attribute(__force_align_arg_pointer__)
 #   define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-#  define __ms_va_list __builtin_ms_va_list
-# elif defined(__arm__) && !defined(__SOFTFP__) && !defined(__CYGWIN__)
-#  define __stdcall __attribute__((pcs("aapcs-vfp")))
-#  define WINAPIV __attribute__((pcs("aapcs")))
-# elif defined(__aarch64__) && __has_attribute(ms_abi)
-#  define __stdcall __attribute__((ms_abi))
-#  define __ms_va_list __builtin_ms_va_list
-# else  /* __i386__ */
-#  define __stdcall
-# endif  /* __i386__ */
-# ifdef __i386__
-#  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
-#   define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
-#  else
-#   define __cdecl __attribute__((__cdecl__))
-#  endif
-# else
 #  define __cdecl __stdcall
+#  define __ms_va_list __builtin_ms_va_list
+# else
+#  define __stdcall
+#  define __cdecl
 # endif
 # define __fastcall __stdcall
 # define __thiscall __stdcall
-#elif !defined(RC_INVOKED)
-# error You need to define __stdcall for your compiler
 #endif  /* WINE_UNIX_LIB */
 
 #endif  /* _MSC_VER || __MINGW32__ */

mingw-w64-tools/widl/include/winnt.h

@@ -229,28 +229,6 @@ extern "C" {
 
 /* Anonymous union/struct handling */
 
-#ifndef NONAMELESSSTRUCT
-# ifdef __GNUC__
-   /* Anonymous struct support starts with gcc 2.96 or gcc/g++ 3.x */
-#  if (__GNUC__ < 2) || ((__GNUC__ == 2) && (defined(__cplusplus) || (__GNUC_MINOR__ < 96)))
-#   define NONAMELESSSTRUCT
-#  endif
-# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#  define NONAMELESSSTRUCT
-# endif
-#endif  /* NONAMELESSSTRUCT */
-
-#ifndef NONAMELESSUNION
-# ifdef __GNUC__
-   /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
-#  if (__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus))))
-#   define NONAMELESSUNION
-#  endif
-# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#  define NONAMELESSUNION
-# endif
-#endif  /* NONAMELESSUNION */
-
 #undef DUMMYSTRUCTNAME
 #undef DUMMYSTRUCTNAME1
 #undef DUMMYSTRUCTNAME2
@@ -323,10 +301,7 @@ extern "C" {
 
 #if !defined(WINE_NO_NAMELESS_EXTENSION)
 # ifdef __GNUC__
-   /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */
+#  define __C89_NAMELESS __extension__
-#  if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus))))
-#   define __C89_NAMELESS __extension__
-#  endif
 # elif defined(_MSC_VER)
 #  define __C89_NAMELESS
 # endif
@@ -6065,6 +6040,7 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS {
 #define DEVICEFAMILYDEVICEFORM_MAX                    0x21
 
 NTSYSAPI void WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*,DWORD*,DWORD*);
+NTSYSAPI DWORD WINAPI RtlConvertDeviceFamilyInfoToString(DWORD *,DWORD *,WCHAR *,WCHAR *);
 
 #define EVENTLOG_SUCCESS                0x0000
 #define EVENTLOG_ERROR_TYPE             0x0001

mingw-w64-tools/widl/src/header.c

@@ -1254,7 +1254,7 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const type_
     if (!is_callas(func->attrs)) {
       const var_t *arg;
 
-      fprintf(header, "static __WIDL_INLINE ");
+      fprintf(header, "static inline ");
       write_type_decl_left(header, type_function_get_ret(func->declspec.type));
       fprintf(header, " %s_%s(", name, get_name(func));
       write_args(header, type_function_get_args(func->declspec.type), name, 1, FALSE, NAME_C);
@@ -2099,14 +2099,6 @@ void write_header(const statement_list_t *stmts)
   fprintf(header, "#ifndef __%s__\n", header_token);
   fprintf(header, "#define __%s__\n\n", header_token);
 
-  fprintf(header, "#ifndef __WIDL_INLINE\n");
-  fprintf(header, "#if defined(__cplusplus) || defined(_MSC_VER)\n");
-  fprintf(header, "#define __WIDL_INLINE inline\n");
-  fprintf(header, "#elif defined(__GNUC__)\n");
-  fprintf(header, "#define __WIDL_INLINE __inline__\n");
-  fprintf(header, "#endif\n");
-  fprintf(header, "#endif\n\n");
-
   fprintf(header, "/* Forward declarations */\n\n");
   write_forward_decls(header, stmts);