February 2021 - Wine-commits

Alexandre Julliard : credui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: a9bfd7f584890f9d9a14f526dd41b7047a0a5412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bfd7f584890f9d9a14f526… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:21:57 2021 +0100 credui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/Makefile.in | 2 +- dlls/credui/credui_main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index f6d89a6b3ec..b9df8764b31 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -2,7 +2,7 @@ MODULE = credui.dll IMPORTLIB = credui IMPORTS = comctl32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ credui_main.c diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index f08d1406f90..b5a0897f520 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -71,9 +71,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hinstCredUI = hinstDLL;

1 0

Alexandre Julliard : cryptdlg: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 9d6a3e9d1a66f1158d983e97152bde39a4c55dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d6a3e9d1a66f1158d983e97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:03 2021 +0100 cryptdlg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdlg/Makefile.in | 2 +- dlls/cryptdlg/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 5fade7e72d3..522a738fc13 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -1,7 +1,7 @@ MODULE = cryptdlg.dll IMPORTS = cryptui crypt32 wintrust user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index e74ce0f48e7..0cc408b741a 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -43,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInstance = hinstDLL;

1 0

Alexandre Julliard : cryptui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 5edf6d15a738349ecede0c5b2503dda02c6fd9c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edf6d15a738349ecede0c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:09 2021 +0100 cryptui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index 5f849364753..7d5b989b53d 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32 DELAYIMPORTS = wintrust urlmon IMPORTLIB = cryptui -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e37b39b8ee1..ef4793b19d8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -52,8 +52,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Alexandre Julliard : evr: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: dc382414dfce1a8cca430f9e7d8df334f0810432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc382414dfce1a8cca430f9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:16 2021 +0100 evr: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/main.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 02cdb9b820a..0fd5526e71c 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -3,7 +3,7 @@ IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 DELAYIMPORTS = mfplat -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ evr.c \ diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 301330a51e2..e75fb0ad691 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -36,16 +36,15 @@ static HINSTANCE instance_evr; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - if (reason == DLL_WINE_PREATTACH) - return FALSE; /* prefer native version */ - else if (reason == DLL_PROCESS_ATTACH) + switch (reason) { - instance_evr = instance; + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); - } - else if (reason == DLL_PROCESS_DETACH && !reserved) - { + break; + case DLL_PROCESS_DETACH: + if (reserved) break; strmbase_release_typelibs(); + break; } return TRUE; }

1 0

Alexandre Julliard : hnetcfg: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 6f3f06840d8a78ac77e7359169505417aba6c2a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3f06840d8a78ac77e73591… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:21 2021 +0100 hnetcfg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/hnetcfg.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 2164c6a8e6b..f40ee2fc4e5 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,7 +1,7 @@ MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 5cc24a1447b..5018c9f285d 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -123,8 +123,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);

1 0

Alexandre Julliard : inetcomm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: e592b5236960913718ed55d47cb64f9dc9c01162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e592b5236960913718ed55d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:26 2021 +0100 inetcomm: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 2 +- dlls/inetcomm/inetcomm_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index 198ef0b28ce..b73879a006c 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -2,7 +2,7 @@ MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ imaptransport.c \ diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 75436286631..e9029ffb98b 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -48,8 +48,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); instance = hinstDLL;

1 0

Alexandre Julliard : inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 735fc0e725e26adbdc7ebdf9a4ac72a6615344e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=735fc0e725e26adbdc7ebdf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:31 2021 +0100 inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/inetcpl.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 972c66697a8..f7f241b7b1f 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -2,7 +2,7 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ connections.c \ diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index e2178e1fac6..b4dbe848677 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -50,9 +50,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); hcpl = hdll;

1 0

