commit 21.0.0 upon wine-6.0

AUTHORS

 Wine is available thanks to the work of:
 
+Aaro Altonen
 Aaron Arvey
 Aaron Barnes
 Aaron Brazener
+Aaron Hill
 Aaron Hope
 Aaryaman Vasishta
 Abey George
@@ -57,6 +59,7 @@ Alexander Puzankov
 Alexander Scott-Johns
 Alexander V. Lukyanov
 Alexander Yaworsky
+Alexandre Abgrall
 Alexandre Bique
 Alexandre Goujon
 Alexandre Julliard
@@ -78,6 +81,7 @@ Alex Zorach
 Alfons Hoogervorst
 Alistair Leslie-Hughes
 Allan Tong
+Alon Barzilai
 Álvaro Nieto
 Ambrož Bizjak
 Américo José Melo
@@ -115,6 +119,7 @@ Andrew de los Reyes
 Andrew de Quincey
 Andrew Eikum
 Andrew Fenn
+Andrew Guertin
 Andre Wisplinghoff
 Andrew John Hughes
 Andrew Johnston
@@ -154,6 +159,7 @@ Aric Cyr
 Aric Stewart
 Arjen Nienhuis
 Arjun Comar
+Arkadiusz Hiler
 Arno Teigseth
 Artem Reznikov
 Artur Szymiec
@@ -190,7 +196,7 @@ Bernd Paysan
 Bernd Schmidt
 Bernhard Loos
 Bernhard Reiter
-Bernhard Rosenkraenzer
+Bernhard Rosenkränzer
 Bernhard Übelacker
 Bertho Stultiens
 Bill Currie
@@ -240,6 +246,7 @@ Carlo Bramini
 Carlos Garnacho
 Carlos Lozano
 Carlos Rafael Ramirez
+Carlos Rivera
 Carlos Rodriguez
 Carl Raffaele
 Carl Sopchak
@@ -255,6 +262,8 @@ Chad Fraleigh
 Chad Powell
 Chae Jong Bin
 Changhui Liu
+Changping Yu
+Chao Long
 Charles Blacklock
 Charles Davis
 Charles Duffy
@@ -384,9 +393,11 @@ David Moore
 David Naylor
 David Quintana
 David Smith
+David Torok
 David Welch
 David Woodhouse
 Davin McCall
+Dean M Greer
 Denil Verghese
 Denis Baranov
 Denis Lukianov
@@ -399,6 +410,7 @@ Diego Nieto Cid
 Diego Pettenò
 Dietmar Kling
 Dimitrie O. Paun
+Dirk Niggemann
 Dirk Thierbach
 Divan Burger
 Dmitrij Sinukov
@@ -435,6 +447,7 @@ EG Galano
 Elias Benali
 Elias Ross
 Elie Morisse
+Emilio Cobos Álvarez
 Emmanuel Maillard
 Enol Puente
 Enrico Horn
@@ -449,6 +462,7 @@ Eric Lammerts
 Eric Pouech
 Eric van Beurden
 Eric Warnke
+Eric Wheeler
 Eric Williams
 Eric Youngdale
 Erik Bos
@@ -459,6 +473,7 @@ Eriks Dobelis
 Erik Svendsen
 Erwin Wolff
 Eryk Wieliczko
+Esme Povirk
 Ethan Chen
 Ethan Lee
 Eugene Mayevski
@@ -466,6 +481,7 @@ Eugeny Gorelov
 Evan Deaubl
 Evan G. Parry
 Evan Stade
+Evan Tang
 Evan Teran
 Evgeny Litvinenko
 Evgeny Putin
@@ -493,8 +509,10 @@ Florian Goth
 Florian Köberle
 Florian Pelz
 Florian Tobias Schandinat
+Florian Will
 Fons Botman
 Francesco Di Punzio
+Francesco Noferi
 Francis Beaudet
 Francois Boisvert
 François Dorin
@@ -526,6 +544,7 @@ Geoff Thorpe
 Georg Beyerle
 George Gov
 George Stephanos
+Georg Lehmann
 Gerald Pfeifer
 Gerard Patel
 Gerhard W. Gruber
@@ -571,14 +590,17 @@ György 'Nog' Jeney
 Hadrien Boizard
 Hagen Heiduck
 Hagop Hagopian
+Haidong Yu
 Haithem Hmida
 Hajime Segawa
 Hamza Lakhani
 Hann-huei Chiou
 Hannu Valtonen
 Hans de Graaff
+Hans-Kristian Arntzen
 Hans Leidekker
 Hao Peng
+Haoyang Chen
 Harald Hoyer
 Hari Saksena
 Harry Jeffery
