March 2020 - Wine-commits - list.winehq.org

Francois Gouget : configure: Add an option to enable -Werror.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 85100cfc7a03a0fc32fd98241d9cf462eaae5988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85100cfc7a03a0fc32fd9824… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:29:21 2020 +0100 configure: Add an option to enable -Werror. --maintainer-mode already enables -Werror but it it incompatible with out-of-tree builds. Calling configure with CFLAGS=-Werror causes it to misdetect some functions like llrint() due to redefinition warnings. And setting CFLAGS when invoking make risks losing compiler options like -g -O2. So add a --enable-werror configure option to allow cleanly using -Werror. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++++++++++-- configure.ac | 10 +++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/configure b/configure index bb2fccd1fc..76cfea1c07 100755 --- a/configure +++ b/configure @@ -841,6 +841,7 @@ enable_win16 enable_win64 enable_tests enable_maintainer_mode +enable_werror with_alsa with_capi with_cms @@ -2537,6 +2538,7 @@ Optional Features: --disable-tests do not build the regression tests --enable-maintainer-mode enable maintainer-specific build rules + --enable-werror treat compilation warnings as errors --disable-largefile omit support for large files Optional Packages: @@ -3861,6 +3863,11 @@ if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; fi +# Check whether --enable-werror was given. +if test "${enable_werror+set}" = set; then : + enableval=$enable_werror; +fi + # Check whether --with-alsa was given. @@ -6790,6 +6797,8 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } with_gettext=yes with_gettextpo=yes + + enable_werror=yes fi test "x$with_gettext" != xno || MSGFMT=false @@ -10582,7 +10591,7 @@ if test "x$ac_cv_crosscflags__Wl__delayload_autoconftest_dll" = xyes; then : fi - if test "x$enable_maintainer_mode" = xyes + if test "x$enable_werror" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 $as_echo_n "checking whether the cross-compiler supports -Werror... " >&6; } @@ -17691,7 +17700,7 @@ fi ;; CFLAGS=$saved_CFLAGS - if test "x$enable_maintainer_mode" = "xyes" + if test "x$enable_werror" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 $as_echo_n "checking whether the compiler supports -Werror... " >&6; } diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..f722ac5d04 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) +AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnings as errors])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) @@ -373,6 +374,9 @@ else dnl Maintainer mode requires gettext with_gettext=yes with_gettextpo=yes + + dnl Maintainer mode wants -Werror + enable_werror=yes fi test "x$with_gettext" != xno || MSGFMT=false @@ -1092,7 +1096,7 @@ then WINE_TRY_CROSSCFLAGS([-Wl,-delayload,autoconftest.dll], [AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) - if test "x$enable_maintainer_mode" = xyes + if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) fi @@ -2080,8 +2084,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_CFLAGS - dnl Enable -Werror for maintainer mode - if test "x$enable_maintainer_mode" = "xyes" + dnl Enable -Werror + if test "x$enable_werror" = "xyes" then WINE_TRY_CFLAGS([-Werror]) fi

1 0

Francois Gouget : kernel32/tests: Clean up the argv[0] tests and improve coverage.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 435b41ec7c87d7b1eb6c51a538c3624110a39a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=435b41ec7c87d7b1eb6c51a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:29:45 2020 +0100 kernel32/tests: Clean up the argv[0] tests and improve coverage. The argv[0] tests mostly care about the value of argvA0 in the child process. So remove most of the extra arguments and use the remaining ones to check other aspects. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c5ff473d30..264f737178 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -910,9 +910,9 @@ static void test_CommandLine(void) ok(!info.dwProcessId, "unexpected dwProcessId %04x\n", info.dwProcessId); ok(!info.dwThreadId, "unexpected dwThreadId %04x\n", info.dwThreadId); - /* the basics */ + /* the basics; not getting confused by the leading and trailing " */ get_file_name(resfile); - sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* Check that the effective STARTUPINFOA parameters are not modified */ ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); @@ -927,10 +927,9 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); - okChildInt("Arguments", "argcA", 6); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); - okChildString("Arguments", "argvA5", "\""); - okChildString("Arguments", "argvA6", NULL); + okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); DeleteFileA(resfile); @@ -955,10 +954,12 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); - /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ + /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0] + * and " escaping. + */ get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, "./%s process dump \"%s\" \"\"\"\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -969,13 +970,16 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA0", buffer); + okChildString("Arguments", "argvA4", "\""); + okChildString("Arguments", "argvA5", NULL); release_memory(); DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, ".\\%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, ".\\%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -996,8 +1000,8 @@ static void test_CommandLine(void) *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); /* Use exename to avoid buffer containing things like 'C:' */ - if (p) sprintf(buffer, "..%s/%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); - else sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + if (p) sprintf(buffer, "..%s/%s process dump \"%s\"", p, exename, resfile); + else sprintf(buffer, "./%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -1022,7 +1026,7 @@ static void test_CommandLine(void) /* Use exename to avoid buffer containing things like 'C:' */ if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); - sprintf(buffer2, "dummy process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", resfile); + sprintf(buffer2, "dummy process dump \"%s\"", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError());

