December 2020 - Wine-Commits

Francois Gouget : crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: 7cd5cc2ecbbf2ed841659add63cb18a4c709b3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd5cc2ecbbf2ed841659add… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 17 10:29:57 2020 +0100 crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/oid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index ae03bba90e8..7e7c1310dd2 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -646,7 +646,8 @@ static void test_registerOIDInfo(void) SetLastError(0xdeadbeef); ret = CryptUnregisterOIDInfo(&info1); ok(!ret, "should fail\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); ok(!info2, "should fail\n");

1 0

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

Dec. 17, 2020

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

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

Dec. 17, 2020

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: Avoid errors when restoring a VM with no snapshot.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

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

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

Dec. 17, 2020

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

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

Dec. 16, 2020

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

Rémi Bernon : wintrust: Don't fail CryptCATOpen on empty file or invalid data.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: 0fb7ea91208b4e693f013e36e1a240e2b974f46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb7ea91208b4e693f013e36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 16 22:17:16 2020 +0100 wintrust: Don't fail CryptCATOpen on empty file or invalid data. Fixes a regression from 699e0a55ea71e2506917e38fc85cb4ae23a9cd1a, making "winetricks dotnet30sp1" fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 14 ++++++++++++-- dlls/wintrust/tests/crypt.c | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..fcf419c76d1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -908,6 +908,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, BYTE *buffer = NULL; DWORD size, open_mode = OPEN_ALWAYS; struct cryptcat *cc; + BOOL valid; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -941,13 +942,15 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, HeapFree(GetProcessHeap(), 0, buffer); return INVALID_HANDLE_VALUE; } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) + if (!size) valid = FALSE; + else if (!ReadFile(file, buffer, size, &size, NULL)) { CloseHandle(file); HeapFree(GetProcessHeap(), 0, buffer); CryptMsgClose(hmsg); return INVALID_HANDLE_VALUE; } + else valid = CryptMsgUpdate(hmsg, buffer, size, TRUE); HeapFree(GetProcessHeap(), 0, buffer); CloseHandle(file); @@ -961,7 +964,13 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) + if (!valid) + { + cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); + return cc; + } + else if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) { DWORD i, sum = 0; BYTE *p; @@ -1012,6 +1021,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, return INVALID_HANDLE_VALUE; } cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); return cc; } HeapFree(GetProcessHeap(), 0, cc); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1b436e9f4ab..5f9c402e00f 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -429,10 +429,10 @@ static void test_CryptCATOpen(void) } else { - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); ret = DeleteFileW(filename); ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); } @@ -443,10 +443,10 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(filename, flags, 0, 0, 0); - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file);

1 0