@@ -632,6 +654,7 @@ Ilya Shpigor
 Indrek Altpere
 Ingmar Thiemann
 Ingo Schneider
+Isabella Bosia
 Isira Seneviratne
 Ismael Barros
 İsmail Dönmez
@@ -646,6 +669,7 @@ Ivan Vojtko
 Ivan Wong
 Jacek Bator
 Jacek Caban
+Jacek Konieczny
 Jacob Lifshay
 Jaco Greeff
 Jactry Zeng
@@ -681,6 +705,7 @@ Janne Hakonen
 Jan Nieuwenhuizen
 Jan-Peter Nilsson
 Jan Schmidt
+Jan Sikorski
 Janusz Tomczak
 Jan Van Buggenhout
 Jan Willamowius
@@ -744,6 +769,8 @@ Jesse Allen
 Jesse Litton
 Jess Haas
 Jetro Jormalainen
+Jiajin Cui
+Jiangyi Chen
 Jiang Yike
 Jianqiu Zhang
 Jiaxing Wang
@@ -980,6 +1007,7 @@ Luis Javier Merino
 Luis Sahagun
 Luiz Otavio L. Zorzella
 Lu Jiashu
+Lukáš Horáček
 Lukáš Krejčí
 Łukasz Wojniłowicz
 Luke Benstead
@@ -1022,6 +1050,7 @@ Marko Hauptvogel
 Marko Kreen
 Marko Nikolic
 Markus Amsler
+Markus Engel
 Markus Gömmel
 Markus Heidelberg
 Markus Hitter
@@ -1046,6 +1075,7 @@ Martin von Loewis
 Martin Walker
 Martin Wilck
 Marton Balint
+Mas Ahmad Muhammad
 Masanori Kakura
 Massimo Del Fedele
 Matěj Laitl
@@ -1155,6 +1185,7 @@ Moshe Vainer
 Mounir Idrassi
 Muneyuki Noguchi
 Murali Pattathe
+Murray Colpman
 Myah Caron
 Mykola Zadorozhnyy
 Natanael Copa
@@ -1259,6 +1290,7 @@ Pavel Semerad
 Pavel Troller
 Pedro Araujo Chaves Jr
 Pedro Maia
+Pengpeng Dong
 Per Ångström
 Per Johansson
 Per Lindström
@@ -1323,9 +1355,11 @@ Pim Bollen
 Piotr Caban
 Piotr Chruściel
 Piotr Pawłow
+Porot Mo
 Przemysław Białek
 Przemyslaw Bruski
 Qian Hong
+Qijia Liu
 Qingchuan Wang
 Qingdoa Daoo
 Rafael Kitover
@@ -1393,6 +1427,7 @@ Robert Wilhelm
 Robert Xiao
 Rob Farnum
 Rob Hughes
+Robin Kertels
 Rob McClinton
 Rob Walker
 Roderick Colenbrander
@@ -1459,6 +1494,7 @@ Serge Gautherie
 Sergei Bolotov
 Sergei Butakov
 Sergei Ivanov
+Sergei Trofimovich
 Serge S. Spiridonoff
 Sergey Guralnik
 Sergey Isakov
@@ -1470,6 +1506,7 @@ Seth Shelnutt
 Shachar Shemesh
 Shanren Zhou
 Shaun Morris
+Shawn M. Chapla
 Sheri Steeves
 Shi Quan He
 Shuai Meng
@@ -1598,6 +1635,7 @@ Tom Wickline
 Tony Lambregts
 Tony Wasserka
 Torbjörn Andersson
+Torge Matthies
 Toshiaki Hirose
 Toufic Milan
 Travis Athougies
@@ -1635,7 +1673,6 @@ Vincent Beers
 Vincent Béron
 Vincent Hardy
 Vincent Pelletier
-Vincent Povirk
 Vitaliy Margolen
 Vitaly Budovski
 Vitaly Lipatov
@@ -1672,6 +1709,7 @@ William Smith
 William Stinson
 William Waghorn
 Willie Sippel
+Will Mainio
 Will Tipton
 Wim Lewis
 Wino Rojo
@@ -1690,6 +1728,7 @@ Yifu Wang
 Yngvi Sigurjonsson
 Yong Chi
 YongHao Hu
+Yongjie Yao
 Yorick Hardy
 Yoshiro Takeno
 Young Chung
@@ -1710,6 +1749,8 @@ Zhang Shuai
 Zhan Jianyu
 Zhenbo Li
 Zheng Chen
+Zhennan Cai
+Zhipeng Zhao
 Zhiyi Zhang
 Zimler Attila
 Ziqing Hui