1 0

Zebediah Figura : winegstreamer: Allocate media type format blocks with CoTaskMemAlloc().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 57492f55fdf17444c68ef57525240d8dbd4b4baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=57492f55fdf17444c68ef575… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:13 2020 -0500 winegstreamer: Allocate media type format blocks with CoTaskMemAlloc(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e9548e80e4..0b00fc5339 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = heap_alloc(sizeof(*wfe)); + wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -186,7 +186,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = heap_alloc(sizeof(*vih)); + vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -225,14 +225,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * break; default: FIXME("Unhandled type %s.\n", vinfo.finfo->name); - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } switch (amt->subtype.Data1) {

1 0

Zebediah Figura : winegstreamer: Use accessor macros for GstVideoInfo fields.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 3178f1d0afc2170da61175ae3fbeb9e01e840083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3178f1d0afc2170da61175ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:14 2020 -0500 winegstreamer: Use accessor macros for GstVideoInfo fields. As the documentation prescribes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0b00fc5339..40301c0d63 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -176,15 +176,13 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; - gint32 width, height, nom, denom; + gint32 width, height; GstVideoInfo vinfo; if (!gst_video_info_from_caps (&vinfo, caps)) return FALSE; - width = vinfo.width; - height = vinfo.height; - nom = vinfo.fps_n; - denom = vinfo.fps_d; + width = GST_VIDEO_INFO_WIDTH(&vinfo); + height = GST_VIDEO_INFO_HEIGHT(&vinfo); vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; @@ -201,7 +199,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (GST_VIDEO_INFO_IS_RGB(&vinfo)) { - switch (vinfo.finfo->format) + switch (GST_VIDEO_INFO_FORMAT(&vinfo)) { case GST_VIDEO_FORMAT_BGRA: amt->subtype = MEDIASUBTYPE_ARGB32; @@ -224,14 +222,15 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", vinfo.finfo->name); + FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(&vinfo)); CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; - if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { + if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(&vinfo)))) + { CoTaskMemFree(vih); return FALSE; } @@ -248,7 +247,8 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, + GST_VIDEO_INFO_FPS_D(&vinfo), GST_VIDEO_INFO_FPS_N(&vinfo))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ bih->biSize = sizeof(*bih); bih->biWidth = width;

1 0

Zebediah Figura : winegstreamer: Use amt_from_gst_video_info() in gstdecoder_source_get_media_type().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 1bb868e9c1ca5ffbe1d6070ec5275123f3dcd69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb868e9c1ca5ffbe1d6070e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:15 2020 -0500 winegstreamer: Use amt_from_gst_video_info() in gstdecoder_source_get_media_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 74 +++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 40301c0d63..a8b1098752 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -172,17 +172,14 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * return TRUE; } -static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; gint32 width, height; - GstVideoInfo vinfo; - if (!gst_video_info_from_caps (&vinfo, caps)) - return FALSE; - width = GST_VIDEO_INFO_WIDTH(&vinfo); - height = GST_VIDEO_INFO_HEIGHT(&vinfo); + width = GST_VIDEO_INFO_WIDTH(info); + height = GST_VIDEO_INFO_HEIGHT(info); vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; @@ -197,9 +194,9 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * ZeroMemory(vih, sizeof(*vih)); amt->majortype = MEDIATYPE_Video; - if (GST_VIDEO_INFO_IS_RGB(&vinfo)) + if (GST_VIDEO_INFO_IS_RGB(info)) { - switch (GST_VIDEO_INFO_FORMAT(&vinfo)) + switch (GST_VIDEO_INFO_FORMAT(info)) { case GST_VIDEO_FORMAT_BGRA: amt->subtype = MEDIASUBTYPE_ARGB32; @@ -222,14 +219,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(&vinfo)); + FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(info)); CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; - if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(&vinfo)))) + if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(info)))) { CoTaskMemFree(vih); return FALSE; @@ -248,7 +245,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * } bih->biSizeImage = width * height * bih->biBitCount / 8; if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, - GST_VIDEO_INFO_FPS_D(&vinfo), GST_VIDEO_INFO_FPS_N(&vinfo))) == -1) + GST_VIDEO_INFO_FPS_D(info), GST_VIDEO_INFO_FPS_N(info))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ bih->biSize = sizeof(*bih); bih->biWidth = width; @@ -331,7 +328,13 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); else if (!strcmp(type, "video/x-raw")) - return amt_from_gst_caps_video_raw(caps, mt); + { + GstVideoInfo info; + + if (!gst_video_info_from_caps(&info, caps)) + return FALSE; + return amt_from_gst_video_info(&info, mt); + } else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); else if (!strcmp(type, "video/x-cinepak")) @@ -1649,26 +1652,19 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - static const struct - { - const GUID *subtype; - WORD bpp; - DWORD compression; - } - video_types[] = + static const GstVideoFormat video_formats[] = { /* Roughly ordered by preference from videoflip. */ - {&MEDIASUBTYPE_AYUV, 32, mmioFOURCC('A','Y','U','V')}, - {&MEDIASUBTYPE_ARGB32, 32, BI_RGB}, - {&MEDIASUBTYPE_RGB32, 32, BI_RGB}, - {&MEDIASUBTYPE_RGB24, 24, BI_RGB}, - {&MEDIASUBTYPE_I420, 12, mmioFOURCC('I','4','2','0')}, - {&MEDIASUBTYPE_YV12, 12, mmioFOURCC('Y','V','1','2')}, - {&MEDIASUBTYPE_IYUV, 12, mmioFOURCC('I','Y','U','V')}, - {&MEDIASUBTYPE_YUY2, 16, mmioFOURCC('Y','U','Y','2')}, - {&MEDIASUBTYPE_UYVY, 16, mmioFOURCC('U','Y','V','Y')}, - {&MEDIASUBTYPE_YVYU, 16, mmioFOURCC('Y','V','Y','U')}, - {&MEDIASUBTYPE_NV12, 12, mmioFOURCC('N','V','1','2')}, + GST_VIDEO_FORMAT_AYUV, + GST_VIDEO_FORMAT_BGRA, + GST_VIDEO_FORMAT_BGRx, + GST_VIDEO_FORMAT_BGR, + GST_VIDEO_FORMAT_I420, + GST_VIDEO_FORMAT_YV12, + GST_VIDEO_FORMAT_YUY2, + GST_VIDEO_FORMAT_UYVY, + GST_VIDEO_FORMAT_YVYU, + GST_VIDEO_FORMAT_NV12, }; if (!index) @@ -1677,19 +1673,15 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, return S_OK; } else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Video) - && index - 1 < ARRAY_SIZE(video_types)) + && index - 1 < ARRAY_SIZE(video_formats)) { - VIDEOINFOHEADER *vih; + const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + GstVideoInfo info; - *mt = pin->mt; - mt->subtype = *video_types[index - 1].subtype; - mt->pbFormat = CoTaskMemAlloc(pin->mt.cbFormat); - memcpy(mt->pbFormat, pin->mt.pbFormat, pin->mt.cbFormat); - vih = (VIDEOINFOHEADER *)mt->pbFormat; - vih->bmiHeader.biBitCount = video_types[index - 1].bpp; - vih->bmiHeader.biCompression = video_types[index - 1].compression; - vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth - * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + gst_video_info_set_format(&info, video_formats[index - 1], + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + if (!amt_from_gst_video_info(&info, mt)) + return E_OUTOFMEMORY; return S_OK; } else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Audio) && index == 1)