Hugh McMaster : winetest/gather: Make the 'platform' table header sticky.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: tools Branch: master Commit: b890623cde5f969c53a7b4d39ecb293b37e5ec33 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b890623cde5f969c53a7b4d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 18:07:26 2021 +1100 winetest/gather: Make the 'platform' table header sticky. The component test table is very long, which makes it difficult to remember which column holds what data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 4 ++-- winetest/summary.css | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8948697..392e8e6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -530,7 +530,7 @@ EOF chop $msg; } $title .= <<"EOF"; - <th> + <th class="sticky"> $msg </th> EOF @@ -557,7 +557,7 @@ EOF return <<"EOF"; <thead> <tr> - <th class="test" colspan="2">platforms</th> + <th class="test sticky" colspan="2">platforms</th> $title </tr> <tr> diff --git a/winetest/summary.css b/winetest/summary.css index 9dd7219..d01a227 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -112,6 +112,13 @@ table.report th.test { text-align: center; vertical-align: middle; } +table.report th.sticky { + background-color: white; + padding-bottom: 0.25rem; + position: sticky; + top: 0; + z-index: 10; +} table.report thead th { border-bottom-style: solid; border-bottom-color: #601919;

1 0

Alexandre Julliard : packaging: Force purging all the symlinked files.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: tools Branch: master Commit: 2aee2d4f27056ff288d70ee54c1f38e9e447b6a6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2aee2d4f27056ff288d70ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 21:36:06 2021 +0100 packaging: Force purging all the symlinked files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 29960d3..d7405f1 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -159,22 +159,22 @@ index_deb () publish_files () { key=$(cat auth_key) - dest=/wine-builds/debian/dists diff -ur --no-dereference $winehq_dir dest >diffs || true rsync -av --delete-after --delay-updates --exclude-from=rsync-filter --link-dest=$(pwd)/dest dest/ $winehq_dir cp .cache/apt-cache.db .cache/apt-cache.db.backup # purge the download cache for symlinked directories - for i in stable testing + for i in debian/dists/stable debian/dists/testing do - for arch in $deb_archs + for f in $(cd $winehq_dir && find -L $i -mtime -1 -type f) do - purge_url $key dl.winehq.org $dest/$i/main/binary-$arch/ + purge_url $key dl.winehq.org /wine-builds/$f + done + for f in $(cd $winehq_dir && find -L $i -type d) + do + purge_url $key dl.winehq.org /wine-builds/$f/ done - purge_url $key dl.winehq.org $dest/$i/main/source/ - purge_url $key dl.winehq.org $dest/$i/main/ - purge_url $key dl.winehq.org $dest/$i/ done }

1 0

Alexandre Julliard : packaging: Use llvm-mingw to build the Android packages.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: tools Branch: master Commit: 650310376652caf1f5c6221dfac1e986cc28bfa8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=650310376652caf1f5c6221… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 21:36:24 2021 +0100 packaging: Use llvm-mingw to build the Android packages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index 3662a48..f28a994 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -32,6 +32,7 @@ silent=--silent makeflags="--no-print-directory $silent -j$(nproc)" android_ndk=android-ndk-r21d +llvm_mingw=llvm-mingw-20201020-ucrt-ubuntu-18.04 gradle=gradle-3.5.1 png=libpng-1.6.37 jpeg=jpeg-9d @@ -80,6 +81,11 @@ config_gradle () download $gradle https://services.gradle.org/distributions/$gradle-bin.zip } +config_llvm_mingw () +{ + download $llvm_mingw https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/$llvm_min… +} + config_png () { download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/d… @@ -278,8 +284,9 @@ test -z "$release" || rm -rf $basedir test -d $basedir || mkdir $basedir cd $basedir -config_ndk -config_gradle +test -d $android_ndk || config_ndk +test -d $gradle || config_gradle +test -d $llvm_mingw || config_llvm_mingw test -d wine || git clone $winetree test -z "$release" || (cd wine && git checkout wine-$release) @@ -301,8 +308,7 @@ do esac (cd $arch - config_toolchain - PATH=$default_path:$basedir/$gradle/bin:$basedir/$arch/toolchain/bin + PATH=$default_path:$basedir/$llvm_mingw/bin:$basedir/$gradle/bin:$basedir/$arch/toolchain/bin run_configure="./configure $silent --host=$host PKG_CONFIG=false" install_all) done

1 0