LICENSE

-Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS
+Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS
 for a complete list)
 
 Wine is free software; you can redistribute it and/or modify it under

MAINTAINERS

@@ -53,7 +53,7 @@ P:	Nikolay Sivov <nsivov@codeweavers.com>
 F:	dlls/comctl32/
 
 Common Item Dialog
-P:	Vincent Povirk <vincent@codeweavers.com>
+P:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/comdlg32/itemdlg.c
 F:	dlls/comdlg32/tests/itemdlg.c
 
@@ -64,9 +64,8 @@ F:	dlls/d2d*/
 Direct3D
 M:	Henri Verbeet <hverbeet@codeweavers.com>
 P:	Stefan Dösinger <stefan@codeweavers.com>
-P:	Józef Kucia <jkucia@codeweavers.com>
 P:	Matteo Bruni <mbruni@codeweavers.com>
-F:	dlls/d3d10*/
+F:	dlls/d3d10core/
 F:	dlls/d3d11/
 F:	dlls/d3d12/
 F:	dlls/d3d8/
@@ -80,7 +79,8 @@ Direct3D helper libraries
 M:	Matteo Bruni <mbruni@codeweavers.com>
 P:	Henri Verbeet <hverbeet@codeweavers.com>
 P:	Stefan Dösinger <stefan@codeweavers.com>
-P:	Józef Kucia <jkucia@codeweavers.com>
+F:	dlls/d3d10/
+F:	dlls/d3d10_1/
 F:	dlls/d3dcompiler*/
 F:	dlls/d3dx10*/
 F:	dlls/d3dx11*/
@@ -103,14 +103,18 @@ F:	dlls/dpnet/
 F:	dlls/dpwsockx/
 
 DirectShow
+M:	Zebediah Figura <z.figura12@gmail.com>
 P:	Andrew Eikum <aeikum@codeweavers.com>
 F:	dlls/amstream/
+F:	dlls/devenum/
 F:	dlls/mciqtz32/
+F:	dlls/qasf/
 F:	dlls/qcap/
+F:	dlls/qdvd/
 F:	dlls/qedit/
 F:	dlls/quartz/
 F:	dlls/strmbase/
-F:	dlls/winegstreamer/
+F:	dlls/winegstreamer/gstdemux.c
 F:	dlls/wineqtdecoder/
 
 DirectWrite
@@ -118,7 +122,7 @@ M:	Nikolay Sivov <nsivov@codeweavers.com>
 F:	dlls/dwrite/
 
 DotNet Runtime
-M:	Vincent Povirk <vincent@codeweavers.com>
+M:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/mscoree/
 
 GDI
@@ -126,7 +130,7 @@ M:	Huw Davies <huw@codeweavers.com>
 F:	dlls/gdi32/
 
 GDIPlus
-M:	Vincent Povirk <vincent@codeweavers.com>
+M:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/gdiplus/
 
 GPhoto Driver
@@ -139,6 +143,11 @@ F:	dlls/hid/
 F:	dlls/hidclass.sys/
 F:	dlls/winehid.sys/
 
+HTTP server
+M:	Zebediah Figura <z.figura12@gmail.com>
+F:	dlls/httpapi/
+F:	dlls/http.sys/
+
 Input methods
 M:	Aric Stewart <aric@codeweavers.com>
 F:	dlls/imm32/
@@ -162,6 +171,7 @@ F:	dlls/msvc*/
 
 MSI installers
 M:	Hans Leidekker <hans@codeweavers.com>
+P:	Zebediah Figura <z.figura12@gmail.com>
 F:	dlls/msi/
 
 Netstat
@@ -185,14 +195,13 @@ F:	dlls/ole32/oleobj.c
 
 OLE RPC
 M:	Huw Davies <huw@codeweavers.com>
+F:	dlls/combase/
 F:	dlls/ole32/compobj.c
 F:	dlls/ole32/marshal.c
-F:	dlls/ole32/rpc.c
-F:	dlls/ole32/stubmanager.c
 F:	dlls/ole32/usrmarshal.c
 
 OLE Storage
-M:	Vincent Povirk <vincent@codeweavers.com>
+M:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/ole32/filelockbytes.c
 F:	dlls/ole32/memlockbytes.c
 F:	dlls/ole32/stg_stream.c
@@ -205,6 +214,12 @@ P:	Andrew Eikum <aeikum@codeweavers.com>
 P:	Huw Davies <huw@codeweavers.com>
 F:	dlls/oleaut32/typelib.c
 
