December 2020 - Wine-Commits

Alexandre Julliard : makefiles: Add support for Automake-style silent make rules.
by Alexandre Julliard Dec. 11, 2020

Dec. 11, 2020

Module: wine Branch: master Commit: 1a16b9e9aa9a3ea1d0b5adbfa5fb6c83d99a06bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a16b9e9aa9a3ea1d0b5adbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 16:05:45 2020 +0100 makefiles: Add support for Automake-style silent make rules. Based on a patch by Jeff Smith. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49841 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 14 ++++++- configure.ac | 8 +++- tools/makedep.c | 120 ++++++++++++++++++++++++++++++++++++++++---------------- 4 files changed, 106 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a16b9e9aa9a3ea1d0b5…

1 0

Jacek Caban : setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.
by Alexandre Julliard Dec. 11, 2020

Dec. 11, 2020

Module: wine Branch: master Commit: d91ad4ca2438e2193d45d99edc210a3118882f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91ad4ca2438e2193d45d99e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 11 17:36:24 2020 +0100 setjmp.h: Use GCC-style setjmp on Clang in MSVC mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index d4b7f8019ab..b539b22058f 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -149,7 +149,7 @@ _ACRTIMP void __cdecl longjmp(jmp_buf,int); # ifdef _UCRT # define _setjmpex __intrinsic_setjmpex # endif -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) @@ -158,7 +158,7 @@ _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(j # ifdef _UCRT # define _setjmp __intrinsic_setjmp # endif -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # else _ACRTIMP int __cdecl _setjmp(jmp_buf);

1 0

Haidong Yu : evr: Add missing LeaveCriticalSection on creating tracking thread.
by Alexandre Julliard Dec. 11, 2020

Dec. 11, 2020

Module: wine Branch: master Commit: 1647524ba08974d512c5d6d69f2ff10028bc1440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1647524ba08974d512c5d6d6… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Fri Dec 11 10:21:22 2020 +0800 evr: Add missing LeaveCriticalSection on creating tracking thread. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index aedf19b9fd4..44b09d6d474 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -345,6 +345,7 @@ static void video_sample_create_tracking_thread(void) { WARN("Failed to create sample tracking thread.\n"); CloseHandle(ready_event); + LeaveCriticalSection(&tracking_thread_cs); return; }

1 0

Julian Rüger : German translation for release 5.22.
by Alexandre Julliard Dec. 11, 2020

Dec. 11, 2020

Module: website Branch: master Commit: 5b1206e974b8fb7044db27dde46759a2544fb851 URL: https://source.winehq.org/git/website.git/?a=commit;h=5b1206e974b8fb7044db2… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 11 14:18:17 2020 +0100 German translation for release 5.22. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020112001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020112001.xml b/news/de/2020112001.xml new file mode 100644 index 00000000..a49e67bf --- /dev/null +++ b/news/de/2020112001.xml @@ -0,0 +1,16 @@ +<news> +<date>20. November 2020</date> +<title>Wine 5.22 freigegeben</title> +<body> + Die Entwicklungsversion 5.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>C-Laufzeitbibliotheken nach PE konvertiert.</li> + <li>Fontconfig-Cache sorgt für schnelleren Start.</li> + <li>Verbesserungen beim Abspielen von Videos.</li> + <li>Unterstützung der 3DES-Verschlüsselung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc1.
by Alexandre Julliard Dec. 11, 2020

Dec. 11, 2020

Module: website Branch: master Commit: 27792e6cac50ffc945c38963138391cf0483d07a URL: https://source.winehq.org/git/website.git/?a=commit;h=27792e6cac50ffc945c38… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 11 14:23:57 2020 +0100 German translation for release 6.0-rc1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020120401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020120401.xml b/news/de/2020120401.xml new file mode 100644 index 00000000..8ba600b6 --- /dev/null +++ b/news/de/2020120401.xml @@ -0,0 +1,17 @@ +<news> +<date>4. Dezember 2020</date> +<title>Wine 6.0-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate des bevorstehenden Wine 6.0. Hiermit beginnt der jährliche Code-Freeze. Wir bitten Sie, dieses Release ausführlich zu testen, um uns zu helfen Wine 6.0 so gut wie möglich zu machen. + <a href="{$root}/announce/6.0-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Update der Gecko-Engine.</li> + <li>WindowsCodecs und QCap-Bibliotheken nach PE konvertiert.</li> + <li>Schnellere Font-Initialisierung beim Prozessstart.</li> + <li>Unterstützung von Named-Pipes mit leerem Namen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : configure: Force -static-libgcc when using libunwind.
by Alexandre Julliard Dec. 10, 2020

Dec. 10, 2020

Module: wine Branch: master Commit: 167f188d71c75d88e3b74600b3bda4688e70f984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=167f188d71c75d88e3b74600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 10:34:17 2020 +0100 configure: Force -static-libgcc when using libunwind. libunwind defines the same symbols as libgcc_s but may not be compatible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49312 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure b/configure index c04b4106a86..c6d2bab49f5 100755 --- a/configure +++ b/configure @@ -14892,6 +14892,7 @@ $as_echo "$wine_cv_have_unw_step" >&6; } if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS + UNWIND_LIBS="-static-libgcc $UNWIND_LIBS" LIBS="$UNWIND_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5 $as_echo_n "checking for unw_step in libunwind... " >&6; } diff --git a/configure.ac b/configure.ac index 020fd19256f..85ba522a951 100644 --- a/configure.ac +++ b/configure.ac @@ -1685,6 +1685,8 @@ then if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS + dnl Force static libgcc, libunwind breaks libgcc_s unwinding + UNWIND_LIBS="-static-libgcc $UNWIND_LIBS" LIBS="$UNWIND_LIBS $LIBS" AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY

