June 2022 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Use correct printf specifier for UINT64 (QWORD) values.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: e06a62049e8268e7501a9a703e42bfbf7dc9ea42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06a62049e8268e7501a9a70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 29 21:32:26 2022 +1000 regedit: Use correct printf specifier for UINT64 (QWORD) values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e314862ee6f..8e40d488b15 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -122,7 +122,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz { UINT64 value = *(UINT64 *)data; WCHAR buf[64]; - swprintf(buf, ARRAY_SIZE(buf), L"0x%08Ix (%Iu)", value, value); + swprintf(buf, ARRAY_SIZE(buf), L"0x%08I64x (%I64u)", value, value); ListView_SetItemTextW(hwndLV, index, 2, buf); break; }

1 0

Alexandre Julliard : ntdll: Add strcpy_s and wcscpy_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 41f488a32d17b47a88606d538f6ab10fed96bad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f488a32d17b47a88606d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:48:47 2022 +0200 ntdll: Add strcpy_s and wcscpy_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 21 +++++++++++++++++++++ dlls/ntdll/wcstring.c | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fa1941ec811..93cb322f06d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1590,6 +1590,7 @@ @ cdecl strchr(str long) @ cdecl strcmp(str str) @ cdecl strcpy(ptr str) +@ cdecl strcpy_s(ptr long str) @ cdecl strcspn(str str) @ cdecl strlen(str) @ cdecl strncat(str str long) @@ -1618,6 +1619,7 @@ @ cdecl wcschr(wstr long) @ cdecl wcscmp(wstr wstr) @ cdecl wcscpy(ptr wstr) +@ cdecl wcscpy_s(ptr long wstr) @ cdecl wcscspn(wstr wstr) @ cdecl wcslen(wstr) @ cdecl wcsncat(wstr wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 9c46b02aac4..6308ecfe049 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -21,6 +21,7 @@ */ #include <limits.h> +#include <errno.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -256,6 +257,26 @@ char * __cdecl strcpy( char *dst, const char *src ) } +/********************************************************************* + * strcpy_s (NTDLL.@) + */ +errno_t __cdecl strcpy_s( char *dst, size_t len, const char *src ) +{ + size_t i; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!(dst[i] = src[i])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strcspn (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index eef3197c4fe..b6afdb1d72e 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -21,6 +21,7 @@ */ #include <ctype.h> +#include <errno.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -162,6 +163,26 @@ LPWSTR __cdecl wcscpy( LPWSTR dst, LPCWSTR src ) } +/********************************************************************* + * wcscpy_s (NTDLL.@) + */ +errno_t __cdecl wcscpy_s( wchar_t *dst, size_t len, const wchar_t *src ) +{ + size_t i; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!(dst[i] = src[i])) return 0; + *dst = 0; + return ERANGE; +} + + /*********************************************************************** * wcslen (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strcat_s and wcscat_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 83cd792e355f94e39b63eedc295b1cbfa25bea83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cd792e355f94e39b63eedc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:14 2022 +0200 ntdll: Add strcat_s and wcscat_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 20 ++++++++++++++++++++ dlls/ntdll/wcstring.c | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 93cb322f06d..1e94d23c7df 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1587,6 +1587,7 @@ @ cdecl sqrt(double) @ varargs sscanf(str str) @ cdecl strcat(str str) +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @ cdecl strcpy(ptr str) @@ -1616,6 +1617,7 @@ @ cdecl vsprintf_s(ptr long str ptr) @ cdecl vswprintf_s(ptr long wstr ptr) @ cdecl wcscat(wstr wstr) +@ cdecl wcscat_s(wstr long wstr) @ cdecl wcschr(wstr long) @ cdecl wcscmp(wstr wstr) @ cdecl wcscpy(ptr wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 6308ecfe049..8a37cd6d8d4 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -224,6 +224,26 @@ char * __cdecl strcat( char *dst, const char *src ) } +/********************************************************************* + * strcat_s (NTDLL.@) + */ +errno_t __cdecl strcat_s( char *dst, size_t len, const char *src ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + for (i = 0; i < len; i++) if (!dst[i]) break; + for (j = 0; (j + i) < len; j++) if (!(dst[j + i] = src[j])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strchr (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index b6afdb1d72e..d5e50981153 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -204,6 +204,26 @@ LPWSTR __cdecl wcscat( LPWSTR dst, LPCWSTR src ) } +/********************************************************************* + * wcscat_s (NTDLL.@) + */ +errno_t __cdecl wcscat_s( wchar_t *dst, size_t len, const wchar_t *src ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + for (i = 0; i < len; i++) if (!dst[i]) break; + for (j = 0; (j + i) < len; j++) if (!(dst[j + i] = src[j])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * wcschr (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strncpy_s and wcsncpy_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 94e960c861c013771d72022ef994d38e937cef58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e960c861c013771d72022e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:38 2022 +0200 ntdll: Add strncpy_s and wcsncpy_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e94d23c7df..95b2e652b3d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1597,6 +1597,7 @@ @ cdecl strncat(str str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) +@ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(ptr long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @@ -1627,6 +1628,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsncpy_s(ptr long wstr long) @ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 8a37cd6d8d4..212cd30e2f1 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -356,6 +356,48 @@ char * __cdecl strncpy( char *dst, const char *src, size_t len ) } +/********************************************************************* + * strncpy_s (NTDLL.@) + */ +errno_t __cdecl strncpy_s( char *dst, size_t len, const char *src, size_t count ) +{ + size_t i, end; + + if (!count) + { + if (dst && len) *dst = 0; + return 0; + } + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + if (count != _TRUNCATE && count < len) + end = count; + else + end = len - 1; + + for (i = 0; i < end; i++) + if (!(dst[i] = src[i])) return 0; + + if (count == _TRUNCATE) + { + dst[i] = 0; + return STRUNCATE; + } + if (end == count) + { + dst[i] = 0; + return 0; + } + dst[0] = 0; + return ERANGE; +} + + /********************************************************************* * strnlen (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index d5e50981153..cb45986207d 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -292,6 +292,48 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsncpy_s (NTDLL.@) + */ +errno_t __cdecl wcsncpy_s( wchar_t *dst, size_t len, const wchar_t *src, size_t count ) +{ + size_t i, end; + + if (!count) + { + if (dst && len) *dst = 0; + return 0; + } + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + if (count != _TRUNCATE && count < len) + end = count; + else + end = len - 1; + + for (i = 0; i < end; i++) + if (!(dst[i] = src[i])) return 0; + + if (count == _TRUNCATE) + { + dst[i] = 0; + return STRUNCATE; + } + if (end == count) + { + dst[i] = 0; + return 0; + } + dst[0] = 0; + return ERANGE; +} + + /********************************************************************* * wcsnlen (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strtok_s and wcstok_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: b44ebda3888fbd746a44b745d1f971e1a95a9025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44ebda3888fbd746a44b745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:50:12 2022 +0200 ntdll: Add strtok_s and wcstok_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 27 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e02c4278deb..18055fe3b9c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1604,6 +1604,7 @@ @ cdecl strrchr(str long) @ cdecl strspn(str str) @ cdecl strstr(str str) +@ cdecl strtok_s(str str ptr) @ cdecl strtol(str ptr long) @ cdecl strtoul(str ptr long) @ varargs swprintf(ptr wstr) NTDLL_swprintf @@ -1637,6 +1638,7 @@ @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) @ cdecl wcstok(wstr wstr) +@ cdecl wcstok_s(wstr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 6c4ac47803a..d0330f48926 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -795,6 +795,33 @@ int CDECL _tolower(int c) } +/********************************************************************* + * strtok_s (NTDLL.@) + */ +char * __cdecl strtok_s( char *str, const char *delim, char **ctx ) +{ + char *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && strchr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !strchr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + static int char_to_int( char c ) { if ('0' <= c && c <= '9') return c - '0'; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index e481c89ca71..ed9e1612918 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -455,6 +455,33 @@ LPWSTR __cdecl wcstok( LPWSTR str, LPCWSTR delim ) } +/********************************************************************* + * wcstok_s (NTDLL.@) + */ +wchar_t * __cdecl wcstok_s( wchar_t *str, const wchar_t *delim, wchar_t **ctx ) +{ + wchar_t *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && wcschr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !wcschr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + /********************************************************************* * wcstombs (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strupr_s and wcsupr_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 25f4760e851a05e3c241e6d9f83f14cca7f1ef4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f4760e851a05e3c241e6d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:46 2022 +0200 ntdll: Add strupr_s and wcsupr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 20 +++++++++++++++++++- dlls/ntdll/wcstring.c | 23 ++++++++++++++++++----- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 91c56d4d92c..0cda13586f4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1524,6 +1524,7 @@ @ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) +@ cdecl _strupr_s(str long) @ cdecl _tolower(long) @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) @@ -1540,6 +1541,7 @@ @ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) +@ cdecl _wcsupr_s(wstr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 8fbce780eb2..1bea000b2bd 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -600,11 +600,29 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) LPSTR __cdecl _strupr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = RtlUpperChar(*str); + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' + 'a'; return ret; } +/********************************************************************* + * _strupr_s (NTDLL.@) + */ +errno_t __cdecl _strupr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + + _strupr( str ); + return 0; +} + + /********************************************************************* * _strlwr (NTDLL.@) * diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index b2662cb9cf1..97d67ee38d0 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -154,13 +154,26 @@ LPWSTR __cdecl _wcsupr( LPWSTR str ) { WCHAR *ret = str; - while (*str) + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' - 'a'; + return ret; +} + + +/********************************************************************* + * _wcsupr_s (NTDLL.@) + */ +errno_t __cdecl _wcsupr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'a' && ch <= 'z') ch -= 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcsupr( str ); + return 0; }

1 0

Rémi Bernon : mf: Release video renderer services before re-initializing.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 98c9aff086461a4120c11b5e3afaf1b68095fef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c9aff086461a4120c11b5e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 13:37:26 2022 +0200 mf: Release video renderer services before re-initializing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/evr.c | 2 ++ dlls/mf/tests/mf.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b035b8b601b..90702ff3d95 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1707,6 +1707,8 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra { HRESULT hr; + video_renderer_release_services(renderer); + if (renderer->mixer) { IMFTransform_Release(renderer->mixer); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 006709f698c..8d725a65515 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4766,7 +4766,6 @@ static void test_evr(void) IMFMediaSink_Release(sink); ref = IMFVideoRenderer_Release(video_renderer); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); hr = MFCreateVideoRendererActivate(NULL, NULL);

1 0

Rémi Bernon : mf/tests: Add some missing IMFActivate_ShutdownObject calls.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: d7c3aac296031071e6eebc0420da16ed7bcfe823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c3aac296031071e6eebc04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 17:45:29 2022 +0200 mf/tests: Add some missing IMFActivate_ShutdownObject calls. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 61 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d8ff2dc4ac..27596e4f527 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2377,7 +2377,8 @@ todo_wine { ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr); ok(!count, "Unexpected count %u.\n", count); - IMFActivate_ShutdownObject(sink_activate); + hr = IMFActivate_ShutdownObject(sink_activate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IMFActivate_Release(sink_activate); ok(ref == 0, "Release returned %ld\n", ref); } @@ -2547,15 +2548,16 @@ static void test_topology_loader_evr(void) todo_wine ok(ref == 0, "Release returned %ld\n", ref); + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); ref = IMFActivate_Release(activate); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaSink_Release(sink); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(media_type); todo_wine - ok(ref == 2, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); DestroyWindow(window); @@ -3521,13 +3523,15 @@ static void test_sample_grabber(void) ref = IMFActivate_Release(activate); ok(ref == 0, "Release returned %ld\n", ref); + /* required for the sink to be fully released */ + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); + ref = IMFMediaSink_Release(sink); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(media_type); - todo_wine - ok(ref > 0, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); @@ -3627,19 +3631,23 @@ static void test_sample_grabber_is_mediatype_supported(void) IMFMediaTypeHandler_Release(handler); + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ref = IMFActivate_Release(activate); ok(ref == 0, "Release returned %ld\n", ref); + /* required for the sink to be fully released */ + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); + ref = IMFMediaSink_Release(sink); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(media_type2); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(media_type); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); } static BOOL is_supported_video_type(const GUID *guid) @@ -4668,6 +4676,9 @@ if (SUCCEEDED(hr)) hr = IMFActivate_DetachObject(activate); ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ref = IMFActivate_Release(activate); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaSink_Release(sink); @@ -4690,9 +4701,12 @@ if (SUCCEEDED(hr)) hr = MFCreateAudioRenderer(attributes, &sink); ok(hr == S_OK, "Failed to create a sink, hr %#lx.\n", hr); + /* required for the sink to be fully released */ + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ref = IMFMediaSink_Release(sink); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); /* Invalid endpoint. */ hr = IMFAttributes_SetString(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, L"endpoint"); @@ -4753,9 +4767,16 @@ static void test_evr(void) hr = IMFVideoRenderer_InitializeRenderer(video_renderer, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* required for the video renderer to be fully released */ + hr = IMFVideoRenderer_QueryInterface(video_renderer, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaSink_Release(sink); + ref = IMFVideoRenderer_Release(video_renderer); todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); hr = MFCreateVideoRendererActivate(NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); @@ -4801,11 +4822,13 @@ static void test_evr(void) IMFVideoDisplayControl_Release(display_control); + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ref = IMFActivate_Release(activate); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaSink_Release(sink); - todo_wine - ok(ref == 1, "Release returned %ld\n", ref); + ok(ref == 0, "Release returned %ld\n", ref); DestroyWindow(window); hr = MFCreateVideoRendererActivate(NULL, &activate);

1 0

Rémi Bernon : mf/tests: Add more consistent reference count checks.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: e71fe80c3a29e08010aeac167d4f4f7db28aae95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71fe80c3a29e08010aeac16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 24 11:40:52 2022 +0200 mf/tests: Add more consistent reference count checks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 517 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 353 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e71fe80c3a29e08010ae…

1 0

Rémi Bernon : mf: Avoid leaking nodes in IMFTopoLoader_Load.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: d21fee129b4b04b85dc61824fe1a10c06da1a284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21fee129b4b04b85dc61824… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 24 11:49:20 2022 +0200 mf: Avoid leaking nodes in IMFTopoLoader_Load. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 13 ++----------- dlls/mf/topology.c | 28 +++++++++++++++++++++------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 27596e4f527..006709f698c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2175,9 +2175,8 @@ static void test_topology_loader(void) /* Source node only. */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); - todo_wine_if(hr == S_OK) + todo_wine_if(hr == E_INVALIDARG) ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) IMFTopology_Release(full_topology); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); ok(hr == S_OK, "Failed to create output node, hr %#lx.\n", hr); @@ -2388,28 +2387,23 @@ todo_wine { ref = IMFTopoLoader_Release(loader); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(src_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(sink_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaSource_Release(source); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFPresentationDescriptor_Release(pd); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFStreamDescriptor_Release(sd); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(input_type); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); /* FIXME: is native really leaking refs here, or are we? */ ref = IMFMediaType_Release(output_type); + todo_wine ok(ref != 0, "Release returned %ld\n", ref); hr = MFShutdown(); @@ -2542,10 +2536,8 @@ static void test_topology_loader_evr(void) ref = IMFTopology_Release(topology); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(source_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(evr_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); hr = IMFActivate_ShutdownObject(activate); @@ -2556,7 +2548,6 @@ static void test_topology_loader_evr(void) ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(media_type); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); DestroyWindow(window); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index ff90bc2c8af..8d64c10b5c7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2359,6 +2359,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context }; MF_TOPOLOGY_TYPE u_type, d_type; IMFTopologyNode *node; + HRESULT hr; TOPOID id; /* Downstream node might have already been cloned. */ @@ -2372,10 +2373,13 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context if (!connectors[u_type][d_type]) { WARN("Unsupported branch kind %d -> %d.\n", u_type, d_type); + IMFTopologyNode_Release(node); return E_FAIL; } - return connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); + hr = connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); + IMFTopologyNode_Release(node); + return hr; } static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size) @@ -2391,19 +2395,25 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, { ++size; - IMFTopology_GetNodeByID(context->input_topology, id, &orig_node); - IMFTopologyNode_GetNodeType(node, &node_type); switch (node_type) { case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (FAILED(IMFTopologyNode_GetOutput(orig_node, 0, &downstream_node, &input_index))) + if (SUCCEEDED(hr = IMFTopology_GetNodeByID(context->input_topology, id, &orig_node))) + { + hr = IMFTopologyNode_GetOutput(orig_node, 0, &downstream_node, &input_index); + IMFTopologyNode_Release(orig_node); + } + + if (FAILED(hr)) { IMFTopology_RemoveNode(context->output_topology, node); + IMFTopologyNode_Release(node); continue; } hr = topology_loader_resolve_branch(context, node, 0, downstream_node, input_index); + IMFTopologyNode_Release(downstream_node); break; case MF_TOPOLOGY_TRANSFORM_NODE: case MF_TOPOLOGY_TEE_NODE: @@ -2414,6 +2424,7 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, } IMFTopologyNode_DeleteItem(node, &context->key); + IMFTopologyNode_Release(node); if (FAILED(hr)) break; @@ -2661,10 +2672,13 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - if (SUCCEEDED(hr)) + if (FAILED(hr)) + IMFTopology_Release(output_topology); + else + { topology_loader_resolve_complete(&context); - - *ret_topology = output_topology; + *ret_topology = output_topology; + } return hr; }

1 0