December 2020 - Wine-commits

Zebediah Figura : httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server().
by Alexandre Julliard 17 Dec '20

17 Dec '20

Module: wine Branch: master Commit: 0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa6f8e2ea1e3f2e852bef1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 16 10:51:49 2020 -0600 httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server(). This seems to be a variation of a bug already encountered; here the kernel does not report the right value in the IOSB until after completion is signaled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48587 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index c54158d45a2..5d79197505c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -233,9 +233,11 @@ static void test_v1_server(void) ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - /* 64-bit Windows 10 version 1507 apparently suffers from a bug where it - * will report success before completely filling the buffer. Wait for a - * short interval to work around this. */ + /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 + * version 1507, but probably affecting others) suffer from a bug where the + * kernel will report success before completely filling the buffer or + * reporting the correct buffer size. Wait for a short interval to work + * around this. */ Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); @@ -1296,10 +1298,14 @@ static void test_v2_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + + Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n");

1 0

Alexandre Julliard : packaging: Bump the version of several of the Android package dependencies.
by Alexandre Julliard 17 Dec '20

17 Dec '20

Module: tools Branch: master Commit: 3161fe99057ba6bd217c4fea9354d4e91b74def6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3161fe99057ba6bd217c4fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 22:11:39 2020 +0100 packaging: Bump the version of several of the Android package dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 56 ++++++++++++---------- packaging/android/cups.diff | 111 +++++++++++++++++-------------------------- 2 files changed, 74 insertions(+), 93 deletions(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index c2147ae..3662a48 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -31,31 +31,26 @@ winetools=$basedir/tools silent=--silent makeflags="--no-print-directory $silent -j$(nproc)" -android_ndk=android-ndk-r18b +android_ndk=android-ndk-r21d gradle=gradle-3.5.1 -png=libpng-1.6.36 -jpeg=jpeg-9c -freetype=freetype-2.8.1 -lcms2=lcms2-2.9 -tiff=tiff-4.0.10 -xml2=libxml2-2.9.7 -xslt=libxslt-1.1.30 -gmp=gmp-6.1.2 -nettle=nettle-3.4.1 -gnutls=gnutls-3.6.5 -openldap=openldap-2.4.46 -mpeg=mpg123-1.25.10 -cups=cups-2.2.9 +png=libpng-1.6.37 +jpeg=jpeg-9d +freetype=freetype-2.10.4 +lcms2=lcms2-2.11 +tiff=tiff-4.1.0 +xml2=libxml2-2.9.10 +xslt=libxslt-1.1.34 +gmp=gmp-6.2.1 +nettle=nettle-3.6 +gnutls=gnutls-3.7.0 +openldap=openldap-2.4.56 +mpeg=mpg123-1.26.3 +cups=cups-2.3.3 +gecko=wine-gecko-2.47.2 sourcedir=$(cd $(dirname $0) && pwd) release=$1 -if test -z "$release" -then - echo "Usage: $0 release_tag" - exit 1 -fi - download () { test -d $downloads || mkdir -p $downloads @@ -87,13 +82,13 @@ config_gradle () config_png () { - download $png https://sourceforge.net/projects/libpng/files/libpng16/1.6.36/$png.tar.xz/d… + download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/d… (cd $png && $run_configure && make $makeflags) } config_jpeg () { - download $jpeg http://www.ijg.org/files/jpegsrc.v9c.tar.gz + download $jpeg http://www.ijg.org/files/jpegsrc.v9d.tar.gz (cd $jpeg && $run_configure && make $makeflags) # rename libjpeg.so to avoid conflicts with the system one cp $jpeg/.libs/libjpeg.so $jpeg/.libs/libwjpeg.so @@ -102,7 +97,7 @@ config_jpeg () config_freetype () { test -d $png || config_png - download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.bz2 + download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.xz pngdir=$(pwd)/$png (cd $freetype && $run_configure LIBPNG_CFLAGS=-I$pngdir LIBPNG_LIBS="-L$pngdir/.libs -lpng16" && make $makeflags) } @@ -275,12 +270,11 @@ install_all () $install -m 644 $sourcedir/LICENSE.txt assets-tmp/LICENSE.txt mv assets-tmp $destdir/assets - (cd $destdir && gradle -q -Psrcdir=../../$srcdir -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) + (cd $destdir && gradle -q -Psrcdir=$srcdir -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) mv $destdir/build/outputs/apk/wine-debug.apk ../../wine-${release:-debug}-$arch.apk } -rm -rf $basedir - +test -z "$release" || rm -rf $basedir test -d $basedir || mkdir $basedir cd $basedir @@ -312,3 +306,13 @@ do run_configure="./configure $silent --host=$host PKG_CONFIG=false" install_all) done + +# upload + +if test -n "$release" +then + allfiles="wine-$release-x86.apk wine-$release-arm.apk" + scp -p $allfiles www.winehq.org:. + sha512sum $allfiles | ssh www.winehq.org sha512sum -c + ssh -n www.winehq.org mv $allfiles /home/ftp/pub/wine-builds/android +fi diff --git a/packaging/android/cups.diff b/packaging/android/cups.diff index 0bad095..af82ad6 100644 --- a/packaging/android/cups.diff +++ b/packaging/android/cups.diff @@ -1,27 +1,26 @@ -diff -ur cups-2.2.4.orig/config-scripts/cups-sharedlibs.m4 cups-2.2.4/config-scripts/cups-sharedlibs.m4 ---- cups-2.2.4.orig/config-scripts/cups-sharedlibs.m4 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/config-scripts/cups-sharedlibs.m4 2017-11-02 10:32:29.411070604 +0100 -@@ -32,6 +32,16 @@ +diff -ur cups-2.3.3.orig/config-scripts/cups-sharedlibs.m4 cups-2.3.3/config-scripts/cups-sharedlibs.m4 +--- cups-2.3.3.orig/config-scripts/cups-sharedlibs.m4 2020-04-27 20:04:29.000000000 +0200 ++++ cups-2.3.3/config-scripts/cups-sharedlibs.m4 2020-12-09 11:23:58.182435987 +0100 +@@ -29,6 +29,15 @@ DSOXX="\$(CXX)" - DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" + DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G" ;; + linux-android*) + LIBCUPS="lib$cupsbase.so" -+ LIBCUPSCGI="libcupscgi.so" -+ LIBCUPSIMAGE="libcupsimage.so" -+ LIBCUPSMIME="libcupsmime.so" -+ LIBCUPSPPDC="libcupsppdc.so" ++ if test "x$cupsimagebase" != x; then ++ LIBCUPSIMAGE="lib$cupsimagebase.so" ++ fi + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -shared \$(OPTIM)" + ;; linux* | gnu* | *bsd*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" -diff -ur cups-2.2.4.orig/config-scripts/cups-ssl.m4 cups-2.2.4/config-scripts/cups-ssl.m4 ---- cups-2.2.4.orig/config-scripts/cups-ssl.m4 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/config-scripts/cups-ssl.m4 2017-11-02 10:32:29.411070604 +0100 -@@ -68,6 +68,12 @@ + if test "x$cupsimagebase" != x; then +diff -ur cups-2.3.3.orig/config-scripts/cups-ssl.m4 cups-2.3.3/config-scripts/cups-ssl.m4 +--- cups-2.3.3.orig/config-scripts/cups-ssl.m4 2020-04-27 20:04:29.000000000 +0200 ++++ cups-2.3.3/config-scripts/cups-ssl.m4 2020-12-09 11:12:41.389901875 +0100 +@@ -45,6 +45,12 @@ SSLFLAGS=`$PKGCONFIG --cflags gnutls` AC_DEFINE(HAVE_SSL) AC_DEFINE(HAVE_GNUTLS) @@ -34,27 +33,26 @@ diff -ur cups-2.2.4.orig/config-scripts/cups-ssl.m4 cups-2.2.4/config-scripts/cu elif test "x$LIBGNUTLSCONFIG" != x; then have_ssl=1 SSLLIBS=`$LIBGNUTLSCONFIG --libs` -diff -ur cups-2.2.4.orig/configure cups-2.2.4/configure ---- cups-2.2.4.orig/configure 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/configure 2017-11-02 10:32:29.415070543 +0100 -@@ -6530,6 +6530,16 @@ +diff -ur cups-2.3.3.orig/configure cups-2.3.3/configure +--- cups-2.3.3.orig/configure 2020-04-27 20:04:29.000000000 +0200 ++++ cups-2.3.3/configure 2020-12-09 11:24:31.907224437 +0100 +@@ -6511,6 +6511,15 @@ DSOXX="\$(CXX)" - DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" + DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G" ;; + linux-android*) + LIBCUPS="lib$cupsbase.so" -+ LIBCUPSCGI="libcupscgi.so" -+ LIBCUPSIMAGE="libcupsimage.so" -+ LIBCUPSMIME="libcupsmime.so" -+ LIBCUPSPPDC="libcupsppdc.so" ++ if test "x$cupsimagebase" != x; then ++ LIBCUPSIMAGE="lib$cupsimagebase.so" ++ fi + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -shared \$(OPTIM)" + ;; linux* | gnu* | *bsd*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" -@@ -8516,6 +8526,14 @@ + if test "x$cupsimagebase" != x; then +@@ -8290,6 +8299,14 @@ $as_echo "#define HAVE_SSL 1" >>confdefs.h $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h @@ -69,10 +67,10 @@ diff -ur cups-2.2.4.orig/configure cups-2.2.4/configure elif test "x$LIBGNUTLSCONFIG" != x; then have_ssl=1 -diff -ur cups-2.2.4.orig/cups/Makefile cups-2.2.4/cups/Makefile ---- cups-2.2.4.orig/cups/Makefile 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/cups/Makefile 2017-11-02 11:14:10.450961961 +0100 -@@ -317,6 +317,16 @@ +diff -ur cups-2.3.3.orig/cups/Makefile cups-2.3.3/cups/Makefile +--- cups-2.3.3.orig/cups/Makefile 2020-04-27 20:04:29.000000000 +0200 ++++ cups-2.3.3/cups/Makefile 2020-12-09 11:27:09.498901365 +0100 +@@ -373,6 +373,16 @@ # @@ -89,54 +87,33 @@ diff -ur cups-2.2.4.orig/cups/Makefile cups-2.2.4/cups/Makefile # libcups.2.dylib # -diff -ur cups-2.2.4.orig/cups/language.c cups-2.2.4/cups/language.c ---- cups-2.2.4.orig/cups/language.c 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/cups/language.c 2017-11-02 10:32:29.415070543 +0100 -@@ -31,6 +31,13 @@ - #endif /* HAVE_COREFOUNDATION_H */ - - -+#ifdef __ANDROID__ -+/* nl_langinfo not available on API < 26 */ -+#if __ANDROID_API__ < 26 -+#undef CODESET -+#endif -+#endif -+ - /* - * Local globals... - */ -diff -ur cups-2.2.4.orig/cups/thread.c cups-2.2.4/cups/thread.c ---- cups-2.2.4.orig/cups/thread.c 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/cups/thread.c 2017-11-02 10:32:29.415070543 +0100 -@@ -150,7 +150,9 @@ - void - _cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */ - { -- pthread_cancel(thread); -+#ifndef __ANDROID__ -+ pthread_cancel(thread); -+#endif - } - - -diff -ur cups-2.2.4.orig/filter/Makefile cups-2.2.4/filter/Makefile ---- cups-2.2.4.orig/filter/Makefile 2017-06-30 17:44:38.000000000 +0200 -+++ cups-2.2.4/filter/Makefile 2017-11-02 11:16:22.624712571 +0100 -@@ -241,6 +241,16 @@ +@@ -439,6 +449,15 @@ # +# libcupsimage.so +# + -+libcupsimage.so: $(IMAGEOBJS) ++libcupsimage.so: $(IMAGEOBJS) libcups.so + echo Linking $@... -+ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \ -+ -L../cups $(LINKCUPS) ++ $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(LINKCUPS) + + +# # libcupsimage.2.dylib # +diff -ur cups-2.3.3.orig/cups/thread.c cups-2.3.3/cups/thread.c +--- cups-2.3.3.orig/cups/thread.c 2020-04-27 20:04:29.000000000 +0200 ++++ cups-2.3.3/cups/thread.c 2020-12-09 11:12:41.393901979 +0100 +@@ -153,7 +153,9 @@ + void + _cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */ + { +- pthread_cancel(thread); ++#ifndef __ANDROID__ ++ pthread_cancel(thread); ++#endif + } + +

1 0

Francois Gouget : testbot/RestoreVM: Avoid errors when restoring a VM with no snapshot.
by Alexandre Julliard 17 Dec '20

17 Dec '20

Module: tools Branch: master Commit: 6a4772a0e924252a82bc8e239d74f22b68bef475 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a4772a0e924252a82bc8e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 17 11:53:02 2020 +0100 testbot/RestoreVM: Avoid errors when restoring a VM with no snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/RestoreVM | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index a31f3ea..57e11c0 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -677,6 +677,7 @@ then _dir="$1" for snapxml in "$_dir"/*.xml do + [ -f "$snapxml" ] || continue name=`basename "$snapxml" .xml` ctime=`sed -e 's~^.*<creationTime>$[0-9][0-9]*$</creationTime>.*$~\1~' -e t -e d "$snapxml"` echo "$ctime $name"

1 0

Francois Gouget : testbot/TestAgent: Also dereference symbolic links to better find $::RootDir.
by Alexandre Julliard 17 Dec '20

17 Dec '20

Module: tools Branch: master Commit: e15e3a459d7a7ec0277f5c65b18eea4b66562307 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e15e3a459d7a7ec0277f5c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 17 11:53:33 2020 +0100 testbot/TestAgent: Also dereference symbolic links to better find $::RootDir. This allows putting a symbolic link to TestAgent in $PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 40f443e..10bdc63 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,12 +23,10 @@ use strict; sub BEGIN { - if ($0 !~ m=^/=) - { - # Turn $0 into an absolute path so it can safely be used in @INC - require Cwd; - $0 = Cwd::cwd() . "/$0"; - } + # Turn $0 into an absolute path so it can safely be used in @INC. + # Also dereference symbolic links to better find $::RootDir. + use Cwd 'abs_path'; + $0 = abs_path($0); if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1;

1 0

Francois Gouget : testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.
by Alexandre Julliard 17 Dec '20

17 Dec '20

Module: tools Branch: master Commit: ff73eb836e91f0f2f721a2927700b8217359221c URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff73eb836e91f0f2f721a29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 17 11:53:56 2020 +0100 testbot/RestoreVM: Explicitly deleting the old disks may not be necessary. Normally virsh undefine --remove-all-storage handles it but it does not follow the symbolic links. So tell rm not to complain if it finds no file to delete. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/RestoreVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index 57e11c0..a1b9d15 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -641,7 +641,7 @@ then then fatal_no_cleanup "could not remove the existing '$opt_vm' VM" fi - [ -z "$olddisks" ] || dry_run rm $olddisks + [ -z "$olddisks" ] || dry_run rm -f $olddisks fi

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: ebb8a59d813f037e75c1584e1201c0498c9863f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb8a59d813f037e75c1584e… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Dec 16 13:17:39 2020 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 536 ++++++++++++++++++++++----------------------------------------- 1 file changed, 189 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb8a59d813f037e75c1…

1 0

Paul Gofman : ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: f17404f8ed2883e28ef33887c7e0a9c2fc2e4874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17404f8ed2883e28ef33887… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 16 11:58:27 2020 +0300 ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST. Fixes out of bound memory access in Anno 1404 Addon. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6cb35bcd135..05097ce53b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4618,10 +4618,11 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (ptr->IpAddressList.IpAddress.String[0] == '\0') continue; - if ((numInt + 1)*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) + if ((numInt + 1) * sizeof(INTERFACE_INFO) > out_size) { WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); status = WSAEFAULT; + if (ret_size) *ret_size = 0; break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8711b65fcea..98cc3881853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10514,6 +10514,30 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_wsaioctl(void) +{ + char buffer[4096]; + DWORD size; + SOCKET s; + int ret; + + s = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(s != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); + ok(!ret, "Got unexpected ret %d.\n", ret); + ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10595,6 +10619,7 @@ START_TEST( sock ) /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); + test_wsaioctl(); Exit(); }

1 0

Paul Gofman : ntdll: Remove unwind registers save space from struct stack_layout on x64.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 0643a4fdce93a1bfde08a25b29b4884d46f33656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0643a4fdce93a1bfde08a25b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 14 17:05:28 2020 +0300 ntdll: Remove unwind registers save space from struct stack_layout on x64. The unwind space used right below the context's Rsp and can currently potentially overlap with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..7181b48728c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,10 +240,6 @@ struct stack_layout CONTEXT context; CONTEXT_EX context_ex; EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; ULONG64 align; char xstate[0]; /* If xstate is present it is allocated * dynamically to provide 64 byte alignment. */ @@ -252,7 +248,7 @@ struct stack_layout C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))); C_ASSERT( sizeof(XSTATE) == 0x140 ); -C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ struct syscall_frame { @@ -1964,10 +1960,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - stack_size = sizeof(*stack); + stack_size = sizeof(*stack) + 0x20; if ((src_xs = xstate_from_context( context ))) { - stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr + stack_size += (ULONG_PTR)stack_ptr - 0x20 - (((ULONG_PTR)stack_ptr - 0x20 - sizeof(XSTATE)) & ~(ULONG_PTR)63); } @@ -2120,12 +2116,13 @@ struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RE __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "subq $0x20,%r9\n\t" /* Unwind registers save space */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" "subq $0x140,%r9\n\t" /* sizeof(XSTATE) */ "andq $~63,%r9\n" - "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ + "1:\tsubq $0x590,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "pushq %r8\n\t"

1 0

Jacek Caban : ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: e734d729461855a5ddaf81f4e08e0cc2b3286e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e734d729461855a5ddaf81f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:15 2020 +0100 ucrtbase: Improve __intrinsic_abnormal_termination stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 2a912bba7bf..136358a174c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index efa5c022808..ce1bbc9d5b7 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -38,7 +38,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln_dll MSVCRT__acmdln @ extern _aexit_rtn_dll _aexit_rtn diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c27eda4652..c7a458950c7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -676,7 +676,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 10258b032d1..90125fed340 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1024,7 +1024,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e5f6520caf..bb66b83739d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1014,7 +1014,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2851c42d7c8..bf5f61484fe 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -209,7 +209,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6a60a7d5827..9a97c41cbe9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -204,7 +204,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5634e34d5ff..1159876f235 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -325,7 +325,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8151b4ddd3c..d115d2f9eed 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -309,7 +309,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 3cc8b9c92ea..8130e34b2c4 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -281,7 +281,7 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _abnormal_termination (MSVCRT.@) */ -int CDECL _abnormal_termination(void) +int CDECL __intrinsic_abnormal_termination(void) { FIXME("(void)stub\n"); return 0; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6f256a2d58e..a425ff8aa6d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -295,7 +295,7 @@ # stub __wcsncnt(wstr long) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 503a13180ba..5fda5332f62 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -197,7 +197,7 @@ @ extern __wargv MSVCRT___wargv @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3c8afa86c0d..35925d4ebe5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -92,7 +92,7 @@ @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long)

1 0

Jacek Caban : msvcrt: Prefix *rot* functions.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: e8936e79c20f09156afe8ecac0fe9cde87905a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8936e79c20f09156afe8eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:33 2020 +0100 msvcrt: Prefix *rot* functions. MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8936e79c20f09156afe…

1 0