+Plug and Play
+P:	Zebediah Figura <z.figura12@gmail.com>
+F:	dlls/newdev/
+F:	dlls/ntoskrnl.exe/pnp.c
+F:	dlls/setupapi/devinst.c
+
 Postscript Driver
 M:	Huw Davies <huw@codeweavers.com>
 F:	dlls/wineps.drv/
@@ -222,18 +237,19 @@ F:	dlls/riched20
 
 RPC Runtime
 P:	Huw Davies <huw@codeweavers.com>
+P:	Zebediah Figura <z.figura12@gmail.com>
 F:	dlls/rpcrt4
 F:	tools/widl
 
 TWAIN
-P:	Vincent Povirk <vincent@codeweavers.com>
+P:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/twain_32/
 F:	dlls/sane.ds/
 F:	dlls/gphoto2.ds/
 
 Uniscribe
 M:	Aric Stewart <aric@codeweavers.com>
-F:	dlls/usp10/
+F:	dlls/gdi32/uniscribe/
 
 URL Moniker
 M:	Jacek Caban <jacek@codeweavers.com>
@@ -254,7 +270,7 @@ F:	dlls/mshtml/
 F:	dlls/shdocvw/
 
 Windows Imaging Component
-M:	Vincent Povirk <vincent@codeweavers.com>
+M:	Esme Povirk <vincent@codeweavers.com>
 F:	dlls/windowscodecs/
 F:	dlls/windowscodecsext/
 
@@ -264,6 +280,17 @@ F:	dlls/wbemdisp/
 F:	dlls/wbemprox/
 F:	dlls/wmiutils/
 
+Windows Media Foundation
+M:	Nikolay Sivov <nsivov@codeweavers.com>
+F:	dlls/mf/
+F:	dlls/mferror/
+F:	dlls/mfmediaengine/
+F:	dlls/mfplat/
+F:	dlls/mfplay/
+F:	dlls/mfreadwrite/
+F:	dlls/mfuuid/
+F:	dlls/rtworkq/
+
 Wine server, IPC
 M:	Alexandre Julliard <julliard@winehq.org>
 P:	Erich E. Hoover <erich.e.hoover@wine-staging.com>
@@ -287,7 +314,6 @@ F:	dlls/wpcap/
 
 X11 Driver
 M:	Alexandre Julliard <julliard@winehq.org>
-P:	Vincent Povirk <vincent@codeweavers.com>
 F:	dlls/winex11.drv/
 
 XML parsing
@@ -301,7 +327,7 @@ P:	Alex Henrie <alexhenrie24@gmail.com>
 P:	Andrew Eikum <aeikum@codeweavers.com>
 P:	Huw Davies <huw@codeweavers.com>
 P:	Jacek Caban <jacek@codeweavers.com>
-P:	Vincent Povirk <vincent@codeweavers.com>
+P:	Esme Povirk <vincent@codeweavers.com>
 P:	Erich E. Hoover <erich.e.hoover@wine-staging.com>
 F:	*
 F:	*/
@@ -313,5 +339,6 @@ W:	https://wiki.winehq.org/StableRules
 Staging Branch
 M:	Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Paul Gofman <gofmanp@gmail.com>
 P:	Erich E. Hoover <erich.e.hoover@wine-staging.com>
 W:	https://wine-staging.com/

Makefile.in

@@ -28,9 +28,8 @@ datadir         = @datadir@
 mandir          = @mandir@
 includedir      = @includedir@
 fontdir         = ${datadir}/wine/fonts
+nlsdir          = ${datadir}/wine/nls
 dlldir          = ${libdir}/wine
-top_srcdir      = @top_srcdir@
-top_builddir    = @top_builddir@
 srcdir          = @srcdir@
 SHELL           = /bin/sh
 CC              = @CC@
@@ -70,14 +69,13 @@ CONVERT         = @CONVERT@
 ICOTOOL         = @ICOTOOL@
 MSGFMT          = @MSGFMT@
 CROSSTARGET     = @CROSSTARGET@
+CROSSDEBUG      = @CROSSDEBUG@
 SUBDIRS         = @SUBDIRS@
 RUNTESTFLAGS    = -q -P wine
 MAKEDEP         = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
 DELAYLOADFLAG   = @DELAYLOADFLAG@
 PACKAGE_VERSION = @PACKAGE_VERSION@
-SED_CMD         = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
-LDRPATH_INSTALL = @LDRPATH_INSTALL@
-LDRPATH_LOCAL   = @LDRPATH_LOCAL@
+SED_CMD         = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
 api_manext      = 3w
 HOSTSTACK_CFLAGS = @HOSTSTACK_CFLAGS@
 WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@