Jacek Caban : winapi: Use __alignof__ on clang.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: fcf545f449e286118c0d1b8ee8d620a81aa22114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf545f449e286118c0d1b8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:26 2020 +0100 winapi: Use __alignof__ on clang. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 2 +- dlls/kernel32/tests/generated.c | 2 +- dlls/ntdll/tests/generated.c | 2 +- dlls/rpcrt4/tests/generated.c | 2 +- dlls/shell32/tests/generated.c | 2 +- dlls/shlwapi/tests/generated.c | 2 +- dlls/urlmon/tests/generated.c | 90 +---------------------------------------- dlls/user32/tests/generated.c | 2 +- dlls/wininet/tests/generated.c | 2 +- dlls/winmm/tests/generated.c | 2 +- tools/winapi/winapi_test | 2 +- 11 files changed, 11 insertions(+), 99 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 40c2b910b56..02898227b2b 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 9c83ec69f6e..1b0489094ea 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index d1976e87678..995ffb90b57 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 3c143265fa7..53416566418 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -31,7 +31,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 86e8e549480..15e44f0e8ea 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -32,7 +32,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index 0b9f109aa55..8465bf34475 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -30,7 +30,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 64959493181..578f722ad16 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -28,7 +28,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* @@ -92,81 +92,41 @@ static void test_pack_IBindHost(void) /* IBindHost */ } -static void test_pack_IBindHostVtbl(void) -{ - /* IBindHostVtbl */ -} - static void test_pack_IBindStatusCallback(void) { /* IBindStatusCallback */ } -static void test_pack_IBindStatusCallbackVtbl(void) -{ - /* IBindStatusCallbackVtbl */ -} - static void test_pack_IBinding(void) { /* IBinding */ } -static void test_pack_IBindingVtbl(void) -{ - /* IBindingVtbl */ -} - static void test_pack_IInternetProtocolInfo(void) { /* IInternetProtocolInfo */ } -static void test_pack_IInternetProtocolInfoVtbl(void) -{ - /* IInternetProtocolInfoVtbl */ -} - static void test_pack_IInternetSession(void) { /* IInternetSession */ } -static void test_pack_IInternetSessionVtbl(void) -{ - /* IInternetSessionVtbl */ -} - static void test_pack_IPersistMoniker(void) { /* IPersistMoniker */ } -static void test_pack_IPersistMonikerVtbl(void) -{ - /* IPersistMonikerVtbl */ -} - static void test_pack_IWinInetHttpInfo(void) { /* IWinInetHttpInfo */ } -static void test_pack_IWinInetHttpInfoVtbl(void) -{ - /* IWinInetHttpInfoVtbl */ -} - static void test_pack_IWinInetInfo(void) { /* IWinInetInfo */ } -static void test_pack_IWinInetInfoVtbl(void) -{ - /* IWinInetInfoVtbl */ -} - static void test_pack_LPBINDHOST(void) { /* LPBINDHOST */ @@ -346,81 +306,41 @@ static void test_pack_IBindHost(void) /* IBindHost */ } -static void test_pack_IBindHostVtbl(void) -{ - /* IBindHostVtbl */ -} - static void test_pack_IBindStatusCallback(void) { /* IBindStatusCallback */ } -static void test_pack_IBindStatusCallbackVtbl(void) -{ - /* IBindStatusCallbackVtbl */ -} - static void test_pack_IBinding(void) { /* IBinding */ } -static void test_pack_IBindingVtbl(void) -{ - /* IBindingVtbl */ -} - static void test_pack_IInternetProtocolInfo(void) { /* IInternetProtocolInfo */ } -static void test_pack_IInternetProtocolInfoVtbl(void) -{ - /* IInternetProtocolInfoVtbl */ -} - static void test_pack_IInternetSession(void) { /* IInternetSession */ } -static void test_pack_IInternetSessionVtbl(void) -{ - /* IInternetSessionVtbl */ -} - static void test_pack_IPersistMoniker(void) { /* IPersistMoniker */ } -static void test_pack_IPersistMonikerVtbl(void) -{ - /* IPersistMonikerVtbl */ -} - static void test_pack_IWinInetHttpInfo(void) { /* IWinInetHttpInfo */ } -static void test_pack_IWinInetHttpInfoVtbl(void) -{ - /* IWinInetHttpInfoVtbl */ -} - static void test_pack_IWinInetInfo(void) { /* IWinInetInfo */ } -static void test_pack_IWinInetInfoVtbl(void) -{ - /* IWinInetInfoVtbl */ -} - static void test_pack_LPBINDHOST(void) { /* LPBINDHOST */ @@ -588,21 +508,13 @@ static void test_pack(void) { test_pack_BINDINFO(); test_pack_IBindHost(); - test_pack_IBindHostVtbl(); test_pack_IBindStatusCallback(); - test_pack_IBindStatusCallbackVtbl(); test_pack_IBinding(); - test_pack_IBindingVtbl(); test_pack_IInternetProtocolInfo(); - test_pack_IInternetProtocolInfoVtbl(); test_pack_IInternetSession(); - test_pack_IInternetSessionVtbl(); test_pack_IPersistMoniker(); - test_pack_IPersistMonikerVtbl(); test_pack_IWinInetHttpInfo(); - test_pack_IWinInetHttpInfoVtbl(); test_pack_IWinInetInfo(); - test_pack_IWinInetInfoVtbl(); test_pack_LPBINDHOST(); test_pack_LPBINDING(); test_pack_LPBINDSTATUSCALLBACK(); diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 7f6325fa2c9..6b80ad8d6f0 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 39a34f778f4..c0d9c9bd97e 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -29,7 +29,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ae183afad22..5eaa6fb1cf1 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -27,7 +27,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index fd801572894..716bb30ac08 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -544,7 +544,7 @@ sub output_header($$$) { print OUT "\n"; print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof(type)\n"; - print OUT "#elif defined(__GNUC__)\n"; + print OUT "#elif defined(__GNUC__) || defined(__clang__)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof__(type)\n"; print OUT "#else\n"; print OUT "/*\n";

1 0

Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

Module: wine Branch: master Commit: df446b9c21f52b917a9c2a360bccaed35896a32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=df446b9c21f52b917a9c2a36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:11 2020 +0100 msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h. 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/msvcrt/cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 42717f9d702..f8fe239b8aa 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -240,7 +240,7 @@ typedef struct #endif -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Dec. 16, 2020

Dec. 16, 2020

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