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

[tools] testbot/build: Simplify the --no-rm handling.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 ++++-- testbot/bin/build/WineReconfig.pl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f0ed128d4e..62644e11a9 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,6 +40,8 @@ sub BEGIN $::BuildEnv = 1; } +use File::Path; + use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; @@ -53,13 +55,13 @@ sub BuildNative($) { my ($NoRm) = @_; + rmtree "$DataDir/wine-native" if (!$NoRm); mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); system("cd '$DataDir/wine-native' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); @@ -77,6 +79,7 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate @@ -84,7 +87,6 @@ sub BuildCross($$$) my $CPUCount = GetCPUCount(); my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 835be4609b..ad0d429e1f 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,6 +54,7 @@ sub BuildWine($$$$;$) my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -62,7 +63,6 @@ sub BuildWine($$$$;$) my $CPUCount = GetCPUCount(); $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0) -- 2.20.1

1 0

[tools] testbot/WinePatchesMLSubmit: Add a semi-colon.
by Francois Gouget 16 Mar '20

16 Mar '20

It's at the end of a block and thus optional but all other blocks have one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 4797e986ad..92c769f465 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -65,7 +65,7 @@ if (defined $ErrMessage) { # The Engine will pick up the email later so return success anyway. # But still log the issue so it can be checked out. - LogMsg "$ErrMessage\n" + LogMsg "$ErrMessage\n"; } exit 0; -- 2.20.1

1 0

[PATCH v3] shell32/tests: Avoid ever changing values in the shlexec failure messages.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v3: The derandomisation must be done in the ok*() functions, not before to not break the comparisons. The TestBot now shows the expected results: it still has failures but the TestBot will be able to see that they are not new. dlls/shell32/tests/shlexec.c | 60 ++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525a..3571b64cc9e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -350,6 +350,42 @@ static void dump_child_(const char* file, int line) * ***/ +static void substTmpPath(char* str, const char *path, char rep) +{ + char *p; + + /* Only modify the last component of the path */ + p = strrchr(path, '\\'); + if (p) path = p + 1; + p = strrchr(path, '/'); + if (p) path = p + 1; + + p = strstr(str, path); + while (p) + { + p += 2; /* skip the 'wt' prefix */ + /* and only replace the random part of the filename */ + while (*p && *p != '.') + *p++ = rep; + p = strstr(p, path); + } +} + +static const char* derandomizeString(const char* str) +{ + static char buffer[2][2048]; + static int current_buffer = 0; + + if (!str || strlen(str) >= sizeof(buffer[0])) + return str; + + current_buffer = current_buffer ? 0 : 1; + strcpy(buffer[current_buffer], str); + substTmpPath(buffer[current_buffer], tmpdir, 'D'); + substTmpPath(buffer[current_buffer], child_file, 'C'); + return buffer[current_buffer]; +} + static char shell_call[2048]; static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { @@ -378,12 +414,12 @@ static void okChildString_(const char* file, int line, const char* key, const ch result=getChildString("Child", key); if (!result) { - okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, derandomizeString(expected)); return; } okShell_(file, line)(lstrcmpiA(result, expected) == 0 || broken(lstrcmpiA(result, bad) == 0), - "%s expected '%s', got '%s'\n", key, expected, result); + "%s expected '%s', got '%s'\n", key, derandomizeString(expected), derandomizeString(result)); } #define okChildString(key, expected) okChildString_(__FILE__, __LINE__, (key), (expected), (expected)) #define okChildStringBroken(key, expected, broken) okChildString_(__FILE__, __LINE__, (key), (expected), (broken)) @@ -432,7 +468,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char result=getChildString("Child", key); if (!result) { - okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, derandomizeString(expected)); return; } shortequal = FALSE; @@ -451,7 +487,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char } } okShell_(file,line)(equal || broken(shortequal) /* XP SP1 */, - "%s expected '%s', got '%s'\n", key, expected, result); + "%s expected '%s', got '%s'\n", key, derandomizeString(expected), derandomizeString(result)); } #define okChildPath(key, expected) okChildPath_(__FILE__, __LINE__, (key), (expected)) @@ -507,9 +543,9 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); if (winetest_debug > 1) @@ -591,9 +627,9 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat_param(shell_call, "class", class); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); @@ -832,7 +868,7 @@ static void create_test_verb_dde(const char* classname, const char* verb, sprintf(shell, "%d", rawcmd); strcat_param(assoc_desc, "rawcmd", shell); strcat_param(assoc_desc, "cmdtail", cmdtail); - strcat_param(assoc_desc, "ddeexec", ddeexec); + strcat_param(assoc_desc, "ddeexec", derandomizeString(ddeexec)); strcat_param(assoc_desc, "app", application); strcat_param(assoc_desc, "topic", topic); strcat_param(assoc_desc, "ifexec", ifexec); @@ -2080,7 +2116,7 @@ static void test_find_executable(void) if (rc > 32) rc=33; todo_wine_if(test->todo & 0x10) - ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", filename, rc); + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", derandomizeString(filename), rc); if (rc > 32) { BOOL equal; -- 2.20.1