1 0

Henri Verbeet : wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers.
by Alexandre Julliard Dec. 10, 2020

Dec. 10, 2020

Module: wine Branch: master Commit: ddd55cadb8a45464a4a096f557ae89b702caa934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd55cadb8a45464a4a096f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 17:08:12 2020 +0330 wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers. We don't typically need these to be in VRAM, and VRAM may not be mappable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6ff6a5b6cd0..dc32d97530a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,8 +1390,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n");

1 0

Biswapriyo Nath : include: Add ID2D1GradientStopCollection1 interface in d2d1_1.idl.
by Alexandre Julliard Dec. 10, 2020

Dec. 10, 2020

Module: wine Branch: master Commit: 95106430ee94bac435b730dcece7632a8411480d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95106430ee94bac435b730dc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Dec 9 19:42:34 2020 +0530 include: Add ID2D1GradientStopCollection1 interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index f18de83e779..64bd5fb53f4 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -28,7 +28,6 @@ interface IWICImagingFactory; interface IWICColorContext; interface ID2D1ColorContext; interface ID2D1Effect; -interface ID2D1GradientStopCollection1; interface ID2D1ImageBrush; interface ID2D1BitmapBrush1; @@ -495,6 +494,23 @@ interface ID2D1BitmapBrush1 : ID2D1BitmapBrush D2D1_INTERPOLATION_MODE GetInterpolationMode1(); } +[ + object, + uuid(ae1572f4-5dd0-4777-998b-9279472ae63b), + local, +] +interface ID2D1GradientStopCollection1 : ID2D1GradientStopCollection +{ + void GetGradientStops1( + [out] D2D1_GRADIENT_STOP *gradient, + [in] UINT32 count + ); + D2D1_COLOR_SPACE GetPreInterpolationSpace(); + D2D1_COLOR_SPACE GetPostInterpolationSpace(); + D2D1_BUFFER_PRECISION GetBufferPrecision(); + D2D1_COLOR_INTERPOLATION_MODE GetColorInterpolationMode(); +} + [ object, uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c),

1 0

Biswapriyo Nath : include: Add ID2D1ColorContext interface in d2d1_1.idl.
by Alexandre Julliard Dec. 10, 2020

Dec. 10, 2020

Module: wine Branch: master Commit: 7929a7dcfc259b5e617bc8c0d54a162de2f27f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7929a7dcfc259b5e617bc8c0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Dec 9 19:42:34 2020 +0530 include: Add ID2D1ColorContext interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index a72a6a9e9be..f18de83e779 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -446,6 +446,21 @@ interface ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock ); } +[ + object, + uuid(1c4820bb-5771-4518-a581-2fe4dd0ec657), + local, +] +interface ID2D1ColorContext : ID2D1Resource +{ + D2D1_COLOR_SPACE GetColorSpace(); + UINT32 GetProfileSize(); + HRESULT GetProfile( + [out] BYTE *profile, + [in] UINT32 size + ); +} + [ object, uuid(a898a84c-3873-4588-b08b-ebbf978df041),

1 0

Biswapriyo Nath : include: Add ID2D1ImageBrush interface in d2d1_1.idl.
by Alexandre Julliard Dec. 10, 2020

Dec. 10, 2020

Module: wine Branch: master Commit: 527e0469bfb917757c086e90021fb5faa3a80ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=527e0469bfb917757c086e90… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Dec 9 19:42:34 2020 +0530 include: Add ID2D1ImageBrush interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 64bd5fb53f4..d9671fab256 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -28,7 +28,6 @@ interface IWICImagingFactory; interface IWICColorContext; interface ID2D1ColorContext; interface ID2D1Effect; -interface ID2D1ImageBrush; interface ID2D1BitmapBrush1; cpp_quote("#ifndef __dwrite_h__") @@ -677,6 +676,39 @@ interface ID2D1PrintControl : IUnknown HRESULT Close(); } +[ + object, + uuid(fe9e984d-3f95-407c-b5db-cb94d4e8f87c), + local, +] +interface ID2D1ImageBrush : ID2D1Brush +{ + void SetImage( + [in] ID2D1Image *image + ); + void SetExtendModeX( + [in] D2D1_EXTEND_MODE extend_mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE extend_mode + ); + void SetInterpolationMode( + [in] D2D1_INTERPOLATION_MODE interpolation_mode + ); + void SetSourceRectangle( + [in] const D2D1_RECT_F *rect + ); + void GetImage( + [out] ID2D1Image **image + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_INTERPOLATION_MODE GetInterpolationMode(); + void GetSourceRectangle( + [out] D2D1_RECT_F *rect + ); +} + [ object, uuid(e8f7fe7a-191c-466d-ad95-975678bda998),

1 0