December 2020 - Wine-Commits

Michael Stefaniuc : winspool/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 21, 2020

Dec. 21, 2020

Module: wine Branch: master Commit: 301d7204f90bcd1896dd82e3d943256710add5a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=301d7204f90bcd1896dd82e3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 19 21:17:01 2020 +0100 winspool/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 46 +++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=301d7204f90bcd1896dd…

1 0

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

Dec. 21, 2020

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

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

Dec. 21, 2020

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

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard Dec. 21, 2020

Dec. 21, 2020

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

Alistair Leslie-Hughes : include: Add DB_LRESERVE type.
by Alexandre Julliard Dec. 21, 2020

Dec. 21, 2020

Module: wine Branch: master Commit: fd416ebc7859cb92f3e7d97cf0f865c9ac90db58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd416ebc7859cb92f3e7d97c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 21 20:54:33 2020 +1100 include: Add DB_LRESERVE type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oledb.idl b/include/oledb.idl index 5609e219320..4e333353a5e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,7 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; +typedef LONG_PTR DB_LRESERVE; #include "dbs.idl"

1 0

André Hentschel : opengl32/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 21, 2020

Dec. 21, 2020

Module: wine Branch: master Commit: 77047c76dd6a1f7f2b1391844f1509fcb6127c55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77047c76dd6a1f7f2b139184… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 16:00:39 2020 +0100 opengl32/tests: Don't test function directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db5ad0ad765..90f06492e81 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -235,9 +235,10 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt pf = ChoosePixelFormat( hdc, pfd ); if (pf && fmt) { + INT ret; memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); + ret = DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ); + ok(ret, "DescribePixelFormat failed with error: %u\n", GetLastError()); } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd );

1 0

Martin Storsjo : include: Fix the signature of _InterlockedCompareExchange128.
by Alexandre Julliard Dec. 21, 2020

Dec. 21, 2020

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

Alexandre Julliard : Wine release 6.0-rc3
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

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

Alexandre Julliard : Release 6.0-rc3.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

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

Zebediah Figura : winmm/tests: Add some tests for MMIO_PARSE with long file names.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 2df4112661216c0a5a9b7c828f538aee95e4e212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df4112661216c0a5a9b7c82… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 17 16:40:50 2020 -0600 winmm/tests: Add some tests for MMIO_PARSE with long file names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0236855f246..c9ceda24f3f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void) L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; WCHAR buffer[MAX_PATH], expect[MAX_PATH]; - char exedir_filename[MAX_PATH]; + char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH]; MMIOINFO info = {0}; BOOL ret; FILE *f; @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void) DeleteFileW(long_filename); + wcscpy(buffer, long_filename); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, long_filename); + expect[127] = 0; + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL); + info.wErrorRet = 0xdead; + hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL); + todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA)); + wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);

1 0