4 4

[PATCH] mscoree: Use wcstok_s instead of wcstok.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- wcstok may be different on different crts, see 7aa1f6ee1c62b0cf395. dlls/mscoree/corruntimehost.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] ucrtbase/tests: Use more functions directly.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 122 +++++++++++++------------------------ 1 file changed, 44 insertions(+), 78 deletions(-)

1 0

[PATCH 1/2] ucrtbase/tests: Build with -fno-builtin.
by Jacek Caban 16 Mar '20

16 Mar '20

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> --- dlls/ucrtbase/tests/Makefile.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/4] kernelbase: Implement compatibility mode for GetVersionEx.
by Gabriel Ivăncescu 16 Mar '20

16 Mar '20

Since Windows 8.1, these functions have been deprecated and run in a sort of compatibility mode, reporting Windows 8 unless the application supplies a manifest that specifies compatibility with newer Windows versions explicitly (by listing their GUIDs). Some applications have bad non-forward-compatible checks based on GetVersionEx, and depend on this behavior (they do not supply a manifest). Currently, they break on Wine if we use a Windows 10 prefix for example, since we always report the real version. One example is the game Rock of Ages. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm introducing an exported internal ntdll function, since I didn't want to duplicate the table for kernelbase. I don't know if this is the best way, so let me know if I should proceed differently. dlls/kernelbase/version.c | 54 +++++++++++++++++++------ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/version.c | 85 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index cf46e9c..d07c1c9 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); +extern CDECL const RTL_OSVERSIONINFOEXW *__wine_get_compat_win_version(void); + typedef struct { WORD offset; @@ -1317,7 +1319,7 @@ DWORD WINAPI GetVersion(void) */ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) { - RTL_OSVERSIONINFOEXW infoW; + const RTL_OSVERSIONINFOEXW *ver; if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) @@ -1327,23 +1329,26 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) return FALSE; } - infoW.dwOSVersionInfoSize = sizeof(infoW); - if (!set_ntstatus( RtlGetVersion( &infoW ))) return FALSE; + if (!(ver = __wine_get_compat_win_version())) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } - info->dwMajorVersion = infoW.dwMajorVersion; - info->dwMinorVersion = infoW.dwMinorVersion; - info->dwBuildNumber = infoW.dwBuildNumber; - info->dwPlatformId = infoW.dwPlatformId; - WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, + info->dwMajorVersion = ver->dwMajorVersion; + info->dwMinorVersion = ver->dwMinorVersion; + info->dwBuildNumber = ver->dwBuildNumber; + info->dwPlatformId = ver->dwPlatformId; + WideCharToMultiByte( CP_ACP, 0, ver->szCSDVersion, -1, info->szCSDVersion, sizeof(info->szCSDVersion), NULL, NULL ); if (info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) { OSVERSIONINFOEXA *vex = (OSVERSIONINFOEXA *)info; - vex->wServicePackMajor = infoW.wServicePackMajor; - vex->wServicePackMinor = infoW.wServicePackMinor; - vex->wSuiteMask = infoW.wSuiteMask; - vex->wProductType = infoW.wProductType; + vex->wServicePackMajor = ver->wServicePackMajor; + vex->wServicePackMinor = ver->wServicePackMinor; + vex->wSuiteMask = ver->wSuiteMask; + vex->wProductType = ver->wProductType; } return TRUE; } @@ -1354,11 +1359,34 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) */ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) { + const RTL_OSVERSIONINFOEXW *ver; + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) { WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); return FALSE; } - return set_ntstatus( RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info )); + + if (!(ver = __wine_get_compat_win_version())) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + info->dwMajorVersion = ver->dwMajorVersion; + info->dwMinorVersion = ver->dwMinorVersion; + info->dwBuildNumber = ver->dwBuildNumber; + info->dwPlatformId = ver->dwPlatformId; + wcscpy( info->szCSDVersion, ver->szCSDVersion ); + + if(info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + OSVERSIONINFOEXW *vex = (OSVERSIONINFOEXW *)info; + vex->wServicePackMajor = ver->wServicePackMajor; + vex->wServicePackMinor = ver->wServicePackMinor; + vex->wSuiteMask = ver->wSuiteMask; + vex->wProductType = ver->wProductType; + } + return TRUE; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ea72e3..5f58e4a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1572,6 +1572,7 @@ @ cdecl wine_get_version() NTDLL_wine_get_version @ cdecl wine_get_build_id() NTDLL_wine_get_build_id @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version +@ cdecl __wine_get_compat_win_version() # Codepages @ cdecl __wine_get_unix_codepage() diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 61e48f6..f48f725 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -191,6 +191,13 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }; +/* GUIDs for Windows versions WIN81 and later, needed for compatibility manifest check */ +static const GUID version_compat_guid[NB_WINDOWS_VERSIONS - WIN81] = +{ + {0x1f676c76,0x80e1,0x4239,{0x95,0xbb,0x83,0xd0,0xf6,0xd0,0xda,0x78}}, /* WIN81 */ + {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}}, /* WIN10 */ +}; + static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = { { {'w','i','n','2','0',0}, WIN20 }, @@ -781,3 +788,81 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } + +/****************************************************************************** + * __wine_get_compat_win_version (NTDLL.@) + * + * Get a pointer to a RTL_OSVERSIONINFOEXW that matches the compatibility mode. + * + * For compatibility, Windows 8.1 and later report Win8 version unless the app + * has a manifest that confirms its compatibility with newer versions of Windows. + * + * RETURNS + * A pointer to a RTL_OSVERSIONINFOEXW containing the version in compatibility + * mode, or NULL if out of memory. + */ +CDECL const RTL_OSVERSIONINFOEXW *__wine_get_compat_win_version(void) +{ + static const RTL_OSVERSIONINFOEXW *compat_ver; + + if (!compat_ver) + { + /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci; + const RTL_OSVERSIONINFOEXW *ver = current_version; + SIZE_T req; + int idx; + + for (idx = ARRAY_SIZE(version_compat_guid); idx--;) + { + const RTL_OSVERSIONINFOEXW *v = &VersionData[WIN81 + idx]; + + if ( current_version->dwMajorVersion > v->dwMajorVersion || + (current_version->dwMajorVersion == v->dwMajorVersion && + current_version->dwMinorVersion >= v->dwMinorVersion)) + break; + } + + if (idx >= 0) + { + ver = &VersionData[WIN8]; + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, NULL, 0, &req) == STATUS_BUFFER_TOO_SMALL + && req) + { + if (!(acci = RtlAllocateHeap(GetProcessHeap(), 0, req))) + return NULL; + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, acci, req, &req) == STATUS_SUCCESS) + { + do + { + COMPATIBILITY_CONTEXT_ELEMENT *elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); + DWORD i, count = *acci; + + for (i = 0; i < count; i++) + { + if (elements[i].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + IsEqualGUID(&elements[i].Id, &version_compat_guid[idx])) + { + ver = &VersionData[WIN81 + idx]; + + if (ver->dwMajorVersion == current_version->dwMajorVersion && + ver->dwMinorVersion == current_version->dwMinorVersion) + ver = current_version; + + idx = 0; /* break from outer loop */ + break; + } + } + } while(idx--); + } + RtlFreeHeap(GetProcessHeap(), 0, acci); + } + } + interlocked_cmpxchg_ptr((void**)&compat_ver, (void*)ver, NULL); + } + + return compat_ver; +} -- 2.21.0