1 0

Zebediah Figura : winegstreamer: Use the image size provided by GStreamer.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 8575484f2192d5394903f3362601f4131bd7f25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8575484f2192d5394903f336… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:16 2020 -0500 winegstreamer: Use the image size provided by GStreamer. If the stride is not equal to the width, this calculation will be invalid. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a8b1098752..9d7f85b82d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -243,7 +243,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE } bih->biCompression = amt->subtype.Data1; } - bih->biSizeImage = width * height * bih->biBitCount / 8; + bih->biSizeImage = GST_VIDEO_INFO_SIZE(info); if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, GST_VIDEO_INFO_FPS_D(info), GST_VIDEO_INFO_FPS_N(info))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */

1 0

Jacek Caban : ucrtbase/tests: Build with -fno-builtin.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: f202beb7454e3c39de7a8271c4a2f05f21d3c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f202beb7454e3c39de7a8271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 21:12:32 2020 +0100 ucrtbase/tests: Build with -fno-builtin. Some of tested functions are handled as builtin compiler functions. We always want to test our actual implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 126cafd66d..259880a7d9 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = ucrtbase.dll IMPORTS = ucrtbase +EXTRADEFS = -fno-builtin C_SRCS = \ cpp.c \

1 0

Jacek Caban : ucrtbase/tests: Use more functions directly.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: c2ee20c95bea55069d32cfa69a95ae3e4486a02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ee20c95bea55069d32cfa6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 21:12:57 2020 +0100 ucrtbase/tests: Use more functions directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 122 ++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2ee20c95bea55069d32…

