September 2022 - Wine-Commits

Alexandre Julliard : oleaut32: Check that the 32/64 syskind matches when getting a typelib from the cache.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 43e5f9e4bfa65ccea633df244a7ec0c790ed8ffb URL: https://gitlab.winehq.org/wine/wine/-/commit/43e5f9e4bfa65ccea633df244a7ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 17:27:27 2022 +0200 oleaut32: Check that the 32/64 syskind matches when getting a typelib from the cache. Fixes test failures on 64-bit. --- dlls/oleaut32/typelib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7f10bcc968d..a7bbb273856 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7966,7 +7966,8 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( && IsEqualIID(&entry->guid->guid, TLB_get_guid_null(ref_type->pImpTLInfo->guid)) && entry->ver_major == ref_type->pImpTLInfo->wVersionMajor && entry->ver_minor == ref_type->pImpTLInfo->wVersionMinor - && entry->set_lcid == ref_type->pImpTLInfo->lcid) + && entry->set_lcid == ref_type->pImpTLInfo->lcid + && entry->syskind == This->pTypeLib->syskind) { TRACE("got cached %p\n", entry); pTLib = (ITypeLib*)&entry->ITypeLib2_iface;

1 0

Alexandre Julliard : webservices/tests: Mark tests that fail on 64-bit as todo.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: c0c93d80173c1540accbf9638ba9d0826ada932e URL: https://gitlab.winehq.org/wine/wine/-/commit/c0c93d80173c1540accbf9638ba9d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:28:46 2022 +0200 webservices/tests: Mark tests that fail on 64-bit as todo. --- dlls/webservices/tests/writer.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index c09a9916120..8e83707c3cf 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2222,12 +2222,14 @@ static void test_text_types(void) static void test_double(void) { + static const BOOL is_win64 = sizeof(void*) > sizeof(int); WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; unsigned int fpword, fpword_orig; static const struct { double val; const char *result; + BOOL todo64; } tests[] = { @@ -2240,12 +2242,12 @@ static void test_double(void) {1.0000000000000004, "<t>1.0000000000000004</t>"}, {100000000000000, "<t>100000000000000</t>"}, {1000000000000000, "<t>1E+15</t>"}, - {0.1, "<t>0.1</t>"}, - {0.01, "<t>1E-2</t>"}, - {-0.1, "<t>-0.1</t>"}, - {-0.01, "<t>-1E-2</t>"}, - {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>"}, - {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>"}, + {0.1, "<t>0.1</t>", TRUE}, + {0.01, "<t>1E-2</t>", TRUE}, + {-0.1, "<t>-0.1</t>", TRUE}, + {-0.01, "<t>-1E-2</t>", TRUE}, + {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>", TRUE}, + {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>", TRUE}, }; HRESULT hr; WS_XML_WRITER *writer; @@ -2269,7 +2271,22 @@ static void test_double(void) hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); - check_output( writer, tests[i].result, __LINE__ ); + if (tests[i].todo64 && is_win64) + { + WS_BYTES bytes; + ULONG size = sizeof(bytes); + int len = strlen( tests[i].result ); + HRESULT hr; + + memset( &bytes, 0, sizeof(bytes) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); + todo_wine + ok( bytes.length == len && !memcmp( bytes.bytes, tests[i].result, len ), + "%lu: got %lu %s expected %d %s\n", i, bytes.length, + debugstr_bytes(bytes.bytes, bytes.length), len, tests[i].result ); + } + else check_output( writer, tests[i].result, __LINE__ ); } hr = set_output( writer );

1 0

Alexandre Julliard : oleaut32: Avoid spurious debug traces when FIXMEs are disabled.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 524cc6339c15c8c757d9e0e8854709fdfdf06491 URL: https://gitlab.winehq.org/wine/wine/-/commit/524cc6339c15c8c757d9e0e8854709… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:45:57 2022 +0200 oleaut32: Avoid spurious debug traces when FIXMEs are disabled. --- dlls/oleaut32/olepicture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2f9e27042d9..1ded5f9dc2e 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1518,11 +1518,11 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) FIXME("Unknown magic %04x, %ld read bytes:\n", magic, xread); hr=E_FAIL; for (i=0;i<xread+8;i++) { - if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]); - else MESSAGE("%02x ",xbuf[i-8]); - if (i % 10 == 9) MESSAGE("\n"); + if (i<8) FIXME("%02x ",((unsigned char*)header)[i]); + else FIXME("%02x ",xbuf[i-8]); + if (i % 10 == 9) FIXME("\n"); } - MESSAGE("\n"); + FIXME("\n"); break; } }

1 0

Alexandre Julliard : ntdll/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 3c9c1ffdba637f11681cda26b8205db9d6316134 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c9c1ffdba637f11681cda26b8205d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:54:24 2022 +0200 ntdll/tests: Fix affinity test when there are too many CPUs. --- dlls/ntdll/tests/info.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 53f42d5a897..0af4259b85d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2958,11 +2958,13 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); proc_affinity = pbi.AffinityMask; ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); - proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); - + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); + } proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, @@ -2971,10 +2973,13 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); - thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); + } thread_affinity = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER,

1 0

