August 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Fix a test in test_basic_video().
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: eedbfe0c0d7c6575aa9b5d04f103bc05d4c7bf2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eedbfe0c0d7c6575aa9b5d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 10:49:37 2020 -0500 quartz/tests: Fix a test in test_basic_video(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 9e6a618a36..c2b6271021 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2733,6 +2733,7 @@ static void test_basic_video(void) vih.bmiHeader.biWidth = 16; vih.bmiHeader.biHeight = 16; + vih.bmiHeader.biSizeImage = 0; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Sven Baars : prntvpt: Fix a null check (Coverity).
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: bb8d23d5637ff677f90b819a0d5d9bd079d5ef2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb8d23d5637ff677f90b819a… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Aug 2 19:20:21 2020 +0200 prntvpt: Fix a null check (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/ticket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 132a117a24..13aaf80423 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -740,7 +740,7 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre if (hr != S_OK) return hr; *dm = heap_alloc(sizeof(**dm)); - if (!dm) return E_OUTOFMEMORY; + if (!*dm) return E_OUTOFMEMORY; ticket_to_devmode(&ticket, *dm); *size = sizeof(**dm);

1 0

Zebediah Figura : msvcrt/tests: Fix some tests on Windows 2003 and earlier.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: 3f5066b12ef71385c02be345896800271d9ec590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5066b12ef71385c02be345… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 10:19:15 2020 -0500 msvcrt/tests: Fix some tests on Windows 2003 and earlier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e23f9cffe..3970f703f6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1983,7 +1983,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef) /* <= 2003 */, + "%d) errno = %d\n", i, errno); } if (!p__strtod_l)

1 0

Jacek Caban : configure: Build with -mcx16 on x86_64.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: dc199ae8b8b38ac088eb0bcd05e1b023e3f5cd8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc199ae8b8b38ac088eb0bcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 15:37:17 2020 +0200 configure: Build with -mcx16 on x86_64. This is needed on clang msvc target to allow _InterlockedCompareExchange128. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 +++++++++++++++++++++++++++++++ configure.ac | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8808ab6807..f4e188f38e 100755 --- a/configure +++ b/configure @@ -10582,6 +10582,37 @@ fi $as_echo "$ac_cv_crosscflags__Wnonnull" >&6; } if test "x$ac_cv_crosscflags__Wnonnull" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wnonnull" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -mcx16" >&5 +$as_echo_n "checking whether the cross-compiler supports -mcx16... " >&6; } +if ${ac_cv_crosscflags__mcx16+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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 -mcx16" +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__mcx16=yes +else + ac_cv_crosscflags__mcx16=no +fi +rm -f core conftest.err conftest.$ac_objext \ + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__mcx16" >&5 +$as_echo "$ac_cv_crosscflags__mcx16" >&6; } +if test "x$ac_cv_crosscflags__mcx16" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -mcx16" fi ;; esac diff --git a/configure.ac b/configure.ac index 65a7c5d625..c0a44f3712 100644 --- a/configure.ac +++ b/configure.ac @@ -1096,7 +1096,8 @@ then *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;; x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) WINE_TRY_CROSSCFLAGS([-Wformat-overflow]) - WINE_TRY_CROSSCFLAGS([-Wnonnull]) ;; + WINE_TRY_CROSSCFLAGS([-Wnonnull]) + WINE_TRY_CROSSCFLAGS([-mcx16]) ;; esac dnl Determine debug info format

1 0

Alexandre Julliard : winebuild: Always use DllMain as entry point for the 32-bit side of a 16-bit module.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: cff04b34ac7bc252799932a5c376a93094e6f115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff04b34ac7bc252799932a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 3 11:44:33 2020 +0200 winebuild: Always use DllMain as entry point for the 32-bit side of a 16-bit module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49559 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 1 + tools/winebuild/parser.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 34761ea4c5..da9ad62022 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -475,6 +475,7 @@ static int has_stubs( const DLLSPEC *spec ) static void add_extra_undef_symbols( DLLSPEC *spec ) { add_extra_ld_symbol( spec->init_func ); + if (spec->type == SPEC_WIN16) add_extra_ld_symbol( "DllMain" ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9822456fe5..54fffd8a1b 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -836,6 +836,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) spec32->file_name = xstrdup( spec16->file_name ); spec32->characteristics = IMAGE_FILE_DLL; + spec32->init_func = xstrdup( "DllMain" ); /* add an export for the NE module */

1 0

Alexandre Julliard : ntdll: Fix wcsncpy() implementation now that length is unsigned.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: 647c54e539c6dcc76c6289bad0fc387274d999eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=647c54e539c6dcc76c6289ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 3 13:00:03 2020 +0200 ntdll: Fix wcsncpy() implementation now that length is unsigned. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49206 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/wcstring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 393d5af8c2..eee856b21d 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -244,8 +244,8 @@ int __cdecl wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n ) LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) { WCHAR *ret = s1; - while (n-- > 0) if (!(*s1++ = *s2++)) break; - while (n-- > 0) *s1++ = 0; + for ( ; n; n--) if (!(*s1++ = *s2++)) break; + for ( ; n; n--) *s1++ = 0; return ret; }

1 0

Huw Davies : maintainers: Add combase to the OLE RPC section.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: 88730d225436fe7cf82d1b70ab2ed6c6aa1142d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88730d225436fe7cf82d1b70… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 3 10:47:19 2020 +0100 maintainers: Add combase to the OLE RPC section. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc1699665..46b3d40ec3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -195,6 +195,7 @@ F: dlls/ole32/oleobj.c OLE RPC M: Huw Davies <huw(a)codeweavers.com> +F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/rpc.c

1 0

Jeff Smith : setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList.
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: f9028142d1e57322f893d7e47d846f72a8c6c72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9028142d1e57322f893d7e4… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 29 09:29:24 2020 -0500 setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cb77fdf3c4..58b6303608 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2708,7 +2708,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2740,7 +2743,10 @@ static void test_class_installer(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2766,7 +2772,10 @@ static void test_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2786,7 +2795,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2854,7 +2866,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2883,7 +2898,10 @@ static void test_class_coinstaller(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2906,7 +2924,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2954,7 +2975,10 @@ static void test_call_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll");

1 0

Sven Baars : ntoskrnl.exe/tests: Add a missing argument to an ok call (Coverity).
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: 333a867f75cc0bc380714a0369a1e896f4a2941a URL: https://source.winehq.org/git/wine.git/?a=commit;h=333a867f75cc0bc380714a03… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Aug 2 19:20:22 2020 +0200 ntoskrnl.exe/tests: Add a missing argument to an ok call (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d3f62879a4..7a325753d4 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1614,7 +1614,7 @@ static void test_completion(void) IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); ret = IoCallDriver(upper_device, irp); ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); - ok(got_completion == 2, "got %u calls to completion routine\n"); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); } static void test_IoAttachDeviceToDeviceStack(void)

1 0

Zebediah Figura : Revert "winegstreamer: Check for failure from gst_video_info_set_format().".
by Alexandre Julliard Aug. 3, 2020

Aug. 3, 2020

Module: wine Branch: master Commit: 3231901ad886198dba016f10822cd8410d6546a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3231901ad886198dba016f10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 14:17:35 2020 -0500 Revert "winegstreamer: Check for failure from gst_video_info_set_format().". This reverts commit ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d. This function returns void before 1.12. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49647 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fe5fe0e60d..e8f65a0e6e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,11 +413,7 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) - { - ERR("Failed to set format.\n"); - return NULL; - } + gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */

1 0