1 0

Stefan Dösinger : ddraw/tests: Re-init for every test_surface_discard iteration.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: bc4ad3ca4d6dcb6e0bb03e9d9706be2687a7fe09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4ad3ca4d6dcb6e0bb03e9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 15 14:10:32 2020 +0300 ddraw/tests: Re-init for every test_surface_discard iteration. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 39 ++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw2.c | 39 ++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 41 +++++++++++++++++++++++++---------------- dlls/ddraw/tests/ddraw7.c | 41 +++++++++++++++++++++++++---------------- 4 files changed, 98 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4ad3ca4d6dcb6e0bb0…

1 0

Stefan Dösinger : ddraw/tests: Don't print uninitialized l in test_compressed_surface_stretch.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: d6917dee9d23eb59f5daf76333cc298e75f4c3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6917dee9d23eb59f5daf763… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 15 14:10:33 2020 +0300 ddraw/tests: Don't print uninitialized l in test_compressed_surface_stretch. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bdec30621e..5c0c5bb7c3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17127,16 +17127,16 @@ static void test_compressed_surface_stretch(void) { U4(src_surface_desc).ddpfPixelFormat = test_formats[k].fmt; hr = IDirectDraw7_CreateSurface(ddraw, &src_surface_desc, &src_surf, NULL); - ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + ok(hr == DD_OK, "Test (%u, %u, %u), got unexpected hr %#x.\n", i, j, k, hr); U5(fx).dwFillColor = 0x801f; hr = IDirectDrawSurface7_Blt(rb_surf, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + ok(hr == DD_OK, "Test (%u, %u, %u), got unexpected hr %#x.\n", i, j, k, hr); hr = IDirectDrawSurface7_Blt(src_surf, &src_rect, rb_surf, &src_rect, DDBLT_WAIT, NULL); todo_wine_if(test_formats[k].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_src) - ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + ok(hr == DD_OK, "Test (%u, %u, %u), got unexpected hr %#x.\n", i, j, k, hr); if (FAILED(hr)) { IDirectDrawSurface7_Release(src_surf);

1 0