wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Martin Storsjo : include: Fix the signature of _InterlockedCompareExchange128.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 8c7014eb239edb09ecb861a25d97147701d43c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7014eb239edb09ecb861a2… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Dec 19 23:56:15 2020 +0200 include: Fix the signature of _InterlockedCompareExchange128. Clang 12 doesn't consider a function with an inconsistent signature as matching the intrinsic. This fixes InterlockedCompareExchange128 with clang 12 in MSVC mode. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 04353d9405d..83fcc67c85d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6897,7 +6897,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #if defined(_MSC_VER) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); #pragma intrinsic(_InterlockedCompareExchange128) #elif defined(__x86_64__)

1 0

Martin Storsjo : asm: Use SEH assembly when building with clang in MSVC mode.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 6844f671fc413c33c38a87a81929e702e1e87165 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6844f671fc413c33c38a87a8… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Dec 19 00:37:12 2020 +0200 asm: Use SEH assembly when building with clang in MSVC mode. In MSVC mode, the __SEH__ macro isn't defined, but the .seh directives are supported in assembly. In these cases, we have to hardcode which architectures we know clang supports SEH directives in as it's not exposed otherwise. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index ed44a7dd6dd..236b35cf8fe 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -41,7 +41,7 @@ # define __ASM_CFI(str) #endif -#ifdef __SEH__ +#if defined(__SEH__) || (defined(_MSC_VER) && defined(__clang__) && (defined(__x86_64__) || defined(__aarch64__))) # if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) /* Clang got support for aarch64 SEH assembly directives in Clang 12, * before that, only .seh_startproc/.seh_endproc but nothing else was

1 0

Martin Storsjo : winebuild: Pass -m options to dlltool for arm and arm64.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: dc46af72453b4e20710e7f9b72099864d10f9d1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc46af72453b4e20710e7f9b… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Dec 19 00:35:05 2020 +0200 winebuild: Pass -m options to dlltool for arm and arm64. This allows using the arch independent llvm-dlltool without the llvm-mingw specific <triple>-dlltool wrappers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fb5c26da07f..bd25ec5ee70 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1856,6 +1856,14 @@ static void build_windows_import_lib( DLLSPEC *spec ) m_flag = "i386:x86-64"; as_flags = "--as-flags=--64"; break; + case CPU_ARM: + m_flag = "arm"; + as_flags = NULL; + break; + case CPU_ARM64: + m_flag = "arm64"; + as_flags = NULL; + break; default: m_flag = NULL; break;

1 0

Martin Storsjo : asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: e9fa452ba3c25646b7275e22252f056367fbb31f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9fa452ba3c25646b7275e22… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Dec 19 00:34:34 2020 +0200 asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons. When targeting arm64 in MSVC mode, LLVM treats semicolons in assembly as comment char, instead of as statement separator (contrary to in mingw mode, where semicolons still work as separator). In generated code, there's no need to keep these directives on one single line though, so just separate them with newlines. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- tools/winebuild/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b5e6c6efd3d..ed44a7dd6dd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -56,7 +56,7 @@ #endif #ifdef _WIN32 -# define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" +# define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" #elif defined(__arm__) || defined(__arm64__) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1af42f10005..5cffc74accd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -686,7 +686,7 @@ void output_standard_file_header(void) output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); if (safe_seh) { - output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.def @feat.00\n\t.scl 3\n\t.type 0\n\t.endef\n" ); output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } @@ -1119,7 +1119,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); break; default: free( buffer );

1 0

Dmitry Timoshkov : wbemprox/tests: Add some tests for SystemRestore class.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 5befc694fa9c531ee68d0010ef740b47205d41e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5befc694fa9c531ee68d0010… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 18 15:51:26 2020 +0300 wbemprox/tests: Add some tests for SystemRestore class. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd1..37b6fb4e8dc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,67 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + else if (hr == WBEM_E_ACCESS_DENIED) + win_skip( "insufficient privs to test SystemRestore\n" ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1884,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1898,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Dmitry Timoshkov : wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: a45f6a49f7e4749bc56d11ac4454c68c4a087f5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45f6a49f7e4749bc56d11ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 18 15:51:19 2020 +0300 wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point. StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85a..73f055e8bd1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator );

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 3cd5c35525db3537d2280d5b5d025c09c812e07e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd5c35525db3537d2280d5b… Author: Can Taşan <betax34(a)hotmail.com> Date: Sat Dec 19 21:20:25 2020 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 298 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 147 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd5c35525db3537d228…

1 0

Alexandre Julliard : Wine release 6.0-rc3
by Alexandre Julliard 18 Dec '20

18 Dec '20

Module: website Branch: master Commit: 28b93ff8aadac9ee599c451f05b755d843e3e4da URL: https://source.winehq.org/git/website.git/?a=commit;h=28b93ff8aadac9ee599c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:53:09 2020 +0100 Wine release 6.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020121801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020121801.xml b/news/en/2020121801.xml new file mode 100644 index 00000000..7dcf0365 --- /dev/null +++ b/news/en/2020121801.xml @@ -0,0 +1,12 @@ +<news> +<date>December 18, 2020</date> +<title>Wine 6.0-rc3 Released</title> +<body> + The Wine development release 6.0-rc3 is now available. + <a href="{$root}/announce/6.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.0-rc3 : Alexandre Julliard : Release 6.0-rc3
by Alexandre Julliard 18 Dec '20

18 Dec '20

Module: wine Branch: refs/tags/wine-6.0-rc3 Tag: 948bcdbfb0e81067a8470ca8f2bab713b2c112cc URL: https://source.winehq.org/git/wine.git/?a=tag;h=948bcdbfb0e81067a8470ca8f2b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:51:19 2020 +0100 Release 6.0-rc3

1 0

Alexandre Julliard : Release 6.0-rc3.
by Alexandre Julliard 18 Dec '20

18 Dec '20

Module: wine Branch: master Commit: 56e7cd12ce0ce3bb331a8595b25aedb811b79110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e7cd12ce0ce3bb331a8595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:51:19 2020 +0100 Release 6.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 261 ++++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 129 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56e7cd12ce0ce3bb331a…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2020