Alexandre Julliard : kernel32/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 5314fac5b77ef7d6b157e975b90ec094d4353db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5314fac5b77ef7d6b157e975b90ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:53:50 2022 +0200 kernel32/tests: Fix affinity test when there are too many CPUs. --- dlls/kernel32/tests/thread.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 69aa133330f..0274cb6e266 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -956,12 +956,15 @@ static VOID test_thread_processor(void) affinity_new.Mask, affinity.Mask); /* show that the "all processors" flag is not supported for SetThreadGroupAffinity */ - affinity_new.Group = 0; - affinity_new.Mask = ~0u; - SetLastError(0xdeadbeef); - ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + if (sysInfo.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + affinity_new.Group = 0; + affinity_new.Mask = ~(DWORD_PTR)0; + SetLastError(0xdeadbeef); + ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + } affinity_new.Group = 1; /* assumes that you have less than 64 logical processors */ affinity_new.Mask = 0x1;

1 0

Alexandre Julliard : ntoskrnl/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 6ca6bb542e1335b416533074e166ca6b95d16746 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ca6bb542e1335b416533074e166ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:54:41 2022 +0200 ntoskrnl/tests: Fix affinity test when there are too many CPUs. --- dlls/ntoskrnl.exe/tests/driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dc4f4ad993d..d293889c823 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2031,7 +2031,10 @@ static void test_affinity(void) count = pKeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); ok(count == cpu_count, "Got unexpected count %lu.\n", count); - mask_all_cpus = ~((~0u) << cpu_count); + if (cpu_count >= 8 * sizeof(KAFFINITY)) + mask_all_cpus = ~(KAFFINITY)0; + else + mask_all_cpus = ((KAFFINITY)1 << cpu_count) - 1; mask = pKeQueryActiveProcessors(); ok(mask == mask_all_cpus, "Got unexpected mask %#Ix.\n", mask);

1 0

Alexandre Julliard : configure: Use --disable-stdcall-fixup for all PE builds.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 8b7baa1128d974b6b9e4fc49853242e50d96c940 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7baa1128d974b6b9e4fc49853242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:46:18 2022 +0200 configure: Use --disable-stdcall-fixup for all PE builds. --- configure | 34 ++++++++++++++++++++++++++++++++++ configure.ac | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/configure b/configure index e77a4c87c2c..25bbb308cc1 100755 --- a/configure +++ b/configure @@ -11451,6 +11451,40 @@ printf "%s\n" "$ac_cv_crosscflags__fno_omit_frame_pointer" >&6; } if test "x$ac_cv_crosscflags__fno_omit_frame_pointer" = xyes then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -fno-omit-frame-pointer" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wl,--disable-stdcall-fixup" >&5 +printf %s "checking whether the cross-compiler supports -Wl,--disable-stdcall-fixup... " >&6; } +if test ${ac_cv_crosscflags__Wl___disable_stdcall_fixup+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wl,--disable-stdcall-fixup" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_crosscflags__Wl___disable_stdcall_fixup=yes +else $as_nop + ac_cv_crosscflags__Wl___disable_stdcall_fixup=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wl___disable_stdcall_fixup" >&5 +printf "%s\n" "$ac_cv_crosscflags__Wl___disable_stdcall_fixup" >&6; } +if test "x$ac_cv_crosscflags__Wl___disable_stdcall_fixup" = xyes +then : + CROSSLDFLAGS="$CROSSLDFLAGS -Wl,--disable-stdcall-fixup" fi ;; x86_64) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wno-format" >&5 printf %s "checking whether the cross-compiler supports -Wno-format... " >&6; } diff --git a/configure.ac b/configure.ac index 49d414e1d17..ed6d128d379 100644 --- a/configure.ac +++ b/configure.ac @@ -952,7 +952,8 @@ then WINE_TRY_CROSSCFLAGS([-Wabsolute-value]) case $host_cpu in - *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;; + *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) + WINE_TRY_CROSSCFLAGS([-Wl,--disable-stdcall-fixup],[CROSSLDFLAGS="$CROSSLDFLAGS -Wl,--disable-stdcall-fixup"]) ;; x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) WINE_TRY_CROSSCFLAGS([-Wformat-overflow]) WINE_TRY_CROSSCFLAGS([-Wnonnull])

1 0

Alexandre Julliard : Wine release 7.17
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: website Branch: master Commit: e6dbaa881679de9e3850217af66578c51f1ce8f3 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/e6dbaa881679de9e3850217af6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 23:37:24 2022 +0200 Wine release 7.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022090901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2022090901.xml b/news/en/2022090901.xml new file mode 100644 index 00000000..68fb444c --- /dev/null +++ b/news/en/2022090901.xml @@ -0,0 +1,15 @@ +<news> +<date>September 9, 2022</date> +<title>Wine 7.17 Released</title> +<body> + The Wine development release 7.17 is now available. + <a href="{$root}/announce/7.17">What's new</a> in this release: +<ul> + <li>High Unicode planes support in DirectWrite.</li> + <li>Some work towards Wow64 support in the Vulkan driver.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.17.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-7.17 : Alexandre Julliard : Release 7.17
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: refs/tags/wine-7.17 Tag: f2576f91ddcef187431f3781fb4774ffefd9757b URL: https://gitlab.winehq.org/wine/wine/-/tags/f2576f91ddcef187431f3781fb4774ff… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 23:35:02 2022 +0200 Release 7.17

1 0

Alexandre Julliard : Release 7.17.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: ef13dcf0b98d3fc489d27a0c0fcbed5ed0e584b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef13dcf0b98d3fc489d27a0c0fcbed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 23:35:02 2022 +0200 Release 7.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 616 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 316 insertions(+), 322 deletions(-)

1 0