@@ -123,20 +121,24 @@ install-image: install-lib
 # Rules for API documentation
 
 install-manpages:: manpages
-	for i in documentation/man$(api_manext)/*.$(api_manext); do $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done
+	for i in documentation/man$(api_manext)/*.$(api_manext); do $(srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done
 
 .PHONY: install-manpages
 
-# Dependencies between directories
+# Rules for generated source files
 
-# dependencies needed to build any dll or program
-__tooldeps__: libs/wpp
-__builddeps__: __tooldeps__ libs/wine include po
-.PHONY: depend dummy install install-lib install-dev
+dlls/ntdll/unix/version.c: dummy
+	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
 
-dummy:
-server: include
-libs/port libs/wine libs/wpp: include/config.h
+programs/winetest/build.rc: dummy
+	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
+
+programs/winetest/build.nfo:
+	@-$(CC) -v 2>$@
+
+dlls/wineandroid.drv/wineandroid.drv-debug.aar: dlls/wineandroid.drv/build.gradle $(srcdir)/dlls/wineandroid.drv/AndroidManifest.xml $(srcdir)/dlls/wineandroid.drv/WineDriver.java $(srcdir)/dlls/wineandroid.drv/WineProvider.java $(srcdir)/dlls/wineandroid.drv/wine.svg $(srcdir)/dlls/wineandroid.drv/strings.xml
+	cd dlls/wineandroid.drv && `cd ../.. && cd $(srcdir) && pwd`/gradlew -q -Psrcdir=$(srcdir) assembleDebug
+	mv dlls/wineandroid.drv/build/outputs/aar/wineandroid.drv-debug.aar $@
 
 # Misc rules
 
@@ -144,8 +146,8 @@ TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)'
 
 TAGS etags:
 	rm -f TAGS
-	(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS)
+	(test -d .git && git ls-files || find -L $(srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS)
 
 tags ctags:
 	rm -f tags
-	(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)
+	(test -d .git && git ls-files || find -L $(srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)

README

@@ -40,7 +40,7 @@ To compile and run Wine, you must have one of the following:
   FreeBSD 8.0 or later
   Solaris x86 9 or later
   NetBSD-current
-  Mac OS X 10.5 or later
+  Mac OS X 10.8 or later
 
 As Wine requires kernel-level thread support to run, only the operating
 systems mentioned above are supported.  Other operating systems which
@@ -61,8 +61,10 @@ NetBSD info:
   turned on in your kernel.
 
 Mac OS X info:
-  You need Xcode 2.4 or later to build properly on x86.
-  The Mac driver requires OS X 10.6 or later and won't be built on 10.5.
+  You need Xcode/Xcode Command Line Tools or Apple cctools.  The
+  minimum requirements for compiling Wine are clang 3.8 with the
+  MacOSX10.10.sdk and mingw-w64 v8.  The MacOSX10.14.sdk and later can
+  only build wine64.
 
 
 Supported file systems:

VERSION

-Wine version 5.0
+Wine version 6.0

aclocal.m4

@@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name
 dnl
 AC_DEFUN([WINE_CHECK_HOST_TOOL],
 [AS_VAR_SET_IF([ac_tool_prefix],
-  AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4]))
+  [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])])
 AS_VAR_IF([ac_cv_prog_$1],[],
   [AS_VAR_IF([cross_compiling],[yes],[],
     [AS_UNSET([ac_cv_prog_$1])
@@ -121,8 +121,6 @@ ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $ac_cflags"
 $6
 CPPFLAGS=$ac_save_CPPFLAGS
-test -z "$ac_cflags" || ac_cflags=`echo " $ac_cflags" | sed 's/ -I\([[^/]]\)/ -I\$(top_builddir)\/\1/g'`
-test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top_builddir)\/\1/g'`
 AS_VAR_POPDEF([ac_libs])dnl
 AS_VAR_POPDEF([ac_cflags])])dnl
 
@@ -162,10 +160,10 @@ AC_CACHE_CHECK([whether the cross-compiler supports $1], ac_var,
 [ac_wine_try_cflags_saved=$CFLAGS
 ac_wine_try_cflags_saved_cc=$CC
 ac_wine_try_cflags_saved_exeext=$ac_exeext
-CFLAGS="$CFLAGS $1"
+CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs $1"
 CC="$CROSSCC"
 ac_exeext=".exe"
-AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])],
+AC_LINK_IFELSE([AC_LANG_SOURCE([[int __cdecl mainCRTStartup(void) { return 0; }]])],
                [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
 CFLAGS=$ac_wine_try_cflags_saved
 CC=$ac_wine_try_cflags_saved_cc