3 8

[PATCH v2] quartz: Clear the WS_CHILD style instead of unparenting the window.
by Gabriel Ivăncescu 16 Mar '20

16 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48732 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 4 ++++ dlls/quartz/window.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 01152c2..f8b80dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4380,11 +4380,15 @@ static void test_window_threading(void) else skip("Could not find renderer window.\n"); + SetActiveWindow(parent); expect_parent_message = FALSE; ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); expect_parent_message = TRUE; + hwnd = GetActiveWindow(); + ok(hwnd == parent, "Parent window lost focus, active window %p.\n", hwnd); + hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 0b0df13..4656bad 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -136,14 +136,14 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { - BaseControlWindow *window = impl_from_BaseWindow(This); - if (!This->hWnd) return S_OK; - /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent - * the window first. */ - IVideoWindow_put_Owner(&window->IVideoWindow_iface, 0); + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so clear + * the child style first. Just like Windows, we don't actually unparent + * the window, to prevent extra focus events from being generated since + * it would become top-level for a brief period before being destroyed. */ + SetWindowLongW(This->hWnd, GWL_STYLE, GetWindowLongW(This->hWnd, GWL_STYLE) & ~WS_CHILD); SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; -- 2.21.0

2 1

[PATCH v3 1/4] winegstreamer: Allocate media type format blocks with CoTaskMemAlloc().
by Zebediah Figura 16 Mar '20

16 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 6897eeda3f1..5a7f696ef14 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) { -- 2.25.1

1 3

[PATCH 1/3] winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Zebediah Figura 16 Mar '20

16 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e9548e80e4b..7429b360b3a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1972,6 +1972,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1984,8 +1985,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n"); -- 2.25.1

3 4